Fix after rebase

Author: grendello

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 {