Fix NRT annotations in Xamarin.Android.Build.Tasks/Utilities directory and resolve runtime KeyNotFoundException

src/Xamarin.Android.Build.Tasks/Mono.Android/ActivityAttribute.Partial.cs

@@ -54,7 +54,7 @@ public static ActivityAttribute FromTypeDefinition (TypeDefinition type, TypeDef
 
 		internal XElement ToElement (IAssemblyResolver resolver, string packageName, TypeDefinitionCache cache, int targetSdkVersion)
 		{
-			return mapping.ToElement (this, specified, packageName, cache, type, resolver, targetSdkVersion);
+			return mapping.ToElement (this, specified ?? new HashSet<string> (), packageName, cache, type, resolver, targetSdkVersion);
 		}
 	}
 }

src/Xamarin.Android.Build.Tasks/Mono.Android/ApplicationAttribute.Partial.cs

@@ -76,7 +76,7 @@ public static ApplicationAttribute FromCustomAttributeProvider (ICustomAttribute
 
 		internal XElement ToElement (IAssemblyResolver resolver, string packageName, TypeDefinitionCache cache)
 		{
-			return mapping.ToElement (this, specified, packageName, cache, provider, resolver);
+			return mapping.ToElement (this, specified ?? new HashSet<string> (), packageName, cache, provider, resolver);
 		}
 
 		static string ToNameAttribute (ApplicationAttribute self, ICustomAttributeProvider provider, IAssemblyResolver resolver, TypeDefinitionCache cache)

src/Xamarin.Android.Build.Tasks/Mono.Android/BroadcastReceiverAttribute.Partial.cs

@@ -29,7 +29,7 @@ public static BroadcastReceiverAttribute FromTypeDefinition (TypeDefinition type
 
 		public XElement ToElement (string packageName, TypeDefinitionCache cache)
 		{
-			return mapping.ToElement (this, specified, packageName, cache);
+			return mapping.ToElement (this, specified ?? new HashSet<string> (), packageName, cache);
 		}
 	}
 }

src/Xamarin.Android.Build.Tasks/Mono.Android/ContentProviderAttribute.Partial.cs

@@ -46,7 +46,7 @@ public static ContentProviderAttribute FromTypeDefinition (TypeDefinition type,
 
 		public XElement ToElement (string packageName, TypeDefinitionCache cache)
 		{
-			return mapping.ToElement (this, specified, packageName, cache);
+			return mapping.ToElement (this, specified ?? new HashSet<string> (), packageName, cache);
 		}
 	}
 }

src/Xamarin.Android.Build.Tasks/Mono.Android/GrantUriPermissionAttribute.Partial.cs

@@ -28,7 +28,7 @@ public static IEnumerable<GrantUriPermissionAttribute> FromTypeDefinition (TypeD
 
 		public XElement ToElement (string packageName, TypeDefinitionCache cache)
 		{
-			return mapping.ToElement (this, specified, packageName, cache);
+			return mapping.ToElement (this, specified ?? new HashSet<string> (), packageName, cache);
 		}
 	}
 }

src/Xamarin.Android.Build.Tasks/Mono.Android/InstrumentationAttribute.Partial.cs

@@ -33,7 +33,7 @@ public void SetTargetPackage (string package)
 
 		public XElement ToElement (string packageName, TypeDefinitionCache cache)
 		{
-			return mapping.ToElement (this, specified, packageName, cache);
+			return mapping.ToElement (this, specified ?? new HashSet<string> (), packageName, cache);
 		}
 	}
 }

src/Xamarin.Android.Build.Tasks/Mono.Android/LayoutAttribute.Partial.cs

@@ -37,7 +37,7 @@ public static LayoutAttribute FromTypeDefinition (TypeDefinition type, TypeDefin
 
 		internal XElement ToElement (IAssemblyResolver resolver, string packageName, TypeDefinitionCache cache)
 		{
-			return mapping.ToElement (this, specified, packageName, cache, type, resolver);
+			return mapping.ToElement (this, specified ?? new HashSet<string> (), packageName, cache, type, resolver);
 		}
 	}
 }

src/Xamarin.Android.Build.Tasks/Mono.Android/MetaDataAttribute.Partial.cs

@@ -29,7 +29,7 @@ public static IEnumerable<MetaDataAttribute> FromCustomAttributeProvider (ICusto
 
 		public XElement ToElement (string packageName, TypeDefinitionCache cache)
 		{
-			return mapping.ToElement (this, specified, packageName, cache);
+			return mapping.ToElement (this, specified ?? new HashSet<string> (), packageName, cache);
 		}
 	}
 }

src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionAttribute.Partial.cs

@@ -33,7 +33,7 @@ public static IEnumerable<PermissionAttribute> FromCustomAttributeProvider (ICus
 
 		internal XElement ToElement (string packageName, TypeDefinitionCache cache)
 		{
-			return mapping.ToElement (this, specified, packageName, cache);
+			return mapping.ToElement (this, specified ?? new HashSet<string> (), packageName, cache);
 		}
 
 		internal class PermissionAttributeComparer : IEqualityComparer<PermissionAttribute>

src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionGroupAttribute.Partial.cs

@@ -33,7 +33,7 @@ public static IEnumerable<PermissionGroupAttribute> FromCustomAttributeProvider
 
 		internal XElement ToElement (string packageName, TypeDefinitionCache cache)
 		{
-			return mapping.ToElement (this, specified, packageName, cache);
+			return mapping.ToElement (this, specified ?? new HashSet<string> (), packageName, cache);
 		}
 
 		internal class PermissionGroupAttributeComparer : IEqualityComparer<PermissionGroupAttribute>

src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionTreeAttribute.Partial.cs

@@ -33,7 +33,7 @@ public static IEnumerable<PermissionTreeAttribute> FromCustomAttributeProvider (
 
 		internal XElement ToElement (string packageName, TypeDefinitionCache cache)
 		{
-			return mapping.ToElement (this, specified, packageName, cache);
+			return mapping.ToElement (this, specified ?? new HashSet<string> (), packageName, cache);
 		}
 
 		internal class PermissionTreeAttributeComparer : IEqualityComparer<PermissionTreeAttribute>

src/Xamarin.Android.Build.Tasks/Mono.Android/PropertyAttribute.Partial.cs

@@ -29,7 +29,7 @@ public static IEnumerable<PropertyAttribute> FromCustomAttributeProvider (ICusto
 
 		public XElement ToElement (string packageName, TypeDefinitionCache cache)
 		{
-			return mapping.ToElement (this, specified, packageName, cache);
+			return mapping.ToElement (this, specified ?? new HashSet<string> (), packageName, cache);
 		}
 	}
 }

src/Xamarin.Android.Build.Tasks/Mono.Android/ServiceAttribute.Partial.cs

@@ -31,7 +31,7 @@ public static ServiceAttribute FromTypeDefinition (TypeDefinition type, TypeDefi
 
 		public XElement ToElement (string packageName, TypeDefinitionCache cache)
 		{
-			return mapping.ToElement (this, specified, packageName, cache);
+			return mapping.ToElement (this, specified ?? new HashSet<string> (), packageName, cache);
 		}
 	}
 }

src/Xamarin.Android.Build.Tasks/Mono.Android/SupportsGLTextureAttribute.Partial.cs

@@ -24,7 +24,7 @@ partial class SupportsGLTextureAttribute
 
 		internal XElement ToElement (string packageName, TypeDefinitionCache cache)
 		{
-			return mapping.ToElement (this, specified, packageName, cache);
+			return mapping.ToElement (this, specified ?? new HashSet<string> (), packageName, cache);
 		}
 
 		ICollection<string>? specified;

src/Xamarin.Android.Build.Tasks/Mono.Android/UsesConfigurationAttribute.Partial.cs

@@ -15,7 +15,7 @@ partial class UsesConfigurationAttribute	{
 
 		internal XElement ToElement (string packageName, TypeDefinitionCache cache)
 		{
-			return mapping.ToElement (this, specified, packageName, cache);
+			return mapping.ToElement (this, specified ?? new HashSet<string> (), packageName, cache);
 		}
 
 		ICollection<string>? specified;

src/Xamarin.Android.Build.Tasks/Mono.Android/UsesFeatureAttribute.Partial.cs

@@ -30,7 +30,7 @@ internal string GLESVesionAsString ()
 
 		internal XElement ToElement (string packageName, TypeDefinitionCache cache)
 		{
-			return mapping.ToElement (this, specified, packageName, cache);
+			return mapping.ToElement (this, specified ?? new HashSet<string> (), packageName, cache);
 		}
 
 		ICollection<string>? specified;

src/Xamarin.Android.Build.Tasks/Mono.Android/UsesLibraryAttribute.Partial.cs

@@ -48,7 +48,7 @@ public static IEnumerable<UsesLibraryAttribute> FromCustomAttributeProvider (ICu
 
 		public XElement ToElement (string packageName, TypeDefinitionCache cache)
 		{
-			return mapping.ToElement (this, specified, packageName, cache);
+			return mapping.ToElement (this, specified ?? new HashSet<string> (), packageName, cache);
 		}
 	}
 }

src/Xamarin.Android.Build.Tasks/Mono.Android/UsesPermissionAttribute.Partial.cs

@@ -31,16 +31,18 @@ public static IEnumerable<UsesPermissionAttribute> FromCustomAttributeProvider (
 
 				self.specified = mapping.Load (self, attr, cache);
 
-				foreach (var e in extra)
+				foreach (var e in extra) {
+					self.specified ??= new HashSet<string> ();
 					self.specified.Add (e);
+				}
 
 				yield return self;
 			}
 		}
 
 		public XElement ToElement (string packageName, TypeDefinitionCache cache)
 		{
-			return mapping.ToElement (this, specified, packageName, cache);
+			return mapping.ToElement (this, specified ?? new HashSet<string> (), packageName, cache);
 		}
 
 		internal class UsesPermissionComparer : IEqualityComparer<UsesPermissionAttribute>

src/Xamarin.Android.Build.Tasks/Tasks/GenerateMainAndroidManifest.cs

@@ -111,7 +111,7 @@ IList<string> MergeManifest (NativeCodeGenState codeGenState, Dictionary<string,
 		} else if (!VersionCode.IsNullOrEmpty ()) {
 			manifest.VersionCode = VersionCode;
 		}
-		manifest.Assemblies.AddRange (userAssemblies.Values.Select (item => item.ItemSpec));
+		manifest.Assemblies?.AddRange (userAssemblies?.Values?.Where (item => item?.ItemSpec != null).Select (item => item.ItemSpec) ?? []);
 
 		if (!String.IsNullOrWhiteSpace (CheckedBuild)) {
 			// We don't validate CheckedBuild value here, this will be done in BuildApk. We just know that if it's
@@ -120,10 +120,10 @@ IList<string> MergeManifest (NativeCodeGenState codeGenState, Dictionary<string,
 			manifest.ForceExtractNativeLibs = true;
 		}
 
-		IList<string> additionalProviders = manifest.Merge (Log, codeGenState.TypeCache, codeGenState.AllJavaTypes, ApplicationJavaClass, EmbedAssemblies, BundledWearApplicationName, MergedManifestDocuments);
+		IList<string> additionalProviders = manifest.Merge (Log, codeGenState.TypeCache, codeGenState.AllJavaTypes, ApplicationJavaClass, EmbedAssemblies, BundledWearApplicationName, MergedManifestDocuments ?? []);
 
 		// Only write the new manifest if it actually changed
-		if (manifest.SaveIfChanged (Log, MergedAndroidManifestOutput)) {
+		if (!MergedAndroidManifestOutput.IsNullOrEmpty () && manifest.SaveIfChanged (Log, MergedAndroidManifestOutput)) {
 			Log.LogDebugMessage ($"Saving: {MergedAndroidManifestOutput}");
 		}
 

src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrFunctionBody.cs

@@ -1,4 +1,4 @@
-#nullable disable
+#nullable enable
 
 using System;
 using System.Collections.Generic;
@@ -24,7 +24,7 @@ abstract class LlvmIrFunctionBodyItem
 	public void Write (GeneratorWriteContext context, LlvmIrGenerator generator)
 	{
 		DoWrite (context, generator);
-		if (!String.IsNullOrEmpty (Comment)) {
+		if (!Comment.IsNullOrEmpty ()) {
 			context.Output.Write (' ');
 			generator.WriteComment (context, Comment);
 		}
@@ -44,14 +44,14 @@ abstract class LlvmIrFunctionLocalItem : LlvmIrFunctionBodyItem
 
 	public string Name {
 		get {
-			if (String.IsNullOrEmpty (name)) {
+			if (name.IsNullOrEmpty ()) {
 				throw new InvalidOperationException ("Internal error: name hasn't been set yet");
 			}
 			return name;
 		}
 
 		protected set {
-			if (String.IsNullOrEmpty (value)) {
+			if (value.IsNullOrEmpty ()) {
 				throw new InvalidOperationException ("Internal error: value must not be null or empty");
 			}
 			name = value;
@@ -84,7 +84,7 @@ protected void SetName (ulong num)
 		Name = num.ToString (CultureInfo.InvariantCulture);
 	}
 
-	protected bool NameIsSet () => !String.IsNullOrEmpty (name);
+	protected bool NameIsSet () => !name.IsNullOrEmpty ();
 }
 
 class LlvmIrFunctionLabelItem : LlvmIrFunctionLocalItem
@@ -192,11 +192,14 @@ public void Add (LlvmIrFunctionLabelItem label, string? comment = null)
 		previousLabel = label;
 
 		if (comment == null) {
-			var sb = new StringBuilder (" preds = %");
-			sb.Append (precedingBlock1.Name);
-			if (precedingBlock2 != null) {
-				sb.Append (", %");
-				sb.Append (precedingBlock2.Name);
+			var sb = new StringBuilder (" preds = ");
+			if (precedingBlock1 != null) {
+				sb.Append ('%');
+				sb.Append (precedingBlock1.Name);
+				if (precedingBlock2 != null) {
+					sb.Append (", %");
+					sb.Append (precedingBlock2.Name);
+				}
 			}
 			comment = sb.ToString ();
 		}