microsoft · Evangelink · Feb 24, 2025 · Feb 13, 2025 · Feb 15, 2025 · Feb 13, 2025
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -13,6 +13,7 @@
     <LangVersion>preview</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <!-- The TFMs to build and test against. -->

diff --git a/eng/TestingPlatformRunner/TestingPlatformRunner.targets b/eng/TestingPlatformRunner/TestingPlatformRunner.targets
@@ -1,8 +1,3 @@
 <Project>
-  <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.arcade.sdk\$(ArcadeSdkVersion)\tools\VSTest.targets" Condition=" '$(UseVSTestRunner)' == 'true' "/>
-  <Import Project=".\TestingPlatform.Runner.targets" Condition=" '$(UseVSTestRunner)' != 'true' " />
-
-  <PropertyGroup>
-    <TestRunnerAdditionalArguments Condition=" '$(UseVSTestRunner)' == 'true' ">--blame-crash --blame-crash-dump-type full</TestRunnerAdditionalArguments>
-  </PropertyGroup>
+  <Import Project=".\TestingPlatform.Runner.targets" />
 </Project>
diff --git a/samples/FxExtensibility/AssertEx.cs b/samples/FxExtensibility/AssertEx.cs
@@ -11,7 +11,7 @@ namespace MSTest.Extensibility.Samples;
 [SuppressMessage("Naming", "CA1711:Identifiers should not have incorrect suffix", Justification = "This is only some sample type")]
 public static class AssertEx
 {
-    private static AssertIs s_assertIs;
+    private static AssertIs? s_assertIs;
 
     /// <summary>
     /// A simple assert extension to validate if an object is of a given type.
@@ -22,13 +22,14 @@ public static class AssertEx
     /// <returns>True if object is of the given type.</returns>
     /// <exception cref="AssertFailedException">If object is not of the given type.</exception>
 #pragma warning disable IDE0060 // Remove unused parameter
-    public static bool IsOfType<T>(this Assert assert, object obj) => obj is T
+    public static bool IsOfType<T>(this Assert assert, object obj)
+        => obj is T
             ? true
             : throw new AssertFailedException(string.Format(
                 CultureInfo.InvariantCulture,
                 "Expected object of type {0} but found object of type {1}",
                 typeof(T),
-                obj ?? obj.GetType()));
+                obj ?? obj?.GetType()));
 
     /// <summary>
     /// A chain/grouping of assert statements.

diff --git a/src/Platform/Microsoft.Testing.Platform/Microsoft.Testing.Platform.csproj b/src/Platform/Microsoft.Testing.Platform/Microsoft.Testing.Platform.csproj
@@ -56,6 +56,8 @@ This package provides the core platform and the .NET implementation of the proto
     <InternalsVisibleTo Include="MSTest.Acceptance.IntegrationTests" Key="$(VsPublicKey)" />
     <InternalsVisibleTo Include="MSTest.Engine" Key="$(VsPublicKey)" />
     <InternalsVisibleTo Include="MSTest.Engine.UnitTests" Key="$(VsPublicKey)" />
+    <InternalsVisibleTo Include="TestFramework.ForTestingMSTest" Key="$(VsPublicKey)" />
+    <InternalsVisibleTo Include="MSTest.IntegrationTests" Key="$(VsPublicKey)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -5,9 +5,6 @@
 
   <PropertyGroup>
     <TestRunnerName>TestingPlatformRunner</TestRunnerName>
-    <!-- By default we run tests with VSTest runner and custom test framework. Platform projects will use a different runner and framework -->
-    <UseVSTestRunner Condition=" '$(UseVSTestRunner)' == '' " >true</UseVSTestRunner>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <!-- Build & pack tests -->

diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
@@ -3,10 +3,8 @@
 
   <Import Project="../Directory.Build.targets" />
 
-  <PropertyGroup Condition=" '$(UseVSTestRunner)' == 'false' ">
-    <Nullable>enable</Nullable>
-    <OutputType>Exe</OutputType>
-    <EnableMSTestRunner>true</EnableMSTestRunner>
+  <PropertyGroup Condition=" '$(EnableMSTestRunner)' == 'true' OR '$(UseInternalTestFramework)' == 'true' ">
+    <UseMSTest Condition=" '$(UseMSTest)' == '' ">true</UseMSTest>
     <GenerateProgramFile>false</GenerateProgramFile>
     <GenerateTestingPlatformEntryPoint>false</GenerateTestingPlatformEntryPoint>
     <Architecture Condition=" '$(Architecture)' == '' ">$(PlatformTarget)</Architecture>
@@ -21,29 +19,32 @@
     <!-- /Arcade runner settings -->
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(UseVSTestRunner)' == 'false' ">
-    <ProjectReference Include="$(RepoRoot)test\Utilities\Microsoft.Testing.TestInfrastructure\Microsoft.Testing.TestInfrastructure.csproj" />
+  <ItemGroup Condition=" '$(EnableMSTestRunner)' == 'true' OR '$(UseInternalTestFramework)' == 'true' ">
+    <ProjectReference Include="$(RepoRoot)test\Utilities\Microsoft.Testing.TestInfrastructure\Microsoft.Testing.TestInfrastructure.csproj"
+                      Condition="'$(UseInternalTestFramework)' != 'true'" />
     <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.CrashDump\Microsoft.Testing.Extensions.CrashDump.csproj" />
     <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.HangDump\Microsoft.Testing.Extensions.HangDump.csproj" />
     <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.Retry\Microsoft.Testing.Extensions.Retry.csproj" />
     <ProjectReference Include="$(RepoRoot)src\Platform\Microsoft.Testing.Extensions.TrxReport\Microsoft.Testing.Extensions.TrxReport.csproj" />
     <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" GeneratePathProperty="True" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(UseVSTestRunner)' == 'false' AND '$(UseMSTestFromSource)' != 'true' ">
+  <ItemGroup Condition=" '$(EnableMSTestRunner)' == 'true' AND '$(UseInternalTestFramework)' != 'true' AND '$(UseMSTestFromSource)' != 'true' ">
     <PackageReference Include="MSTest.Analyzers" />
     <PackageReference Include="MSTest.TestFramework" />
     <PackageReference Include="MSTest.TestAdapter" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(UseVSTestRunner)' == 'false' ">
+  <ItemGroup Condition=" '$(EnableMSTestRunner)' == 'true' OR '$(UseInternalTestFramework)' == 'true' ">
     <Using Include="Microsoft.Testing.Platform.Builder" />
     <Using Include="Microsoft.Testing.Platform.Extensions" />
-    <Using Include="Microsoft.Testing.TestInfrastructure" />
-    <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
+    <Using Include="Microsoft.Testing.TestInfrastructure"
+           Condition="'$(UseInternalTestFramework)' != 'true'" />
+    <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting"
+           Condition="'$(UseMSTest)' == 'true'" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(UseVSTestRunner)' == 'false' ">
+  <ItemGroup Condition=" '$(EnableMSTestRunner)' == 'true' OR '$(UseInternalTestFramework)' == 'true' ">
     <None Update="*.testconfig.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/...grationTests/MSTest.Acceptance.IntegrationTests/MSTest.Acceptance.IntegrationTests.csproj b/...grationTests/MSTest.Acceptance.IntegrationTests/MSTest.Acceptance.IntegrationTests.csproj
@@ -1,11 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>$(NetCurrent)</TargetFrameworks>
-    <UseVSTestRunner>false</UseVSTestRunner>
-	  <EnableMSTestRunner>true</EnableMSTestRunner>
-    <DefineConstants Condition=" '$(FastAcceptanceTest)' == 'true'">$(DefineConstants);SKIP_INTERMEDIATE_TARGET_FRAMEWORKS</DefineConstants>
+    <EnableMSTestRunner>true</EnableMSTestRunner>
     <OutputType>Exe</OutputType>
+    <DefineConstants Condition=" '$(FastAcceptanceTest)' == 'true'">$(DefineConstants);SKIP_INTERMEDIATE_TARGET_FRAMEWORKS</DefineConstants>
     <UseAppHost>true</UseAppHost>
   </PropertyGroup>
 

diff --git a/test/IntegrationTests/MSTest.IntegrationTests/Extensions/VerifyE2E.cs b/test/IntegrationTests/MSTest.IntegrationTests/Extensions/VerifyE2E.cs
@@ -6,6 +6,8 @@
 using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
+using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
+
 namespace MSTest.IntegrationTests;
 
 public static class VerifyE2E

diff --git a/test/IntegrationTests/MSTest.IntegrationTests/MSTest.IntegrationTests.csproj b/test/IntegrationTests/MSTest.IntegrationTests/MSTest.IntegrationTests.csproj
@@ -1,9 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(NetFrameworkMinimum)</TargetFramework>
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn),1685</NoWarn>
+    <UseInternalTestFramework>true</UseInternalTestFramework>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/IntegrationTests/MSTest.IntegrationTests/OutputTests.cs b/test/IntegrationTests/MSTest.IntegrationTests/OutputTests.cs
@@ -6,6 +6,8 @@
 using Microsoft.MSTestV2.CLIAutomation;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
+using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
+
 namespace MSTest.IntegrationTests;
 
 public class OutputTests : CLITestBase

diff --git a/test/IntegrationTests/MSTest.IntegrationTests/Parameterized tests/DataExtensibilityTests.cs b/test/IntegrationTests/MSTest.IntegrationTests/Parameterized tests/DataExtensibilityTests.cs
@@ -6,6 +6,8 @@
 using Microsoft.MSTestV2.CLIAutomation;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
+using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
+
 namespace MSTest.IntegrationTests;
 
 public class DataExtensibilityTests : CLITestBase

diff --git a/test/IntegrationTests/MSTest.IntegrationTests/Parameterized tests/DynamicDataTests.cs b/test/IntegrationTests/MSTest.IntegrationTests/Parameterized tests/DynamicDataTests.cs
@@ -6,6 +6,8 @@
 using Microsoft.MSTestV2.CLIAutomation;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
+using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
+
 namespace MSTest.IntegrationTests;
 
 public class DynamicDataTests : CLITestBase

diff --git a/test/IntegrationTests/MSTest.IntegrationTests/Program.cs b/test/IntegrationTests/MSTest.IntegrationTests/Program.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Testing.Extensions;
+
+using TestFramework.ForTestingMSTest;
+
+ITestApplicationBuilder builder = await TestApplication.CreateBuilderAsync(args);
+
+#if ENABLE_CODECOVERAGE
+builder.AddCodeCoverageProvider();
+#endif
+builder.AddTrxReportProvider();
+builder.AddHangDumpProvider();
+builder.AddCrashDumpProvider(ignoreIfNotSupported: true);
+builder.AddRetryProvider();
+
+builder.AddInternalTestFramework();
+
+ITestApplication app = await builder.BuildAsync();
+return await app.RunAsync();
diff --git a/test/IntegrationTests/MSTest.IntegrationTests/Utilities/CLITestBase.discovery.cs b/test/IntegrationTests/MSTest.IntegrationTests/Utilities/CLITestBase.discovery.cs
@@ -15,6 +15,8 @@
 
 using TestFramework.ForTestingMSTest;
 
+using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
+
 namespace Microsoft.MSTestV2.CLIAutomation;
 
 public partial class CLITestBase : TestContainer
@@ -90,7 +92,7 @@ private sealed class InternalFrameworkHandle : IFrameworkHandle
         private readonly List<string> _messageList = [];
         private readonly ConcurrentDictionary<TestCase, ConcurrentBag<TestResult>> _testResults = new();
 
-        private ConcurrentBag<TestResult> _activeResults = null!;
+        private ConcurrentBag<TestResult> _activeResults = new();
 
         public bool EnableShutdownAfterTestRun { get; set; }
 

diff --git a/test/IntegrationTests/MSTest.IntegrationTests/Utilities/TestCaseFilterFactory.cs b/test/IntegrationTests/MSTest.IntegrationTests/Utilities/TestCaseFilterFactory.cs
@@ -113,7 +113,8 @@ public TestFilterExpression(string filter, Func<Func<string, object?>, bool> exp
 
         public string TestCaseFilterValue { get; }
 
-        public bool MatchTestCase(TestCase testCase, Func<string, object?> propertyValueProvider) => _expression(propertyValueProvider);
+        public bool MatchTestCase(TestCase testCase, Func<string, object?> propertyValueProvider)
+            => _expression(propertyValueProvider);
     }
 
     private static void MergeExpression(Stack<Expression<Func<Func<string, object?>, bool>>> exp, Operator op)

diff --git a/...VstestConsoleWrapper.IntegrationTests/MSTest.VstestConsoleWrapper.IntegrationTests.csproj b/...VstestConsoleWrapper.IntegrationTests/MSTest.VstestConsoleWrapper.IntegrationTests.csproj
@@ -1,7 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(NetFrameworkMinimum)</TargetFramework>
+    <UseInternalTestFramework>true</UseInternalTestFramework>
+    <UseMSTest>false</UseMSTest>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/IntegrationTests/MSTest.VstestConsoleWrapper.IntegrationTests/Program.cs b/test/IntegrationTests/MSTest.VstestConsoleWrapper.IntegrationTests/Program.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Testing.Extensions;
+
+using TestFramework.ForTestingMSTest;
+
+ITestApplicationBuilder builder = await TestApplication.CreateBuilderAsync(args);
+
+#if ENABLE_CODECOVERAGE
+builder.AddCodeCoverageProvider();
+#endif
+builder.AddTrxReportProvider();
+builder.AddHangDumpProvider();
+builder.AddCrashDumpProvider(ignoreIfNotSupported: true);
+builder.AddRetryProvider();
+
+builder.AddInternalTestFramework();
+
+ITestApplication app = await builder.BuildAsync();
+return await app.RunAsync();
diff --git a/...Acceptance.IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests.csproj b/...Acceptance.IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests.csproj
@@ -3,10 +3,9 @@
   <PropertyGroup>
     <TargetFrameworks>$(NetCurrent)</TargetFrameworks>
     <TestRunnerAdditionalArguments>$(TestRunnerAdditionalArguments) --retry-failed-tests 3</TestRunnerAdditionalArguments>
-    <UseVSTestRunner>false</UseVSTestRunner>
     <EnableMSTestRunner>true</EnableMSTestRunner>
-    <DefineConstants Condition=" '$(FastAcceptanceTest)' == 'true'">$(DefineConstants);SKIP_INTERMEDIATE_TARGET_FRAMEWORKS</DefineConstants>
     <OutputType>Exe</OutputType>
+    <DefineConstants Condition=" '$(FastAcceptanceTest)' == 'true'">$(DefineConstants);SKIP_INTERMEDIATE_TARGET_FRAMEWORKS</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...latformServices.Desktop.IntegrationTests/PlatformServices.Desktop.IntegrationTests.csproj b/...latformServices.Desktop.IntegrationTests/PlatformServices.Desktop.IntegrationTests.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(NetFrameworkMinimum)</TargetFramework>
+    <UseInternalTestFramework>true</UseInternalTestFramework>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/IntegrationTests/PlatformServices.Desktop.IntegrationTests/Program.cs b/test/IntegrationTests/PlatformServices.Desktop.IntegrationTests/Program.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Testing.Extensions;
+
+using TestFramework.ForTestingMSTest;
+
+ITestApplicationBuilder builder = await TestApplication.CreateBuilderAsync(args);
+
+#if ENABLE_CODECOVERAGE
+builder.AddCodeCoverageProvider();
+#endif
+builder.AddTrxReportProvider();
+builder.AddHangDumpProvider();
+builder.AddCrashDumpProvider(ignoreIfNotSupported: true);
+builder.AddRetryProvider();
+
+builder.AddInternalTestFramework();
+
+ITestApplication app = await builder.BuildAsync();
+return await app.RunAsync();
diff --git a/test/IntegrationTests/PlatformServices.Desktop.IntegrationTests/ReflectionUtilityTests.cs b/test/IntegrationTests/PlatformServices.Desktop.IntegrationTests/ReflectionUtilityTests.cs
@@ -4,7 +4,6 @@
 using FluentAssertions;
 
 using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using SampleFrameworkExtensions;
 

diff --git a/test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj b/test/UnitTests/MSTest.Analyzers.UnitTests/MSTest.Analyzers.UnitTests.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <UseVSTestRunner>false</UseVSTestRunner>
-    <EnableMSTestRunner>true</EnableMSTestRunner>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
 
     <!-- Analyzers project need to explicitly exclude compile and runtime assets from MSTest.TestFramework NuGet package -->
     <!-- This is to ensure that the assembly built from source is what is being used in tests -->
     <!-- This will exclude compile and runtime assets from NuGet so that they flow via ProjectReference -->
     <UseMSTestFromSource>true</UseMSTestFromSource>
+    <EnableMSTestRunner>true</EnableMSTestRunner>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/UnitTests/MSTest.Engine.UnitTests/MSTest.Engine.UnitTests.csproj b/test/UnitTests/MSTest.Engine.UnitTests/MSTest.Engine.UnitTests.csproj
@@ -1,13 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(TargetFrameworks);net462</TargetFrameworks>
-    <OutputType>Exe</OutputType>
+    <TargetFrameworks>$(MicrosoftTestingTargetFrameworks);net462</TargetFrameworks>
+    <RootNamespace>Microsoft.Testing.Framework.UnitTests</RootNamespace>
     <NoMoq>true</NoMoq>
     <NoFluentAssertions>true</NoFluentAssertions>
-    <UseVSTestRunner>false</UseVSTestRunner>
     <EnableMSTestRunner>true</EnableMSTestRunner>
-    <RootNamespace>Microsoft.Testing.Framework.UnitTests</RootNamespace>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/UnitTests/MSTest.Engine.UnitTests/Properties/launchSettings.json b/test/UnitTests/MSTest.Engine.UnitTests/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "MSTest.Engine.UnitTests": {
       "commandName": "Project",
-      "commandLineArgs": "--treenode-filter /*/*/*/**",
+      "commandLineArgs": "",
       "environmentVariables": {
         //"TESTINGPLATFORM_HOTRELOAD_ENABLED": "1"
       }

diff --git a/test/UnitTests/MSTest.SourceGeneration.UnitTests/MSTest.SourceGeneration.UnitTests.csproj b/test/UnitTests/MSTest.SourceGeneration.UnitTests/MSTest.SourceGeneration.UnitTests.csproj
@@ -3,10 +3,10 @@
   <PropertyGroup>
     <!-- Analyzers testing tools don't yet support tfms over net6.0 -->
     <TargetFrameworks>net6.0</TargetFrameworks>
+    <RootNamespace>Microsoft.Testing.Framework.SourceGeneration.UnitTests</RootNamespace>
     <NoWarn>$(NoWarn);NU1701</NoWarn>
-    <UseVSTestRunner>false</UseVSTestRunner>
     <EnableMSTestRunner>true</EnableMSTestRunner>
-    <RootNamespace>Microsoft.Testing.Framework.SourceGeneration.UnitTests</RootNamespace>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/UnitTests/MSTest.SourceGeneration.UnitTests/Properties/launchSettings.json b/test/UnitTests/MSTest.SourceGeneration.UnitTests/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "MSTest.SourceGeneration.UnitTests": {
       "commandName": "Project",
-      "commandLineArgs": "--treenode-filter /*/*/*/**"
+      "commandLineArgs": ""
     }
   }
 }