From fa4fdda13d81df762b782d1f0c3f1104fe040690 Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Fri, 21 Nov 2025 14:00:00 -0800 Subject: [PATCH 1/4] Revert "Update to MTP (#958)" This reverts commit 7080e3a621bdbe1846cc48acb7ec31dadb08aed2. --- .github/dependabot.yml | 1 - Directory.Build.props | 5 ++-- Directory.Packages.props | 14 +++++---- Makefile | 19 +++++++----- global.json | 3 -- ...delContextProtocol.AspNetCore.Tests.csproj | 29 +++++++++++++++---- .../ModelContextProtocol.Tests.csproj | 28 ++++++++++++++---- 7 files changed, 67 insertions(+), 32 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 312734f26..cf9226da4 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -17,7 +17,6 @@ updates: patterns: - "xunit.*" - "Microsoft.NET.Test.Sdk" - - "Microsoft.Testing.*" - "coverlet.*" - "GitHubActionsTestLogger" - "Moq" diff --git a/Directory.Build.props b/Directory.Build.props index df8d974b8..390be36e7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -33,9 +33,8 @@ - true - <_MTPResultsDirectory>$(ArtifactsTestResultsDir) - $(TestingPlatformCommandLineArguments) --results-directory $(_MTPResultsDirectory) --report-trx --report-trx-filename $(MSBuildProjectName).$(TargetFramework).$(OS).trx + trx%3bLogFileName=$(MSBuildProjectName).$(TargetFramework).$(OS).trx + $(ArtifactsTestResultsDir) diff --git a/Directory.Packages.props b/Directory.Packages.props index f7eccb1b7..9df60ca69 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,7 +4,6 @@ 8.0.22 9.0.11 10.0.0 - 2.0.2 @@ -61,10 +60,11 @@ - - - - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + @@ -72,6 +72,7 @@ + @@ -86,7 +87,8 @@ - + + diff --git a/Makefile b/Makefile index 8fd72b1e1..f300ca158 100644 --- a/Makefile +++ b/Makefile @@ -18,15 +18,18 @@ build: restore test: build dotnet test \ --no-build \ - --no-progress \ --configuration $(CONFIGURATION) \ - --filter-not-trait 'Execution=Manual' \ - --crashdump \ - --hangdump \ - --hangdump-timeout 7m \ - --coverage \ - --coverage-output-format cobertura \ - -p:_MTPResultsDirectory=$(ARTIFACT_PATH)/testresults \ + --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 pack: restore dotnet pack --no-restore --configuration $(CONFIGURATION) diff --git a/global.json b/global.json index 4ed7c32bc..fcb4599c2 100644 --- a/global.json +++ b/global.json @@ -2,8 +2,5 @@ "sdk": { "version": "10.0.100", "rollForward": "minor" - }, - "test": { - "runner": "Microsoft.Testing.Platform" } } diff --git a/tests/ModelContextProtocol.AspNetCore.Tests/ModelContextProtocol.AspNetCore.Tests.csproj b/tests/ModelContextProtocol.AspNetCore.Tests/ModelContextProtocol.AspNetCore.Tests.csproj index 19f4e4149..5d21d0a0a 100644 --- a/tests/ModelContextProtocol.AspNetCore.Tests/ModelContextProtocol.AspNetCore.Tests.csproj +++ b/tests/ModelContextProtocol.AspNetCore.Tests/ModelContextProtocol.AspNetCore.Tests.csproj @@ -4,7 +4,8 @@ net10.0;net9.0;net8.0 enable enable - Exe + false + true ModelContextProtocol.AspNetCore.Tests @@ -13,25 +14,41 @@ false + + + true + + - - - - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/tests/ModelContextProtocol.Tests/ModelContextProtocol.Tests.csproj b/tests/ModelContextProtocol.Tests/ModelContextProtocol.Tests.csproj index 6bdca3438..425944624 100644 --- a/tests/ModelContextProtocol.Tests/ModelContextProtocol.Tests.csproj +++ b/tests/ModelContextProtocol.Tests/ModelContextProtocol.Tests.csproj @@ -6,6 +6,8 @@ enable enable + false + true ModelContextProtocol.Tests $(NoWarn);NU1903;NU1902 @@ -16,6 +18,13 @@ false + + + true + + @@ -26,20 +35,29 @@ - - - - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + From 64f8e1039de6aef9e98cb635a353197dbba1f055 Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Fri, 21 Nov 2025 14:14:01 -0800 Subject: [PATCH 2/4] Removed GitHubActionsTestLogger dependency - I left it in dependabot.yml config in case it gets added back as was done in #990 --- Directory.Packages.props | 1 - Makefile | 1 - .../ModelContextProtocol.AspNetCore.Tests.csproj | 4 ---- .../ModelContextProtocol.Tests.csproj | 4 ---- 4 files changed, 10 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 9df60ca69..6b2b1523e 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -64,7 +64,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - diff --git a/Makefile b/Makefile index f300ca158..ce3d7f986 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,6 @@ test: build --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 \ -- \ diff --git a/tests/ModelContextProtocol.AspNetCore.Tests/ModelContextProtocol.AspNetCore.Tests.csproj b/tests/ModelContextProtocol.AspNetCore.Tests/ModelContextProtocol.AspNetCore.Tests.csproj index 5d21d0a0a..76f2a181c 100644 --- a/tests/ModelContextProtocol.AspNetCore.Tests/ModelContextProtocol.AspNetCore.Tests.csproj +++ b/tests/ModelContextProtocol.AspNetCore.Tests/ModelContextProtocol.AspNetCore.Tests.csproj @@ -30,10 +30,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - diff --git a/tests/ModelContextProtocol.Tests/ModelContextProtocol.Tests.csproj b/tests/ModelContextProtocol.Tests/ModelContextProtocol.Tests.csproj index 425944624..e0fb3d1fa 100644 --- a/tests/ModelContextProtocol.Tests/ModelContextProtocol.Tests.csproj +++ b/tests/ModelContextProtocol.Tests/ModelContextProtocol.Tests.csproj @@ -39,10 +39,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - From 1ffd98c3af7b44fd8d76d682e3f052a16c0dd6db Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Fri, 21 Nov 2025 14:24:06 -0800 Subject: [PATCH 3/4] Update ModelContextProtocol.Analyzers.Tests.csproj to use older MTP packages --- ...odelContextProtocol.Analyzers.Tests.csproj | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/tests/ModelContextProtocol.Analyzers.Tests/ModelContextProtocol.Analyzers.Tests.csproj b/tests/ModelContextProtocol.Analyzers.Tests/ModelContextProtocol.Analyzers.Tests.csproj index 4b7486a44..686634e86 100644 --- a/tests/ModelContextProtocol.Analyzers.Tests/ModelContextProtocol.Analyzers.Tests.csproj +++ b/tests/ModelContextProtocol.Analyzers.Tests/ModelContextProtocol.Analyzers.Tests.csproj @@ -4,19 +4,33 @@ net9.0 enable Exe + + false + true + + + + + true - - - - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + all runtime; build; native; contentfiles; analyzers; buildtransitive - + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + From bbb997d4d259a4660489dfa56d649e76c0ecda98 Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Fri, 21 Nov 2025 14:43:21 -0800 Subject: [PATCH 4/4] Add missing Microsoft.NET.Test.Sdk PackageReference to Analyzers.Tests --- .../ModelContextProtocol.Analyzers.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/ModelContextProtocol.Analyzers.Tests/ModelContextProtocol.Analyzers.Tests.csproj b/tests/ModelContextProtocol.Analyzers.Tests/ModelContextProtocol.Analyzers.Tests.csproj index 686634e86..2bed8175b 100644 --- a/tests/ModelContextProtocol.Analyzers.Tests/ModelContextProtocol.Analyzers.Tests.csproj +++ b/tests/ModelContextProtocol.Analyzers.Tests/ModelContextProtocol.Analyzers.Tests.csproj @@ -26,6 +26,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + runtime; build; native; contentfiles; analyzers; buildtransitive