Add dotnet test integration tests for all Apple platforms

mk/xamarin.mk

@@ -1,5 +1,5 @@
 # Available versions can be seen here:
 # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.Tools.Mlaunch/versions
-MLAUNCH_NUGET_VERSION=1.1.113
+MLAUNCH_NUGET_VERSION=1.1.115
 # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/AppleDocReader/versions
 ADR_NUGET_VERSION=1.0.0

tests/common/DotNet.cs

@@ -238,6 +238,7 @@ public static ExecutionResult Execute (string verb, string project, Dictionary<s
 			case "publish":
 			case "restore":
 			case "run":
+			case "test":
 				var args = new List<string> ();
 				args.Add (verb);
 				args.Add (project);
@@ -304,11 +305,15 @@ public static ExecutionResult Execute (string verb, string project, Dictionary<s
 				Console.WriteLine ($"Binlog: {binlogPath}");
 
 				// Work around https://github.com/dotnet/msbuild/issues/8845
-				args.Add ("/v:diag");
-				args.Add ("/consoleloggerparameters:Verbosity=Quiet");
-				// vb does not have preview lang, so we force it to latest
-				if (project.EndsWith (".vbproj", StringComparison.OrdinalIgnoreCase))
-					args.Add ("/p:LangVersion=latest");
+				// Skip these for 'dotnet test' because they leak through '-- ' in
+				// RunArguments and get passed to the test runner as app arguments.
+				if (verb != "test") {
+					args.Add ("/v:diag");
+					args.Add ("/consoleloggerparameters:Verbosity=Quiet");
+					// vb does not have preview lang, so we force it to latest
+					if (project.EndsWith (".vbproj", StringComparison.OrdinalIgnoreCase))
+						args.Add ("/p:LangVersion=latest");
+				}
 				// End workaround
 
 				if (msbuildParallelism.HasValue) {

tests/dotnet/UnitTests/DotNetTestTest.cs

@@ -0,0 +1,114 @@
+using System.Linq;
+
+using Xamarin.MacDev;
+using Xamarin.MacDev.Models;
+using Xamarin.Tests;
+using Xamarin.Utils;
+
+#nullable enable
+
+namespace Xamarin.Tests {
+	[TestFixture]
+	public class DotNetTestTest : TestBaseClass {
+		[Test]
+		[TestCase (ApplePlatform.iOS, "iostest")]
+		[TestCase (ApplePlatform.TVOS, "tvostest")]
+		// macOS and Mac Catalyst don't use mlaunch (they use 'open' via Desktop.targets),
+		// so MTP support requires a different approach for these platforms.
+		// [TestCase (ApplePlatform.MacCatalyst, "maccatalysttest")]
+		// [TestCase (ApplePlatform.MacOSX, "macostest")]
+		public void DotNetTest (ApplePlatform platform, string template)
+		{
+			Configuration.IgnoreIfIgnoredPlatform (platform);
+
+			var tmpDir = Cache.CreateTemporaryDirectory ();
+			var outputDir = Path.Combine (tmpDir, template);
+			DotNet.AssertNew (outputDir, template);
+			var proj = Path.Combine (outputDir, $"{template}.csproj");
+
+			// Boot a simulator so that ComputeRunArguments can find a device
+			var log = ConsoleLogger.Instance;
+			var simService = new SimulatorService (log);
+			var runtimeService = new RuntimeService (log);
+			var device = GetOrCreateDevice (platform, simService, runtimeService);
+
+			if (!device.IsBooted)
+				Assert.That (simService.Boot (device.Udid), Is.True, $"Failed to boot simulator {device.Udid}.");
+
+			try {
+				// dotnet test internally calls ComputeRunArguments via MSBuild API without
+				// forwarding /p: properties, so we must set them in the project file directly.
+				var csproj = File.ReadAllText (proj);
+				csproj = csproj.Replace (
+					"</PropertyGroup>",
+					$"  <UseFloatingTargetPlatformVersion>true</UseFloatingTargetPlatformVersion>\n    <Device>{device.Udid}</Device>\n  </PropertyGroup>");
+				File.WriteAllText (proj, csproj);
+
+				// Replace generated tests with a single passing test
+				var testFile = Path.Combine (outputDir, "Test1.cs");
+				File.WriteAllText (testFile, $@"namespace {template};
+
+[TestClass]
+public sealed class Test1 {{
+	[TestMethod]
+	public void TestMethod1 ()
+	{{
+	}}
+}}
+");
+
+				// Run 'dotnet test' directly using Execution.RunAsync.
+				// dotnet test's MTP flow doesn't forward /p: properties to its internal
+				// ComputeRunArguments MSBuild API call, so properties must be in the csproj.
+				var env = new Dictionary<string, string?> ();
+				env ["MSBuildSDKsPath"] = null;
+				env ["MSBUILD_EXE_PATH"] = null;
+				var binlog = Path.Combine (outputDir, "log-test.binlog");
+				var testArgs = new List<string> { "test", proj, $"/bl:{binlog}" };
+				var testResult = Execution.RunAsync (DotNet.Executable, testArgs, env, Console.Out, workingDirectory: outputDir, timeout: TimeSpan.FromMinutes (10)).Result;
+				Assert.That (testResult.ExitCode, Is.EqualTo (0), $"'dotnet test' failed with exit code {testResult.ExitCode}.\nBinlog: {binlog}\nOutput:\n{testResult.Output.MergedOutput}");
+			} finally {
+				simService.Shutdown (device.Udid);
+			}
+		}
+
+		static SimulatorDeviceInfo GetOrCreateDevice (ApplePlatform platform, SimulatorService simService, RuntimeService runtimeService)
+		{
+			var runtimePlatform = platform switch {
+				ApplePlatform.iOS => "iOS",
+				ApplePlatform.TVOS => "tvOS",
+				_ => throw new ArgumentException ($"Unsupported platform: {platform}"),
+			};
+
+			// Find an existing available device for this platform
+			var devices = simService.List (availableOnly: true);
+			var platformDevices = devices
+				.Where (d => string.Equals (d.Platform, runtimePlatform, StringComparison.OrdinalIgnoreCase))
+				.OrderByDescending (d => d.OSVersion)
+				.ToList ();
+
+			if (platformDevices.Count > 0)
+				return platformDevices [0];
+
+			// No devices exist — find the best runtime and create one
+			var runtimes = runtimeService.ListByPlatform (runtimePlatform, availableOnly: true);
+			Assert.That (runtimes, Is.Not.Empty, $"No available {runtimePlatform} simulator runtimes found.");
+
+			var bestRuntime = runtimes.OrderByDescending (r => r.Version).First ();
+
+			var defaultDeviceType = platform switch {
+				ApplePlatform.iOS => "com.apple.CoreSimulator.SimDeviceType.iPhone-16",
+				ApplePlatform.TVOS => "com.apple.CoreSimulator.SimDeviceType.Apple-TV-4K-3rd-generation-4K",
+				_ => throw new ArgumentException ($"Unsupported platform: {platform}"),
+			};
+
+			var udid = simService.Create ("test-device", defaultDeviceType, bestRuntime.Identifier);
+			Assert.That (udid, Is.Not.Null, $"Failed to create {runtimePlatform} simulator device.");
+
+			// Re-fetch the device info so we have the full object
+			var created = simService.List (availableOnly: true).FirstOrDefault (d => d.Udid == udid);
+			Assert.That (created, Is.Not.Null, $"Created simulator {udid} not found in device list.");
+			return created!;
+		}
+	}
+}

tests/dotnet/UnitTests/DotNetUnitTests.csproj

@@ -54,9 +54,6 @@
 		<Compile Include="..\..\common\BinLog.cs">
 			<Link>external\BinLog.cs</Link>
 		</Compile>
-		<Compile Include="..\..\..\external\Xamarin.MacDev\Xamarin.MacDev\PListObject.cs">
-			<Link>external\PListObject.cs</Link>
-		</Compile>
 		<Compile Include="..\..\..\tools\common\SdkVersions.cs">
 			<Link>external\SdkVersions.cs</Link>
 		</Compile>
@@ -85,6 +82,9 @@
 	<ItemGroup>
 		<Folder Include="external\" />
 	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\..\external\Xamarin.MacDev\Xamarin.MacDev\Xamarin.MacDev.csproj" />
+	</ItemGroup>
 	<ItemGroup>
 		<None Remove="System.Text.Json" />
 	</ItemGroup>