Test fixes

Author: jonathanpeppers

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

@@ -127,7 +127,6 @@ public void BuildAotApplicationWithSpecialCharactersInProject (string testName,
 				IsRelease = isRelease,
 				AotAssemblies = aot,
 			};
-			proj.SetAndroidSupportedAbis ("armeabi-v7a",  "arm64-v8a", "x86", "x86_64");
 			using (var builder = CreateApkBuilder (Path.Combine (rootPath, proj.ProjectName))){
 				Assert.IsTrue (builder.Build (proj), "Build should have succeeded.");
 			}

tests/MSBuildDeviceIntegration/Tests/BundleToolTests.cs

@@ -19,7 +19,7 @@ public class BundleToolTests : DeviceTest
 			new object[] { true },
 		};
 
-		static readonly string [] Abis = new [] { "armeabi-v7a", "arm64-v8a", "x86", "x86_64" };
+		static readonly string [] Abis = ["arm64-v8a", "x86_64"];
 		XamarinAndroidLibraryProject lib;
 		XamarinAndroidApplicationProject app;
 		ProjectBuilder libBuilder, appBuilder;

tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs

@@ -383,6 +383,8 @@ public Foo ()
 				IsRelease = false,
 				EmbedAssembliesIntoApk = embedAssemblies,
 			};
+			// MonoVM-only test
+			app.SetRuntime (Android.Tasks.AndroidRuntime.MonoVM);
 			if (!useLatestSdk) {
 				lib.TargetFramework = "net9.0-android";
 				app.TargetFramework = "net9.0-android";

tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs

@@ -386,7 +386,7 @@ public void JsonDeserializationCreatesJavaHandle ([Values (false, true)] bool is
 			proj.SetProperty ("NoWarn", "SYSLIB0011");
 
 			if (isRelease || !TestEnvironment.CommercialBuildAvailable) {
-				proj.SetAndroidSupportedAbis ("armeabi-v7a", "arm64-v8a", "x86", "x86_64");
+				proj.SetAndroidSupportedAbis (DeviceAbi);
 			}
 
 			proj.References.Add (new BuildItem.Reference ("System.Runtime.Serialization"));
@@ -553,8 +553,7 @@ public void SingleProject_ApplicationId ([Values (false, true)] bool testOnly)
 			if (testOnly)
 				proj.AndroidManifest = proj.AndroidManifest.Replace ("<application", "<application android:testOnly=\"true\"");
 
-			var abis = new string [] { "armeabi-v7a", "arm64-v8a", "x86", "x86_64" };
-			proj.SetAndroidSupportedAbis (abis);
+			proj.SetAndroidSupportedAbis (DeviceAbi);
 			builder = CreateApkBuilder ();
 			Assert.IsTrue (builder.Install (proj), "Install should have succeeded.");
 			RunProjectAndAssert (proj, builder);

tests/MSBuildDeviceIntegration/Tests/InstallTests.cs

@@ -320,6 +320,8 @@ public void LoggingPropsShouldCreateOverrideDirForRelease ()
 			var proj = new XamarinAndroidApplicationProject {
 				IsRelease = true,
 			};
+			// MonoVM-only test
+			proj.SetRuntime (Android.Tasks.AndroidRuntime.MonoVM);
 			// Set debuggable=true to allow run-as command usage with a release build
 			proj.AndroidManifest = proj.AndroidManifest.Replace ("<application ", "<application android:debuggable=\"true\" ");
 			proj.SetAndroidSupportedAbis (DeviceAbi);
@@ -607,7 +609,6 @@ public void AdbTargetChangesAppBundle ()
 				IsRelease = true
 			};
 			proj.SetProperty ("AndroidPackageFormat", "aab");
-			proj.SetAndroidSupportedAbis ("armeabi-v7a", "arm64-v8a", "x86", "x86_64");
 
 			using var b = CreateApkBuilder ();
 			Assert.IsTrue (b.Install (proj), "first build should have succeeded.");

tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs

@@ -135,6 +135,8 @@ XamarinAndroidApplicationProject CreateApplicationProject ()
 		{
 			var proj = new XamarinAndroidApplicationProject () {
 			};
+			// TODO: update times for CoreCLR in the future
+			proj.SetRuntime (Android.Tasks.AndroidRuntime.MonoVM);
 			proj.SetAndroidSupportedAbis (DeviceAbi); // Use a single ABI
 			proj.SetProperty ("_FastDeploymentDiagnosticLogging", "False");
 			return proj;