dotnet · mariam-abdulla · Nov 26, 2024 · Nov 26, 2024 · Nov 26, 2024 · Nov 26, 2024
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -637,6 +637,10 @@
     <Dependency Name="MSTest" Version="3.8.0-preview.25057.8">
       <Uri>https://github.com/microsoft/testfx</Uri>
       <Sha>53488cf463d33882113ca7a6fbbb6f93e06251df</Sha>
+    </Dependency>
+	<Dependency Name="Microsoft.Testing.Platform" Version="1.6.0-preview.25059.14">
+      <Uri>https://github.com/microsoft/testfx</Uri>
+      <Sha>53488cf463d33882113ca7a6fbbb6f93e06251df</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -28,6 +28,7 @@
     <UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</UsingToolMicrosoftNetCompilers>
     <MicrosoftIORedistPackageVersion>6.0.1</MicrosoftIORedistPackageVersion>
     <FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</FlagNetStandard1XDependencies>
+    <MicrosoftTestingPlatformVersion>1.6.0-preview.25059.14</MicrosoftTestingPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Label="Servicing version information">
     <VersionFeature21>30</VersionFeature21>

diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
@@ -304,9 +304,10 @@ private static BuildResult RestoreProject(string projectFilePath, ProjectCollect
             return buildResult;
         }
 
-        private static bool IsBinaryLoggerEnabled(List<string> args, out string binLogFileName)
+        internal static bool IsBinaryLoggerEnabled(List<string> args, out string binLogFileName)
         {
             binLogFileName = string.Empty;
+
             var binLogArgs = new List<string>();
 
             foreach (var arg in args)

@@ -93,7 +93,7 @@ private ProcessStartInfo CreateProcessStartInfo(bool hasFilterMode, bool isDll,
         private void WaitOnTestApplicationPipeConnectionLoop()
         {
             _cancellationToken.Cancel();
-            _testAppPipeConnectionLoop.Wait((int)TimeSpan.FromSeconds(30).TotalMilliseconds);
+            _testAppPipeConnectionLoop?.Wait((int)TimeSpan.FromSeconds(30).TotalMilliseconds);
         }
 
         private async Task WaitConnectionAsync(CancellationToken token)
@@ -212,7 +212,7 @@ private async Task<int> StartProcess(ProcessStartInfo processStartInfo)
         {
             if (VSTestTrace.TraceEnabled)
             {
-                VSTestTrace.SafeWriteTrace(() => $"Updated args: {processStartInfo.Arguments}");
+                VSTestTrace.SafeWriteTrace(() => $"Test application arguments: {processStartInfo.Arguments}");
             }
 
             var process = Process.Start(processStartInfo);

@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.CommandLine;
+using System.Text.Json;
+using System.Text.Json.Nodes;
 using Microsoft.DotNet.Tools.Test;
+using Microsoft.NET.Sdk.WorkloadManifestReader;
 using LocalizableStrings = Microsoft.DotNet.Tools.Test.LocalizableStrings;
 
 namespace Microsoft.DotNet.Cli
@@ -152,38 +155,58 @@ private static CliOption<string> CreateBlameHangDumpOption()
 
         private static readonly CliCommand Command = ConstructCommand();
 
-
-
         public static CliCommand GetCommand()
         {
             return Command;
         }
 
-        private static bool IsTestingPlatformEnabled()
+        private static string GetTestRunnerName()
         {
-            var testingPlatformEnabledEnvironmentVariable = Environment.GetEnvironmentVariable("DOTNET_CLI_TESTINGPLATFORM_ENABLE");
-            var isTestingPlatformEnabled = testingPlatformEnabledEnvironmentVariable == "1" || string.Equals(testingPlatformEnabledEnvironmentVariable, "true", StringComparison.OrdinalIgnoreCase);
-            return isTestingPlatformEnabled;
+            string defaultTestRunnerName = CliConstants.VSTest;
+
+            string? globalJsonPath = SdkDirectoryWorkloadManifestProvider.GetGlobalJsonPath(Environment.CurrentDirectory);
+
+            if (!string.IsNullOrEmpty(globalJsonPath))
+            {
+                JsonNode globalJson = JsonObject.Parse(File.ReadAllText(globalJsonPath));
+                JsonNode? testSection = globalJson[CliConstants.TestSectionKey];
+
+                if (testSection is null)
+                {
+                    return defaultTestRunnerName;
+                }
+
+                JsonSerializerOptions JsonSerializerOptions = new JsonSerializerOptions
+                {
+                    PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+                };
+                var testSettings = JsonSerializer.Deserialize<TestSettings>(testSection, JsonSerializerOptions);
+
+                if (testSettings?.Runner?.Name is not null)
+                {
+                    return testSettings.Runner.Name;
+                }
+            }
+            return defaultTestRunnerName;
         }
 
         private static CliCommand ConstructCommand()
         {
 #if RELEASE
             return GetVSTestCliCommand();
 #else
-            bool isTestingPlatformEnabled = IsTestingPlatformEnabled();
-            string testingSdkName = isTestingPlatformEnabled ? "testingplatform" : "vstest";
+            string testRunnerName = GetTestRunnerName();
 
-            if (isTestingPlatformEnabled)
+            if (testRunnerName.Equals(CliConstants.VSTest, StringComparison.OrdinalIgnoreCase))
             {
-                return GetTestingPlatformCliCommand();
+                return GetVSTestCliCommand();
             }
-            else
+            else if (testRunnerName.Equals(CliConstants.MicrosoftTestingPlatform, StringComparison.OrdinalIgnoreCase))
             {
-                return GetVSTestCliCommand();
+                return GetTestingPlatformCliCommand();
             }
 
-            throw new InvalidOperationException($"Testing sdk not supported: {testingSdkName}");
+            throw new InvalidOperationException(string.Format(LocalizableStrings.CmdUnsupportedTestRunnerDescription, testRunnerName));
 #endif
         }
 

@@ -0,0 +1,8 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.DotNet.Cli
+{
+    internal sealed record TestSettings(Runner? Runner);
+    internal sealed record Runner(string Name);
+}
diff --git a/test/Microsoft.NET.TestFramework/Commands/TestCommand.cs b/test/Microsoft.NET.TestFramework/Commands/TestCommand.cs
@@ -61,6 +61,12 @@ public TestCommand WithTraceOutput()
             return this;
         }
 
+        public TestCommand WithEnableTestingPlatform()
+        {
+            WithEnvironmentVariable("DOTNET_CLI_TESTINGPLATFORM_ENABLE", "1");
+            return this;
+        }
+
         private SdkCommandSpec CreateCommandSpec(IEnumerable<string> args)
         {
             var commandSpec = CreateCommand(args);

diff --git a/test/TestAssets/TestProjects/EmptyFolder/global.json b/test/TestAssets/TestProjects/EmptyFolder/global.json
@@ -0,0 +1,7 @@
+{
+	"test" : {	
+		"runner": {
+			"name": "MicrosoftTestingPlatform"
+		}
+	}	
+}
diff --git a/...ts/TestProjects/HybridTestRunnerTestProjects/AnotherTestProject/AnotherTestProject.csproj b/...ts/TestProjects/HybridTestRunnerTestProjects/AnotherTestProject/AnotherTestProject.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="MSTest" Version="$(MSTestVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
+  </ItemGroup>
+
+</Project>
diff --git a/...TestAssets/TestProjects/HybridTestRunnerTestProjects/AnotherTestProject/MSTestSettings.cs b/...TestAssets/TestProjects/HybridTestRunnerTestProjects/AnotherTestProject/MSTestSettings.cs
@@ -0,0 +1 @@
+[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
diff --git a/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/AnotherTestProject/Test1.cs b/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/AnotherTestProject/Test1.cs
@@ -0,0 +1,11 @@
+namespace AnotherTestProject
+{
+	[TestClass]
+	public sealed class Test1
+	{
+		[TestMethod]
+		public void TestMethod1()
+		{
+		}
+	}
+}
diff --git a/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/HybridTestRunnerTestProjects.sln b/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/HybridTestRunnerTestProjects.sln
@@ -0,0 +1,34 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.13.35415.258
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject", "TestProject\TestProject.csproj", "{702EE852-C8D1-4A85-B3A9-3968AD9A735F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OtherTestProject", "OtherTestProject\OtherTestProject.csproj", "{8683AE78-764B-46C2-98D4-8A3031CBA27E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnotherTestProject", "AnotherTestProject\AnotherTestProject.csproj", "{2604B2BA-D36A-461D-9BB3-207E4253051C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{702EE852-C8D1-4A85-B3A9-3968AD9A735F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{702EE852-C8D1-4A85-B3A9-3968AD9A735F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{702EE852-C8D1-4A85-B3A9-3968AD9A735F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{702EE852-C8D1-4A85-B3A9-3968AD9A735F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8683AE78-764B-46C2-98D4-8A3031CBA27E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8683AE78-764B-46C2-98D4-8A3031CBA27E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8683AE78-764B-46C2-98D4-8A3031CBA27E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8683AE78-764B-46C2-98D4-8A3031CBA27E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2604B2BA-D36A-461D-9BB3-207E4253051C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2604B2BA-D36A-461D-9BB3-207E4253051C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2604B2BA-D36A-461D-9BB3-207E4253051C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2604B2BA-D36A-461D-9BB3-207E4253051C}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/...Assets/TestProjects/HybridTestRunnerTestProjects/OtherTestProject/OtherTestProject.csproj b/...Assets/TestProjects/HybridTestRunnerTestProjects/OtherTestProject/OtherTestProject.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
+
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<IsTestProject>true</IsTestProject>
+		<IsTestingPlatformApplication>true</IsTestingPlatformApplication>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Testing.Platform" Version="$(MicrosoftTestingPlatformVersion)" />
+	</ItemGroup>
+
+</Project>
diff --git a/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/OtherTestProject/Program.cs b/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/OtherTestProject/Program.cs
@@ -0,0 +1,106 @@
+//See https://aka.ms/new-console-template for more information
+
+//Opt -out telemetry
+
+using Microsoft.Testing.Platform.Builder;
+using Microsoft.Testing.Platform.Capabilities.TestFramework;
+using Microsoft.Testing.Platform.Extensions.Messages;
+using Microsoft.Testing.Platform.Extensions.TestFramework;
+
+var testApplicationBuilder = await TestApplication.CreateBuilderAsync(args);
+
+//testApplicationBuilder.AddMSTest(() => new[] { Assembly.GetEntryAssembly()! });
+testApplicationBuilder.RegisterTestFramework(_ => new TestFrameworkCapabilities(), (_, __) => new DummyTestAdapter());
+
+using var testApplication = await testApplicationBuilder.BuildAsync();
+return await testApplication.RunAsync();
+
+public class DummyTestAdapter : ITestFramework, IDataProducer
+{
+	public string Uid => nameof(DummyTestAdapter);
+
+	public string Version => "2.0.0";
+
+	public string DisplayName => nameof(DummyTestAdapter);
+
+	public string Description => nameof(DummyTestAdapter);
+
+	public Task<bool> IsEnabledAsync() => Task.FromResult(true);
+
+	public Type[] DataTypesProduced => new[] {
+		typeof(TestNodeUpdateMessage),
+		typeof(SessionFileArtifact),
+		typeof(TestNodeFileArtifact),
+		typeof(FileArtifact), };
+
+	public Task<CreateTestSessionResult> CreateTestSessionAsync(CreateTestSessionContext context)
+		=> Task.FromResult(new CreateTestSessionResult() { IsSuccess = true });
+
+	public Task<CloseTestSessionResult> CloseTestSessionAsync(CloseTestSessionContext context)
+		=> Task.FromResult(new CloseTestSessionResult() { IsSuccess = true });
+
+	public async Task ExecuteRequestAsync(ExecuteRequestContext context)
+	{
+		await context.MessageBus.PublishAsync(this, new TestNodeUpdateMessage(context.Request.Session.SessionUid, new TestNode()
+		{
+			Uid = "Test0",
+			DisplayName = "Test0",
+			Properties = new PropertyBag(new DiscoveredTestNodeStateProperty()),
+		}));
+
+		await context.MessageBus.PublishAsync(this, new TestNodeUpdateMessage(context.Request.Session.SessionUid, new TestNode()
+		{
+			Uid = "Test0",
+			DisplayName = "Test0",
+			Properties = new PropertyBag(new PassedTestNodeStateProperty("OK")),
+		}));
+
+		await context.MessageBus.PublishAsync(this, new TestNodeUpdateMessage(context.Request.Session.SessionUid, new TestNode()
+		{
+			Uid = "Test1",
+			DisplayName = "Test1",
+			Properties = new PropertyBag(new SkippedTestNodeStateProperty("OK skipped!")),
+		}));
+
+		await context.MessageBus.PublishAsync(this, new TestNodeUpdateMessage(context.Request.Session.SessionUid, new TestNode()
+		{
+			Uid = "Test2",
+			DisplayName = "Test2",
+			Properties = new PropertyBag(new FailedTestNodeStateProperty(new Exception("this is a failed test"), "not OK")),
+		}));
+
+		await context.MessageBus.PublishAsync(this, new TestNodeUpdateMessage(context.Request.Session.SessionUid, new TestNode()
+		{
+			Uid = "Test3",
+			DisplayName = "Test3",
+			Properties = new PropertyBag(new TimeoutTestNodeStateProperty(new Exception("this is a timeout exception"), "not OK")),
+		}));
+
+		await context.MessageBus.PublishAsync(this, new TestNodeUpdateMessage(context.Request.Session.SessionUid, new TestNode()
+		{
+			Uid = "Test4",
+			DisplayName = "Test4",
+			Properties = new PropertyBag(new ErrorTestNodeStateProperty(new Exception("this is an exception"), "not OK")),
+		}));
+
+		await context.MessageBus.PublishAsync(this, new TestNodeUpdateMessage(context.Request.Session.SessionUid, new TestNode()
+		{
+			Uid = "Test5",
+			DisplayName = "Test5",
+			Properties = new PropertyBag(new CancelledTestNodeStateProperty(new Exception("this is a cancelled exception"), "not OK")),
+		}));
+
+		await context.MessageBus.PublishAsync(this, new FileArtifact(new FileInfo("file.txt"), "file", "file description"));
+
+		await context.MessageBus.PublishAsync(this, new SessionFileArtifact(context.Request.Session.SessionUid, new FileInfo("sessionFile.txt"), "sessionFile", "description"));
+
+		await context.MessageBus.PublishAsync(this, new TestNodeFileArtifact(context.Request.Session.SessionUid, new TestNode()
+		{
+			Uid = "Test6 id",
+			DisplayName = "Test6",
+			Properties = new PropertyBag(new PassedTestNodeStateProperty("OK")),
+		}, new FileInfo("testNodeFile.txt"), "testNodeFile", "description"));
+		//await Task.CompletedTask;
+		context.Complete();
+	}
+}
diff --git a/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/TestProject/Test1.cs b/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/TestProject/Test1.cs
@@ -0,0 +1,25 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace TestProject
+{
+	[TestClass]
+	public sealed class Test1
+	{
+		[TestMethod]
+		public void TestMethod4()
+		{
+			Assert.AreEqual(1, 1);
+		}
+
+		[TestMethod]
+		public void TestMethod5()
+		{
+			Assert.AreEqual(2, 2);
+		}
+
+		[TestMethod]
+		public void TestMethod6()
+		{
+		}
+	}
+}
diff --git a/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/TestProject/TestProject.csproj b/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/TestProject/TestProject.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="MSTest.Sdk/$(MSTestVersion)">
+
+	<PropertyGroup>
+		<TargetFramework>net8</TargetFramework>
+		<EnableMicrosoftTestingExtensionsCodeCoverage>False</EnableMicrosoftTestingExtensionsCodeCoverage>
+	</PropertyGroup>
+
+	<!-- references to the code to test -->
+
+</Project>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]