From ad80f2b2d1572a021688e5b40155e16fa1b0856b Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Mon, 8 Dec 2025 13:39:26 +0100
Subject: [PATCH 01/27] InstallAndRunTests.DotNetRun works

---
 .../Tests/InstallAndRunTests.cs               | 43 ++++++++++++++++---
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 5e4c4a5e1b8..a7848cc96ef 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -30,17 +30,46 @@ public void Teardown ()
 			proj = null;
 		}
 
+		static IEnumerable<object[]> Get_DotNetRun_Data ()
+		{
+			var ret = new List<object[]> ();
+
+			foreach (AndroidRuntime runtime in Enum.GetValues (typeof (AndroidRuntime))) {
+				AddTestData (true, "llvm-ir", runtime);
+				AddTestData (false, "llvm-ir", runtime);
+				AddTestData (true, "managed", runtime);
+				// NOTE: TypeMappingStep is not yet setup for Debug mode
+				//AddTestData (false, "managed", runtime);
+			}
+
+			return ret;
+
+			void AddTestData (bool isRelease, string typemapImplementation, AndroidRuntime runtime)
+			{
+				ret.Add (new object[] {
+					isRelease,
+					typemapImplementation,
+					runtime,
+				});
+			}
+		}
+
 		[Test]
-		[TestCase (true, "llvm-ir")]
-		[TestCase (false, "llvm-ir")]
-		[TestCase (true, "managed")]
-		// NOTE: TypeMappingStep is not yet setup for Debug mode
-		//[TestCase (false, "managed")]
-		public void DotNetRun (bool isRelease, string typemapImplementation)
+		[TestCaseSource (nameof (Get_DotNetRun_Data))]
+		public void DotNetRun (bool isRelease, string typemapImplementation, AndroidRuntime runtime)
 		{
-			var proj = new XamarinAndroidApplicationProject {
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
+			if (runtime == AndroidRuntime.NativeAOT && typemapImplementation == "llvm-ir") {
+				Assert.Ignore ("NativeAOT doesn't work with LLVM-IR typemaps");
+			}
+
+			var proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
 				IsRelease = isRelease
 			};
+			proj.SetRuntime (runtime);
 			proj.SetProperty ("_AndroidTypeMapImplementation", typemapImplementation);
 			using var builder = CreateApkBuilder ();
 			builder.Save (proj);

From 0a27a44fcd3487e503f81d24ca864e1d79152307 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Mon, 8 Dec 2025 13:46:29 +0100
Subject: [PATCH 02/27] InstallAndRunTests.ActivityAliasRuns works

---
 .../MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index a7848cc96ef..a12e65f8aa3 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -187,11 +187,16 @@ public void DeployToDevice (bool isRelease)
 		}
 
 		[Test]
-		public void ActivityAliasRuns ([Values (true, false)] bool isRelease)
+		public void ActivityAliasRuns ([Values] bool isRelease, [Values] AndroidRuntime runtime)
 		{
-			var proj = new XamarinAndroidApplicationProject {
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
+			var proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
 				IsRelease = isRelease
 			};
+			proj.SetRuntime (runtime);
 			proj.AndroidManifest = proj.AndroidManifest.Replace ("</application>", @"
 <activity-alias
 			android:name="".MainActivityAlias""

From 1c4d4c5b33a31c44d4fb8e147dc9a5da7e8f251e Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Mon, 8 Dec 2025 14:01:09 +0100
Subject: [PATCH 03/27] 
 InstallAndRunTests.NativeAssemblyCacheWithSatelliteAssemblies updated

---
 .../Tests/InstallAndRunTests.cs                  | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index a12e65f8aa3..4bb2e9acf66 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -219,8 +219,17 @@ public void ActivityAliasRuns ([Values] bool isRelease, [Values] AndroidRuntime
 		}
 
 		[Test]
-		public void NativeAssemblyCacheWithSatelliteAssemblies ([Values (true, false)] bool enableMarshalMethods, [Values (AndroidRuntime.MonoVM, AndroidRuntime.CoreCLR)] AndroidRuntime runtime)
+		public void NativeAssemblyCacheWithSatelliteAssemblies ([Values] bool enableMarshalMethods, [Values] AndroidRuntime runtime)
 		{
+			const bool isRelease = true;
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
+			if (runtime == AndroidRuntime.NativeAOT) {
+				Assert.Ignore ("NativeAOT doesn't support individual assemblies");
+			}
+
 			if (enableMarshalMethods && runtime == AndroidRuntime.CoreCLR) {
 				// This currently fails with the following exception:
 				//
@@ -237,6 +246,7 @@ public void NativeAssemblyCacheWithSatelliteAssemblies ([Values (true, false)] b
 
 			var path = Path.Combine ("temp", TestName);
 			var lib = new XamarinAndroidLibraryProject {
+				IsRelease = isRelease,
 				ProjectName = "Localization",
 				OtherBuildItems = {
 					new BuildItem ("EmbeddedResource", "Foo.resx") {
@@ -255,8 +265,8 @@ public void NativeAssemblyCacheWithSatelliteAssemblies ([Values (true, false)] b
 				);
 			}
 
-			proj = new XamarinAndroidApplicationProject {
-				IsRelease = true,
+			proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
+				IsRelease = isRelease,
 				EnableMarshalMethods = enableMarshalMethods,
 			};
 			proj.SetRuntime (runtime);

From 65a7472027fc021508ed87d2a242cbaa294dddf6 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Mon, 8 Dec 2025 14:10:22 +0100
Subject: [PATCH 04/27] 
 InstallAndRunTests.GlobalLayoutEvent_ShouldRegisterAndFire_OnActivityLaunch
 works

---
 .../Tests/InstallAndRunTests.cs                        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 4bb2e9acf66..1272add3109 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -291,13 +291,15 @@ public void NativeAssemblyCacheWithSatelliteAssemblies ([Values] bool enableMars
 		}
 
 		[Test]
-		public void GlobalLayoutEvent_ShouldRegisterAndFire_OnActivityLaunch (
-		  [Values (false, true)] bool isRelease,
-		  [Values (AndroidRuntime.MonoVM, AndroidRuntime.CoreCLR)] AndroidRuntime runtime)
+		public void GlobalLayoutEvent_ShouldRegisterAndFire_OnActivityLaunch ([Values] bool isRelease, [Values] AndroidRuntime runtime)
 		{
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
 			string expectedLogcatOutput = "Bug 29730: GlobalLayout event handler called!";
 
-			proj = new XamarinAndroidApplicationProject () {
+			proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
 				IsRelease = isRelease,
 				SupportedOSPlatformVersion = "23",
 			};

From 3727657e56e220308f167885d7e7ebd681a72181 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Mon, 8 Dec 2025 14:21:59 +0100
Subject: [PATCH 05/27] 
 InstallAndRunTests.SubscribeToAppDomainUnhandledException updated

---
 .../Tests/InstallAndRunTests.cs                 | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 1272add3109..33627d048b8 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -327,11 +327,22 @@ void Button_ViewTreeObserver_GlobalLayout (object sender, EventArgs e)
 			}, Path.Combine (Root, builder.ProjectDirectory, "startup-logcat.log"), 60), $"Output did not contain {expectedLogcatOutput}!");
 		}
 
+		// TODO: check if AppDomain.CurrentDomain.UnhandledException even works in CoreCLR and NativeAOT
 		[Test]
-		public void SubscribeToAppDomainUnhandledException ([Values (AndroidRuntime.MonoVM, AndroidRuntime.CoreCLR)] AndroidRuntime runtime)
+		public void SubscribeToAppDomainUnhandledException ([Values] AndroidRuntime runtime)
 		{
-			proj = new XamarinAndroidApplicationProject () {
-				IsRelease = true,
+			const bool isRelease = true;
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
+			if (runtime == AndroidRuntime.CoreCLR || runtime == AndroidRuntime.NativeAOT) {
+				Assert.Ignore ("AppDomain.CurrentDomain.UnhandledException doesn't work in CoreCLR or NativeAOT");
+				return;
+			}
+
+			proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
+				IsRelease = isRelease,
 			};
 			proj.SetRuntime (runtime);
 			if (runtime == AndroidRuntime.MonoVM) {

From 16463e37578402858eb22083b3d606a2bd779e94 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Mon, 8 Dec 2025 14:56:37 +0100
Subject: [PATCH 06/27] 
 InstallAndRunTests.SmokeTestBuildAndRunWithSpecialCharacters updated, broken
 on NativeAOT

---
 .../Tests/InstallAndRunTests.cs               | 50 ++++++++++++++++---
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 33627d048b8..49c7f6975a1 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -405,18 +405,56 @@ void Reset ()
 			}
 		}
 
+		static IEnumerable<object[]> Get_SmokeTestBuildAndRunWithSpecialCharacters_Data ()
+		{
+			var ret = new List<object[]> ();
+
+			foreach (AndroidRuntime runtime in Enum.GetValues (typeof (AndroidRuntime))) {
+				AddTestData ("テスト", runtime);
+				AddTestData ("随机生成器", runtime);
+				AddTestData ("中国", runtime);
+			}
+
+			return ret;
+
+			void AddTestData (string testName, AndroidRuntime runtime)
+			{
+				ret.Add (new object[] {
+					testName,
+					runtime,
+				});
+			}
+		}
+
 		[Test]
 		[Category ("UsesDevice")]
-		[TestCase ("テスト")]
-		[TestCase ("随机生成器")]
-		[TestCase ("中国")]
-		public void SmokeTestBuildAndRunWithSpecialCharacters (string testName)
+		[TestCaseSource (nameof (Get_SmokeTestBuildAndRunWithSpecialCharacters_Data))]
+		public void SmokeTestBuildAndRunWithSpecialCharacters (string testName, AndroidRuntime runtime)
 		{
+			const bool isRelease = true;
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
+			// TODO: fix NativeAOT builds. Despite the .so library being preset in the apk (and named correctly)
+			//       all the tests fail with one of:
+			//
+			//  java.lang.UnsatisfiedLinkError: dlopen failed: library "libテスト.so" not found
+			//  java.lang.UnsatisfiedLinkError: dlopen failed: library "lib中国.so" not found
+			//  java.lang.UnsatisfiedLinkError: dlopen failed: library "lib随机生成器.so" not found
+			//
+			// It might be an issue with the Android shared libary loader or name encoding in the archive. It might
+			// be a good idea to limit .so names to ASCII.
+			if (runtime == AndroidRuntime.NativeAOT) {
+				Assert.Ignore ("NativeAOT doesn't work well with diacritics in the application library name");
+			}
+
 			var rootPath = Path.Combine (Root, "temp", TestName);
-			var proj = new XamarinFormsAndroidApplicationProject () {
+			var proj = new XamarinFormsAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
 				ProjectName = testName,
-				IsRelease = true,
+				IsRelease = isRelease,
 			};
+			proj.SetRuntime (runtime);
 			proj.SetAndroidSupportedAbis (DeviceAbi);
 			proj.SetDefaultTargetDevice ();
 			using (var builder = CreateApkBuilder (Path.Combine (rootPath, proj.ProjectName))){

From 445f9a9aa7aa0b7f8cbdc77916dc0996bdd0ac7a Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Mon, 8 Dec 2025 15:10:16 +0100
Subject: [PATCH 07/27] InstallAndRunTests.CustomLinkDescriptionPreserve
 updated, broken on NAOT too

---
 .../Tests/InstallAndRunTests.cs               | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 49c7f6975a1..30f13e7ab97 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -489,10 +489,28 @@ public void SmokeTestBuildAndRunWithSpecialCharacters (string testName, AndroidR
 		[Test]
 		public void CustomLinkDescriptionPreserve (
 		  [Values (AndroidLinkMode.SdkOnly, AndroidLinkMode.Full)] AndroidLinkMode linkMode,
-		  [Values (AndroidRuntime.MonoVM)] AndroidRuntime runtime
+		  [Values] AndroidRuntime runtime
 		)
 		{
+			const bool isRelease = true;
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
+			if (runtime == AndroidRuntime.CoreCLR) {
+				Assert.Ignore ("Currently broken on CoreCLR");
+			}
+
+			// TODO: NativeAOT perhaps should work here (ignoring all the MonoAOT settings?), but for now it fails with
+			//
+			//  Microsoft.NET.Sdk.FrameworkReferenceResolution.targets(120,5): error NETSDK1207: Ahead-of-time compilation is not supported for the target framework.
+			//
+			if (runtime == AndroidRuntime.NativeAOT) {
+				Assert.Ignore ("NativeAOT is currently broken here");
+			}
+
 			var lib1 = new XamarinAndroidLibraryProject () {
+				IsRelease = isRelease,
 				ProjectName = "Library1",
 				Sources = {
 					new BuildItem.Source ("SomeClass.cs") {
@@ -530,6 +548,7 @@ public class LinkModeFullClass {
 			lib1.SetRuntime (runtime);
 
 			var lib2 = new DotNetStandard {
+				IsRelease = isRelease,
 				ProjectName = "LinkTestLib",
 				Sdk = "Microsoft.NET.Sdk",
 				TargetFramework = "netstandard2.0",
@@ -556,8 +575,8 @@ public class LinkModeFullClass {
 			};
 			lib2.SetRuntime (runtime);
 
-			proj = new XamarinFormsAndroidApplicationProject () {
-				IsRelease = true,
+			proj = new XamarinFormsAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
+				IsRelease = isRelease,
 				AndroidLinkModeRelease = linkMode,
 				References = {
 					new BuildItem ("ProjectReference", "..\\Library1\\Library1.csproj"),

From 04572847e74914022b2efb2d2e37a946e98cb073 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Mon, 8 Dec 2025 16:12:38 +0100
Subject: [PATCH 08/27] InstallAndRunTests.JsonDeserializationCreatesJavaHandle
 works

---
 .../MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 30f13e7ab97..316c219611b 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -655,11 +655,15 @@ string getResource (string name)
 		}
 
 		[Test]
-		public void JsonDeserializationCreatesJavaHandle ([Values (false, true)] bool isRelease)
+		public void JsonDeserializationCreatesJavaHandle ([Values] bool isRelease, [Values] AndroidRuntime runtime)
 		{
-			proj = new XamarinAndroidApplicationProject () {
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+			proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
 				IsRelease = isRelease,
 			};
+			proj.SetRuntime (runtime);
 			// error SYSLIB0011: 'BinaryFormatter.Serialize(Stream, object)' is obsolete: 'BinaryFormatter serialization is obsolete and should not be used. See https://aka.ms/binaryformatter for more information.'
 			proj.SetProperty ("NoWarn", "SYSLIB0011");
 

From 571fef98e74d23d084f3eb6fc341bc149e5c392d Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Mon, 8 Dec 2025 16:16:35 +0100
Subject: [PATCH 09/27] InstallAndRunTests.RunWithInterpreterEnabled updated

---
 .../Tests/InstallAndRunTests.cs                  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 316c219611b..8935ba2dd9c 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -751,14 +751,22 @@ public override Type BindToType (string assemblyName, string typeName)
 		}
 
 		[Test]
-		public void RunWithInterpreterEnabled ([Values (false, true)] bool isRelease)
+		public void RunWithInterpreterEnabled ([Values] bool isRelease, [Values] AndroidRuntime runtime)
 		{
-			proj = new XamarinAndroidApplicationProject () {
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
+			// MonoVM-only test, for now (until CoreCLR has interpreter we can use)
+			if (runtime != AndroidRuntime.MonoVM) {
+				Assert.Ignore ("MonoVM-only test for the moment");
+			}
+
+			proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
 				IsRelease = isRelease,
 				AotAssemblies = false, // Release defaults to Profiled AOT for .NET 6
 			};
-			// MonoVM-only test
-			proj.SetRuntime (Android.Tasks.AndroidRuntime.MonoVM);
+			proj.SetRuntime (runtime);
 			var abis = new string[] { "armeabi-v7a", "arm64-v8a", "x86", "x86_64" };
 			proj.SetAndroidSupportedAbis (abis);
 			proj.SetProperty (proj.CommonProperties, "UseInterpreter", "True");

From fe85a5c0d907b93ed26a0b5b6ae8fb75896e2a8e Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Mon, 8 Dec 2025 16:20:36 +0100
Subject: [PATCH 10/27] InstallAndRunTests.SingleProject_ApplicationId updated

---
 .../Tests/InstallAndRunTests.cs                      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 8935ba2dd9c..3d5a0392df9 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -838,11 +838,19 @@ bool SeenFailedToLoad (string line)
 		}
 
 		[Test]
-		public void SingleProject_ApplicationId ([Values (false, true)] bool testOnly)
+		public void SingleProject_ApplicationId ([Values] bool testOnly, [Values] AndroidRuntime runtime)
 		{
+			bool isRelease = runtime == AndroidRuntime.NativeAOT;
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
 			AssertCommercialBuild ();
 
-			proj = new XamarinAndroidApplicationProject ();
+			proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
+				IsRelease = isRelease,
+			};
+			proj.SetRuntime (runtime);
 			proj.SetProperty ("ApplicationId", "com.i.should.get.overridden.by.the.manifest");
 			if (testOnly)
 				proj.AndroidManifest = proj.AndroidManifest.Replace ("<application", "<application android:testOnly=\"true\"");

From 7192902708ad388f16b758260df54f2f4750ff92 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Tue, 9 Dec 2025 16:48:35 +0100
Subject: [PATCH 11/27] InstallAndRunTests.AppWithStyleableUsageRuns updated

---
 .../Tests/InstallAndRunTests.cs               | 52 +++++++++++++++----
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 3d5a0392df9..5378547566a 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -866,22 +866,50 @@ public void SingleProject_ApplicationId ([Values] bool testOnly, [Values] Androi
 		}
 
 		[Test]
-		public void AppWithStyleableUsageRuns ([Values (true, false)] bool useCLR, [Values (true, false)] bool isRelease,
-			[Values (true, false)] bool linkResources, [Values (true, false)] bool useStringTypeMaps)
+		public void AppWithStyleableUsageRuns ([Values] bool isRelease,	[Values] bool linkResources, [Values] bool useStringTypeMaps, [Values] AndroidRuntime runtime)
 		{
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
 			// Not all combinations are valid, ignore those that aren't
-			if (!useCLR && useStringTypeMaps) {
-				Assert.Ignore ("String-based typemaps mode is used only in CoreCLR apps");
+			if (runtime == AndroidRuntime.MonoVM && useStringTypeMaps) {
+				Assert.Ignore ("String-based typemaps mode is used only in CoreCLR and NativeAOT apps");
 			}
 
-			if (useCLR && isRelease && useStringTypeMaps) {
+			if (runtime != AndroidRuntime.MonoVM && isRelease && useStringTypeMaps) {
 				Assert.Ignore ("String-based typemaps mode is available only in Debug CoreCLR builds");
 			}
 
+			// TODO: fix this for NativeAOT
+			if (runtime == AndroidRuntime.NativeAOT && isRelease && !useStringTypeMaps) {
+				// This configuration currently fails with a long stack trace, the gist of it is:
+				//
+				//  AndroidRuntime: java.lang.RuntimeException: Unable to start activity ComponentInfo{com.xamarin.appwithstyleableusageruns_nativeaot/com.xamarin.appwithstyleableusageruns_nativeaot.MainActivity}
+				//  AndroidRuntime: Caused by: android.view.InflateException: Binary XML file line #1 in com.xamarin.appwithstyleableusageruns_nativeaot:layout/main: Binary XML file line #1 in com.xamarin.appwithstyleableusageruns_nativeaot:layout/main: Error inflating class crc64f75eeacfa0ca1368.MyLayout
+				//  AndroidRuntime: Caused by: android.view.InflateException: Binary XML file line #1 in com.xamarin.appwithstyleableusageruns_nativeaot:layout/main: Error inflating class crc64f75eeacfa0ca1368.MyLayout
+				//  AndroidRuntime: Caused by: java.lang.reflect.InvocationTargetException
+				//  AndroidRuntime: Caused by: net.dot.jni.internal.JavaProxyThrowable: System.NotSupportedException: Could not activate { PeerReference=0x7fe9706698/I IdentityHashCode=0xd12aeee Java.Type=crc64f75eeacfa0ca1368/MyLayout } for managed type 'UnnamedProject.MyLayout'.
+				//  AndroidRuntime:  ---> System.Reflection.TargetInvocationException: Arg_TargetInvocationException
+				//  AndroidRuntime:  ---> System.IO.FileNotFoundException: IO_FileNotFound_FileName, _Microsoft.Android.Resource.Designer
+				//  AndroidRuntime: IO_FileName_Name, _Microsoft.Android.Resource.Designer
+				//  DOTNET  : FATAL UNHANDLED EXCEPTION: Java.Lang.Exception: Unable to start activity ComponentInfo{com.xamarin.appwithstyleableusageruns_nativeaot/com.xamarin.appwithstyleableusageruns_nativeaot.MainActivity}
+				//  DOTNET  :  ---> Java.Lang.Exception: Binary XML file line #1 in com.xamarin.appwithstyleableusageruns_nativeaot:layout/main: Binary XML file line #1 in com.xamarin.appwithstyleableusageruns_nativeaot:layout/main: Error inflating class crc64f75eeacfa0ca1368.MyLayout
+				//  DOTNET  :  ---> Java.Lang.Exception: Binary XML file line #1 in com.xamarin.appwithstyleableusageruns_nativeaot:layout/main: Error inflating class crc64f75eeacfa0ca1368.MyLayout
+				//  DOTNET  :  ---> Java.Lang.ReflectiveOperationException: Exception_WasThrown, Java.Lang.ReflectiveOperationException
+				//  DOTNET  :  ---> System.NotSupportedException: Could not activate { PeerReference=0x7fe9706698/I IdentityHashCode=0xd12aeee Java.Type=crc64f75eeacfa0ca1368/MyLayout } for managed type 'UnnamedProject.MyLayout'.
+				//  DOTNET  :  ---> System.Reflection.TargetInvocationException: Arg_TargetInvocationException
+				//  DOTNET  :  ---> System.IO
+				//  eruns_nativeaot: No implementation found for void mono.android.Runtime.propagateUncaughtException(java.lang.Thread, java.lang.Throwable) (tried Java_mono_android_Runtime_propagateUncaughtException and Java_mono_android_Runtime_propagateUncaughtException__Ljava_lang_Thread_2Ljava_lang_Throwable_2) - is the library loaded, e.g. System.loadLibrary?
+				Assert.Ignore ("NativeAOT is broken without string-based typemaps");
+			}
+
 			var rootPath = Path.Combine (Root, "temp", TestName);
 			var lib = new XamarinAndroidLibraryProject () {
+				IsRelease = isRelease,
 				ProjectName = "Styleable.Library"
 			};
+			lib.SetRuntime (runtime);
 
 			lib.AndroidResources.Add (new AndroidItem.AndroidResource ("Resources\\values\\styleables.xml") {
 				TextContent = () => @"<?xml version='1.0' encoding='utf-8'?>
@@ -923,10 +951,10 @@ public MyLibraryLayout (Android.Content.Context context, Android.Util.IAttribute
 }"
 			});
 
-			proj = new XamarinAndroidApplicationProject () {
+			proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
 				IsRelease = isRelease,
 			};
-			proj.SetProperty ("UseMonoRuntime", useCLR ? "false" : "true");
+			proj.SetRuntime (runtime);
 			proj.AddReference (lib);
 
 			proj.AndroidResources.Add (new AndroidItem.AndroidResource ("Resources\\values\\styleables.xml") {
@@ -964,9 +992,11 @@ public MyLayout (Android.Content.Context context, Android.Util.IAttributeSet att
 }
 ");
 
-			string[] abis = useCLR switch {
-				true => new string [] { "arm64-v8a", "x86_64" },
-				false => new string [] { "armeabi-v7a", "arm64-v8a", "x86", "x86_64" },
+			string[] abis = runtime switch {
+				AndroidRuntime.CoreCLR => new string [] { "arm64-v8a", "x86_64" },
+				AndroidRuntime.NativeAOT => new string [] { "arm64-v8a", "x86_64" },
+				AndroidRuntime.MonoVM => new string [] { "armeabi-v7a", "arm64-v8a", "x86", "x86_64" },
+				_ => throw new NotSupportedException ($"Unsupported runtime {runtime}")
 			};
 
 			proj.SetAndroidSupportedAbis (abis);
@@ -977,7 +1007,7 @@ public MyLayout (Android.Content.Context context, Android.Util.IAttributeSet att
 			Assert.IsTrue (builder.Install (proj), "Install should have succeeded.");
 
 			Dictionary<string, string>? environmentVariables = null;
-			if (useCLR && !isRelease && useStringTypeMaps) {
+			if (runtime == AndroidRuntime.CoreCLR && !isRelease && useStringTypeMaps) {
 				// The variable must have content to enable string-based typemaps
 				environmentVariables = new (StringComparer.Ordinal) {
 					{"CI_TYPEMAP_DEBUG_USE_STRINGS", "yes"}

From 681d2753c519908faee1c57d133237afecb7dbf6 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Tue, 9 Dec 2025 17:23:25 +0100
Subject: [PATCH 12/27] 
 InstallAndRunTests.CheckXamarinFormsAppDeploysAndAButtonWorks broken locally

It might work on CI, we'll see
---
 .../Tests/InstallAndRunTests.cs               | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 5378547566a..978ea11a142 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -1022,16 +1022,33 @@ public MyLayout (Android.Content.Context context, Android.Util.IAttributeSet att
 		}
 
 		[Test]
-		public void CheckXamarinFormsAppDeploysAndAButtonWorks ()
+		public void CheckXamarinFormsAppDeploysAndAButtonWorks ([Values] AndroidRuntime runtime)
 		{
-			var proj = new XamarinFormsAndroidApplicationProject ();
+			bool isRelease = runtime == AndroidRuntime.NativeAOT;
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
+			// TODO: fix for NativeAOT. Currently fails with:
+			//
+			//  DOTNET  : FATAL UNHANDLED EXCEPTION: System.InvalidCastException: Unable to convert instance of type 'AndroidX.AppCompat.Widget.AppCompatImageButton' to type 'AndroidX.AppCompat.Widget.Toolbar'.
+			if (runtime == AndroidRuntime.NativeAOT) {
+				Assert.Ignore ("NativeAOT type mapping fails");
+			}
+
+			string packageName = PackageUtils.MakePackageName (runtime);
+			var proj = new XamarinFormsAndroidApplicationProject (packageName: packageName) {
+				IsRelease = isRelease,
+			};
+			proj.SetRuntime (runtime);
 			proj.SetAndroidSupportedAbis (DeviceAbi);
-			var builder = CreateApkBuilder ();
+			var builder = CreateApkBuilder (packageName: packageName);
 
 			Assert.IsTrue (builder.Build (proj), "Build should have succeeded.");
 			builder.BuildLogFile = "install.log";
 			Assert.IsTrue (builder.Install (proj), "Install should have succeeded.");
 
+			ClearAdbLogcat ();
 			AdbStartActivity ($"{proj.PackageName}/{proj.JavaPackageName}.MainActivity");
 			WaitForActivityToStart (proj.PackageName, "MainActivity",
 				Path.Combine (Root, builder.ProjectDirectory, "startup-logcat.log"), 15);

From f5bd5d4a23560121c3c2f968b80176e5a7c8321d Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Tue, 9 Dec 2025 17:50:34 +0100
Subject: [PATCH 13/27] InstallAndRunTests.SkiaSharpCanvasBasedAppRuns works

---
 .../Tests/InstallAndRunTests.cs                     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 978ea11a142..32868d065d7 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -1061,11 +1061,14 @@ public void CheckXamarinFormsAppDeploysAndAButtonWorks ([Values] AndroidRuntime
 		}
 
 		[Test]
-		public void SkiaSharpCanvasBasedAppRuns ([Values (true, false)] bool isRelease, [Values (true, false)] bool addResource)
+		public void SkiaSharpCanvasBasedAppRuns ([Values] bool isRelease, [Values] bool addResource, [Values] AndroidRuntime runtime)
 		{
-			var app = new XamarinAndroidApplicationProject () {
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
+			var app = new XamarinAndroidApplicationProject (packageName: $"SkiaSharpCanvasTest_{runtime.ToString ().ToLowerInvariant ()}") {
 				IsRelease = isRelease,
-				PackageName = "Xamarin.SkiaSharpCanvasTest",
 				PackageReferences = {
 					KnownPackages.SkiaSharp,
 					KnownPackages.SkiaSharp_Views,
@@ -1073,6 +1076,7 @@ public void SkiaSharpCanvasBasedAppRuns ([Values (true, false)] bool isRelease,
 					KnownPackages.AndroidXAppCompatResources,
 				},
 			};
+			app.SetRuntime (runtime);
 			app.AndroidResources.Add (new AndroidItem.AndroidResource ("Resources\\values\\styles.xml") {
 				TextContent = () => @"<resources><style name='AppTheme' parent='Theme.AppCompat.Light.DarkActionBar'/></resources>",
 			});
@@ -1158,7 +1162,8 @@ private void OnPaintSurface(object sender, SKPaintSurfaceEventArgs e)
 			using (var b = CreateApkBuilder (Path.Combine ("temp", TestName, app.ProjectName))) {
 				b.BuildLogFile = "build1.log";
 				b.ThrowOnBuildFailure = false;
-				if (!addResource) {
+				// TODO: fix for NativeAOT
+				if (!addResource && runtime != AndroidRuntime.NativeAOT) {
 					Assert.IsFalse (b.Build (app, doNotCleanupOnUpdate: true), $"Build of {app.ProjectName} should have failed.");
 					Assert.IsTrue (b.LastBuildOutput.ContainsText (isRelease ? "IL8000" : "XA8000"));
 					Assert.IsTrue (b.LastBuildOutput.ContainsText ("@styleable/SKCanvasView"), "Expected '@styleable/SKCanvasView' in build output.");

From 38f543da20deca3fb4a67c3c92e470852712e418 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Tue, 9 Dec 2025 18:04:19 +0100
Subject: [PATCH 14/27] InstallAndRunTests.CheckResouceIsOverridden works

---
 .../Tests/InstallAndRunTests.cs                | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 32868d065d7..cffc3d10297 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -1067,7 +1067,7 @@ public void SkiaSharpCanvasBasedAppRuns ([Values] bool isRelease, [Values] bool
 				return;
 			}
 
-			var app = new XamarinAndroidApplicationProject (packageName: $"SkiaSharpCanvasTest_{runtime.ToString ().ToLowerInvariant ()}") {
+			var app = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime, "SkiaSharpCanvasTest")) {
 				IsRelease = isRelease,
 				PackageReferences = {
 					KnownPackages.SkiaSharp,
@@ -1183,9 +1183,15 @@ private void OnPaintSurface(object sender, SKPaintSurfaceEventArgs e)
 
 
 		[Test]
-		public void CheckResouceIsOverridden ()
+		public void CheckResouceIsOverridden ([Values] AndroidRuntime runtime)
 		{
+			bool isRelease = runtime == AndroidRuntime.NativeAOT;
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
 			var library = new XamarinAndroidLibraryProject () {
+				IsRelease = isRelease,
 				ProjectName = "Library1",
 				AndroidResources = {
 					new AndroidItem.AndroidResource (() => "Resources\\values\\strings2.xml") {
@@ -1196,7 +1202,9 @@ public void CheckResouceIsOverridden ()
 					},
 				},
 			};
+			library.SetRuntime (runtime);
 			var library2 = new XamarinAndroidLibraryProject () {
+				IsRelease = isRelease,
 				ProjectName = "Library2",
 				AndroidResources = {
 					new AndroidItem.AndroidResource (() => "Resources\\values\\strings2.xml") {
@@ -1207,13 +1215,15 @@ public void CheckResouceIsOverridden ()
 					},
 				},
 			};
-			var app = new XamarinAndroidApplicationProject () {
-				PackageName = "Xamarin.ResourceTest",
+			library2.SetRuntime (runtime);
+			var app = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime, "ResourceTest")) {
+				IsRelease = isRelease,
 				References = {
 					new BuildItem.ProjectReference ("..\\Library1\\Library1.csproj"),
 					new BuildItem.ProjectReference ("..\\Library2\\Library2.csproj"),
 				},
 			};
+			app.SetRuntime (runtime);
 			app.LayoutMain = app.LayoutMain.Replace ("@string/hello", "@string/hello_me");
 			using (var l1 = CreateDllBuilder (Path.Combine ("temp", TestName, library.ProjectName)))
 			using (var l2 = CreateDllBuilder (Path.Combine ("temp", TestName, library2.ProjectName)))

From 991aa4389499cab334cb878340cdfa956f067f12 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Tue, 9 Dec 2025 18:11:20 +0100
Subject: [PATCH 15/27] InstallAndRunTests.DotNetInstallAndRunPreviousSdk
 updated

---
 .../Tests/InstallAndRunTests.cs               | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index cffc3d10297..ecddddd71fb 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -1290,15 +1290,25 @@ public void CheckResouceIsOverridden ([Values] AndroidRuntime runtime)
 		[Test]
 		[Category ("WearOS")]
 		public void DotNetInstallAndRunPreviousSdk (
-				[Values (false, true)] bool isRelease)
+				[Values] bool isRelease,
+				[Values ("net9.0-android")] string targetFramework,
+				[Values] AndroidRuntime runtime)
 		{
-			var proj = new XamarinFormsAndroidApplicationProject () {
-				TargetFramework = $"{XABuildConfig.PreviousDotNetTargetFramework}-android",
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
+			// Mono-only test for the moment (until net10 or later is the "previous" framework)
+			if (runtime != AndroidRuntime.MonoVM) {
+				Assert.Ignore ("Mono-only test util net9 is no longer the 'previous' SDK");
+			}
+
+			var proj = new XamarinFormsAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
+				TargetFramework = targetFramework,
 				IsRelease = isRelease,
 				EnableDefaultItems = true,
 			};
-			// Mono-only test
-			proj.SetRuntime (AndroidRuntime.MonoVM);
+			proj.SetRuntime (runtime);
 
 			// Requires 32-bit ABIs
 			proj.SetAndroidSupportedAbis (["armeabi-v7a", "arm64-v8a", "x86", "x86_64"]);

From 77335e2bdefd833366b605e8b8fbe957f95b2dd6 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Tue, 9 Dec 2025 18:17:28 +0100
Subject: [PATCH 16/27] InstallAndRunTests.DotNetInstallAndRunMinorAPILevels
 updated

---
 .../Tests/InstallAndRunTests.cs                      | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index ecddddd71fb..ab860152667 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -1325,16 +1325,22 @@ public void DotNetInstallAndRunPreviousSdk (
 
 		[Test]
 		public void DotNetInstallAndRunMinorAPILevels (
-				[Values (false, true)] bool isRelease,
-				[Values ("net10.0-android36.1")] string targetFramework)
+				[Values] bool isRelease,
+				[Values ("net10.0-android36.1")] string targetFramework,
+				[Values] AndroidRuntime runtime)
 		{
-			var proj = new XamarinAndroidApplicationProject () {
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
+			var proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
 				TargetFramework = targetFramework,
 				IsRelease = isRelease,
 				ExtraNuGetConfigSources = {
 					Path.Combine (XABuildPaths.BuildOutputDirectory, "nuget-unsigned"),
 				}
 			};
+			proj.SetRuntime (runtime);
 
 			// TODO: update on new minor API levels to use an introduced minor API
 			proj.MainActivity = proj.DefaultMainActivity

From 0a8ba6e6e078a7d118576c321d9f67adf0e1e94a Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Wed, 10 Dec 2025 11:43:16 +0100
Subject: [PATCH 17/27] InstallAndRunTests.DeployToDevice works locally

It may be broken on CI with CoreCLR+FastDev
---
 .../Tests/InstallAndRunTests.cs               | 74 ++-----------------
 1 file changed, 5 insertions(+), 69 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index ab860152667..0c19a8acc9a 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -84,80 +84,16 @@ public void DotNetRun (bool isRelease, string typemapImplementation, AndroidRunt
 		}
 
 		[Test]
-		public void DotNetRunWaitForExit ()
+		public void DeployToDevice ([Values] bool isRelease, [Values] AndroidRuntime runtime)
 		{
-			const string logcatMessage = "DOTNET_RUN_TEST_MESSAGE_12345";
-			var proj = new XamarinAndroidApplicationProject ();
-
-			// Enable verbose output from Microsoft.Android.Run for debugging
-			proj.SetProperty ("_AndroidRunExtraArgs", "--verbose");
-
-			// Add a Console.WriteLine that will appear in logcat
-			proj.MainActivity = proj.DefaultMainActivity.Replace (
-				"//${AFTER_ONCREATE}",
-				$"Console.WriteLine (\"{logcatMessage}\");");
-
-			using var builder = CreateApkBuilder ();
-			builder.Save (proj);
-
-			var dotnet = new DotNetCLI (Path.Combine (Root, builder.ProjectDirectory, proj.ProjectFilePath));
-			Assert.IsTrue (dotnet.Build (), "`dotnet build` should succeed");
-
-			// Start dotnet run with WaitForExit=true, which uses Microsoft.Android.Run
-			using var process = dotnet.StartRun ();
-
-			var locker = new Lock ();
-			var output = new StringBuilder ();
-			var outputReceived = new ManualResetEventSlim (false);
-			bool foundMessage = false;
-
-			process.OutputDataReceived += (sender, e) => {
-				if (e.Data != null) {
-					lock (locker) {
-						output.AppendLine (e.Data);
-						if (e.Data.Contains (logcatMessage)) {
-							foundMessage = true;
-							outputReceived.Set ();
-						}
-					}
-				}
-			};
-			process.ErrorDataReceived += (sender, e) => {
-				if (e.Data != null) {
-					lock (locker) {
-						output.AppendLine ($"STDERR: {e.Data}");
-					}
-				}
-			};
-
-			process.BeginOutputReadLine ();
-			process.BeginErrorReadLine ();
-
-			// Wait for the expected message or timeout
-			bool messageFound = outputReceived.Wait (TimeSpan.FromSeconds (60));
-
-			// Kill the process (simulating Ctrl+C)
-			if (!process.HasExited) {
-				process.Kill (entireProcessTree: true);
-				process.WaitForExit ();
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
 			}
 
-			// Write the output to a log file for debugging
-			string logPath = Path.Combine (Root, builder.ProjectDirectory, "dotnet-run-output.log");
-			File.WriteAllText (logPath, output.ToString ());
-			TestContext.AddTestAttachment (logPath);
-
-			Assert.IsTrue (foundMessage, $"Expected message '{logcatMessage}' was not found in output. See {logPath} for details.");
-		}
-
-		[Test]
-		[TestCase (true)]
-		[TestCase (false)]
-		public void DeployToDevice (bool isRelease)
-		{
-			var proj = new XamarinAndroidApplicationProject {
+			var proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
 				IsRelease = isRelease
 			};
+			proj.SetRuntime (runtime);
 			using var builder = CreateApkBuilder ();
 			builder.Save (proj);
 

From bde69a95b69e4613317d53e3bfb7814df254dbe2 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Wed, 10 Dec 2025 12:05:48 +0100
Subject: [PATCH 18/27] InstallAndRunTests.TypeAndMemberRemapping broken on
 NativeAOT

---
 .../Tests/InstallAndRunTests.cs                  | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 0c19a8acc9a..24c0e064a62 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -625,7 +625,7 @@ void TestJsonDeserialization (Person p)
 			StreamReader sr = new StreamReader (stream);
 
 			Console.WriteLine ($""JSON Person representation: {sr.ReadToEnd ()}"");
-
+/
 			stream.Position = 0;
 			Person p2 = (Person) serializer.ReadObject (stream);
 
@@ -1311,9 +1311,18 @@ public MyTextObjectFont (PdfPageTextObjectFont font) : base (font)
 		}
 
 		[Test]
-		public void TypeAndMemberRemapping ([Values (false, true)] bool isRelease)
+		public void TypeAndMemberRemapping ([Values] bool isRelease, [Values] AndroidRuntime runtime)
 		{
-			var proj = new XamarinAndroidApplicationProject () {
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
+			// TODO: fix for NativeAOT, if possible
+			if (runtime == AndroidRuntime.NativeAOT) {
+				Assert.Ignore ("Type and member mapping is currently unsupported under NativeAOT");
+			}
+
+			var proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
 				IsRelease = isRelease,
 				EnableDefaultItems = true,
 				OtherBuildItems = {
@@ -1330,6 +1339,7 @@ public void TypeAndMemberRemapping ([Values (false, true)] bool isRelease)
 					},
 				},
 			};
+			proj.SetRuntime (runtime);
 			proj.MainActivity = proj.DefaultMainActivity.Replace (": Activity", ": global::Example.RemapActivity");
 			var builder = CreateApkBuilder ();
 			Assert.IsTrue (builder.Build (proj), "`dotnet build` should succeed");

From c276e34b38f585fc4d1cfadff57789bf4197705b Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Wed, 10 Dec 2025 12:34:08 +0100
Subject: [PATCH 19/27] 
 InstallAndRunTests.SupportDesugaringStaticInterfaceMethods works

---
 .../Tests/InstallAndRunTests.cs                | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 24c0e064a62..72f6983e4e7 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -1362,9 +1362,22 @@ public void TypeAndMemberRemapping ([Values] bool isRelease, [Values] AndroidRun
 		}
 
 		[Test]
-		public void SupportDesugaringStaticInterfaceMethods ()
+		public void SupportDesugaringStaticInterfaceMethods ([Values] AndroidRuntime runtime)
 		{
-			var proj = new XamarinAndroidApplicationProject () {
+			const bool isRelease = true;
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
+			// TODO: fix for NativeAOT, if possible. Currently fails with:
+			//
+			//  Process: com.xamarin.supportdesugaringstaticinterfacemethods_nativeaot, PID: 13888
+			//  java.lang.NoSuchMethodError: no static method "Lexample/StaticMethodsInterface;.getValue()I"
+			if (runtime == AndroidRuntime.NativeAOT) {
+				Assert.Ignore ("Currently broken on NativeAOT");
+			}
+
+			var proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
 				IsRelease = true,
 				EnableDefaultItems = true,
 				OtherBuildItems = {
@@ -1377,6 +1390,7 @@ public void SupportDesugaringStaticInterfaceMethods ()
 					},
 				},
 			};
+			proj.SetRuntime (runtime);
 
 			// Note: To properly test, Desugaring must be *enabled*, which requires that
 			// `$(SupportedOSPlatformVersion)` be *less than* 23.  21 is currently the default,

From 164ba5102b7c694b5b15eb792d30fe3f1360c8c3 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Wed, 10 Dec 2025 12:46:33 +0100
Subject: [PATCH 20/27] InstallAndRunTests.FastDeployEnvironmentFiles updated

---
 .../Tests/InstallAndRunTests.cs                  | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 72f6983e4e7..580454fff40 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -1416,16 +1416,21 @@ public void SupportDesugaringStaticInterfaceMethods ([Values] AndroidRuntime run
 		}
 
 		[Test]
-		[TestCase (false, true)]
-		[TestCase (false, false)]
-		[TestCase (true, false)]
-		public void FastDeployEnvironmentFiles (bool isRelease, bool embedAssembliesIntoApk)
+		public void FastDeployEnvironmentFiles ([Values] bool isRelease, [Values] bool embedAssembliesIntoApk, [Values] AndroidRuntime runtime)
 		{
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
+			if (!isRelease && !embedAssembliesIntoApk) {
+				Assert.Ignore ("Not a FastDev configuration");
+			}
+
 			if (embedAssembliesIntoApk) {
 				AssertCommercialBuild ();
 			}
 
-			var proj = new XamarinAndroidApplicationProject {
+			var proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
 				ProjectName = nameof (FastDeployEnvironmentFiles),
 				RootNamespace = nameof (FastDeployEnvironmentFiles),
 				IsRelease = isRelease,
@@ -1440,6 +1445,7 @@ public void FastDeployEnvironmentFiles (bool isRelease, bool embedAssembliesInto
 					}
 				}
 			};
+			proj.SetRuntime (runtime);
 			proj.SetProperty ("DiagnosticAddress", "127.0.0.1");
 			proj.SetProperty ("DiagnosticPort", "9000");
 			proj.SetProperty ("DiagnosticSuspend", "false");

From 77c8b5f1c69c7751669da63cac8f84a9e8d9bc00 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Wed, 10 Dec 2025 13:37:03 +0100
Subject: [PATCH 21/27] InstallAndRunTests.FixLegacyResourceDesignerStep
 updated

---
 .../Tests/InstallAndRunTests.cs                       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 580454fff40..d511d452309 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -1506,10 +1506,14 @@ public void FastDeployEnvironmentFiles ([Values] bool isRelease, [Values] bool e
 		}
 
 		[Test]
-		public void FixLegacyResourceDesignerStep ([Values (true, false)] bool isRelease)
+		public void FixLegacyResourceDesignerStep ([Values] bool isRelease, [Values] AndroidRuntime runtime)
 		{
-			string previousTargetFramework = $"{XABuildConfig.PreviousDotNetTargetFramework}-android";
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+			string previousTargetFramework = "net9.0-android";
 
+			// Don't call SetRuntime on library projects (at least until "previous" framework bumps to at least 10.0)
 			var library1 = new XamarinAndroidLibraryProject {
 				IsRelease = isRelease,
 				TargetFramework = previousTargetFramework,
@@ -1536,10 +1540,11 @@ public void FixLegacyResourceDesignerStep ([Values (true, false)] bool isRelease
 			library2.AndroidResources.Clear ();
 			library2.SetProperty ("AndroidGenerateResourceDesigner", "false"); // Disable Android Resource Designer generation
 			library2.AddReference (library1);
-			proj = new XamarinAndroidApplicationProject {
+			proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
 				IsRelease = isRelease,
 				ProjectName = "MyApp",
 			};
+			proj.SetRuntime (runtime);
 			proj.AddReference (library2);
 			proj.MainActivity = proj.DefaultMainActivity.Replace ("//${AFTER_ONCREATE}", "Console.WriteLine(Foo.Hello);");
 

From a8320392ae487c052eab97cf23110efb594d4100 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Wed, 10 Dec 2025 15:17:29 +0100
Subject: [PATCH 22/27] InstallAndRunTests.MicrosoftIntune updated

---
 .../MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index d511d452309..385315a9aa1 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -1565,17 +1565,21 @@ public void FixLegacyResourceDesignerStep ([Values] bool isRelease, [Values] And
 		}
 
 		[Test]
-		public void MicrosoftIntune ([Values (false, true)] bool isRelease)
+		public void MicrosoftIntune ([Values] bool isRelease, [Values] AndroidRuntime runtime)
 		{
 			Assert.Ignore ("https://github.com/xamarin/xamarin-android/issues/8548");
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
 
-			proj = new XamarinAndroidApplicationProject {
+			proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
 				IsRelease = isRelease,
 				PackageReferences = {
 					KnownPackages.AndroidXAppCompat,
 					KnownPackages.Microsoft_Intune_Maui_Essentials_android,
 				},
 			};
+			proj.SetRuntime (runtime);
 			proj.MainActivity = proj.DefaultMainActivity
 				.Replace ("Icon = \"@drawable/icon\")]", "Icon = \"@drawable/icon\", Theme = \"@style/Theme.AppCompat.Light.DarkActionBar\")]")
 				.Replace ("public class MainActivity : Activity", "public class MainActivity : AndroidX.AppCompat.App.AppCompatActivity");

From 9ff80bb43a57c9cea26a7d5b4e02deb53cbffb83 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Wed, 10 Dec 2025 16:01:07 +0100
Subject: [PATCH 23/27] InstallAndRunTests.GradleFBProj works

---
 .../MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 385315a9aa1..3bc9df977dd 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -1605,8 +1605,12 @@ public void MicrosoftIntune ([Values] bool isRelease, [Values] AndroidRuntime ru
 		}
 
 		[Test]
-		public void GradleFBProj ([Values (false, true)] bool isRelease)
+		public void GradleFBProj ([Values] bool isRelease, [Values] AndroidRuntime runtime)
 		{
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
 			var moduleName = "Library";
 			var gradleTestProjectDir = Path.Combine (Root, "temp", "gradle", TestName);
 			var gradleModule = new AndroidGradleModule (Path.Combine (gradleTestProjectDir, moduleName));
@@ -1654,7 +1658,7 @@ public static void logEvent(String eventName) {{
 			};
 			gradleProject.Create ();
 
-			var proj = new XamarinAndroidApplicationProject {
+			var proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
 				IsRelease = isRelease,
 				ExtraNuGetConfigSources = {
 					"https://api.nuget.org/v3/index.json",
@@ -1708,6 +1712,7 @@ public static void logEvent(String eventName) {{
 					},
 				},
 			};
+			proj.SetRuntime (runtime);
 			proj.MainActivity = proj.DefaultMainActivity.Replace ("//${AFTER_ONCREATE}", @"
 Facebook.FacebookSdk.InitializeSDK(this, Java.Lang.Boolean.True);
 Facebook.FacebookSdk.LogEvent(""TestFacebook"");

From 8f6ff3ab053752bd554a590dbedae25ca7e7e613 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Wed, 10 Dec 2025 16:07:10 +0100
Subject: [PATCH 24/27] 
 InstallAndRunTests.AppStartsWithManagedMarshalMethodsLookupEnabled works

---
 .../Tests/InstallAndRunTests.cs                      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 3bc9df977dd..f10a681c553 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -1757,9 +1757,17 @@ public void NativeAOTSample ()
 		}
 
 		[Test]
-		public void AppStartsWithManagedMarshalMethodsLookupEnabled ()
+		public void AppStartsWithManagedMarshalMethodsLookupEnabled ([Values] AndroidRuntime runtime)
 		{
-			var proj = new XamarinAndroidApplicationProject { IsRelease = true };
+			const bool isRelease = true;
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
+			var proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
+				IsRelease = isRelease,
+			};
+			proj.SetRuntime (runtime);
 			proj.SetProperty ("AndroidUseMarshalMethods", "true");
 			proj.SetProperty ("_AndroidUseManagedMarshalMethodsLookup", "true");
 

From a0000db3f48b9e5537eaafefe4e732f1cae88126 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Fri, 9 Jan 2026 12:24:22 +0100
Subject: [PATCH 25/27] Fix after rebase

---
 .../Tests/InstallAndRunTests.cs               | 68 ++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index f10a681c553..8fc54fedbf8 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -83,6 +83,73 @@ public void DotNetRun (bool isRelease, string typemapImplementation, AndroidRunt
 			Assert.IsTrue (didLaunch, "Activity should have started.");
 		}
 
+		[Test]
+		public void DotNetRunWaitForExit ()
+		{
+			const string logcatMessage = "DOTNET_RUN_TEST_MESSAGE_12345";
+			var proj = new XamarinAndroidApplicationProject ();
+
+			// Enable verbose output from Microsoft.Android.Run for debugging
+			proj.SetProperty ("_AndroidRunExtraArgs", "--verbose");
+
+			// Add a Console.WriteLine that will appear in logcat
+			proj.MainActivity = proj.DefaultMainActivity.Replace (
+				"//${AFTER_ONCREATE}",
+				$"Console.WriteLine (\"{logcatMessage}\");");
+
+			using var builder = CreateApkBuilder ();
+			builder.Save (proj);
+
+			var dotnet = new DotNetCLI (Path.Combine (Root, builder.ProjectDirectory, proj.ProjectFilePath));
+			Assert.IsTrue (dotnet.Build (), "`dotnet build` should succeed");
+
+			// Start dotnet run with WaitForExit=true, which uses Microsoft.Android.Run
+			using var process = dotnet.StartRun ();
+
+			var locker = new Lock ();
+			var output = new StringBuilder ();
+			var outputReceived = new ManualResetEventSlim (false);
+			bool foundMessage = false;
+
+			process.OutputDataReceived += (sender, e) => {
+				if (e.Data != null) {
+					lock (locker) {
+						output.AppendLine (e.Data);
+						if (e.Data.Contains (logcatMessage)) {
+							foundMessage = true;
+							outputReceived.Set ();
+						}
+					}
+				}
+			};
+			process.ErrorDataReceived += (sender, e) => {
+				if (e.Data != null) {
+					lock (locker) {
+						output.AppendLine ($"STDERR: {e.Data}");
+					}
+				}
+			};
+
+			process.BeginOutputReadLine ();
+			process.BeginErrorReadLine ();
+
+			// Wait for the expected message or timeout
+			bool messageFound = outputReceived.Wait (TimeSpan.FromSeconds (60));
+
+			// Kill the process (simulating Ctrl+C)
+			if (!process.HasExited) {
+				process.Kill (entireProcessTree: true);
+				process.WaitForExit ();
+			}
+
+			// Write the output to a log file for debugging
+			string logPath = Path.Combine (Root, builder.ProjectDirectory, "dotnet-run-output.log");
+			File.WriteAllText (logPath, output.ToString ());
+			TestContext.AddTestAttachment (logPath);
+
+			Assert.IsTrue (foundMessage, $"Expected message '{logcatMessage}' was not found in output. See {logPath} for details.");
+		}
+
 		[Test]
 		public void DeployToDevice ([Values] bool isRelease, [Values] AndroidRuntime runtime)
 		{
@@ -263,7 +330,6 @@ void Button_ViewTreeObserver_GlobalLayout (object sender, EventArgs e)
 			}, Path.Combine (Root, builder.ProjectDirectory, "startup-logcat.log"), 60), $"Output did not contain {expectedLogcatOutput}!");
 		}
 
-		// TODO: check if AppDomain.CurrentDomain.UnhandledException even works in CoreCLR and NativeAOT
 		[Test]
 		public void SubscribeToAppDomainUnhandledException ([Values] AndroidRuntime runtime)
 		{

From 15d174874627321531646b0fe02497584fc0ea1b Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Wed, 14 Jan 2026 10:40:18 +0100
Subject: [PATCH 26/27] Fix after rebase

---
 tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 8fc54fedbf8..fd199aa85bd 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -1293,7 +1293,6 @@ public void CheckResouceIsOverridden ([Values] AndroidRuntime runtime)
 		[Category ("WearOS")]
 		public void DotNetInstallAndRunPreviousSdk (
 				[Values] bool isRelease,
-				[Values ("net9.0-android")] string targetFramework,
 				[Values] AndroidRuntime runtime)
 		{
 			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
@@ -1306,7 +1305,7 @@ public void DotNetInstallAndRunPreviousSdk (
 			}
 
 			var proj = new XamarinFormsAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
-				TargetFramework = targetFramework,
+				TargetFramework = $"{XABuildConfig.PreviousDotNetTargetFramework}-android",
 				IsRelease = isRelease,
 				EnableDefaultItems = true,
 			};
@@ -1574,10 +1573,14 @@ public void FastDeployEnvironmentFiles ([Values] bool isRelease, [Values] bool e
 		[Test]
 		public void FixLegacyResourceDesignerStep ([Values] bool isRelease, [Values] AndroidRuntime runtime)
 		{
+<<<<<<< HEAD
 			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
 				return;
 			}
 			string previousTargetFramework = "net9.0-android";
+=======
+			string previousTargetFramework = $"{XABuildConfig.PreviousDotNetTargetFramework}-android";
+>>>>>>> main
 
 			// Don't call SetRuntime on library projects (at least until "previous" framework bumps to at least 10.0)
 			var library1 = new XamarinAndroidLibraryProject {

From f802ad8b78141de1df5d9479e7bbf11aafb7ea4b Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Wed, 14 Jan 2026 10:53:56 +0100
Subject: [PATCH 27/27] oops, missed one

---
 tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index fd199aa85bd..bc76acf15ca 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -1573,14 +1573,10 @@ public void FastDeployEnvironmentFiles ([Values] bool isRelease, [Values] bool e
 		[Test]
 		public void FixLegacyResourceDesignerStep ([Values] bool isRelease, [Values] AndroidRuntime runtime)
 		{
-<<<<<<< HEAD
 			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
 				return;
 			}
-			string previousTargetFramework = "net9.0-android";
-=======
 			string previousTargetFramework = $"{XABuildConfig.PreviousDotNetTargetFramework}-android";
->>>>>>> main
 
 			// Don't call SetRuntime on library projects (at least until "previous" framework bumps to at least 10.0)
 			var library1 = new XamarinAndroidLibraryProject {