CheckIncludedAssemblies works

Author: grendello

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

@@ -84,16 +84,25 @@ public void CheckDebugModeWithTrimming ([Values (AndroidRuntime.MonoVM, AndroidR
 
 		[Test]
 		[NonParallelizable] // Commonly fails NuGet restore
-		public void CheckIncludedAssemblies ([Values (false, true)] bool usesAssemblyStores)
+		public void CheckIncludedAssemblies ([Values (false, true)] bool usesAssemblyStores, [Values (AndroidRuntime.MonoVM, AndroidRuntime.CoreCLR)] AndroidRuntime runtime)
 		{
+			if (!usesAssemblyStores && runtime == AndroidRuntime.CoreCLR) {
+				Assert.Ignore ("CoreCLR only supports builds with assembly stores.");
+				return;
+			}
+
 			var proj = new XamarinAndroidApplicationProject {
 				IsRelease = true
 			};
 
 			AndroidTargetArch[] supportedArches = new[] {
-				AndroidTargetArch.Arm,
+				runtime switch {
+					AndroidRuntime.MonoVM => AndroidTargetArch.Arm,
+					AndroidRuntime.CoreCLR => AndroidTargetArch.Arm64,
+					_ => throw new NotSupportedException ($"Unsupported runtime '{runtime}'")
+				}
 			};
-
+			proj.SetRuntime (runtime);
 			proj.SetProperty ("AndroidUseAssemblyStore", usesAssemblyStores.ToString ());
 			proj.SetRuntimeIdentifiers (supportedArches);
 			proj.PackageReferences.Add (new Package {
@@ -130,9 +139,12 @@ public void CheckIncludedAssemblies ([Values (false, true)] bool usesAssemblySto
 				"System.Collections.dll",
 				"System.Collections.Concurrent.dll",
 				"System.Text.RegularExpressions.dll",
-				"libarc.bin.so",
 			};
 
+			if (runtime == AndroidRuntime.MonoVM) {
+				expectedFiles.Add ("libarc.bin.so");
+			}
+
 			using (var b = CreateApkBuilder ()) {
 				Assert.IsTrue (b.Build (proj), "build should have succeeded.");
 				var apk = Path.Combine (Root, b.ProjectDirectory,