Skip to content

Commit 805ea7f

Browse files
committed
Fix conformance tests
1 parent 012460f commit 805ea7f

File tree

2 files changed

+33
-6
lines changed

2 files changed

+33
-6
lines changed

tests/ModelContextProtocol.ConformanceTests/ConformanceTests.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,12 @@ public async Task RunConformanceTests()
7373
$"Conformance tests failed.\n\nStdout:\n{result.Output}\n\nStderr:\n{result.Error}");
7474
} private static Process StartConformanceServer()
7575
{
76-
// Find the ConformanceServer project directory
76+
// The ConformanceServer is in a subdirectory of the test project
77+
// Test binary is in: artifacts/bin/ModelContextProtocol.ConformanceTests/net10.0/
78+
// ConformanceServer project is in: tests/ModelContextProtocol.ConformanceTests/ConformanceServer/
7779
var testProjectDir = AppContext.BaseDirectory;
7880
var conformanceServerDir = Path.GetFullPath(
79-
Path.Combine(testProjectDir, "..", "..", "..", "..", "ConformanceServer"));
81+
Path.Combine(testProjectDir, "..", "..", "..", "..", "tests", "ModelContextProtocol.ConformanceTests", "ConformanceServer"));
8082

8183
if (!Directory.Exists(conformanceServerDir))
8284
{

tests/ModelContextProtocol.ConformanceTests/ModelContextProtocol.ConformanceTests.csproj

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,42 @@
55
<TargetFramework>net10.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
8+
<IsPackable>false</IsPackable>
9+
<IsTestProject>true</IsTestProject>
810
<RootNamespace>ModelContextProtocol.ConformanceTests</RootNamespace>
911
</PropertyGroup>
1012

13+
<PropertyGroup>
14+
<!-- Without this, tests are currently not showing results until all tests complete
15+
https://xunit.net/docs/getting-started/v3/microsoft-testing-platform
16+
-->
17+
<DisableTestingPlatformServerCapability>true</DisableTestingPlatformServerCapability>
18+
</PropertyGroup>
19+
20+
<ItemGroup>
21+
<!-- Exclude ConformanceServer files from compilation - it's a separate project -->
22+
<Compile Remove="ConformanceServer/**/*.cs" />
23+
</ItemGroup>
24+
1125
<ItemGroup>
12-
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
13-
<PackageReference Include="Microsoft.Testing.Extensions.HangDump" />
14-
<PackageReference Include="xunit.v3.mtp-v2" />
26+
<PackageReference Include="coverlet.collector">
27+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
28+
<PrivateAssets>all</PrivateAssets>
29+
</PackageReference>
30+
<PackageReference Include="GitHubActionsTestLogger">
31+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
32+
<PrivateAssets>all</PrivateAssets>
33+
</PackageReference>
34+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
35+
<PackageReference Include="xunit.v3" />
36+
<PackageReference Include="xunit.runner.visualstudio">
37+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
38+
<PrivateAssets>all</PrivateAssets>
39+
</PackageReference>
1540
</ItemGroup>
1641

1742
<ItemGroup>
18-
<ProjectReference Include="../ConformanceServer/ConformanceServer.csproj" />
43+
<ProjectReference Include="ConformanceServer/ConformanceServer.csproj" />
1944
</ItemGroup>
2045

2146
</Project>

0 commit comments

Comments
 (0)