Task backport to 5.x

RabbitMQDotNetClient.sln

@@ -1,77 +1,161 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26114.2
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29709.97
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "projects", "projects", "{068D7DC3-8E6E-4951-B9E3-272C641BF0DE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client", "projects\client\RabbitMQ.Client\RabbitMQ.Client.csproj", "{8C554257-5ECC-45DB-873D-560BFBB74EC8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RabbitMQ.Client", "projects\client\RabbitMQ.Client\RabbitMQ.Client.csproj", "{8C554257-5ECC-45DB-873D-560BFBB74EC8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unit", "projects\client\Unit\Unit.csproj", "{B8FAC024-CC03-4067-9FFC-02846FB8AE48}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unit", "projects\client\Unit\Unit.csproj", "{B8FAC024-CC03-4067-9FFC-02846FB8AE48}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApigenBootstrap", "projects\client\ApigenBootstrap\ApigenBootstrap.csproj", "{9534956B-60D5-49BA-8179-1382D4E64349}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApigenBootstrap", "projects\client\ApigenBootstrap\ApigenBootstrap.csproj", "{9534956B-60D5-49BA-8179-1382D4E64349}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apigen", "projects\client\Apigen\Apigen.csproj", "{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apigen", "projects\client\Apigen\Apigen.csproj", "{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unit.WinRT", "projects\client\Unit.WinRT\Unit.WinRT.csproj", "{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{34486CC0-D61E-46BA-9E5E-6E8EFA7C34B5}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unit.WinRT", "projects\client\Unit.WinRT\Unit.WinRT.csproj", "{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		DebugNoTest|Any CPU = DebugNoTest|Any CPU
-		Release|Any CPU = Release|Any CPU
-		SignedRelease|Any CPU = SignedRelease|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		DebugNoTest|Any CPU = DebugNoTest|Any CPU
+		DebugNoTest|x64 = DebugNoTest|x64
+		DebugNoTest|x86 = DebugNoTest|x86
+		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
+		SignedRelease|Any CPU = SignedRelease|Any CPU
+		SignedRelease|x64 = SignedRelease|x64
+		SignedRelease|x86 = SignedRelease|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Debug|x64.Build.0 = Debug|Any CPU
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Debug|x86.Build.0 = Debug|Any CPU
 		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
 		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.DebugNoTest|x64.ActiveCfg = Debug|Any CPU
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.DebugNoTest|x64.Build.0 = Debug|Any CPU
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.DebugNoTest|x86.ActiveCfg = Debug|Any CPU
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.DebugNoTest|x86.Build.0 = Debug|Any CPU
 		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.SignedRelease|Any CPU.ActiveCfg = SignedRelease|Any CPU
-		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.SignedRelease|Any CPU.Build.0 = SignedRelease|Any CPU
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Release|x64.ActiveCfg = Release|Any CPU
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Release|x64.Build.0 = Release|Any CPU
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Release|x86.ActiveCfg = Release|Any CPU
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Release|x86.Build.0 = Release|Any CPU
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.SignedRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.SignedRelease|Any CPU.Build.0 = Release|Any CPU
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.SignedRelease|x64.ActiveCfg = Release|Any CPU
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.SignedRelease|x64.Build.0 = Release|Any CPU
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.SignedRelease|x86.ActiveCfg = Release|Any CPU
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8}.SignedRelease|x86.Build.0 = Release|Any CPU
 		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Debug|x64.Build.0 = Debug|Any CPU
+		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Debug|x86.Build.0 = Debug|Any CPU
 		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.DebugNoTest|x64.ActiveCfg = Debug|Any CPU
+		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.DebugNoTest|x64.Build.0 = Debug|Any CPU
+		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.DebugNoTest|x86.ActiveCfg = Debug|Any CPU
+		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.DebugNoTest|x86.Build.0 = Debug|Any CPU
 		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Release|x64.ActiveCfg = Release|Any CPU
+		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Release|x64.Build.0 = Release|Any CPU
+		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Release|x86.ActiveCfg = Release|Any CPU
+		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Release|x86.Build.0 = Release|Any CPU
 		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.SignedRelease|Any CPU.ActiveCfg = Release|Any CPU
 		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.SignedRelease|Any CPU.Build.0 = Release|Any CPU
+		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.SignedRelease|x64.ActiveCfg = Release|Any CPU
+		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.SignedRelease|x64.Build.0 = Release|Any CPU
+		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.SignedRelease|x86.ActiveCfg = Release|Any CPU
+		{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.SignedRelease|x86.Build.0 = Release|Any CPU
 		{9534956B-60D5-49BA-8179-1382D4E64349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9534956B-60D5-49BA-8179-1382D4E64349}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9534956B-60D5-49BA-8179-1382D4E64349}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9534956B-60D5-49BA-8179-1382D4E64349}.Debug|x64.Build.0 = Debug|Any CPU
+		{9534956B-60D5-49BA-8179-1382D4E64349}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9534956B-60D5-49BA-8179-1382D4E64349}.Debug|x86.Build.0 = Debug|Any CPU
 		{9534956B-60D5-49BA-8179-1382D4E64349}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
 		{9534956B-60D5-49BA-8179-1382D4E64349}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
+		{9534956B-60D5-49BA-8179-1382D4E64349}.DebugNoTest|x64.ActiveCfg = Debug|Any CPU
+		{9534956B-60D5-49BA-8179-1382D4E64349}.DebugNoTest|x64.Build.0 = Debug|Any CPU
+		{9534956B-60D5-49BA-8179-1382D4E64349}.DebugNoTest|x86.ActiveCfg = Debug|Any CPU
+		{9534956B-60D5-49BA-8179-1382D4E64349}.DebugNoTest|x86.Build.0 = Debug|Any CPU
 		{9534956B-60D5-49BA-8179-1382D4E64349}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9534956B-60D5-49BA-8179-1382D4E64349}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9534956B-60D5-49BA-8179-1382D4E64349}.Release|x64.ActiveCfg = Release|Any CPU
+		{9534956B-60D5-49BA-8179-1382D4E64349}.Release|x64.Build.0 = Release|Any CPU
+		{9534956B-60D5-49BA-8179-1382D4E64349}.Release|x86.ActiveCfg = Release|Any CPU
+		{9534956B-60D5-49BA-8179-1382D4E64349}.Release|x86.Build.0 = Release|Any CPU
 		{9534956B-60D5-49BA-8179-1382D4E64349}.SignedRelease|Any CPU.ActiveCfg = Release|Any CPU
 		{9534956B-60D5-49BA-8179-1382D4E64349}.SignedRelease|Any CPU.Build.0 = Release|Any CPU
+		{9534956B-60D5-49BA-8179-1382D4E64349}.SignedRelease|x64.ActiveCfg = Release|Any CPU
+		{9534956B-60D5-49BA-8179-1382D4E64349}.SignedRelease|x64.Build.0 = Release|Any CPU
+		{9534956B-60D5-49BA-8179-1382D4E64349}.SignedRelease|x86.ActiveCfg = Release|Any CPU
+		{9534956B-60D5-49BA-8179-1382D4E64349}.SignedRelease|x86.Build.0 = Release|Any CPU
 		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Debug|x64.Build.0 = Debug|Any CPU
+		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Debug|x86.Build.0 = Debug|Any CPU
 		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
 		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
+		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.DebugNoTest|x64.ActiveCfg = Debug|Any CPU
+		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.DebugNoTest|x64.Build.0 = Debug|Any CPU
+		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.DebugNoTest|x86.ActiveCfg = Debug|Any CPU
+		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.DebugNoTest|x86.Build.0 = Debug|Any CPU
 		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Release|x64.ActiveCfg = Release|Any CPU
+		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Release|x64.Build.0 = Release|Any CPU
+		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Release|x86.ActiveCfg = Release|Any CPU
+		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Release|x86.Build.0 = Release|Any CPU
 		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.SignedRelease|Any CPU.ActiveCfg = Release|Any CPU
 		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.SignedRelease|Any CPU.Build.0 = Release|Any CPU
+		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.SignedRelease|x64.ActiveCfg = Release|Any CPU
+		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.SignedRelease|x64.Build.0 = Release|Any CPU
+		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.SignedRelease|x86.ActiveCfg = Release|Any CPU
+		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.SignedRelease|x86.Build.0 = Release|Any CPU
 		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Debug|x64.ActiveCfg = Debug|x64
-		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Debug|x64.Build.0 = Debug|x64
-		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Debug|x86.ActiveCfg = Debug|x86
-		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Debug|x86.Build.0 = Debug|x86
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Debug|x64.Build.0 = Debug|Any CPU
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Debug|x86.Build.0 = Debug|Any CPU
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.DebugNoTest|x64.ActiveCfg = Debug|Any CPU
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.DebugNoTest|x64.Build.0 = Debug|Any CPU
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.DebugNoTest|x86.ActiveCfg = Debug|Any CPU
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.DebugNoTest|x86.Build.0 = Debug|Any CPU
 		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Release|x64.ActiveCfg = Release|x64
-		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Release|x64.Build.0 = Release|x64
-		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Release|x86.ActiveCfg = Release|x86
-		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Release|x86.Build.0 = Release|x86
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Release|x64.ActiveCfg = Release|Any CPU
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Release|x64.Build.0 = Release|Any CPU
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Release|x86.ActiveCfg = Release|Any CPU
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Release|x86.Build.0 = Release|Any CPU
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.SignedRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.SignedRelease|Any CPU.Build.0 = Release|Any CPU
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.SignedRelease|x64.ActiveCfg = Release|Any CPU
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.SignedRelease|x64.Build.0 = Release|Any CPU
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.SignedRelease|x86.ActiveCfg = Release|Any CPU
+		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.SignedRelease|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -84,4 +168,7 @@ Global
 		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
 		{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {587CFF88-68A5-4478-A7AC-B35E67A7817C}
+	EndGlobalSection
 EndGlobal

projects/client/Apigen/src/apigen/Apigen.cs

@@ -131,9 +131,9 @@ public static string MangleConstant(string name)
         public static IList<string> IdentifierParts(string name)
         {
             IList<string> result = new List<string>();
-            foreach (String s1 in name.Split(new Char[] { '-' }))
+            foreach (string s1 in name.Split(new char[] { '-' }))
             {
-                foreach (String s2 in s1.Split(new Char[] { ' ' }))
+                foreach (string s2 in s1.Split(new char[] { ' ' }))
                 {
                     result.Add(s2);
                 }
@@ -144,9 +144,9 @@ public static IList<string> IdentifierParts(string name)
         public static string MangleClass(string name)
         {
             StringBuilder sb = new StringBuilder();
-            foreach (String s in IdentifierParts(name))
+            foreach (string s in IdentifierParts(name))
             {
-                sb.Append(Char.ToUpperInvariant(s[0]) + s.Substring(1).ToLowerInvariant());
+                sb.Append(char.ToUpperInvariant(s[0]) + s.Substring(1).ToLowerInvariant());
             }
             return sb.ToString();
         }
@@ -155,11 +155,11 @@ public static string MangleMethod(string name)
         {
             StringBuilder sb = new StringBuilder();
             bool useUpper = false;
-            foreach (String s in IdentifierParts(name))
+            foreach (string s in IdentifierParts(name))
             {
                 if (useUpper)
                 {
-                    sb.Append(Char.ToUpperInvariant(s[0]) + s.Substring(1).ToLowerInvariant());
+                    sb.Append(char.ToUpperInvariant(s[0]) + s.Substring(1).ToLowerInvariant());
                 }
                 else
                 {
@@ -937,7 +937,7 @@ public void EmitContentHeaderFactory(MethodInfo method)
             EmitLine("    {");
             if (Attribute(method, typeof(AmqpUnsupportedAttribute)) != null)
             {
-                EmitLine(String.Format("      throw new UnsupportedMethodException(\"" + method.Name + "\");"));
+                EmitLine(string.Format("      throw new UnsupportedMethodException(\"" + method.Name + "\");"));
             }
             else
             {

projects/client/RabbitMQ.Client/src/client/api/ConnectionFactory.cs

@@ -381,7 +381,7 @@ public virtual IConnection CreateConnection()
         /// <exception cref="BrokerUnreachableException">
         /// When the configured hostname was not reachable.
         /// </exception>
-        public IConnection CreateConnection(String clientProvidedName)
+        public IConnection CreateConnection(string clientProvidedName)
         {
             return CreateConnection(EndpointResolverFactory(LocalEndpoints()), clientProvidedName);
         }
@@ -425,7 +425,7 @@ public IConnection CreateConnection(IList<string> hostnames)
         /// <exception cref="BrokerUnreachableException">
         /// When no hostname was reachable.
         /// </exception>
-        public IConnection CreateConnection(IList<string> hostnames, String clientProvidedName)
+        public IConnection CreateConnection(IList<string> hostnames, string clientProvidedName)
         {
             var endpoints = hostnames.Select(h => new AmqpTcpEndpoint(h, this.Port, this.Ssl));
             return CreateConnection(new DefaultEndpointResolver(endpoints), clientProvidedName);
@@ -465,7 +465,7 @@ public IConnection CreateConnection(IList<AmqpTcpEndpoint> endpoints)
         /// <exception cref="BrokerUnreachableException">
         /// When no hostname was reachable.
         /// </exception>
-        public IConnection CreateConnection(IEndpointResolver endpointResolver, String clientProvidedName)
+        public IConnection CreateConnection(IEndpointResolver endpointResolver, string clientProvidedName)
         {
             IConnection conn;
             try

projects/client/RabbitMQ.Client/src/client/api/IConnectionFactory.cs

@@ -50,7 +50,7 @@ public interface IConnectionFactory
         /// <summary>
         /// Dictionary of client properties to be sent to the server.
         /// </summary>
-        IDictionary<String, object> ClientProperties { get; set; }
+        IDictionary<string, object> ClientProperties { get; set; }
 
         /// <summary>
         /// Password to use when authenticating to the server.
@@ -113,7 +113,7 @@ public interface IConnectionFactory
         /// This value is supposed to be human-readable.
         /// </param>
         /// <returns></returns>
-        IConnection CreateConnection(String clientProvidedName);
+        IConnection CreateConnection(string clientProvidedName);
 
         /// <summary>
         /// Connects to the first reachable hostname from the list.
@@ -133,7 +133,7 @@ public interface IConnectionFactory
         /// This value is supposed to be human-readable.
         /// </param>
         /// <returns></returns>
-        IConnection CreateConnection(IList<string> hostnames, String clientProvidedName);
+        IConnection CreateConnection(IList<string> hostnames, string clientProvidedName);
 
         /// <summary>
         /// Create a connection using a list of endpoints.

projects/client/RabbitMQ.Client/src/client/api/IProtocol.cs

@@ -100,13 +100,13 @@ public interface IProtocol
         /// a frame handler, a client-provided name, and no automatic recovery.
         /// The "insist" parameter is passed on to the AMQP connection.open method.
         /// </summary>
-        IConnection CreateConnection(IConnectionFactory factory, bool insist, IFrameHandler frameHandler, String clientProvidedName);
+        IConnection CreateConnection(IConnectionFactory factory, bool insist, IFrameHandler frameHandler, string clientProvidedName);
 
         /// <summary>
         /// Construct a connection from a given set of parameters,
         /// a frame handler, a client-provided name, and automatic recovery settings.
         /// </summary>
-        IConnection CreateConnection(ConnectionFactory factory, IFrameHandler frameHandler, bool automaticRecoveryEnabled, String clientProvidedName);
+        IConnection CreateConnection(ConnectionFactory factory, IFrameHandler frameHandler, bool automaticRecoveryEnabled, string clientProvidedName);
 
         /// <summary>
         /// Construct a protocol model atop a given session.