Skip to content

Commit ac970a6

Browse files
halter73halter73
committed
Merge remote-tracking branch 'origin/main' into stop-conflating-ids
2 parents 289c9f2 + 703b0fe commit ac970a6

180 files changed

Lines changed: 265 additions & 119 deletions

File tree

Some content is hidden

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

‎Directory.Packages.props‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,34 @@
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" />
14+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
1315
<PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
1416
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
1517
<PackageVersion Include="System.Threading.Channels" Version="8.0.0" />
1618
</ItemGroup>
1719

1820
<!-- Product dependencies LTS -->
1921
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
20-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
22+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
2123
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
2224
<PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
2325
</ItemGroup>
2426

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

3234
<!-- Product dependencies shared -->
@@ -42,36 +44,36 @@
4244
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
4345

4446
<!-- Testing dependencies -->
45-
<PackageVersion Include="Anthropic.SDK" Version="5.2.3" />
47+
<PackageVersion Include="Anthropic.SDK" Version="5.4.1" />
4648
<PackageVersion Include="coverlet.collector" Version="6.0.4">
4749
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4850
<PrivateAssets>all</PrivateAssets>
4951
</PackageVersion>
5052
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
5153
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.5.0-preview.1.25265.7" />
52-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
53-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
54-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.4" />
55-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.4" />
56-
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.4" />
57-
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.4.0" />
58-
<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" />
5961
<PackageVersion Include="Moq" Version="4.20.72" />
60-
<PackageVersion Include="OpenTelemetry" Version="1.11.2" />
61-
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.11.2" />
62-
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
63-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http " Version="1.11.0" />
64-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
65-
<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" />
6668
<PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />
67-
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
69+
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.1" />
6870
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
6971
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
70-
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
72+
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
7173
<PackageVersion Include="Serilog" Version="4.3.0" />
7274
<PackageVersion Include="System.Linq.AsyncEnumerable" Version="$(System10Version)" />
73-
<PackageVersion Include="xunit.v3" Version="2.0.1" />
74-
<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" />
7577
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
7678
</ItemGroup>
7779
</Project>

‎ModelContextProtocol.slnx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<Folder Name="/src/">
3030
<File Path="src/Directory.Build.props" />
3131
<Project Path="src/ModelContextProtocol.AspNetCore/ModelContextProtocol.AspNetCore.csproj" />
32+
<Project Path="src/ModelContextProtocol.Core/ModelContextProtocol.Core.csproj" />
3233
<Project Path="src/ModelContextProtocol/ModelContextProtocol.csproj" />
3334
</Folder>
3435
<Folder Name="/tests/">

‎README.md‎

Lines changed: 10 additions & 0 deletions

‎samples/AspNetCoreSseServer/AspNetCoreSseServer.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<ProjectReference Include="..\..\src\ModelContextProtocol\ModelContextProtocol.csproj" />
1211
<ProjectReference Include="..\..\src\ModelContextProtocol.AspNetCore\ModelContextProtocol.AspNetCore.csproj" />
1312
</ItemGroup>
1413

‎samples/ChatWithTools/ChatWithTools.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<ProjectReference Include="..\..\src\ModelContextProtocol\ModelContextProtocol.csproj" />
23+
<ProjectReference Include="..\..\src\ModelContextProtocol.Core\ModelContextProtocol.Core.csproj" />
2424
</ItemGroup>
2525

2626
</Project>

‎samples/QuickstartClient/QuickstartClient.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<ProjectReference Include="..\..\src\ModelContextProtocol\ModelContextProtocol.csproj" />
16+
<ProjectReference Include="..\..\src\ModelContextProtocol.Core\ModelContextProtocol.Core.csproj" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

‎src/ModelContextProtocol.AspNetCore/HttpMcpServerBuilderExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Microsoft.Extensions.DependencyInjection.Extensions;
1+
using Microsoft.Extensions.DependencyInjection.Extensions;
22
using ModelContextProtocol.AspNetCore;
33
using ModelContextProtocol.Server;
44

‎src/ModelContextProtocol.AspNetCore/ModelContextProtocol.AspNetCore.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<ItemGroup>
2020
<None Include="README.md" pack="true" PackagePath="\" />
2121
</ItemGroup>
22+
2223
<ItemGroup>
2324
<ProjectReference Include="..\ModelContextProtocol\ModelContextProtocol.csproj" />
2425
</ItemGroup>

src/ModelContextProtocol/AIContentExtensions.cs renamed to src/ModelContextProtocol.Core/AIContentExtensions.cs

File renamed without changes.

src/ModelContextProtocol/Client/AutoDetectingClientSessionTransport.cs renamed to src/ModelContextProtocol.Core/Client/AutoDetectingClientSessionTransport.cs

File renamed without changes.

0 commit comments

Comments
 (0)