Update to .NET 10.x packages (#957)

src/ModelContextProtocol.Core/CustomizableJsonStringEnumConverter.cs

@@ -1,125 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-#if !NET9_0_OR_GREATER
-using System.Reflection;
-#endif
-using System.Text.Json;
-using System.Text.Json.Serialization;
-#if !NET9_0_OR_GREATER
-using ModelContextProtocol;
-#endif
-
-// NOTE:
-// This is a workaround for lack of System.Text.Json's JsonStringEnumConverter<T>
-// 9.x support for JsonStringEnumMemberNameAttribute. Once all builds use the System.Text.Json 9.x
-// version, this whole file can be removed. Note that the type is public so that external source
-// generators can use it, so removing it is a potential breaking change.
-
-namespace ModelContextProtocol
-{
-    /// <summary>
-    /// A JSON converter for enums that allows customizing the serialized string value of enum members
-    /// using the <see cref="JsonStringEnumMemberNameAttribute"/>.
-    /// </summary>
-    /// <typeparam name="TEnum">The enum type to convert.</typeparam>
-    /// <remarks>
-    /// This is a temporary workaround for lack of System.Text.Json's JsonStringEnumConverter&lt;T&gt;
-    /// 9.x support for custom enum member naming. It will be replaced by the built-in functionality
-    /// once .NET 9 is fully adopted.
-    /// </remarks>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class CustomizableJsonStringEnumConverter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] TEnum> :
-        JsonStringEnumConverter<TEnum> where TEnum : struct, Enum
-    {
-#if !NET9_0_OR_GREATER
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CustomizableJsonStringEnumConverter{TEnum}"/> class.
-        /// </summary>
-        /// <remarks>
-        /// The converter automatically detects any enum members decorated with <see cref="JsonStringEnumMemberNameAttribute"/>
-        /// and uses those values during serialization and deserialization.
-        /// </remarks>
-        public CustomizableJsonStringEnumConverter() :
-            base(namingPolicy: ResolveNamingPolicy())
-        {
-        }
-
-        private static JsonNamingPolicy? ResolveNamingPolicy()
-        {
-            var map = typeof(TEnum).GetFields(BindingFlags.Public | BindingFlags.Static)
-                .Select(f => (f.Name, AttributeName: f.GetCustomAttribute<JsonStringEnumMemberNameAttribute>()?.Name))
-                .Where(pair => pair.AttributeName != null)
-                .ToDictionary(pair => pair.Name, pair => pair.AttributeName);
-
-            return map.Count > 0 ? new EnumMemberNamingPolicy(map!) : null;
-        }
-
-        private sealed class EnumMemberNamingPolicy(Dictionary<string, string> map) : JsonNamingPolicy
-        {
-            public override string ConvertName(string name) =>
-                map.TryGetValue(name, out string? newName) ?
-                    newName :
-                    name;
-        }
-#endif
-    }
-
-    /// <summary>
-    /// A JSON converter for enums that allows customizing the serialized string value of enum members
-    /// using the <see cref="JsonStringEnumMemberNameAttribute"/>.
-    /// </summary>
-    /// <remarks>
-    /// This is a temporary workaround for lack of System.Text.Json's JsonStringEnumConverter&lt;T&gt;
-    /// 9.x support for custom enum member naming. It will be replaced by the built-in functionality
-    /// once .NET 9 is fully adopted.
-    /// </remarks>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    [RequiresUnreferencedCode("Requires unreferenced code to instantiate the generic enum converter.")]
-    [RequiresDynamicCode("Requires dynamic code to instantiate the generic enum converter.")]
-    public sealed class CustomizableJsonStringEnumConverter : JsonConverterFactory
-    {
-        /// <inheritdoc/>
-        public override bool CanConvert(Type typeToConvert) => typeToConvert.IsEnum;
-        /// <inheritdoc/>
-        public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
-        {
-            Type converterType = typeof(CustomizableJsonStringEnumConverter<>).MakeGenericType(typeToConvert)!;
-            var factory = (JsonConverterFactory)Activator.CreateInstance(converterType)!;
-            return factory.CreateConverter(typeToConvert, options);
-        }
-    }
-}
-
-#if !NET9_0_OR_GREATER
-namespace System.Text.Json.Serialization
-{
-    /// <summary>
-    /// Determines the custom string value that should be used when serializing an enum member using JSON.
-    /// </summary>
-    /// <remarks>
-    /// This attribute is a temporary workaround for lack of System.Text.Json's support for custom enum member naming
-    /// in versions prior to .NET 9. It works together with <see cref="CustomizableJsonStringEnumConverter{TEnum}"/>
-    /// to provide customized string representations of enum values during JSON serialization and deserialization.
-    /// </remarks>
-    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
-    internal sealed class JsonStringEnumMemberNameAttribute : Attribute
-    {
-        /// <summary>
-        /// Creates new attribute instance with a specified enum member name.
-        /// </summary>
-        /// <param name="name">The name to apply to the current enum member when serialized to JSON.</param>
-        public JsonStringEnumMemberNameAttribute(string name)
-        {
-            Name = name;
-        }
-
-        /// <summary>
-        /// Gets the custom JSON name of the enum member.
-        /// </summary>
-        public string Name { get; }
-    }
-}
-#endif

src/ModelContextProtocol.Core/Diagnostics.cs

@@ -13,13 +13,8 @@ internal static class Diagnostics
     internal static Meter Meter { get; } = new("Experimental.ModelContextProtocol");
 
     internal static Histogram<double> CreateDurationHistogram(string name, string description, bool longBuckets) =>
-        Meter.CreateHistogram<double>(name, "s", description
-#if NET9_0_OR_GREATER
-        , advice: longBuckets ? LongSecondsBucketBoundaries : ShortSecondsBucketBoundaries
-#endif
-        );
+        Meter.CreateHistogram<double>(name, "s", description, advice: longBuckets ? LongSecondsBucketBoundaries : ShortSecondsBucketBoundaries);
 
-#if NET9_0_OR_GREATER
     /// <summary>
     /// Follows boundaries from http.server.request.duration/http.client.request.duration
     /// </summary>
@@ -36,7 +31,6 @@ internal static class Diagnostics
     {
         HistogramBucketBoundaries = [0.01, 0.02, 0.05, 0.1, 0.2, 0.5, 1, 2, 5, 10, 30, 60, 120, 300],
     };
-#endif
 
     internal static ActivityContext ExtractActivityContext(this DistributedContextPropagator propagator, JsonRpcMessage message)
     {

src/ModelContextProtocol.Core/McpJsonUtilities.cs

@@ -47,7 +47,7 @@ public static partial class McpJsonUtilities
         // Add a converter for user-defined enums, if reflection is enabled by default.
         if (JsonSerializer.IsReflectionEnabledByDefault)
         {
-            options.Converters.Add(new CustomizableJsonStringEnumConverter());
+            options.Converters.Add(new JsonStringEnumConverter());
         }
 
         options.MakeReadOnly();

src/ModelContextProtocol.Core/Protocol/ContextInclusion.cs

@@ -8,7 +8,7 @@ namespace ModelContextProtocol.Protocol;
 /// <remarks>
 /// See the <see href="https://github.com/modelcontextprotocol/specification/blob/main/schema/">schema</see> for details.
 /// </remarks>
-[JsonConverter(typeof(CustomizableJsonStringEnumConverter<ContextInclusion>))]
+[JsonConverter(typeof(JsonStringEnumConverter<ContextInclusion>))]
 public enum ContextInclusion
 {
     /// <summary>

src/ModelContextProtocol.Core/Protocol/LoggingLevel.cs

@@ -8,7 +8,7 @@ namespace ModelContextProtocol.Protocol;
 /// <remarks>
 /// 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>.
 /// </remarks>
-[JsonConverter(typeof(CustomizableJsonStringEnumConverter<LoggingLevel>))]
+[JsonConverter(typeof(JsonStringEnumConverter<LoggingLevel>))]
 public enum LoggingLevel
 {
     /// <summary>Detailed debug information, typically only valuable to developers.</summary>

src/ModelContextProtocol.Core/Protocol/Role.cs

@@ -5,7 +5,7 @@ namespace ModelContextProtocol.Protocol;
 /// <summary>
 /// Represents the type of role in the Model Context Protocol conversation.
 /// </summary>
-[JsonConverter(typeof(CustomizableJsonStringEnumConverter<Role>))]
+[JsonConverter(typeof(JsonStringEnumConverter<Role>))]
 public enum Role
 {
     /// <summary>