VSTestBridge+MSTest: Use TestMethodIdentifierProperty and stop sending VSTest-specifics

src/Adapter/MSTest.TestAdapter/TestingPlatformAdapter/TestApplicationBuilderExtensions.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #if !WINDOWS_UWP
-using Microsoft.Testing.Extensions.VSTestBridge.Capabilities;
+using Microsoft.Testing.Extensions.TrxReport.Abstractions;
 using Microsoft.Testing.Extensions.VSTestBridge.Helpers;
 using Microsoft.Testing.Platform.Builder;
 using Microsoft.Testing.Platform.Capabilities.TestFramework;
@@ -17,6 +17,17 @@ namespace Microsoft.VisualStudio.TestTools.UnitTesting;
 [SuppressMessage("ApiDesign", "RS0030:Do not use banned APIs", Justification = "We can use MTP from this folder")]
 public static class TestApplicationBuilderExtensions
 {
+    // NOTE: We intentionally use this class and not VSTestBridgeExtensionBaseCapabilities because
+    // we don't want MSTest to use vstestProvider capability
+    private sealed class MSTestCapabilities : ITrxReportCapability
+    {
+        bool ITrxReportCapability.IsSupported { get; } = true;
+
+        void ITrxReportCapability.Enable()
+        {
+        }
+    }
+
     /// <summary>
     /// Register MSTest as the test framework and register the necessary services.
     /// </summary>
@@ -34,7 +45,7 @@ public static void AddMSTest(this ITestApplicationBuilder testApplicationBuilder
         testApplicationBuilder.AddRunSettingsEnvironmentVariableProvider(extension);
         testApplicationBuilder.RegisterTestFramework(
             serviceProvider => new TestFrameworkCapabilities(
-                new VSTestBridgeExtensionBaseCapabilities(),
+                new MSTestCapabilities(),
 #pragma warning disable TPEXP // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
                 new MSTestBannerCapability(serviceProvider.GetRequiredService<IPlatformInformation>()),
                 MSTestGracefulStopTestExecutionCapability.Instance),

src/Platform/Microsoft.Testing.Extensions.VSTestBridge/Capabilities/VSTestBridgeExtensionBaseCapabilities.cs

@@ -9,6 +9,10 @@ namespace Microsoft.Testing.Extensions.VSTestBridge.Capabilities;
 /// <summary>
 /// The VSTest bridged test framework capabilities.
 /// </summary>
+// NOTE: MSTest no longer uses this, as we don't want to use the vstestProvider.
+// Only NUnit and Expecto use this.
+// https://github.com/nunit/nunit3-vs-adapter/blob/3d0f824243aaaeb85621d3c7dddc92e7a7c45097/src/NUnitTestAdapter/TestingPlatformAdapter/TestApplicationBuilderExtensions.cs#L20
+// https://github.com/YoloDev/YoloDev.Expecto.TestSdk/blob/0d1a3eadd65b605f61bb01d302f28382be76b8ac/src/YoloDev.Expecto.TestSdk/TestApplicationHelpers.fs#L16
 public sealed class VSTestBridgeExtensionBaseCapabilities : ITrxReportCapability, IVSTestFlattenedTestNodesReportCapability, INamedFeatureCapability
 {
     private const string VSTestProviderSupport = "vstestProvider";

src/Platform/Microsoft.Testing.Extensions.VSTestBridge/Microsoft.Testing.Extensions.VSTestBridge.csproj

@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" />
+    <PackageReference Include="Microsoft.TestPlatform.AdapterUtilities" />
   </ItemGroup>
 
   <ItemGroup>

src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/FrameworkHandlerAdapter.cs

@@ -4,6 +4,8 @@
 #pragma warning disable TPEXP // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
 
 using Microsoft.Testing.Extensions.VSTestBridge.Helpers;
+using Microsoft.Testing.Platform.Capabilities.TestFramework;
+using Microsoft.Testing.Platform.CommandLine;
 using Microsoft.Testing.Platform.Extensions.Messages;
 using Microsoft.Testing.Platform.Logging;
 using Microsoft.Testing.Platform.Messages;
@@ -30,15 +32,26 @@ internal sealed class FrameworkHandlerAdapter : IFrameworkHandle
     private readonly IMessageBus _messageBus;
     private readonly VSTestBridgedTestFrameworkBase _adapterExtensionBase;
     private readonly TestSessionContext _session;
-    private readonly IClientInfo _clientInfo;
     private readonly CancellationToken _cancellationToken;
     private readonly bool _isTrxEnabled;
     private readonly MessageLoggerAdapter _comboMessageLogger;
     private readonly string _testAssemblyPath;
-
-    public FrameworkHandlerAdapter(VSTestBridgedTestFrameworkBase adapterExtensionBase, TestSessionContext session, IClientInfo clientInfo, string[] testAssemblyPaths,
-        ITestApplicationModuleInfo testApplicationModuleInfo, ILoggerFactory loggerFactory, IMessageBus messageBus, IOutputDevice outputDevice,
-        bool isTrxEnabled, CancellationToken cancellationToken, IFrameworkHandle? frameworkHandle = null)
+    private readonly INamedFeatureCapability? _namedFeatureCapability;
+    private readonly ICommandLineOptions _commandLineOptions;
+
+    public FrameworkHandlerAdapter(
+        VSTestBridgedTestFrameworkBase adapterExtensionBase,
+        TestSessionContext session,
+        string[] testAssemblyPaths,
+        ITestApplicationModuleInfo testApplicationModuleInfo,
+        INamedFeatureCapability? namedFeatureCapability,
+        ICommandLineOptions commandLineOptions,
+        IMessageBus messageBus,
+        IOutputDevice outputDevice,
+        ILoggerFactory loggerFactory,
+        bool isTrxEnabled,
+        CancellationToken cancellationToken,
+        IFrameworkHandle? frameworkHandle = null)
     {
         if (testAssemblyPaths.Length == 0)
         {
@@ -58,12 +71,13 @@ public FrameworkHandlerAdapter(VSTestBridgedTestFrameworkBase adapterExtensionBa
             _testAssemblyPath = testAssemblyPaths[0];
         }
 
+        _namedFeatureCapability = namedFeatureCapability;
+        _commandLineOptions = commandLineOptions;
         _frameworkHandle = frameworkHandle;
         _logger = loggerFactory.CreateLogger<FrameworkHandlerAdapter>();
         _messageBus = messageBus;
         _adapterExtensionBase = adapterExtensionBase;
         _session = session;
-        _clientInfo = clientInfo;
         _cancellationToken = cancellationToken;
         _isTrxEnabled = isTrxEnabled;
         _comboMessageLogger = new MessageLoggerAdapter(loggerFactory, outputDevice, adapterExtensionBase, frameworkHandle);
@@ -126,7 +140,7 @@ public void RecordResult(TestResult testResult)
         _frameworkHandle?.RecordResult(testResult);
 
         // Publish node state change to Microsoft Testing Platform
-        var testNode = testResult.ToTestNode(_isTrxEnabled, _clientInfo);
+        var testNode = testResult.ToTestNode(_isTrxEnabled, _namedFeatureCapability, _commandLineOptions);
 
         var testNodeChange = new TestNodeUpdateMessage(_session.SessionUid, testNode);
         _messageBus.PublishAsync(_adapterExtensionBase, testNodeChange).Await();
@@ -145,7 +159,7 @@ public void RecordStart(TestCase testCase)
         _frameworkHandle?.RecordStart(testCase);
 
         // Publish node state change to Microsoft Testing Platform
-        var testNode = testCase.ToTestNode(_isTrxEnabled, _clientInfo);
+        var testNode = testCase.ToTestNode(_isTrxEnabled, _namedFeatureCapability, _commandLineOptions);
         testNode.Properties.Add(InProgressTestNodeStateProperty.CachedInstance);
         var testNodeChange = new TestNodeUpdateMessage(_session.SessionUid, testNode);