Use MSTest.Sdk and opt-in to MTP (#1680)

* Use MSTest.Sdk and opt-in to MTP

* Update .github/workflows/build.yml

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update test/Microsoft.ComponentDetection.TestsUtilities/Microsoft.ComponentDetection.TestsUtilities.csproj

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Fix Directory.Build.props

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Jamie Magee <jamagee@microsoft.com>

Author: 3 people

.github/workflows/build.yml

@@ -41,7 +41,9 @@ jobs:
         run: dotnet build --no-restore --configuration Debug
 
       - name: Run tests
-        run: dotnet test --no-build --configuration Debug --collect:"Code Coverage;Format=cobertura;CoverageFileName=coverage.cobertura.xml"
+        # The '--' separator forwards options to the Microsoft Testing Platform runner.
+        # After upgrading to .NET 10 SDK, these can be passed directly without '--'.
+        run: dotnet test --no-build --configuration Debug -- --coverage --coverage-output-format cobertura
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2

Directory.Packages.props

@@ -23,8 +23,6 @@
     <PackageVersion Include="morelinq" Version="4.4.0" />
     <PackageVersion Include="MSTest.TestFramework" Version="4.1.0" />
     <PackageVersion Include="MSTest.Analyzers" Version="4.1.0" />
-    <PackageVersion Include="MSTest.TestAdapter" Version="4.1.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageVersion Include="Newtonsoft.Json.Schema" Version="4.0.1" />
     <PackageVersion Include="NuGet.ProjectModel" Version="7.3.0" />

global.json

@@ -2,5 +2,8 @@
 	"sdk": {
 		"version": "8.0.418",
 		"rollForward": "latestFeature"
+	},
+	"msbuild-sdks": {
+		"MSTest.Sdk": "4.1.0"
 	}
 }

test/Directory.Build.props

@@ -4,11 +4,15 @@
 
   <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <!-- Opts into running tests via Microsoft Testing Platform instead of VSTest when using 'dotnet test'.
+         When migrating to .NET 10 SDK, this should be removed and opt-in should be done via global.json instead.
+         https://learn.microsoft.com/dotnet/core/testing/unit-testing-mstest-runner-intro#dotnet-test-integration -->
+    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
+    <!-- Shows the failed test output inline when using 'dotnet test' with Microsoft Testing Platform. -->
+    <TestingPlatformShowTestsFailure>true</TestingPlatformShowTestsFailure>
   </PropertyGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="MSTest.TestFramework"/>
-    <PackageReference Include="MSTest.Analyzers "/>
     <PackageReference Include="Moq"/>
     <PackageReference Include="AwesomeAssertions"/>
     <PackageReference Include="Faker.net"/>

test/Microsoft.ComponentDetection.Common.Tests/Microsoft.ComponentDetection.Common.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
 
     <ItemGroup Label="Project References">
         <ProjectReference Include="..\Microsoft.ComponentDetection.TestsUtilities\Microsoft.ComponentDetection.TestsUtilities.csproj" />
@@ -9,8 +9,6 @@
       <PackageReference Include="AwesomeAssertions.Analyzers" PrivateAssets="all" />
       <PackageReference Include="Microsoft.Extensions.Logging" />
       <PackageReference Include="System.Threading.Tasks.Dataflow" />
-      <PackageReference Include="MSTest.TestAdapter" />
-      <PackageReference Include="Microsoft.NET.Test.Sdk" />
     </ItemGroup>
 
     <ItemGroup>

test/Microsoft.ComponentDetection.Contracts.Tests/Microsoft.ComponentDetection.Contracts.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
 
     <ItemGroup Label="Project References">
         <ProjectReference Include="..\..\src\Microsoft.ComponentDetection.Contracts\Microsoft.ComponentDetection.Contracts.csproj" />
@@ -9,8 +9,6 @@
         <PackageReference Include="System.Reactive" />
         <PackageReference Include="System.Threading.Tasks.Dataflow" />
         <PackageReference Include="packageurl-dotnet" />
-        <PackageReference Include="MSTest.TestAdapter " />
-        <PackageReference Include="Microsoft.NET.Test.Sdk " />
         <PackageReference Include="AwesomeAssertions.Analyzers" PrivateAssets="all" />
     </ItemGroup>
 

test/Microsoft.ComponentDetection.Detectors.Tests/Microsoft.ComponentDetection.Detectors.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
 
     <ItemGroup Label="Project References">
         <ProjectReference Include="..\..\src\Microsoft.ComponentDetection.Orchestrator\Microsoft.ComponentDetection.Orchestrator.csproj" />
@@ -16,8 +16,6 @@
         <PackageReference Include="packageurl-dotnet" />
         <PackageReference Include="Tomlyn.Signed" />
         <PackageReference Include="YamlDotNet" />
-        <PackageReference Include="MSTest.TestAdapter" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" />
     </ItemGroup>
 
     <ItemGroup>

test/Microsoft.ComponentDetection.Orchestrator.Tests/Microsoft.ComponentDetection.Orchestrator.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
 
     <ItemGroup Label="Project References">
         <ProjectReference Include="..\..\src\Microsoft.ComponentDetection.Orchestrator\Microsoft.ComponentDetection.Orchestrator.csproj" />
@@ -11,8 +11,6 @@
         <PackageReference Include="Spectre.Console.Cli" />
         <PackageReference Include="Spectre.Console.Testing" />
         <PackageReference Include="System.Threading.Tasks.Dataflow" />
-        <PackageReference Include="MSTest.TestAdapter " />
-        <PackageReference Include="Microsoft.NET.Test.Sdk " />
         <PackageReference Include="AwesomeAssertions.Analyzers" PrivateAssets="all" />
     </ItemGroup>
 

test/Microsoft.ComponentDetection.VerificationTests/Microsoft.ComponentDetection.VerificationTests.csproj

@@ -1,28 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
 
     <PropertyGroup>
-        <IsTestProject>true</IsTestProject>
-        <TestProjectType>UnitTest</TestProjectType>
         <ProjectGuid>{95c8e34e-5895-4c7e-8c7e-c300a114a1e5}</ProjectGuid>
-        <OutputType>Library</OutputType>
         <OutputPath>./bin</OutputPath>
         <RootNamespace>Microsoft.ComponentDetection.VerificationTests</RootNamespace>
         <AssemblyName>Microsoft.ComponentDetection.VerificationTests</AssemblyName>
         <NoWarn>$(NoWarn);NU1504;NU1105</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
-        <!--<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-        <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-        <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-        IF TESTING LOCALLY, UNCOMMENT ABOVE AND COMMENT BELOW -->
-        <PackageReference Include="Microsoft.NET.Test.Sdk" />
-        <PackageReference Include="MSTest.TestAdapter" />
-        <PackageReference Include="MSTest.TestFramework" />
         <PackageReference Include="AwesomeAssertions" />
         <PackageReference Include="Microsoft.Extensions.Logging" />
-        <PackageReference Include="MSTest.TestFramework"/>
-        <PackageReference Include="MSTest.Analyzers "/>
         <PackageReference Include="Newtonsoft.Json.Schema" />
         <PackageReference Include="packageurl-dotnet" />
         <PackageReference Include="System.Threading.Tasks.Dataflow" />