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

@@ -222,6 +222,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);
@@ -288,11 +289,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,102 @@
+using System.Text.Json;
+
+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");
+
+			// 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  </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 ()
+	{{
+	}}
+}}
+");
+
+			// Boot a simulator so that ComputeRunArguments can find a device
+			var runtimeIdentifier = GetDefaultRuntimeIdentifier (platform);
+			var deviceUdid = GetDeviceUdid (outputDir, runtimeIdentifier);
+			BootSimulator (deviceUdid);
+
+			// 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.AreEqual (0, testResult.ExitCode, $"'dotnet test' failed with exit code {testResult.ExitCode}.\nBinlog: {binlog}\nOutput:\n{testResult.Output.MergedOutput}");
+		}
+
+		static string GetDeviceUdid (string projectDirectory, string runtimeIdentifier)
+		{
+			var tmpdir = Cache.CreateTemporaryDirectory ();
+			var outputFile = Path.Combine (tmpdir, "AvailableDevices.json");
+			var args = new List<string> {
+				"build",
+				"-t:ComputeAvailableDevices",
+				"-getItem:Devices",
+				$"-getResultOutputFile:{outputFile}",
+				$"-p:RuntimeIdentifier={runtimeIdentifier}",
+			};
+
+			var env = new Dictionary<string, string?> ();
+			env ["MSBuildSDKsPath"] = null;
+			env ["MSBUILD_EXE_PATH"] = null;
+			var rv = Execution.RunAsync (DotNet.Executable, args, env, Console.Out, workingDirectory: projectDirectory, timeout: TimeSpan.FromMinutes (2)).Result;
+			Assert.AreEqual (0, rv.ExitCode, $"Failed to compute available devices. Output:\n{rv.Output.MergedOutput}");
+
+			var output = File.ReadAllText (outputFile);
+			var doc = JsonDocument.Parse (output);
+			var devices = doc.RootElement.GetProperty ("Items").GetProperty ("Devices").EnumerateArray ().Select (e => {
+				var identity = e.GetProperty ("Identity").GetString ()!;
+				var osVersion = Version.Parse (e.GetProperty ("OSVersion").GetString ()!);
+				var deviceTypeIdentifier = e.GetProperty ("DeviceTypeIdentifier").GetString ()!;
+				return (Identity: identity, OsVersion: osVersion, DeviceTypeIdentifier: deviceTypeIdentifier);
+			}).OrderByDescending (d => d.OsVersion).ThenBy (d => d.DeviceTypeIdentifier).ThenBy (d => d.Identity).ToList ();
+
+			Assert.That (devices, Is.Not.Empty, $"No devices found. Output:\n{output}");
+			return devices.First ().Identity;
+		}
+
+		static void BootSimulator (string udid)
+		{
+			var rv = Execution.RunAsync ("xcrun", new List<string> { "simctl", "boot", udid }, timeout: TimeSpan.FromMinutes (1)).Result;
+			// Exit code 149 means "already booted", which is fine
+			if (rv.ExitCode != 0 && rv.ExitCode != 149)
+				Assert.Fail ($"Failed to boot simulator {udid}. Exit code: {rv.ExitCode}\nOutput:\n{rv.Output.MergedOutput}");
+		}
+	}
+}