Update to MTP (#958)

* Update to MTP * Drop GitHubActionsTestLogger, better test output, and update dependabot.yml * Keep cobertura * Fix Makefile
2025-11-18 14:06:09 +01:00 · 2025-11-18 14:06:09 +01:00 · 7080e3a621
commit 7080e3a621
parent b9c9f44e06
7 changed files with 32 additions and 67 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -17,6 +17,7 @@ updates:
        patterns:
          - "xunit.*"
          - "Microsoft.NET.Test.Sdk"
+          - "Microsoft.Testing.*"
          - "coverlet.*"
          - "GitHubActionsTestLogger"
          - "Moq"
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -29,8 +29,9 @@
  </PropertyGroup>

  <PropertyGroup>
-    <VSTestLogger Condition="'$(VSTestLogger)' == ''">trx%3bLogFileName=$(MSBuildProjectName).$(TargetFramework).$(OS).trx</VSTestLogger>
-    <VSTestResultsDirectory Condition="'$(VSTestResultsDirectory)' == ''">$(ArtifactsTestResultsDir)</VSTestResultsDirectory>
+    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
+    <_MTPResultsDirectory>$(ArtifactsTestResultsDir)</_MTPResultsDirectory>
+    <TestingPlatformCommandLineArguments>$(TestingPlatformCommandLineArguments) --results-directory $(_MTPResultsDirectory) --report-trx --report-trx-filename $(MSBuildProjectName).$(TargetFramework).$(OS).trx</TestingPlatformCommandLineArguments>
  </PropertyGroup>

  <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@ -4,6 +4,7 @@
    <System8Version>8.0.22</System8Version>
    <System9Version>9.0.11</System9Version>
    <System10Version>10.0.0</System10Version>
+    <MicrosoftTestingPlatformVersion>2.0.2</MicrosoftTestingPlatformVersion>
  </PropertyGroup>

  <!-- Product dependencies shared -->
@ -52,11 +53,10 @@

    <!-- Testing dependencies -->
    <PackageVersion Include="Anthropic.SDK" Version="5.8.0" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.4">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageVersion>
-    <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="$(MicrosoftTestingPlatformVersion)" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="$(MicrosoftTestingPlatformVersion)" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingPlatformVersion)" />
    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.0.0-preview.1.25559.3" />
    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(System10Version)" />
    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(System10Version)" />
@ -64,7 +64,6 @@
    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(System10Version)" />
    <PackageVersion Include="Microsoft.Extensions.Options" Version="$(System10Version)" />
    <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="$(System10Version)" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
    <PackageVersion Include="Moq" Version="4.20.72" />
    <PackageVersion Include="OpenTelemetry" Version="1.12.0" />
    <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.12.0" />
@ -79,8 +78,7 @@
    <PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
    <PackageVersion Include="Serilog" Version="4.3.0" />
    <PackageVersion Include="System.Linq.AsyncEnumerable" Version="$(System10Version)" />
-    <PackageVersion Include="xunit.v3" Version="3.0.1" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
+    <PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.0" />
    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
    <PackageVersion Include="JsonSchema.Net" Version="7.4.0" />
  </ItemGroup>
--- a/19
+++ b/19
@ -18,18 +18,15 @@ build: restore
 test: build
 	dotnet test \
 		--no-build \
+		--no-progress \
 		--configuration $(CONFIGURATION) \
-		--filter '(Execution!=Manual)' \
-		--blame \
-		--blame-crash \
-		--blame-hang-timeout 7m \
-		--diag "$(ARTIFACT_PATH)/diag.txt" \
-		--logger "trx" \
-		--logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true" \
-		--collect "XPlat Code Coverage" \
-		--results-directory $(ARTIFACT_PATH)/testresults \
-		-- \
-		RunConfiguration.CollectSourceInformation=true
+		--filter-not-trait 'Execution=Manual' \
+		--crashdump \
+		--hangdump \
+		--hangdump-timeout 7m \
+		--coverage \
+		--coverage-output-format cobertura \
+		-p:_MTPResultsDirectory=$(ARTIFACT_PATH)/testresults \

 pack: restore
 	dotnet pack --no-restore --configuration $(CONFIGURATION)
--- a/global.json
+++ b/global.json
@ -2,5 +2,8 @@
  "sdk": {
    "version": "10.0.100",
    "rollForward": "minor"
+  },
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
  }
 }
--- a/tests/ModelContextProtocol.AspNetCore.Tests/ModelContextProtocol.AspNetCore.Tests.csproj
+++ b/tests/ModelContextProtocol.AspNetCore.Tests/ModelContextProtocol.AspNetCore.Tests.csproj
@ -4,8 +4,7 @@
    <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
+    <OutputType>Exe</OutputType>
    <RootNamespace>ModelContextProtocol.AspNetCore.Tests</RootNamespace>
  </PropertyGroup>

@ -14,41 +13,25 @@
    <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
  </PropertyGroup>

-  <PropertyGroup>
-    <!-- Without this, tests are currently not showing results until all tests complete
-         https://xunit.net/docs/getting-started/v3/microsoft-testing-platform
-    -->
-    <DisableTestingPlatformServerCapability>true</DisableTestingPlatformServerCapability>
-  </PropertyGroup>
-
  <ItemGroup>
    <Compile Include="..\Common\**\*.cs" />
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="coverlet.collector">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="GitHubActionsTestLogger">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
+    <PackageReference Include="Microsoft.Testing.Extensions.HangDump" />
+    <PackageReference Include="Microsoft.Testing.Extensions.CrashDump" />
+    <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" />
    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
    <PackageReference Include="Microsoft.Extensions.AI" />
    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
    <PackageReference Include="Microsoft.Extensions.Logging" />
    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
    <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
    <PackageReference Include="Moq" />
    <PackageReference Include="OpenTelemetry" />
    <PackageReference Include="OpenTelemetry.Exporter.InMemory" />
-    <PackageReference Include="xunit.v3" />
-    <PackageReference Include="xunit.runner.visualstudio">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="xunit.v3.mtp-v2" />
  </ItemGroup>

  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
--- a/tests/ModelContextProtocol.Tests/ModelContextProtocol.Tests.csproj
+++ b/tests/ModelContextProtocol.Tests/ModelContextProtocol.Tests.csproj
@ -6,8 +6,6 @@
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>

-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
    <RootNamespace>ModelContextProtocol.Tests</RootNamespace>
    <!-- https://github.com/dotnet/sdk/issues/51060 -->
    <NoWarn>$(NoWarn);NU1903;NU1902</NoWarn>
@ -18,13 +16,6 @@
    <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
  </PropertyGroup>

-  <PropertyGroup>
-    <!-- Without this, tests are currently not showing results until all tests complete
-         https://xunit.net/docs/getting-started/v3/microsoft-testing-platform
-    -->
-    <DisableTestingPlatformServerCapability>true</DisableTestingPlatformServerCapability>
-  </PropertyGroup>
-
  <ItemGroup>
    <Compile Include="..\Common\**\*.cs" />
  </ItemGroup>
@ -35,29 +26,20 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="coverlet.collector">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="GitHubActionsTestLogger">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
+    <PackageReference Include="Microsoft.Testing.Extensions.HangDump" />
+    <PackageReference Include="Microsoft.Testing.Extensions.CrashDump" />
+    <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" />
    <PackageReference Include="Microsoft.Extensions.AI" />
    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
    <PackageReference Include="Microsoft.Extensions.Logging" />
    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
    <PackageReference Include="Moq" />
    <PackageReference Include="OpenTelemetry" />
    <PackageReference Include="OpenTelemetry.Exporter.InMemory" />
    <PackageReference Include="Serilog" />
    <PackageReference Include="JsonSchema.Net" />
-    <PackageReference Include="xunit.v3" />
-    <PackageReference Include="xunit.runner.visualstudio">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="xunit.v3.mtp-v2" />
  </ItemGroup>

  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">