Fix build on CoreCLR after main rebase

Author: grendello

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

@@ -251,25 +251,27 @@ void Run (bool useMarshalMethods)
 
 		internal static Dictionary<string, ITaskItem> MaybeGetArchAssemblies (Dictionary<AndroidTargetArch, Dictionary<string, ITaskItem>> dict, AndroidTargetArch arch)
 		{
-			if (androidRuntime != Xamarin.Android.Tasks.AndroidRuntime.CoreCLR) {
-				// Create additional runtime provider java sources.
-				bool isMonoVM = androidRuntime == Xamarin.Android.Tasks.AndroidRuntime.MonoVM;
-				string providerTemplateFile = isMonoVM ?
-					"MonoRuntimeProvider.Bundled.java" :
-					"NativeAotRuntimeProvider.java";
-				string providerTemplate = GetResource (providerTemplateFile);
-
-				foreach (var provider in additionalProviders) {
-					var contents = providerTemplate.Replace (isMonoVM ? "MonoRuntimeProvider" : "NativeAotRuntimeProvider", provider);
-					var real_provider = isMonoVM ?
-						Path.Combine (OutputDirectory, "src", "mono", provider + ".java") :
-						Path.Combine (OutputDirectory, "src", "net", "dot", "jni", "nativeaot", provider + ".java");
-					Files.CopyIfStringChanged (contents, real_provider);
-				}
-			} else {
-				Log.LogDebugMessage ($"Skipping android.content.ContentProvider generation for: {androidRuntime}");
+			// Create additional runtime provider java sources.
+			bool isMonoVM = androidRuntime switch {
+				Xamarin.Android.Tasks.AndroidRuntime.MonoVM => true,
+				Xamarin.Android.Tasks.AndroidRuntime.CoreCLR => true,
+				_ => false,
+			};
+
+			string providerTemplateFile = isMonoVM ?
+				"MonoRuntimeProvider.Bundled.java" :
+				"NativeAotRuntimeProvider.java";
+			string providerTemplate = GetResource (providerTemplateFile);
+
+			foreach (var provider in additionalProviders) {
+				var contents = providerTemplate.Replace (isMonoVM ? "MonoRuntimeProvider" : "NativeAotRuntimeProvider", provider);
+				var real_provider = isMonoVM ?
+					Path.Combine (OutputDirectory, "src", "mono", provider + ".java") :
+					Path.Combine (OutputDirectory, "src", "net", "dot", "jni", "nativeaot", provider + ".java");
+				Files.CopyIfStringChanged (contents, real_provider);
 			}
 
+
 			// For NativeAOT, generate JavaInteropRuntime.java
 			if (androidRuntime == Xamarin.Android.Tasks.AndroidRuntime.NativeAOT) {
 				const string fileName = "JavaInteropRuntime.java";
@@ -414,10 +416,7 @@ void WriteTypeMappings (NativeCodeGenState state)
 				// NativeAOT typemaps are generated in `Microsoft.Android.Sdk.ILLink.TypeMappingStep`
 				return;
 			}
-			if (androidRuntime == Xamarin.Android.Tasks.AndroidRuntime.CoreCLR) {
-				// TODO: CoreCLR typemaps will be emitted later
-				return;
-			}
+
 			Log.LogDebugMessage ($"Generating type maps for architecture '{state.TargetArch}'");
 			var tmg = new TypeMapGenerator (Log, state, androidRuntime);
 			if (!tmg.Generate (Debug, SkipJniAddNativeMethodRegistrationAttributeScan, TypemapOutputDirectory, GenerateNativeAssembly)) {

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

@@ -1474,7 +1474,7 @@ because xbuild doesn't support framework reference assemblies.
 
 <!-- _PrepareAssemblies lives in Microsoft.Android.Sdk.AssemblyResolution.targets -->
 
-<Target Name="_PrepareNativeAssemblySources" Condition=" '$(_AndroidRuntime)' != 'CoreCLR' ">
+<Target Name="_PrepareNativeAssemblySources" Condition=" '$(_AndroidRuntime)' != 'NativeAOT' ">
   <PrepareAbiItems
       BuildTargetAbis="@(_BuildTargetAbis)"
       NativeSourcesDir="$(_NativeAssemblySourceDir)"