Skip to content

Commit b993ae0

Browse files
stephentoubstephentoub
authored
Update to .NET 10.x packages (#957)
1 parent d4ee787 commit b993ae0

File tree

9 files changed

+298
-174
lines changed

9 files changed

+298
-174
lines changed

‎Directory.Packages.props‎

Lines changed: 34 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,69 @@
11
<Project>
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
<System9Version>9.0.10</System9Version>
5-
<System10Version>10.0.0-rc.2.25502.107</System10Version>
6-
<MicrosoftExtensionsAIVersion>9.10.2</MicrosoftExtensionsAIVersion>
4+
<System8Version>8.0.22</System8Version>
5+
<System9Version>9.0.11</System9Version>
6+
<System10Version>10.0.0</System10Version>
77
</PropertyGroup>
88

9-
<!-- Product dependencies netstandard -->
9+
<!-- Product dependencies shared -->
10+
<ItemGroup>
11+
<PackageVersion Include="Microsoft.Extensions.AI" Version="$(System10Version)" />
12+
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="$(System10Version)" />
13+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(System10Version)" />
14+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(System10Version)" />
15+
</ItemGroup>
16+
17+
<!-- Product dependencies < .NET 10 -->
18+
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net10.0'))">
19+
<PackageVersion Include="System.Net.ServerSentEvents" Version="$(System10Version)" />
20+
</ItemGroup>
21+
22+
<!-- Product dependencies .NET Standard -->
1023
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
11-
<PackageVersion Include="Microsoft.Bcl.Memory" Version="$(System9Version)" />
12-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
13-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
14-
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
15-
<PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
16-
<PackageVersion Include="System.Text.Json" Version="8.0.6" />
17-
<PackageVersion Include="System.Threading.Channels" Version="8.0.0" />
24+
<PackageVersion Include="Microsoft.Bcl.Memory" Version="$(System10Version)" />
25+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="$(System10Version)" />
26+
<PackageVersion Include="System.IO.Pipelines" Version="$(System10Version)" />
27+
<PackageVersion Include="System.Text.Json" Version="$(System10Version)" />
28+
<PackageVersion Include="System.Threading.Channels" Version="$(System10Version)" />
1829
</ItemGroup>
1930

20-
<!-- Product dependencies LTS -->
31+
<!-- Product dependencies .NET 8 -->
2132
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
22-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.15" />
23-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
24-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
25-
<PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
33+
<PackageVersion Include="System.IO.Pipelines" Version="$(System10Version)" />
34+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(System8Version)" />
2635
</ItemGroup>
2736

2837
<!-- Product dependencies .NET 9 -->
2938
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
30-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(System9Version)" />
3139
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
32-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(System9Version)" />
33-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(System9Version)" />
40+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(System9Version)" />
3441
</ItemGroup>
3542

3643
<!-- Product dependencies .NET 10 -->
3744
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
3845
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(System10Version)" />
3946
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
40-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(System10Version)" />
41-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(System10Version)" />
4247
</ItemGroup>
4348

44-
<!-- Product dependencies shared -->
4549
<ItemGroup>
46-
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="$(MicrosoftExtensionsAIVersion)" />
47-
<PackageVersion Include="Microsoft.Extensions.AI" Version="$(MicrosoftExtensionsAIVersion)" />
48-
<PackageVersion Include="System.Net.ServerSentEvents" Version="$(System10Version)" />
49-
</ItemGroup>
50-
51-
<ItemGroup>
52-
5350
<!-- Build Infra & Packaging -->
5451
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
5552

5653
<!-- Testing dependencies -->
57-
<PackageVersion Include="Anthropic.SDK" Version="5.6.0" />
54+
<PackageVersion Include="Anthropic.SDK" Version="5.8.0" />
5855
<PackageVersion Include="coverlet.collector" Version="6.0.4">
5956
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6057
<PrivateAssets>all</PrivateAssets>
6158
</PackageVersion>
6259
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
63-
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.10.2-preview.1.25552.1" />
64-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(System9Version)" />
65-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(System9Version)" />
66-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(System9Version)" />
67-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(System9Version)" />
68-
<PackageVersion Include="Microsoft.Extensions.Options" Version="$(System9Version)" />
69-
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.10.0" />
60+
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.0.0-preview.1.25559.3" />
61+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(System10Version)" />
62+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(System10Version)" />
63+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(System10Version)" />
64+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(System10Version)" />
65+
<PackageVersion Include="Microsoft.Extensions.Options" Version="$(System10Version)" />
66+
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="$(System10Version)" />
7067
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
7168
<PackageVersion Include="Moq" Version="4.20.72" />
7269
<PackageVersion Include="OpenTelemetry" Version="1.12.0" />

‎src/ModelContextProtocol.Core/CustomizableJsonStringEnumConverter.cs‎

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

‎src/ModelContextProtocol.Core/Diagnostics.cs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,8 @@ internal static class Diagnostics
1313
internal static Meter Meter { get; } = new("Experimental.ModelContextProtocol");
1414

1515
internal static Histogram<double> CreateDurationHistogram(string name, string description, bool longBuckets) =>
16-
Meter.CreateHistogram<double>(name, "s", description
17-
#if NET9_0_OR_GREATER
18-
, advice: longBuckets ? LongSecondsBucketBoundaries : ShortSecondsBucketBoundaries
19-
#endif
20-
);
16+
Meter.CreateHistogram<double>(name, "s", description, advice: longBuckets ? LongSecondsBucketBoundaries : ShortSecondsBucketBoundaries);
2117

22-
#if NET9_0_OR_GREATER
2318
/// <summary>
2419
/// Follows boundaries from http.server.request.duration/http.client.request.duration
2520
/// </summary>
@@ -36,7 +31,6 @@ internal static Histogram<double> CreateDurationHistogram(string name, string de
3631
{
3732
HistogramBucketBoundaries = [0.01, 0.02, 0.05, 0.1, 0.2, 0.5, 1, 2, 5, 10, 30, 60, 120, 300],
3833
};
39-
#endif
4034

4135
internal static ActivityContext ExtractActivityContext(this DistributedContextPropagator propagator, JsonRpcMessage message)
4236
{

‎src/ModelContextProtocol.Core/McpJsonUtilities.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private static JsonSerializerOptions CreateDefaultOptions()
4747
// Add a converter for user-defined enums, if reflection is enabled by default.
4848
if (JsonSerializer.IsReflectionEnabledByDefault)
4949
{
50-
options.Converters.Add(new CustomizableJsonStringEnumConverter());
50+
options.Converters.Add(new JsonStringEnumConverter());
5151
}
5252

5353
options.MakeReadOnly();

‎src/ModelContextProtocol.Core/Protocol/ContextInclusion.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace ModelContextProtocol.Protocol;
88
/// <remarks>
99
/// See the <see href="https://github.com/modelcontextprotocol/specification/blob/main/schema/">schema</see> for details.
1010
/// </remarks>
11-
[JsonConverter(typeof(CustomizableJsonStringEnumConverter<ContextInclusion>))]
11+
[JsonConverter(typeof(JsonStringEnumConverter<ContextInclusion>))]
1212
public enum ContextInclusion
1313
{
1414
/// <summary>

‎src/ModelContextProtocol.Core/Protocol/LoggingLevel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace ModelContextProtocol.Protocol;
88
/// <remarks>
99
/// These map to syslog message severities, as specified in <see href="https://datatracker.ietf.org/doc/html/rfc5424#section-6.2.1">RFC-5424</see>.
1010
/// </remarks>
11-
[JsonConverter(typeof(CustomizableJsonStringEnumConverter<LoggingLevel>))]
11+
[JsonConverter(typeof(JsonStringEnumConverter<LoggingLevel>))]
1212
public enum LoggingLevel
1313
{
1414
/// <summary>Detailed debug information, typically only valuable to developers.</summary>

‎src/ModelContextProtocol.Core/Protocol/Role.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace ModelContextProtocol.Protocol;
55
/// <summary>
66
/// Represents the type of role in the Model Context Protocol conversation.
77
/// </summary>
8-
[JsonConverter(typeof(CustomizableJsonStringEnumConverter<Role>))]
8+
[JsonConverter(typeof(JsonStringEnumConverter<Role>))]
99
public enum Role
1010
{
1111
/// <summary>

‎tests/ModelContextProtocol.Tests/Protocol/ElicitationTypedTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ public async Task Elicit_Typed_With_NonObject_Generic_Type_Throws()
309309
Assert.Contains(typeof(string).FullName!, ex.Message);
310310
}
311311

312-
[JsonConverter(typeof(CustomizableJsonStringEnumConverter<SampleRole>))]
312+
[JsonConverter(typeof(JsonStringEnumConverter<SampleRole>))]
313313

314314
public enum SampleRole
315315
{

0 commit comments

Comments
 (0)