Revert Utilities directory nullable reference type changes due to build errors

Copilot · jonathanpeppers · Copilot · commit c1add459fdfa · 2025-07-24T14:03:49.000Z
Co-authored-by: jonathanpeppers &lt;840039+jonathanpeppers@users.noreply.github.com&gt;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGeneratorCLR.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGeneratorCLR.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/CompressedAssembliesNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/CompressedAssembliesNativeAssemblyGenerator.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/DummyCustomAttributeProvider.cs b/src/Xamarin.Android.Build.Tasks/Utilities/DummyCustomAttributeProvider.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System.Reflection.Metadata;
 
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/FileResourceParser.cs b/src/Xamarin.Android.Build.Tasks/Utilities/FileResourceParser.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.CodeDom;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/JavaResourceParser.cs b/src/Xamarin.Android.Build.Tasks/Utilities/JavaResourceParser.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.CodeDom;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/JniRemappingAssemblyGenerator.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrBufferManager.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrBufferManager.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrFunctionBody.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrFunctionBody.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrGenerator.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Buffers;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrInstructions.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrInstructions.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrStringManager.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrStringManager.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StructureInfo.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StructureInfo.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StructureInstance.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StructureInstance.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StructureMemberInfo.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/StructureMemberInfo.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Reflection;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MD2Managed.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MD2Managed.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#nullable enable
+#nullable disable
 
 using System;
 
@@ -72,7 +72,7 @@ class MD2Managed : System.Security.Cryptography.HashAlgorithm {
 			166, 119, 114, 248, 235, 117, 75, 10, 49, 68, 80, 180, 143, 237,
 			31, 26, 219, 153, 141, 51, 159, 17, 131, 20 };
 
-		private byte[]? Padding (int nLength)
+		private byte[] Padding (int nLength)
 		{
 			if (nLength > 0) {
 				byte[] padding = new byte [nLength];
@@ -146,7 +146,7 @@ protected override byte[] HashFinal ()
 
 			// is padding needed ? required if length not a multiple of 16.
 			if (padLen > 0)
-				HashCore (Padding (padLen)!, 0, padLen);
+				HashCore (Padding (padLen), 0, padLen);
 
 			// Extend with checksum 
 			HashCore (checksum, 0, 16);
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ManagedMarshalMethodsLookupGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ManagedMarshalMethodsLookupGenerator.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ManagedMarshalMethodsLookupInfo.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ManagedMarshalMethodsLookupInfo.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ManagedResourceParser.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ManagedResourceParser.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.CodeDom;
@@ -435,7 +435,7 @@ CodeMemberField CreateIntArrayField (CodeTypeDeclaration parentType, string name
 				"add-resource",
 			};
 
-		void CreateResourceField (string root, string fieldName, XmlReader? element = null)
+		void CreateResourceField (string root, string fieldName, XmlReader element = null)
 		{
 			var i = root.IndexOf ('-');
 			var item = i < 0 ? root : root.Substring (0, i);
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocument.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocument.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections.Generic;
@@ -44,7 +44,7 @@ internal class ManifestDocument
 
 		XName attName;
 
-		XElement? app;
+		XElement app;
 
 		// the elements and attributes which we apply the "." -> PackageName replacement on
 		static readonly Dictionary<string, string []> ManifestAttributeFixups = new Dictionary<string, string []> {
@@ -81,24 +81,24 @@ internal class ManifestDocument
 			{ "category", "android.intent.category.LAUNCHER" },
 		};
 
-		public string? PackageName { get; set; }
-		public string? ApplicationLabel { get; set; }
-		public string []? Placeholders { get; set; }
+		public string PackageName { get; set; }
+		public string ApplicationLabel { get; set; }
+		public string [] Placeholders { get; set; }
 		public List<string> Assemblies { get; set; }
-		public IAssemblyResolver? Resolver { get; set; }
-		public string? SdkDir { get; set; }
-		public string? TargetSdkVersion { get; set; }
-		public string? MinSdkVersion { get; set; }
+		public IAssemblyResolver Resolver { get; set; }
+		public string SdkDir { get; set; }
+		public string TargetSdkVersion { get; set; }
+		public string MinSdkVersion { get; set; }
 		public bool Debug { get; set; }
 		public bool MultiDex { get; set; }
 		public bool NeedsInternet { get; set; }
 		public bool ForceExtractNativeLibs { get; set; }
 		public bool ForceDebuggable { get; set; }
-		public string? VersionName { get; set; }
+		public string VersionName { get; set; }
 		public IVersionResolver VersionResolver { get; set; } = new MonoAndroidHelperVersionResolver ();
 		public AndroidRuntime AndroidRuntime { get; set; }
 
-		string? versionCode;
+		string versionCode;
 
 		/// <summary>
 		/// NOTE: this property modifies the underlying XDocument
@@ -1061,7 +1061,7 @@ static int GetAbiCode (string abi)
 			}
 		}
 
-		internal static string ReplacePlaceholders (string []? placeholders, string text, Action<string, string>? logCodedWarning = null)
+		internal static string ReplacePlaceholders (string [] placeholders, string text, Action<string, string> logCodedWarning = null)
 		{
 			string result = text;
 			if (placeholders == null)
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocumentElement.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocumentElement.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections;
@@ -29,7 +29,7 @@ public static string ToString (TypeDefinition typeDef, TypeDefinitionCache cache
 			return JavaNativeTypeManager.ToJniName (typeDef, cache).Replace ('/', '.');
 		}
 
-		public static TypeDefinition ResolveType (string type, ICustomAttributeProvider? provider, IAssemblyResolver? resolver)
+		public static TypeDefinition ResolveType (string type, ICustomAttributeProvider provider, IAssemblyResolver resolver)
 		{
 			if (type == null)
 				throw new ArgumentException ("Type resolution support requires a non-null Type.", nameof (type));
@@ -47,7 +47,7 @@ public static TypeDefinition ResolveType (string type, ICustomAttributeProvider?
 			int c = type.IndexOf (',');
 			string typeName = c < 0 ? type  : type.Substring (0, c);
 
-			string? assmName = c < 0 ? null  : type.Substring (c+1);
+			string assmName = c < 0 ? null  : type.Substring (c+1);
 
 			var assmNameRef = AssemblyNameReference.Parse (assmName);
 			var assembly    = assmName == null ? null : resolver.Resolve (assmNameRef);
@@ -78,17 +78,17 @@ public ManifestDocumentElement (string element)
 		public readonly string Element;
 
 		class MappingInfo {
-			public string?             AttributeName;
-			public Func<T, object?>?   Getter;
+			public string             AttributeName;
+			public Func<T, object?>    Getter;
 			public Action<T, object>?  Setter;
-			public Type?               MemberType;
-			public Func<T, string>?    AttributeValue;
-			public Func<T, ICustomAttributeProvider?, IAssemblyResolver?, TypeDefinitionCache, string>?    AttributeValue2;
+			public Type               MemberType;
+			public Func<T, string>    AttributeValue;
+			public Func<T, ICustomAttributeProvider, IAssemblyResolver, TypeDefinitionCache, string>    AttributeValue2;
 		}
 
 		readonly IDictionary<string, MappingInfo>   Mappings = new Dictionary<string, MappingInfo> ();
 
-		public void Add (string member, string attributeName, Func<T, object?> getter, Action<T, object>? setter, Type? memberType = null)
+		public void Add (string member, string attributeName, Func<T, object?> getter, Action<T, object>? setter, Type memberType = null)
 		{
 			Mappings.Add (member, new MappingInfo {
 					AttributeName   = attributeName,
@@ -107,7 +107,7 @@ public void Add (string member, string attributeName, Action<T, object> setter,
 			});
 		}
 
-		public void Add (string member, string attributeName, Action<T, object> setter, Func<T, ICustomAttributeProvider?, IAssemblyResolver?, TypeDefinitionCache, string> attributeValue)
+		public void Add (string member, string attributeName, Action<T, object> setter, Func<T, ICustomAttributeProvider, IAssemblyResolver, TypeDefinitionCache, string> attributeValue)
 		{
 			Mappings.Add (member, new MappingInfo {
 					AttributeName   = attributeName,
@@ -116,7 +116,7 @@ public void Add (string member, string attributeName, Action<T, object> setter,
 			});
 		}
 
-		public ICollection<string>? Load (T value, CustomAttribute attribute, TypeDefinitionCache cache)
+		public ICollection<string> Load (T value, CustomAttribute attribute, TypeDefinitionCache cache)
 		{
 			if (attribute == null)
 				return null;
@@ -134,7 +134,7 @@ public void Add (string member, string attributeName, Action<T, object> setter,
 		}
 
 		public XElement ToElement (T value, ICollection<string> specified, string packageName, TypeDefinitionCache cache,
-			ICustomAttributeProvider? provider = null, IAssemblyResolver? resolver = null, int targetSdkVersion = 0)
+			ICustomAttributeProvider provider = null, IAssemblyResolver resolver = null, int targetSdkVersion = 0)
 		{
 			var r = new XElement (Element,
 					specified.OrderBy (e => e)
@@ -144,23 +144,23 @@ public XElement ToElement (T value, ICollection<string> specified, string packag
 			return r;
 		}
 
-		XAttribute? ToAttribute (string name, T value, string packageName,
-			ICustomAttributeProvider? provider, IAssemblyResolver? resolver, TypeDefinitionCache cache, int targetSdkVersion = 0)
+		XAttribute ToAttribute (string name, T value, string packageName,
+			ICustomAttributeProvider provider, IAssemblyResolver resolver, TypeDefinitionCache cache, int targetSdkVersion = 0)
 		{
 			if (!Mappings.ContainsKey (name))
 				throw new ArgumentException ("Invalid attribute name: " + name);
 			var m = Mappings [name];
 			if (m.AttributeName == null)
 				return null;
 
-			string? v = ToAttributeValue (name, value, provider, resolver, cache, targetSdkVersion);
+			string v = ToAttributeValue (name, value, provider, resolver, cache, targetSdkVersion);
 			if (v == null)
 				return null;
 			v = v.Replace ("@PACKAGE_NAME@", packageName);
 			return new XAttribute (ManifestDocument.AndroidXmlNamespace + m.AttributeName, v);
 		}
 
-		string? ToAttributeValue (string name, T value, ICustomAttributeProvider? provider, IAssemblyResolver? resolver, TypeDefinitionCache cache, int targetSdkVersion = 0)
+		string ToAttributeValue (string name, T value, ICustomAttributeProvider provider, IAssemblyResolver resolver, TypeDefinitionCache cache, int targetSdkVersion = 0)
 		{
 			var m = Mappings [name];
 			if (m.AttributeValue != null)
@@ -180,7 +180,7 @@ public XElement ToElement (T value, ICollection<string> specified, string packag
 			return c (v, provider, resolver, targetSdkVersion, cache);
 		}
 
-		static readonly Dictionary<Type, Func<object, ICustomAttributeProvider?, IAssemblyResolver?, int, TypeDefinitionCache, string>> ValueConverters = new () {
+		static readonly Dictionary<Type, Func<object, ICustomAttributeProvider, IAssemblyResolver, int, TypeDefinitionCache, string>> ValueConverters = new () {
 			{ typeof (bool),                (value, p, r, v, c) => ToString ((bool) value) },
 			{ typeof (int),                 (value, p, r, v, c) => value.ToString () },
 			{ typeof (float),               (value, p, r, v, c) => value.ToString () },
@@ -366,7 +366,7 @@ static string ToString (WindowRotationAnimation value)
 			}
 		}
 
-		static string ToString (string value, ICustomAttributeProvider? provider, IAssemblyResolver? resolver, TypeDefinitionCache cache)
+		static string ToString (string value, ICustomAttributeProvider provider, IAssemblyResolver resolver, TypeDefinitionCache cache)
 		{
 			var typeDef = ResolveType (value, provider, resolver);
 			return ToString (typeDef, cache);
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsClassifier.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsClassifier.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections.Generic;
@@ -603,7 +603,7 @@ TypeDefinition GetMatchingType (TypeDefinition def)
 			}
 		}
 
-		MethodDefinition? FindMethod (TypeDefinition type, string methodName, IMethodSignatureMatcher? signatureMatcher = null)
+		MethodDefinition FindMethod (TypeDefinition type, string methodName, IMethodSignatureMatcher signatureMatcher = null)
 		{
 			foreach (MethodDefinition method in type.Methods) {
 				if (!method.IsManaged || method.IsConstructor) {
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsNativeAssemblyGenerator.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MetadataExtensions.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MetadataExtensions.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Diagnostics;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections.Generic;
@@ -27,8 +27,8 @@ public partial class MonoAndroidHelper
 
 		// Set in ResolveSdks.Execute();
 		// Requires that ResolveSdks.Execute() run before anything else
-		public static AndroidVersions?   SupportedVersions;
-		public static AndroidSdkInfo?    AndroidSdk;
+		public static AndroidVersions   SupportedVersions;
+		public static AndroidSdkInfo    AndroidSdk;
 
 		public static StringBuilder MergeStdoutAndStderrMessages (List<string> stdout, List<string> stderr)
 		{
@@ -126,7 +126,7 @@ public static int RunProcess (string logLabel, string command, string arguments,
 			}
 		}
 
-		public static int RunProcess (string name, string args, DataReceivedEventHandler onOutput, DataReceivedEventHandler onError, Dictionary<string, string>? environmentVariables = null)
+		public static int RunProcess (string name, string args, DataReceivedEventHandler onOutput, DataReceivedEventHandler onError, Dictionary<string, string> environmentVariables = null)
 		{
 			var psi = new ProcessStartInfo (name, args) {
 				UseShellExecute = false,
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/NdkTools/NdkTools.cs b/src/Xamarin.Android.Build.Tasks/Utilities/NdkTools/NdkTools.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/NdkTools/WithClangNoBinutils.cs b/src/Xamarin.Android.Build.Tasks/Utilities/NdkTools/WithClangNoBinutils.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.IO;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/RtxtParser.cs b/src/Xamarin.Android.Build.Tasks/Utilities/RtxtParser.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable disable
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/TypeMapGenerator.cs
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingDebugNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingDebugNativeAssemblyGenerator.cs
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingReleaseNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingReleaseNativeAssemblyGenerator.cs
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingReleaseNativeAssemblyGeneratorCLR.cs b/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingReleaseNativeAssemblyGeneratorCLR.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#nullable enable`
	`1`	`+#nullable disable`
`2`	`2`
`3`	`3`	`using System;`
`4`	`4`	`using System.Collections.Generic;`