Update MSTest

eng/Versions.props

@@ -83,8 +83,8 @@
     <MicrosoftCodeCoverageVersion>17.9.0</MicrosoftCodeCoverageVersion>
     <!-- These versions are used for running unit tests, and running acceptance tests. They are also used as the default version for projects
     in TestAssets.sln to allow running and debugging tests in that solution directly in VS without having to run them via AcceptanceTests. -->
-    <MSTestTestFrameworkVersion>3.4.3</MSTestTestFrameworkVersion>
-    <MSTestTestAdapterVersion>3.4.3</MSTestTestAdapterVersion>
+    <MSTestTestFrameworkVersion>3.9.3</MSTestTestFrameworkVersion>
+    <MSTestTestAdapterVersion>3.9.3</MSTestTestAdapterVersion>
     <MSTestAssertExtensionVersion>1.0.3-preview</MSTestAssertExtensionVersion>
     <XUnitFrameworkVersion>2.4.2</XUnitFrameworkVersion>
     <XUnitAdapterVersion>2.4.5</XUnitAdapterVersion>
@@ -98,8 +98,8 @@
       These versions need to be "statically" readable because we read this file as xml in our build and tests.
     -->
     <!-- <MSTestFrameworkLatestVersion></MSTestFrameworkLatestVersion> is not here, because we don't build MSTest locally, so we don't have access to the latest version. -->
-    <MSTestFrameworkLatestPreviewVersion>[3.4.3]</MSTestFrameworkLatestPreviewVersion>
-    <MSTestFrameworkLatestStableVersion>[3.4.3]</MSTestFrameworkLatestStableVersion>
+    <MSTestFrameworkLatestPreviewVersion>[3.9.3]</MSTestFrameworkLatestPreviewVersion>
+    <MSTestFrameworkLatestStableVersion>[3.9.3]</MSTestFrameworkLatestStableVersion>
     <MSTestFrameworkRecentStableVersion>[3.3.1]</MSTestFrameworkRecentStableVersion>
     <MSTestFrameworkMostDownloadedVersion>[2.2.10]</MSTestFrameworkMostDownloadedVersion>
     <MSTestFrameworkPreviousStableVersion>[2.2.10]</MSTestFrameworkPreviousStableVersion>

src/vstest.console/TestPlatformHelpers/TestRequestManager.cs

@@ -1600,6 +1600,7 @@ internal static class KnownPlatformSourceFilter
         "Microsoft.Testing.Extensions.HangDump.resources.dll",
         "Microsoft.Testing.Extensions.HotReload.dll",
         "Microsoft.Testing.Extensions.HotReload.resources.dll",
+        "Microsoft.Testing.Extensions.MSBuild.dll",
         "Microsoft.Testing.Extensions.Retry.dll",
         "Microsoft.Testing.Extensions.Retry.resources.dll",
         "Microsoft.Testing.Extensions.Telemetry.dll",

test/Microsoft.TestPlatform.Acceptance.IntegrationTests/.runsettings

@@ -0,0 +1,5 @@
+<RunSettings>
+  <MSTestV2>
+    <ConsiderEmptyDataSourceAsInconclusive>true</ConsiderEmptyDataSourceAsInconclusive>
+  </MSTestV2>
+</RunSettings>

test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Microsoft.TestPlatform.Acceptance.IntegrationTests.csproj

@@ -4,6 +4,7 @@
     <TestProject>true</TestProject>
     <IsTestProject>true</IsTestProject>
     <UseBannedApiAnalyzers>true</UseBannedApiAnalyzers>
+    <TestRunnerAdditionalArguments>$(TestRunnerAdditionalArguments) --settings "$(MSBuildThisFileDirectory)\.runsettings"</TestRunnerAdditionalArguments>
   </PropertyGroup>
 
   <PropertyGroup>

test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Helpers/DotnetHostHelperTest.cs

@@ -298,6 +298,7 @@ public void GetDotnetPathByArchitecture_DefaultInstallation_Win(
         Assert.AreEqual(found ? dotnetMuxer : null, muxerPath);
     }
 
+#pragma warning disable MSTEST0042 // duplicate data row - TODO: Look more into it
     [DataTestMethod]
     [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "/usr/local/share/dotnet", "", true, PlatformOperatingSystem.OSX)]
     [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, "/usr/local/share/dotnet/x64", "", true, PlatformOperatingSystem.OSX)]
@@ -316,6 +317,7 @@ public void GetDotnetPathByArchitecture_DefaultInstallation_Win(
     [DataRow(PlatformArchitecture.X64, PlatformArchitecture.ARM64, "/usr/share/dotnet/x64", "", false, PlatformOperatingSystem.Unix, DotnetMuxerResolutionStrategy.DefaultInstallationLocation)]
     [DataRow(PlatformArchitecture.ARM64, PlatformArchitecture.X64, "/usr/share/dotnet", "", false, PlatformOperatingSystem.Unix, DotnetMuxerResolutionStrategy.DefaultInstallationLocation)]
     [DataRow(PlatformArchitecture.X64, PlatformArchitecture.X64, "/usr/share/dotnet", "", false, PlatformOperatingSystem.Unix, DotnetMuxerResolutionStrategy.DefaultInstallationLocation)]
+#pragma warning restore MSTEST0042
     public void GetDotnetPathByArchitecture_DefaultInstallation_Unix(
         PlatformArchitecture targetArchitecture,
         PlatformArchitecture platformArchitecture,

test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs

@@ -46,7 +46,7 @@ public class IntegrationTestBase
     protected readonly IntegrationTestEnvironment _testEnvironment;
 
     private readonly string _msTestPre3_0AdapterRelativePath = @"mstest.testadapter\{0}\build\_common".Replace('\\', Path.DirectorySeparatorChar);
-    private readonly string _msTestAdapterRelativePath = @"mstest.testadapter\{0}\build\{1}".Replace('\\', Path.DirectorySeparatorChar);
+    private readonly string _msTestAdapterRelativePath = @"mstest.testadapter\{0}\buildTransitive\{1}".Replace('\\', Path.DirectorySeparatorChar);
     private readonly string _nUnitTestAdapterRelativePath = @"nunit3testadapter\{0}\build".Replace('\\', Path.DirectorySeparatorChar);
     private readonly string _xUnitTestAdapterRelativePath = @"xunit.runner.visualstudio\{0}\build\{1}".Replace('\\', Path.DirectorySeparatorChar);