More fixes and fixlets

Author: grendello

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs

@@ -99,6 +99,10 @@ public void DotNetBuild (string runtimeIdentifiers, bool isRelease, bool aot, bo
 			});
 			if (!runtimeIdentifiers.Contains (";")) {
 				proj.SetProperty (KnownProperties.RuntimeIdentifier, runtimeIdentifiers);
+
+				// When targeting CoreCLR, XamarinAndroidApplicationProject sets `RuntimeIdentifiers` to make sure that only 64-bit
+				// targets are built. It interferes with this test when `RuntimeIdentifier` is set.
+				proj.RemoveProperty (KnownProperties.RuntimeIdentifiers);
 			} else {
 				proj.SetProperty (KnownProperties.RuntimeIdentifiers, runtimeIdentifiers);
 			}
@@ -1701,7 +1705,7 @@ public void SimilarAndroidXAssemblyNames ([Values(true, false)] bool publishTrim
 		{
 			var proj = new XamarinAndroidApplicationProject {
 				IsRelease = true,
-				AotAssemblies = publishTrimmed,
+				AotAssemblies = publishTrimmed && !TargetRuntimeHelper.UseCoreCLR,
 				PackageReferences = {
 					new Package { Id = "Xamarin.AndroidX.CustomView", Version = "1.1.0.17" },
 					new Package { Id = "Xamarin.AndroidX.CustomView.PoolingContainer", Version = "1.0.0.4" },

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs

@@ -595,6 +595,8 @@ static void Test ()
 		[NonParallelizable] // parallel NuGet restore causes failures
 		public void BuildBasicApplicationFSharp (bool isRelease, bool aot)
 		{
+			TargetRuntimeHelper.IgnoreIfIncompatibleWithMonoAOT (aot);
+
 			var proj = new XamarinAndroidApplicationProject {
 				Language = XamarinAndroidProjectLanguage.FSharp,
 				IsRelease = isRelease,

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildWithLibraryTests.cs

@@ -456,7 +456,7 @@ public void BuildWithNativeLibraryUnknownAbi ()
 					},
 				}
 			};
-			proj.SetAndroidSupportedAbis ("arm64-v8a", "x64");
+			proj.SetAndroidSupportedAbis ("arm64-v8a", "x86_64");
 
 			using (var builder = CreateApkBuilder (Path.Combine ("temp", TestName))) {
 				builder.ThrowOnBuildFailure = false;

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/InvalidConfigTests.cs

@@ -45,6 +45,8 @@ public class InvalidConfigTests : BaseTest
 		[TestCaseSource (nameof (SettingCombinationsSource))]
 		public void SettingCombinations (bool isRelease, bool useInterpreter, bool publishTrimmed, bool aot, bool expected)
 		{
+			TargetRuntimeHelper.IgnoreIfIncompatibleWithMonoAOT (aot);
+
 			var proj = new XamarinAndroidApplicationProject {
 				IsRelease = isRelease,
 				EnableDefaultItems = true,

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs

@@ -85,6 +85,10 @@ public void CheckDebugModeWithTrimming ()
 		[NonParallelizable] // Commonly fails NuGet restore
 		public void CheckIncludedAssemblies ([Values (false, true)] bool usesAssemblyStores)
 		{
+			if (!usesAssemblyStores && TargetRuntimeHelper.UseCoreCLR) {
+				Assert.Ignore ("CoreCLR supports only assembly stores");
+			}
+
 			var proj = new XamarinAndroidApplicationProject {
 				IsRelease = true
 			};

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/LinkerTests.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -649,7 +650,18 @@ public abstract class MyRunner {
 }"
 			});
 			var proj = new XamarinAndroidApplicationProject { IsRelease = true, ProjectName = "App1" };
-			proj.SetRuntimeIdentifiers(["armeabi-v7a", "arm64-v8a", "x86", "x86_64"]);
+
+			bool thirtyTwoBitAbisSupported =
+				!TargetRuntimeHelper.UseCoreCLR ||
+				(TargetRuntimeHelper.CoreClrSupportsAbi ("armeabi-v7a") && TargetRuntimeHelper.CoreClrSupportsAbi ("x86"));
+
+			var rids = new List<string> { "arm64-v8a", "x86_64" };
+			if (thirtyTwoBitAbisSupported) {
+				rids.Add ("armeabi-v7a");
+				rids.Add ("x86");
+			}
+
+			proj.SetRuntimeIdentifiers (rids);
 			proj.References.Add(new BuildItem.ProjectReference (Path.Combine ("..", "Lib1", "Lib1.csproj"), "Lib1"));
 			proj.MainActivity = proj.DefaultMainActivity.Replace (
 				"base.OnCreate (bundle);",
@@ -665,11 +677,15 @@ public abstract class MyRunner {
 
 			var intermediate = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath);
 			var dll = $"{lib.ProjectName}.dll";
-			Assert64Bit ("android-arm", expected64: false);
+
 			Assert64Bit ("android-arm64", expected64: true);
-			Assert64Bit ("android-x86", expected64: false);
 			Assert64Bit ("android-x64", expected64: true);
 
+			if (thirtyTwoBitAbisSupported) {
+				Assert64Bit ("android-arm", expected64: false);
+				Assert64Bit ("android-x86", expected64: false);
+			}
+
 			void Assert64Bit(string rid, bool expected64)
 			{
 				var assembly = AssemblyDefinition.ReadAssembly (Path.Combine (intermediate, rid, "linked", "shrunk", dll));

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Utilities/TargetRuntimeHelper.cs

@@ -78,4 +78,11 @@ public static void IgnoreOnIncompatibleRuntime (string runtime)
 			Assert.Ignore ($"{runtime} tests not supported under MonoVM");
 		}
 	}
+
+	public static void IgnoreIfIncompatibleWithMonoAOT (bool aot)
+	{
+		if (aot && UseCoreCLR) {
+			Assert.Ignore ("CoreCLR runtime doesn't support MonoVM-style AOT");
+		}
+	}
 }