microsoft · nohwnd · May 23, 2022 · Feb 22, 2022 · Feb 22, 2022 · Feb 23, 2022
diff --git a/playground/MSTest1/MSTest1.csproj b/playground/MSTest1/MSTest1.csproj
@@ -6,9 +6,10 @@
   <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
 
   <PropertyGroup>
-    <TargetFrameworks Condition=" '$(OS)' == 'WINDOWS_NT' ">$(TargetFrameworks);net472</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'WINDOWS_NT' ">$(TargetFrameworks);net472;net5.0</TargetFrameworks>
     <!-- We build this on linux as well, and are including ref assemblies for this framework only. -->
     <TargetFrameworks Condition=" '$(OS)' != 'WINDOWS_NT' ">$(TargetFrameworks);net451</TargetFrameworks>
+    <Prefer32Bit>false</Prefer32Bit>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/playground/MSTest1/UnitTest1.cs b/playground/MSTest1/UnitTest1.cs
@@ -7,11 +7,14 @@
 
 namespace MSTest1;
 
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
 [TestClass]
 public class UnitTest1
 {
     [TestMethod]
     public void TestMethod1()
     {
+        // Thread.Sleep(1000);
     }
 }
diff --git a/playground/TestPlatform.Playground/Program.cs b/playground/TestPlatform.Playground/Program.cs
@@ -51,15 +51,34 @@ static void Main(string[] args)
                 <RunSettings>
                     <RunConfiguration>
                         <InIsolation>true</InIsolation>
+                        <MaxCpuCount>4</MaxCpuCount>
                     </RunConfiguration>
                 </RunSettings>
             ";
+
         var sources = new[] {
-            Path.Combine(playground, "MSTest1", "bin", "Debug", "net472", "MSTest1.dll")
+            Path.Combine(playground, "MSTest1", "bin", "Debug", "net472", "MSTest1.dll"),
+            Path.Combine(playground, "MSTest1", "bin", "Debug", "net5.0", "MSTest1.dll"),
+            @"C:\Users\jajares\source\repos\TestProject48\TestProject48\bin\Debug\net48\TestProject48.dll",
+            @"C:\Users\jajares\source\repos\TestProject48\TestProject1\bin\x64\Debug\net48\win10-x64\TestProject1.dll"
         };
 
-        var options = new TestPlatformOptions();
-        r.RunTestsWithCustomTestHost(sources, sourceSettings, options, new TestRunHandler(), new DebuggerTestHostLauncher());
+        // console mode
+        var settingsFile = Path.GetTempFileName();
+        try
+        {
+
+            File.WriteAllText(settingsFile, sourceSettings);
+            Process.Start(console, string.Join(" ", sources) + " --settings:" + settingsFile).WaitForExit();
+        }
+        finally
+        {
+            try { File.Delete(settingsFile); } catch { }
+        }
+
+        // design mode
+        // var options = new TestPlatformOptions();
+        // r.RunTestsWithCustomTestHost(sources, sourceSettings, options, new TestRunHandler(), new DebuggerTestHostLauncher());
     }
 
     public class TestRunHandler : ITestRunEventsHandler

diff --git a/playground/TestPlatform.Playground/Properties/launchSettings.json b/playground/TestPlatform.Playground/Properties/launchSettings.json
@@ -6,7 +6,7 @@
         "VSTEST_CONNECTION_TIMEOUT": "999",
         "VSTEST_DEBUG_NOBP": "1",
         "VSTEST_RUNNER_DEBUG_ATTACHVS": "1",
-        "VSTEST_HOST_DEBUG_ATTACHVS": "1",
+        "VSTEST_HOST_DEBUG_ATTACHVS": "0",
         "VSTEST_DATACOLLECTOR_DEBUG_ATTACHVS": "1"
       }
     }

diff --git a/playground/TestPlatform.Playground/TestPlatform.Playground.csproj b/playground/TestPlatform.Playground/TestPlatform.Playground.csproj
@@ -39,7 +39,7 @@
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(OS)' == 'WINDOWS_NT' ">
-    <Exec Command="xcopy /i /y $(MSBuildProjectDirectory)\..\..\src\vstest.console\bin\$(Configuration)\net451\win7-x64\ $(TargetDir)\vstest.console\&#xD;&#xA;xcopy /i /y $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\net451\win7-x64\ $(TargetDir)\vstest.console\&#xD;&#xA;xcopy /i /y $(MSBuildProjectDirectory)\..\..\src\Microsoft.TestPlatform.TestHostProvider\bin\$(Configuration)\net451\ $(TargetDir)\vstest.console\Extensions\&#xD;&#xA;xcopy /i /y $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net472\win7-x86 $(TargetDir)\vstest.console\TestHost\" />
+    <Exec Command="xcopy /i /y $(MSBuildProjectDirectory)\..\..\src\vstest.console\bin\$(Configuration)\net451\win7-x64\ $(TargetDir)\vstest.console\&#xD;&#xA;xcopy /i /y $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\net451\win7-x64\ $(TargetDir)\vstest.console\&#xD;&#xA;xcopy /i /y $(MSBuildProjectDirectory)\..\..\src\Microsoft.TestPlatform.TestHostProvider\bin\$(Configuration)\net451\ $(TargetDir)\vstest.console\Extensions\&#xD;&#xA;xcopy /i /y $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net472\win7-x86 $(TargetDir)\vstest.console\TestHost\&#xD;&#xA;xcopy /i /y $(MSBuildProjectDirectory)\..\..\src\testhost.x86\bin\$(Configuration)\net48\win7-x86 $(TargetDir)\vstest.console\TestHost\&#xD;&#xA;REM x64 &#xD;&#xA;xcopy /i /y $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\net472\win7-x64 $(TargetDir)\vstest.console\TestHost\&#xD;&#xA;xcopy /i /y $(MSBuildProjectDirectory)\..\..\src\testhost\bin\$(Configuration)\net48\win7-x64 $(TargetDir)\vstest.console\TestHost\" />
   </Target>
   <Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
 </Project>
diff --git a/src/AttachVS/AttachVs.cs b/src/AttachVS/AttachVs.cs
@@ -143,6 +143,14 @@ private static bool AttachVs(Process vs, int pid)
                             Trace($"ComException: Retrying in 250ms.\n{ex}");
                             Thread.Sleep(250);
                         }
+                        catch (TargetInvocationException ex)
+                        {
+                            if (ex.InnerException is not COMException)
+                                throw;
+
+                            Trace($"ComException: Retrying in 250ms.\n{ex}");
+                            Thread.Sleep(250);
+                        }
                     }
                     Marshal.ReleaseComObject(moniker[0]);
 

diff --git a/src/Microsoft.TestPlatform.Client/TestPlatform.cs b/src/Microsoft.TestPlatform.Client/TestPlatform.cs
@@ -85,20 +85,16 @@ protected internal TestPlatform(
     public IDiscoveryRequest CreateDiscoveryRequest(
         IRequestData requestData,
         DiscoveryCriteria discoveryCriteria!!,
-        TestPlatformOptions options)
+        TestPlatformOptions options,
+        Dictionary<string, SourceDetail> sourceToSourceDetailMap)
     {
         PopulateExtensions(discoveryCriteria.RunSettings, discoveryCriteria.Sources);
 
         // Initialize loggers.
         ITestLoggerManager loggerManager = TestEngine.GetLoggerManager(requestData);
         loggerManager.Initialize(discoveryCriteria.RunSettings);
 
-        ITestRuntimeProvider testHostManager = _testHostProviderManager.GetTestHostManagerByRunConfiguration(discoveryCriteria.RunSettings);
-        TestPlatform.ThrowExceptionIfTestHostManagerIsNull(testHostManager, discoveryCriteria.RunSettings);
-
-        testHostManager.Initialize(TestSessionMessageLogger.Instance, discoveryCriteria.RunSettings);
-
-        IProxyDiscoveryManager discoveryManager = TestEngine.GetDiscoveryManager(requestData, testHostManager, discoveryCriteria);
+        IProxyDiscoveryManager discoveryManager = TestEngine.GetDiscoveryManager(requestData,  discoveryCriteria, sourceToSourceDetailMap);
         discoveryManager.Initialize(options?.SkipDefaultAdapters ?? false);
 
         return new DiscoveryRequest(requestData, discoveryCriteria, discoveryManager, loggerManager);
@@ -108,7 +104,8 @@ public IDiscoveryRequest CreateDiscoveryRequest(
     public ITestRunRequest CreateTestRunRequest(
         IRequestData requestData,
         TestRunCriteria testRunCriteria!!,
-        TestPlatformOptions options)
+        TestPlatformOptions options,
+        Dictionary<string, SourceDetail> sourceToSourceDetailMap)
     {
         IEnumerable<string> sources = GetSources(testRunCriteria);
         PopulateExtensions(testRunCriteria.TestRunSettings, sources);
@@ -117,23 +114,7 @@ public ITestRunRequest CreateTestRunRequest(
         ITestLoggerManager loggerManager = TestEngine.GetLoggerManager(requestData);
         loggerManager.Initialize(testRunCriteria.TestRunSettings);
 
-        // TODO: PERF: this will create a testhost manager, and then it will pass that to GetExecutionManager, where it will
-        // be used only when we will run in-process. If we don't run in process, we will throw away the manager we just
-        // created and let the proxy parallel callbacks to create a new one. This seems to be very easy to move to the GetExecutionManager,
-        // and safe as well, so we create the manager only once.
-        // TODO: Of course TestEngine.GetExecutionManager is public api...
-        ITestRuntimeProvider testHostManager = _testHostProviderManager.GetTestHostManagerByRunConfiguration(testRunCriteria.TestRunSettings);
-        TestPlatform.ThrowExceptionIfTestHostManagerIsNull(testHostManager, testRunCriteria.TestRunSettings);
-
-        testHostManager.Initialize(TestSessionMessageLogger.Instance, testRunCriteria.TestRunSettings);
-
-        // NOTE: The custom launcher should not be set when we have test session info available.
-        if (testRunCriteria.TestHostLauncher != null)
-        {
-            testHostManager.SetCustomLauncher(testRunCriteria.TestHostLauncher);
-        }
-
-        IProxyExecutionManager executionManager = TestEngine.GetExecutionManager(requestData, testHostManager, testRunCriteria);
+        IProxyExecutionManager executionManager = TestEngine.GetExecutionManager(requestData, testRunCriteria, sourceToSourceDetailMap);
         executionManager.Initialize(options?.SkipDefaultAdapters ?? false);
 
         return new TestRunRequest(requestData, testRunCriteria, executionManager, loggerManager);
@@ -143,7 +124,8 @@ public ITestRunRequest CreateTestRunRequest(
     public bool StartTestSession(
         IRequestData requestData,
         StartTestSessionCriteria testSessionCriteria!!,
-        ITestSessionEventsHandler eventsHandler)
+        ITestSessionEventsHandler eventsHandler,
+        Dictionary<string, SourceDetail> sourceToSourceDetailMap)
     {
         RunConfiguration runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(testSessionCriteria.RunSettings);
         TestAdapterLoadingStrategy strategy = runConfiguration.TestAdapterLoadingStrategy;
@@ -155,7 +137,7 @@ public bool StartTestSession(
             return false;
         }
 
-        IProxyTestSessionManager testSessionManager = TestEngine.GetTestSessionManager(requestData, testSessionCriteria);
+        IProxyTestSessionManager testSessionManager = TestEngine.GetTestSessionManager(requestData, testSessionCriteria, sourceToSourceDetailMap);
         if (testSessionManager == null)
         {
             // The test session manager is null because the combination of runsettings and

diff --git a/src/Microsoft.TestPlatform.Common/Hosting/ITestRuntimeProviderManager.cs b/src/Microsoft.TestPlatform.Common/Hosting/ITestRuntimeProviderManager.cs
@@ -1,12 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System.Collections.Generic;
+
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
 
 namespace Microsoft.VisualStudio.TestPlatform.Common.Hosting;
 
 internal interface ITestRuntimeProviderManager
 {
-    ITestRuntimeProvider GetTestHostManagerByRunConfiguration(string runConfiguration);
+    ITestRuntimeProvider GetTestHostManagerByRunConfiguration(string runConfiguration, List<string> sources);
     ITestRuntimeProvider GetTestHostManagerByUri(string hostUri);
 }
diff --git a/src/Microsoft.TestPlatform.Common/Hosting/TestRunTimeProviderManager.cs b/src/Microsoft.TestPlatform.Common/Hosting/TestRunTimeProviderManager.cs
@@ -6,6 +6,7 @@
 using Microsoft.VisualStudio.TestPlatform.Common.Logging;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+using System.Collections.Generic;
 
 #nullable disable
 
@@ -44,7 +45,7 @@ public ITestRuntimeProvider GetTestHostManagerByUri(string hostUri)
         return host?.Value;
     }
 
-    public virtual ITestRuntimeProvider GetTestHostManagerByRunConfiguration(string runConfiguration)
+    public virtual ITestRuntimeProvider GetTestHostManagerByRunConfiguration(string runConfiguration, List<string> _)
     {
         foreach (var testExtension in _testHostExtensionManager.TestExtensions)
         {

diff --git a/...crosoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelOperationManager.cs b/...crosoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelOperationManager.cs
diff --git a/...ft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelProxyDiscoveryManager.cs b/...ft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelProxyDiscoveryManager.cs
@@ -10,7 +10,7 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
 /// <summary>
 /// Interface defining the parallel discovery manager
 /// </summary>
-public interface IParallelProxyDiscoveryManager : IParallelOperationManager, IProxyDiscoveryManager
+public interface IParallelProxyDiscoveryManager : IProxyDiscoveryManager
 {
     /// <summary>
     /// Indicates if user requested an abortion

diff --git a/...ft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelProxyExecutionManager.cs b/...ft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelProxyExecutionManager.cs
@@ -12,7 +12,7 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
 /// <summary>
 /// Interface defining the parallel execution manager
 /// </summary>
-public interface IParallelProxyExecutionManager : IParallelOperationManager, IProxyExecutionManager
+public interface IParallelProxyExecutionManager : IProxyExecutionManager
 {
     /// <summary>
     /// Handles Partial Run Complete event coming from a specific concurrent proxy execution manager

diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/ITestEngine.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/ITestEngine.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System.Collections.Generic;
+
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
@@ -28,8 +30,8 @@ public interface ITestEngine
     /// <returns>An IProxyDiscoveryManager object that can do discovery.</returns>
     IProxyDiscoveryManager GetDiscoveryManager(
         IRequestData requestData,
-        ITestRuntimeProvider testHostManager,
-        DiscoveryCriteria discoveryCriteria);
+        DiscoveryCriteria discoveryCriteria,
+        Dictionary<string, SourceDetail> sourceToSourceDetailMap);
 
     /// <summary>
     /// Fetches the ExecutionManager for this engine. This manager would provide all
@@ -45,8 +47,8 @@ IProxyDiscoveryManager GetDiscoveryManager(
     /// <returns>An IProxyExecutionManager object that can do execution.</returns>
     IProxyExecutionManager GetExecutionManager(
         IRequestData requestData,
-        ITestRuntimeProvider testHostManager,
-        TestRunCriteria testRunCriteria);
+        TestRunCriteria testRunCriteria,
+        Dictionary<string, SourceDetail> sourceToSourceDetailMap);
 
     /// <summary>
     /// Fetches the TestSessionManager for this engine. This manager would provide all
@@ -63,7 +65,8 @@ IProxyExecutionManager GetExecutionManager(
     /// <returns>An IProxyTestSessionManager object that can manage test sessions.</returns>
     IProxyTestSessionManager GetTestSessionManager(
         IRequestData requestData,
-        StartTestSessionCriteria testSessionCriteria);
+        StartTestSessionCriteria testSessionCriteria,
+        Dictionary<string, SourceDetail> sourceToSourceDetailMap);
 
     /// <summary>
     /// Fetches the extension manager for this engine. This manager would provide extensibility

diff --git a/src/Microsoft.TestPlatform.CoreUtilities/FeatureFlag/FeatureFlag.cs b/src/Microsoft.TestPlatform.CoreUtilities/FeatureFlag/FeatureFlag.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.Utilities;
 // !!! FEATURES MUST BE KEPT IN SYNC WITH https://github.com/dotnet/sdk/blob/main/src/Cli/dotnet/commands/dotnet-test/VSTestFeatureFlag.cs !!!
-internal partial class FeatureFlag : IFeatureFlag
+internal sealed class FeatureFlag : IFeatureFlag
 {
     private static readonly Dictionary<string, bool> FeatureFlags = new();
 
@@ -18,18 +18,40 @@ internal partial class FeatureFlag : IFeatureFlag
 
     static FeatureFlag()
     {
+#pragma warning disable CS0618 // Type or member is obsolete
+        Reset();
+#pragma warning restore CS0618 // Type or member is obsolete
+    }
+
+    [Obsolete("Use this only from tests, and ctor.")]
+    internal static void Reset()
+    {
+        FeatureFlags.Clear();
         FeatureFlags.Add(ARTIFACTS_POSTPROCESSING, true);
         FeatureFlags.Add(ARTIFACTS_POSTPROCESSING_SDK_KEEP_OLD_UX, false);
+        FeatureFlags.Add(MULTI_TFM_RUN, true);
     }
 
-    // Added for artifact porst-processing, it enable/disable the post processing.
+    [Obsolete("Use this only from tests.")]
+    internal static void SetFlag(string name, bool value)
+    {
+        if (!FeatureFlags.ContainsKey(name))
+            throw new ArgumentException($"Feature flag {name} is a known feature flag.");
+
+        FeatureFlags[name] = value;
+    }
+
+    // Added for artifact post-processing, it enable/disable the post processing.
     // Added in 17.2-preview 7.0-preview
-    public static string ARTIFACTS_POSTPROCESSING = VSTEST_FEATURE + "_" + "ARTIFACTS_POSTPROCESSING";
+    public static string ARTIFACTS_POSTPROCESSING = VSTEST_FEATURE + "_" + nameof(ARTIFACTS_POSTPROCESSING);
 
-    // Added for artifact porst-processing, it will show old output for dotnet sdk scenario.
+    // Added for artifact post-processing, it will show old output for dotnet sdk scenario.
     // It can be useful if we need to restore old UX in case users are parsing the console output.
     // Added in 17.2-preview 7.0-preview
-    public static string ARTIFACTS_POSTPROCESSING_SDK_KEEP_OLD_UX = VSTEST_FEATURE + "_" + "ARTIFACTS_POSTPROCESSING_SDK_KEEP_OLD_UX";
+    public static string ARTIFACTS_POSTPROCESSING_SDK_KEEP_OLD_UX = VSTEST_FEATURE + "_" + nameof(ARTIFACTS_POSTPROCESSING_SDK_KEEP_OLD_UX);
+
+    // Allow vstest.console to sources from multiple TFMs
+    public static string MULTI_TFM_RUN = VSTEST_FEATURE + "_" + nameof(MULTI_TFM_RUN);
 
     // For now we're checking env var.
     // We could add it also to some section inside the runsettings.

diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Friends.cs b/src/Microsoft.TestPlatform.CoreUtilities/Friends.cs
@@ -4,3 +4,6 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("vstest.console, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+
+
+[assembly: InternalsVisibleTo("vstest.ProgrammerTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]