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..6b2b1523e 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,10 @@
-
-
-
-
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
@@ -72,6 +71,7 @@
+
@@ -86,7 +86,8 @@
-
+
+
diff --git a/Makefile b/Makefile
index 8fd72b1e1..ce3d7f986 100644
--- a/Makefile
+++ b/Makefile
@@ -18,15 +18,17 @@ 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" \
+ --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.Analyzers.Tests/ModelContextProtocol.Analyzers.Tests.csproj b/tests/ModelContextProtocol.Analyzers.Tests/ModelContextProtocol.Analyzers.Tests.csproj
index 4b7486a44..2bed8175b 100644
--- a/tests/ModelContextProtocol.Analyzers.Tests/ModelContextProtocol.Analyzers.Tests.csproj
+++ b/tests/ModelContextProtocol.Analyzers.Tests/ModelContextProtocol.Analyzers.Tests.csproj
@@ -4,19 +4,34 @@
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
+
diff --git a/tests/ModelContextProtocol.AspNetCore.Tests/ModelContextProtocol.AspNetCore.Tests.csproj b/tests/ModelContextProtocol.AspNetCore.Tests/ModelContextProtocol.AspNetCore.Tests.csproj
index 19f4e4149..76f2a181c 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,37 @@
false
+
+
+ true
+
+
-
-
-
-
+
+ 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..e0fb3d1fa 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,25 @@
-
-
-
-
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
-
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+