Skip to content

Commit c8d2c5d

Browse files
halter73halter73
committed
Merge remote-tracking branch 'origin/main' into move-deps
# Conflicts: # ModelContextProtocol.sln # src/ModelContextProtocol.Core/Protocol/ElicitRequestParams.cs # src/ModelContextProtocol.Core/Protocol/ElicitResult.cs # src/ModelContextProtocol.Core/Protocol/ElicitationCapability.cs
2 parents 2b66813 + 5745824 commit c8d2c5d

29 files changed

Lines changed: 562 additions & 205 deletions

‎Directory.Packages.props‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<Project>
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
<System10Version>10.0.0-preview.3.25171.5</System10Version>
4+
<System9Version>9.0.5</System9Version>
5+
<System10Version>10.0.0-preview.4.25258.110</System10Version>
56
<MicrosoftExtensionsAIVersion>9.5.0</MicrosoftExtensionsAIVersion>
67
</PropertyGroup>
78

89
<!-- Product dependencies netstandard -->
910
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
10-
<PackageVersion Include="Microsoft.Bcl.Memory" Version="9.0.4" />
11-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
11+
<PackageVersion Include="Microsoft.Bcl.Memory" Version="$(System9Version)" />
12+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
1213
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
1314
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
1415
<PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
@@ -18,16 +19,16 @@
1819

1920
<!-- Product dependencies LTS -->
2021
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
21-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
22+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
2223
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
2324
<PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
2425
</ItemGroup>
2526

2627
<!-- Product dependencies .NET 9 -->
2728
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
28-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.4" />
29-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
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

3334
<!-- Product dependencies shared -->
@@ -43,36 +44,36 @@
4344
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
4445

4546
<!-- Testing dependencies -->
46-
<PackageVersion Include="Anthropic.SDK" Version="5.2.3" />
47+
<PackageVersion Include="Anthropic.SDK" Version="5.4.1" />
4748
<PackageVersion Include="coverlet.collector" Version="6.0.4">
4849
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4950
<PrivateAssets>all</PrivateAssets>
5051
</PackageVersion>
5152
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
5253
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.5.0-preview.1.25265.7" />
53-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
54-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
55-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.4" />
56-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.4" />
57-
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.4" />
58-
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.4.0" />
59-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
54+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(System9Version)" />
55+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(System9Version)" />
56+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(System9Version)" />
57+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(System9Version)" />
58+
<PackageVersion Include="Microsoft.Extensions.Options" Version="$(System9Version)" />
59+
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.5.0" />
60+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
6061
<PackageVersion Include="Moq" Version="4.20.72" />
61-
<PackageVersion Include="OpenTelemetry" Version="1.11.2" />
62-
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.11.2" />
63-
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
64-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http " Version="1.11.0" />
65-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
66-
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
62+
<PackageVersion Include="OpenTelemetry" Version="1.12.0" />
63+
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.12.0" />
64+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
65+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http " Version="1.12.0" />
66+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
67+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
6768
<PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />
68-
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
69+
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.1" />
6970
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
7071
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
71-
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
72+
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
7273
<PackageVersion Include="Serilog" Version="4.3.0" />
7374
<PackageVersion Include="System.Linq.AsyncEnumerable" Version="$(System10Version)" />
74-
<PackageVersion Include="xunit.v3" Version="2.0.1" />
75-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
75+
<PackageVersion Include="xunit.v3" Version="2.0.2" />
76+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
7677
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
7778
</ItemGroup>
7879
</Project>

‎ModelContextProtocol.sln‎

Lines changed: 0 additions & 142 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>

‎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+
}

‎samples/EverythingServer/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
{
4747
subscriptions.Add(uri);
4848

49-
await ctx.Server.RequestSamplingAsync([
49+
await ctx.Server.SampleAsync([
5050
new ChatMessage(ChatRole.System, "You are a helpful test server"),
5151
new ChatMessage(ChatRole.User, $"Resource {uri}, context: A new subscription was started"),
5252
],

‎samples/EverythingServer/Tools/SampleLlmTool.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static async Task<string> SampleLLM(
1515
CancellationToken cancellationToken)
1616
{
1717
var samplingParams = CreateRequestSamplingParams(prompt ?? string.Empty, "sampleLLM", maxTokens);
18-
var sampleResult = await server.RequestSamplingAsync(samplingParams, cancellationToken);
18+
var sampleResult = await server.SampleAsync(samplingParams, cancellationToken);
1919

2020
return $"LLM sampling result: {sampleResult.Content.Text}";
2121
}

‎samples/TestServerWithHosting/Tools/SampleLlmTool.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static async Task<string> SampleLLM(
1818
CancellationToken cancellationToken)
1919
{
2020
var samplingParams = CreateRequestSamplingParams(prompt ?? string.Empty, "sampleLLM", maxTokens);
21-
var sampleResult = await thisServer.RequestSamplingAsync(samplingParams, cancellationToken);
21+
var sampleResult = await thisServer.SampleAsync(samplingParams, cancellationToken);
2222

2323
return $"LLM sampling result: {sampleResult.Content.Text}";
2424
}

0 commit comments

Comments
 (0)