diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 7ffd6a269..57236c8cf 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -17,6 +17,7 @@ updates:
patterns:
- "xunit.*"
- "Microsoft.NET.Test.Sdk"
+ - "Microsoft.Testing.*"
- "coverlet.*"
- "GitHubActionsTestLogger"
- "Moq"
diff --git a/Directory.Build.props b/Directory.Build.props
index bd2aed325..1fad98569 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -29,8 +29,9 @@
- trx%3bLogFileName=$(MSBuildProjectName).$(TargetFramework).$(OS).trx
- $(ArtifactsTestResultsDir)
+ true
+ <_MTPResultsDirectory>$(ArtifactsTestResultsDir)
+ $(TestingPlatformCommandLineArguments) --results-directory $(_MTPResultsDirectory) --report-trx --report-trx-filename $(MSBuildProjectName).$(TargetFramework).$(OS).trx
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 50d5ca624..1bb21c53c 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,6 +4,7 @@
8.0.22
9.0.11
10.0.0
+ 2.0.2
@@ -52,11 +53,10 @@
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
- all
-
-
+
+
+
+
@@ -64,7 +64,6 @@
-
@@ -79,8 +78,7 @@
-
-
+
diff --git a/Makefile b/Makefile
index f300ca158..8fd72b1e1 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
diff --git a/global.json b/global.json
index fcb4599c2..4ed7c32bc 100644
--- a/global.json
+++ b/global.json
@@ -2,5 +2,8 @@
"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 5d21d0a0a..19f4e4149 100644
--- a/tests/ModelContextProtocol.AspNetCore.Tests/ModelContextProtocol.AspNetCore.Tests.csproj
+++ b/tests/ModelContextProtocol.AspNetCore.Tests/ModelContextProtocol.AspNetCore.Tests.csproj
@@ -4,8 +4,7 @@
net10.0;net9.0;net8.0
enable
enable
- false
- true
+ Exe
ModelContextProtocol.AspNetCore.Tests
@@ -14,41 +13,25 @@
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 425944624..6bdca3438 100644
--- a/tests/ModelContextProtocol.Tests/ModelContextProtocol.Tests.csproj
+++ b/tests/ModelContextProtocol.Tests/ModelContextProtocol.Tests.csproj
@@ -6,8 +6,6 @@
enable
enable
- false
- true
ModelContextProtocol.Tests
$(NoWarn);NU1903;NU1902
@@ -18,13 +16,6 @@
false
-
-
- true
-
-
@@ -35,29 +26,20 @@
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
- all
-
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
- all
-
+
+
+
+
-
-
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
- all
-
+