modelcontextprotocol/csharp-sdk
Watch
1
0
Fork
You've already forked csharp-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix reserved expansion (e.g. "{+var}") when matching resources (#1142)

Browse source
This commit is contained in:
Stephen Halter 2026-01-27 14:23:31 -08:00 • committed by GitHub
commit 81664c3fce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 967 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

51
tests/ModelContextProtocol.Tests/ClientServerTestBase.cs
View file

@ -13,36 +13,55 @@ public abstract class ClientServerTestBase : LoggedTest, IAsyncDisposable
{
private readonly Pipe _clientToServerPipe = new();
private readonly Pipe _serverToClientPipe = new();
private readonly IMcpServerBuilder _builder;
private readonly CancellationTokenSource _cts;
private readonly Task _serverTask;
private readonly CancellationTokenSource _cts = CancellationTokenSource.CreateLinkedTokenSource(TestContext.Current.CancellationToken);
private Task _serverTask = Task.CompletedTask;
public ClientServerTestBase(ITestOutputHelper testOutputHelper)
public ClientServerTestBase(ITestOutputHelper testOutputHelper, bool startServer = true)
: base(testOutputHelper)
{
ServiceCollection sc = new();
sc.AddLogging();
sc.AddSingleton(XunitLoggerProvider);
sc.AddSingleton<ILoggerProvider>(MockLoggerProvider);
_builder = sc
ServiceCollection.AddLogging();
ServiceCollection.AddSingleton(XunitLoggerProvider);
ServiceCollection.AddSingleton<ILoggerProvider>(MockLoggerProvider);
McpServerBuilder = ServiceCollection
.AddMcpServer()
.WithStreamServerTransport(_clientToServerPipe.Reader.AsStream(), _serverToClientPipe.Writer.AsStream());
ConfigureServices(sc, _builder);
ServiceProvider = sc.BuildServiceProvider(validateScopes: true);
_cts = CancellationTokenSource.CreateLinkedTokenSource(TestContext.Current.CancellationToken);
Server = ServiceProvider.GetRequiredService<McpServer>();
_serverTask = Server.RunAsync(_cts.Token);
ConfigureServices(ServiceCollection, McpServerBuilder);
if (startServer)
{
StartServer();
}
}
protected McpServer Server { get; }
protected ServiceCollection ServiceCollection { get; } = [];
protected IServiceProvider ServiceProvider { get; }
protected IMcpServerBuilder McpServerBuilder { get; }
protected McpServer Server
{
get => field ?? throw new InvalidOperationException("You must call StartServer first.");
private set => field = value;
}
protected ServiceProvider ServiceProvider
{
get => field ?? throw new InvalidOperationException("You must call StartServer first.");
private set => field = value;
}
protected virtual void ConfigureServices(ServiceCollection services, IMcpServerBuilder mcpServerBuilder)
{
}
protected McpServer StartServer()
{
ServiceProvider = ServiceCollection.BuildServiceProvider(validateScopes: true);
Server = ServiceProvider.GetRequiredService<McpServer>();
_serverTask = Server.RunAsync(_cts.Token);
return Server;
}
public async ValueTask DisposeAsync()
{
await _cts.CancelAsync();