Skip to content

Resolve test server paths deterministically #1735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeffhandley merged 2 commits into from
Jul 26, 2026
+9 −5
Merged

Resolve test server paths deterministically #1735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db4588e
Resolve test server paths from output directory
PranavSenthilnathan Jul 24, 2026
1513de6
Merge branch 'main' into pranavsenthilnathan-resolve-testserver-paths
PranavSenthilnathan Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions tests/ModelContextProtocol.Tests/ClientIntegrationTestFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ public class ClientIntegrationTestFixture
public ClientIntegrationTestFixture()
{
const string ServerEverythingVersion = "2026.1.26";
string testServerExecutable = Path.Combine(AppContext.BaseDirectory, "TestServer.exe");
string testServerDll = Path.Combine(AppContext.BaseDirectory, "TestServer.dll");

EverythingServerTransportOptions = new()
{
Expand All @@ -27,14 +29,14 @@ public ClientIntegrationTestFixture()

TestServerTransportOptions = new()
{
Command = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "TestServer.exe" : PlatformDetection.IsMonoRuntime ? "mono" : "dotnet",
Command = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? testServerExecutable : PlatformDetection.IsMonoRuntime ? "mono" : "dotnet",
Name = "TestServer",
};

if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
// Change to Arguments to "mcp-server-everything" if you want to run the server locally after creating a symlink
TestServerTransportOptions.Arguments = [PlatformDetection.IsMonoRuntime ? "TestServer.exe" : "TestServer.dll"];
TestServerTransportOptions.Arguments = [PlatformDetection.IsMonoRuntime ? testServerExecutable : testServerDll];
}
}

Expand Down
8 changes: 5 additions & 3 deletions tests/ModelContextProtocol.Tests/Transport/StdioClientTransportTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,21 +154,23 @@ public async Task EscapesCliArgumentsCorrectly(string? cliArgumentValue)
}

string cliArgument = $"--cli-arg={cliArgumentValue}";
string testServerExecutable = Path.Combine(AppContext.BaseDirectory, "TestServer.exe");
string testServerDll = Path.Combine(AppContext.BaseDirectory, "TestServer.dll");

StdioClientTransportOptions options = new()
{
Name = "TestServer",
Command = (PlatformDetection.IsMonoRuntime, PlatformDetection.IsWindows) switch
{
(true, _) => "mono",
(_, true) => "TestServer.exe",
(_, true) => testServerExecutable,
_ => "dotnet",
},
Arguments = (PlatformDetection.IsMonoRuntime, PlatformDetection.IsWindows) switch
{
(true, _) => ["TestServer.exe", cliArgument],
(true, _) => [testServerExecutable, cliArgument],
(_, true) => [cliArgument],
_ => ["TestServer.dll", cliArgument],
_ => [testServerDll, cliArgument],
},
};

Expand Down