[msbuild] Don't execute the ParseDeviceSpecificBuildInformation task on Mac Catalyst. (#22887)

The 'ParseDeviceSpecificBuildInformation' task is only applicable to mobile
targets (iOS and tvOS), so skip running it on Mac Catalyst (like we're already
doing for macOS).

This fixes a build error if happens to run on Mac Catalyst:

> The "ParseDeviceSpecificBuildInformation" task failed unexpectedly. System.InvalidOperationException: Invalid platform: MacCatalyst

Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2484312.

Author: rolfbjarne

msbuild/Xamarin.Shared/Xamarin.Shared.targets

@@ -1232,7 +1232,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			will apply to Xamarin.Mac as well.
 		-->
 		<ParseDeviceSpecificBuildInformation
-			Condition="'$(DeviceSpecificBuild)' == 'true' And '$(TargetiOSDevice)' != '' And '$(_CanDeployToDeviceOrSimulator)' == 'true' And '$(_PlatformName)' != 'macOS'"
+			Condition="'$(DeviceSpecificBuild)' == 'true' And '$(TargetiOSDevice)' != '' And '$(_CanDeployToDeviceOrSimulator)' == 'true' And '$(_PlatformName)' != 'macOS' And '$(_PlatformName)' != 'MacCatalyst'"
 			Architectures="$(TargetArchitectures)"
 			IntermediateOutputPath="$(IntermediateOutputPath)"
 			OutputPath="$(OutputPath)"

tests/common/DotNet.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Xml;
 
 using Xamarin.Utils;
 
@@ -217,15 +218,19 @@ public static ExecutionResult Execute (string verb, string project, Dictionary<s
 						}
 					}
 					if (generatedProps is not null) {
+						var settings = new XmlWriterSettings ();
 						var sb = new StringBuilder ();
-						sb.AppendLine ("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
-						sb.AppendLine ("<Project>");
-						sb.AppendLine ("\t<PropertyGroup>");
+						var xml = XmlWriter.Create (sb, settings);
+						xml.WriteStartElement ("Project");
+						xml.WriteStartElement ("PropertyGroup");
 						foreach (var prop in generatedProps) {
-							sb.AppendLine ($"\t\t<{prop.Key}>{prop.Value}</{prop.Key}>");
+							xml.WriteStartElement (prop.Key);
+							xml.WriteString (prop.Value);
+							xml.WriteEndElement ();
 						}
-						sb.AppendLine ("\t</PropertyGroup>");
-						sb.AppendLine ("</Project>");
+						xml.WriteEndElement ();
+						xml.WriteEndElement ();
+						xml.Flush ();
 
 						var generatedProjectFile = Path.Combine (Cache.CreateTemporaryDirectory (), "GeneratedProjectFile.props");
 						File.WriteAllText (generatedProjectFile, sb.ToString ());

tests/dotnet/UnitTests/MauiTest.cs

@@ -11,6 +11,11 @@ public class MauiTest : TestBaseClass {
 		[TestCase (ApplePlatform.iOS, "ios-arm64")]
 		[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-arm64")]
 		public void BuildMauiApp (ApplePlatform platform, string runtimeIdentifiers)
+		{
+			BuildMauiAppImpl (platform, runtimeIdentifiers);
+		}
+
+		void BuildMauiAppImpl (ApplePlatform platform, string runtimeIdentifiers, bool deviceSpecificBuild = false)
 		{
 			var project = "MyMauiApp";
 			Configuration.IgnoreIfIgnoredPlatform (platform);
@@ -21,6 +26,28 @@ public void BuildMauiApp (ApplePlatform platform, string runtimeIdentifiers)
 			DotNet.InstallWorkload ("maui-tizen");
 
 			var properties = GetDefaultProperties (runtimeIdentifiers);
+			if (deviceSpecificBuild) {
+				properties ["file:TargetiOSDevice"] =
+					"""
+					<?xml version="1.0" encoding="UTF-8"?>
+					<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+					<plist version="1.0">
+					<dict>
+						<key>device</key>
+						<dict>
+							<key>architecture</key>
+							<string>ARM64</string>
+							<key>os</key>
+							<string>ios</string>
+							<key>model</key>
+							<string>iphone</string>
+							<key>os-version</key>
+							<string>18.0</string>
+						</dict>
+					</dict>
+					</plist>
+					""";
+			}
 			var rv = DotNet.AssertBuild (project_path, properties);
 			AssertThatLinkerExecuted (rv);
 			var infoPlistPath = GetInfoPListPath (platform, appPath);
@@ -39,5 +66,13 @@ public void BuildMauiApp (ApplePlatform platform, string runtimeIdentifiers)
 			Assert.AreEqual ("None", linkModeValue, "LinkMode");
 			Assert.AreEqual ("None", mtouchLinkValue, "MtouchLink");
 		}
+
+		[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-arm64")]
+		// [Category ("RemoteWindows")]
+		public void BuildMauiAppWithDeviceSpecificBuilds (ApplePlatform platform, string runtimeIdentifiers)
+		{
+			// Configuration.IgnoreIfNotOnWindows ();
+			BuildMauiAppImpl (platform, runtimeIdentifiers, deviceSpecificBuild: true);
+		}
 	}
 }