[build] Enable string operations globalization code analyzers.

Author: jpobst

.editorconfig

@@ -332,9 +332,9 @@ dotnet_diagnostic.CA1200.severity = none		# Avoid using cref tags with a prefix
 dotnet_diagnostic.CA1303.severity = none		# Do not pass literals as localized parameters
 dotnet_diagnostic.CA1304.severity = none		# Specify CultureInfo
 dotnet_diagnostic.CA1305.severity = none		# Specify IFormatProvider
-dotnet_diagnostic.CA1307.severity = none		# Specify StringComparison
+#dotnet_diagnostic.CA1307.severity = none		# Specify StringComparison - Controlled via Directory.Build.props
 dotnet_diagnostic.CA1308.severity = none		# Normalize strings to uppercase
-dotnet_diagnostic.CA1309.severity = none		# Use ordinal stringcomparison
+#dotnet_diagnostic.CA1309.severity = none		# Use ordinal stringcomparison - Controlled via Directory.Build.props
 dotnet_diagnostic.CA1401.severity = none		# P/Invokes should not be visible
 dotnet_diagnostic.CA1417.severity = none		# Do not use 'OutAttribute' on string parameters for P/Invokes
 dotnet_diagnostic.CA1501.severity = none		# Avoid excessive inheritance

Directory.Build.props

@@ -85,6 +85,15 @@
     <_RunJNIEnvGen Condition=" '$(JIBuildingForNetCoreApp)' != 'True' ">$(Runtime) "$(_JNIEnvGenPath)"</_RunJNIEnvGen>
   </PropertyGroup>
 
+  <!-- The net6.0 versions of these are stricter and require overloads not available in .NET Framework, so start with just .NET Framework -->
+  <PropertyGroup Condition=" '$(TargetFramework)' != 'net6.0' ">
+    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
+    <WarningsAsErrors>$(WarningsAsErrors);CA1307;CA1309;CA1310</WarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <NoWarn>$(NoWarn);CA1307;CA1309;CA1310</NoWarn>
+  </PropertyGroup>
+
   <!-- Add Roslyn analyzers NuGet to all projects -->
   <ItemGroup Condition=" '$(DisableRoslynAnalyzers)' != 'True' ">
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">

build-tools/jnienv-gen/Generator.cs

@@ -773,7 +773,7 @@ public override string[] VerifyParameter (HandleStyle style, string variable)
 		{
 			if (managed != "IntPtr")
 				return new string [0];
-			var variableName = variable.StartsWith ("@")
+			var variableName = variable.StartsWith ("@", StringComparison.Ordinal)
 				? variable.Substring (1)
 				: variable;
 			return new[] {
@@ -851,7 +851,7 @@ public override string[] GetMarshalToManagedStatements (HandleStyle style, strin
 
 		public override string[] VerifyParameter (HandleStyle style, string variable)
 		{
-			var variableName = variable.StartsWith ("@")
+			var variableName = variable.StartsWith ("@", StringComparison.Ordinal)
 				? variable.Substring (1)
 				: variable;
 			return new[] {
@@ -940,7 +940,7 @@ public override string GetManagedToMarshalExpression (HandleStyle style, string
 
 		public override string[] VerifyParameter (HandleStyle style, string variable)
 		{
-			var variableName = variable.StartsWith ("@")
+			var variableName = variable.StartsWith ("@", StringComparison.Ordinal)
 				? variable.Substring (1)
 				: variable;
 			switch (style) {
@@ -1097,7 +1097,7 @@ public override string[] GetMarshalToManagedStatements (HandleStyle style, strin
 
 		public override string[] VerifyParameter (HandleStyle style, string variable)
 		{
-			var variableName = variable.StartsWith ("@")
+			var variableName = variable.StartsWith ("@", StringComparison.Ordinal)
 				? variable.Substring (1)
 				: variable;
 			switch (style) {

src/Java.Interop.Tools.Generator/Enumification/ConstantsParser.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -24,7 +25,7 @@ public static List<ConstantEntry> FromEnumMapCsv (TextReader reader)
 			// Read the enum csv file
 			while ((s = reader.ReadLine ()) != null) {
 				// Skip empty lines and comments
-				if (string.IsNullOrEmpty (s) || s.StartsWith ("//"))
+				if (string.IsNullOrEmpty (s) || s.StartsWith ("//", StringComparison.Ordinal))
 					continue;
 
 				// Transient mode means remove the original field

src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs

@@ -693,7 +693,7 @@ public Signature (string name, string signature, string connector, string manage
 				Name      = name;
 
 				var jnisig = signature;
-				int closer = jnisig.IndexOf (")");
+				int closer = jnisig.IndexOf (')');
 				string ret = jnisig.Substring (closer + 1);
 				retval = JavaNativeTypeManager.Parse (ret).Type;
 				string jniparms = jnisig.Substring (1, closer - 1);

src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocGrammar.HtmlBnfTerms.cs

@@ -112,10 +112,10 @@ static IEnumerable<XElement> GetParagraphs (ParseTreeNodeList children)
 						int len = 0;
 						int n   = -1;
 
-						if ((n = s.IndexOf (UnixParagraph, i)) >= 0) {
+						if ((n = s.IndexOf (UnixParagraph, i, StringComparison.Ordinal)) >= 0) {
 							len = UnixParagraph.Length;
 						}
-						else if ((n = s.IndexOf (DosParagraph, i)) >= 0) {
+						else if ((n = s.IndexOf (DosParagraph, i, StringComparison.Ordinal)) >= 0) {
 							len = DosParagraph.Length;
 						}
 

src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JavaNativeTypeManager.cs

@@ -58,8 +58,8 @@ public static JniTypeName Parse (string jniType)
 
 		public static IEnumerable<JniTypeName> FromSignature (string signature)
 		{
-			if (signature.StartsWith ("(")) {
-				int e = signature.IndexOf (")");
+			if (signature.StartsWith ("(", StringComparison.Ordinal)) {
+				int e = signature.IndexOf (')');
 				signature = signature.Substring (1, e >= 0 ? e-1 : signature.Length-1);
 			}
 			int i = 0;
@@ -102,7 +102,7 @@ public static JniTypeName ReturnTypeFromSignature (string signature)
 				case 'J':
 					return new JniTypeName { Type = "long", IsKeyword = true };
 				case 'L': {
-					var e = signature.IndexOf (";", index);
+					var e = signature.IndexOf (';', index);
 					if (e <= 0)
 						throw new InvalidOperationException ("Missing reference type after 'L' at index " + i + "in: " + signature);
 					var s = index;

src/Xamarin.Android.Tools.AnnotationSupport/AndroidAnnotationsSupport.cs

@@ -67,7 +67,7 @@ static Stream FixAnnotationXML (Stream s)
 			// them up before loading with a validating XML parser.
 			var doc = new HtmlDocument ();
 			doc.Load (s);
-			if (doc.DocumentNode.FirstChild.InnerHtml.StartsWith ("<?xml"))
+			if (doc.DocumentNode.FirstChild.InnerHtml.StartsWith ("<?xml", StringComparison.Ordinal))
 				doc.DocumentNode.FirstChild.Remove ();
 
 			var ms = new MemoryStream ();

src/Xamarin.Android.Tools.Bytecode/ClassPath.cs

@@ -129,7 +129,7 @@ XAttribute GetPlatform ()
 
 		bool IsGeneratedName (string parameterName)
 		{
-			return parameterName.StartsWith ("p") && parameterName.Length > 1 && Char.IsDigit (parameterName [1]);
+			return parameterName.StartsWith ("p", StringComparison.Ordinal) && parameterName.Length > 1 && Char.IsDigit (parameterName [1]);
 		}
 
 		IEnumerable<ClassFile> GetDescendants (ClassFile theClass, IList<ClassFile> classFiles)

src/Xamarin.Android.Tools.Bytecode/Kotlin/KotlinFixups.cs

@@ -194,7 +194,7 @@ static void FixupExtensionMethod (MethodInfo method)
 			// like "$this$toByteString", we change it to "obj" to be a bit nicer.
 			var param = method.GetParameters ();
 
-			if (param.Length > 0 && param [0].Name.StartsWith ("$this$")) {
+			if (param.Length > 0 && param [0].Name.StartsWith ("$this$", StringComparison.Ordinal)) {
 				Log.Debug ($"Kotlin: Renaming extension parameter {method.DeclaringType?.ThisClass.Name.Value} - {method.Name} - {param [0].Name} -> obj");
 				param [0].Name = "obj";
 			}
@@ -288,7 +288,7 @@ static FieldInfo FindJavaFieldProperty (KotlinFile kotlinClass, KotlinProperty p
 
 		static MethodInfo FindJavaPropertyGetter (KotlinFile kotlinClass, KotlinProperty property, ClassFile klass)
 		{
-			var possible_methods = klass.Methods.Where (method => string.Compare (method.GetMethodNameWithoutSuffix (), $"get{property.Name}", true) == 0 &&
+			var possible_methods = klass.Methods.Where (method => string.Compare (method.GetMethodNameWithoutSuffix (), $"get{property.Name}", StringComparison.OrdinalIgnoreCase) == 0 &&
 									      method.GetParameters ().Length == 0 &&
 									      TypesMatch (method.ReturnType, property.ReturnType, kotlinClass));
 
@@ -297,7 +297,7 @@ static MethodInfo FindJavaPropertyGetter (KotlinFile kotlinClass, KotlinProperty
 
 		static MethodInfo FindJavaPropertySetter (KotlinFile kotlinClass, KotlinProperty property, ClassFile klass)
 		{
-			var possible_methods = klass.Methods.Where (method => string.Compare (method.GetMethodNameWithoutSuffix (), $"set{property.Name}", true) == 0 &&
+			var possible_methods = klass.Methods.Where (method => string.Compare (method.GetMethodNameWithoutSuffix (), $"set{property.Name}", StringComparison.OrdinalIgnoreCase) == 0 &&
 									      property.ReturnType != null &&
 									      method.GetParameters ().Length == 1 &&
 									      method.ReturnType.BinaryName == "V" &&