Skip to content

Commit 5435861

Browse files
localdenlocalden
committed
Merge branch 'main' of https://github.com/modelcontextprotocol/csharp-sdk into localden/experimental
2 parents 325647b + 5745824 commit 5435861

File tree

241 files changed

+3084
-1426
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

241 files changed

+3084
-1426
lines changed

‎Directory.Packages.props‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<Project>
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
<System10Version>10.0.0-preview.3.25171.5</System10Version>
5-
<MicrosoftExtensionsAIVersion>9.4.4-preview.1.25259.16</MicrosoftExtensionsAIVersion>
4+
<System9Version>9.0.5</System9Version>
5+
<System10Version>10.0.0-preview.4.25258.110</System10Version>
6+
<MicrosoftExtensionsAIVersion>9.5.0</MicrosoftExtensionsAIVersion>
67
</PropertyGroup>
78
<!-- Product dependencies netstandard -->
89
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
@@ -17,57 +18,58 @@
1718
<!-- Product dependencies LTS -->
1819
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
1920
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.15" />
20-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
21+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
2122
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
2223
<PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
2324
</ItemGroup>
2425
<!-- Product dependencies .NET 9 -->
2526
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
2627
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.4" />
27-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.4" />
28-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
2928
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.9.0" />
30-
<PackageVersion Include="System.IO.Pipelines" Version="9.0.4" />
29+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(System9Version)" />
30+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(System9Version)" />
31+
<PackageVersion Include="System.IO.Pipelines" Version="$(System9Version)" />
3132
</ItemGroup>
3233
<!-- Product dependencies shared -->
3334
<ItemGroup>
34-
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.4.4-preview.1.25259.16" />
35+
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="$(MicrosoftExtensionsAIVersion)" />
3536
<PackageVersion Include="Microsoft.Extensions.AI" Version="$(MicrosoftExtensionsAIVersion)" />
3637
<PackageVersion Include="System.Net.ServerSentEvents" Version="$(System10Version)" />
3738
</ItemGroup>
3839
<ItemGroup>
3940
<!-- Build Infra & Packaging -->
4041
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
4142
<!-- Testing dependencies -->
42-
<PackageVersion Include="Anthropic.SDK" Version="5.0.0" />
43+
<PackageVersion Include="Anthropic.SDK" Version="5.4.1" />
4344
<PackageVersion Include="coverlet.collector" Version="6.0.4">
4445
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4546
<PrivateAssets>all</PrivateAssets>
4647
</PackageVersion>
4748
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
48-
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="$(MicrosoftExtensionsAIVersion)" />
49-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
50-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
51-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.4" />
52-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.4" />
53-
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.4" />
54-
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.4.0" />
55-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
49+
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.5.0-preview.1.25265.7" />
50+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(System9Version)" />
51+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(System9Version)" />
52+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(System9Version)" />
53+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(System9Version)" />
54+
<PackageVersion Include="Microsoft.Extensions.Options" Version="$(System9Version)" />
55+
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.5.0" />
56+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
5657
<PackageVersion Include="Moq" Version="4.20.72" />
57-
<PackageVersion Include="OpenTelemetry" Version="1.11.2" />
58-
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.11.2" />
59-
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
60-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http " Version="1.11.0" />
61-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
62-
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
58+
<PackageVersion Include="OpenTelemetry" Version="1.12.0" />
59+
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.12.0" />
60+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
61+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http " Version="1.12.0" />
62+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
63+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
6364
<PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />
64-
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
65+
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.1" />
6566
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
6667
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
67-
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
68+
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
69+
<PackageVersion Include="Serilog" Version="4.3.0" />
6870
<PackageVersion Include="System.Linq.AsyncEnumerable" Version="$(System10Version)" />
69-
<PackageVersion Include="xunit.v3" Version="2.0.1" />
70-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
71+
<PackageVersion Include="xunit.v3" Version="2.0.2" />
72+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
7173
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
7274
</ItemGroup>
7375
</Project>

‎ModelContextProtocol.sln‎

Lines changed: 0 additions & 149 deletions
This file was deleted.

‎ModelContextProtocol.slnx‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<Solution>
2+
<Folder Name="/.github/" />
3+
<Folder Name="/.github/workflows/">
4+
<File Path=".github/workflows/ci-build-test.yml" />
5+
<File Path=".github/workflows/ci-code-coverage.yml" />
6+
<File Path=".github/workflows/docs.yml" />
7+
<File Path=".github/workflows/markdown-link-check.yml" />
8+
<File Path=".github/workflows/release.md" />
9+
<File Path=".github/workflows/release.yml" />
10+
</Folder>
11+
<Folder Name="/samples/">
12+
<Project Path="samples/AspNetCoreSseServer/AspNetCoreSseServer.csproj" />
13+
<Project Path="samples/ChatWithTools/ChatWithTools.csproj" />
14+
<Project Path="samples/EverythingServer/EverythingServer.csproj" />
15+
<Project Path="samples/QuickstartClient/QuickstartClient.csproj" />
16+
<Project Path="samples/QuickstartWeatherServer/QuickstartWeatherServer.csproj" />
17+
<Project Path="samples/TestServerWithHosting/TestServerWithHosting.csproj" />
18+
</Folder>
19+
<Folder Name="/Solution Items/">
20+
<File Path="Directory.Build.props" />
21+
<File Path="Directory.Packages.props" />
22+
<File Path="global.json" />
23+
<File Path="LICENSE" />
24+
<File Path="logo.png" />
25+
<File Path="nuget.config" />
26+
<File Path="README.MD" />
27+
<File Path="version.json" />
28+
</Folder>
29+
<Folder Name="/src/">
30+
<File Path="src/Directory.Build.props" />
31+
<Project Path="src/ModelContextProtocol.AspNetCore/ModelContextProtocol.AspNetCore.csproj" />
32+
<Project Path="src/ModelContextProtocol/ModelContextProtocol.csproj" />
33+
</Folder>
34+
<Folder Name="/tests/">
35+
<Project Path="tests/ModelContextProtocol.AspNetCore.Tests/ModelContextProtocol.AspNetCore.Tests.csproj" />
36+
<Project Path="tests/ModelContextProtocol.Tests/ModelContextProtocol.Tests.csproj" />
37+
<Project Path="tests/ModelContextProtocol.TestServer/ModelContextProtocol.TestServer.csproj" />
38+
<Project Path="tests/ModelContextProtocol.TestSseServer/ModelContextProtocol.TestSseServer.csproj" />
39+
</Folder>
40+
</Solution>

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ McpServerOptions options = new()
169169
Tools = new ToolsCapability()
170170
{
171171
ListToolsHandler = (request, cancellationToken) =>
172-
Task.FromResult(new ListToolsResult()
172+
ValueTask.FromResult(new ListToolsResult()
173173
{
174174
Tools =
175175
[
@@ -202,7 +202,7 @@ McpServerOptions options = new()
202202
throw new McpException("Missing required argument 'message'");
203203
}
204204

205-
return Task.FromResult(new CallToolResponse()
205+
return ValueTask.FromResult(new CallToolResponse()
206206
{
207207
Content = [new Content() { Text = $"Echo: {message}", Type = "text" }]
208208
});

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100",
3+
"version": "9.0.204",
44
"rollForward": "minor"
55
}
6-
}
6+
}

0 commit comments

Comments
 (0)