Remove obsolete APIs from codebase

src/ModelContextProtocol.Core/Protocol/ElicitRequestParams.cs

@@ -23,8 +23,7 @@ public sealed class ElicitRequestParams
     /// <remarks>
     /// May be one of <see cref="StringSchema"/>, <see cref="NumberSchema"/>, <see cref="BooleanSchema"/>,
     /// <see cref="UntitledSingleSelectEnumSchema"/>, <see cref="TitledSingleSelectEnumSchema"/>,
-    /// <see cref="UntitledMultiSelectEnumSchema"/>, <see cref="TitledMultiSelectEnumSchema"/>,
-    /// or <see cref="LegacyTitledEnumSchema"/> (deprecated).
+    /// <see cref="UntitledMultiSelectEnumSchema"/>, or <see cref="TitledMultiSelectEnumSchema"/>.
     /// </remarks>
     [JsonPropertyName("requestedSchema")]
     [field: MaybeNull]
@@ -64,8 +63,7 @@ public IDictionary<string, PrimitiveSchemaDefinition> Properties
     /// Represents restricted subset of JSON Schema: 
     /// <see cref="StringSchema"/>, <see cref="NumberSchema"/>, <see cref="BooleanSchema"/>,
     /// <see cref="UntitledSingleSelectEnumSchema"/>, <see cref="TitledSingleSelectEnumSchema"/>,
-    /// <see cref="UntitledMultiSelectEnumSchema"/>, <see cref="TitledMultiSelectEnumSchema"/>,
-    /// or <see cref="LegacyTitledEnumSchema"/> (deprecated).
+    /// <see cref="UntitledMultiSelectEnumSchema"/>, or <see cref="TitledMultiSelectEnumSchema"/>.
     /// </summary>
     [JsonConverter(typeof(Converter))]
     public abstract class PrimitiveSchemaDefinition
@@ -121,7 +119,6 @@ public class Converter : JsonConverter<PrimitiveSchemaDefinition>
                 string? defaultString = null;
                 IList<string>? defaultStringArray = null;
                 IList<string>? enumValues = null;
-                IList<string>? enumNames = null;
                 IList<EnumSchemaOption>? oneOf = null;
                 int? minItems = null;
                 int? maxItems = null;
@@ -207,10 +204,6 @@ public class Converter : JsonConverter<PrimitiveSchemaDefinition>
                             enumValues = JsonSerializer.Deserialize(ref reader, McpJsonUtilities.JsonContext.Default.IListString);
                             break;
 
-                        case "enumNames":
-                            enumNames = JsonSerializer.Deserialize(ref reader, McpJsonUtilities.JsonContext.Default.IListString);
-                            break;
-
                         case "oneOf":
                             oneOf = DeserializeEnumOptions(ref reader);
                             break;
@@ -245,27 +238,12 @@ public class Converter : JsonConverter<PrimitiveSchemaDefinition>
                         }
                         else if (enumValues is not null)
                         {
-                            if (enumNames is not null)
-                            {
-                                // EnumSchema for backward compatibility
-#pragma warning disable CS0618 // Type or member is obsolete
-                                psd = new EnumSchema
-#pragma warning restore CS0618 // Type or member is obsolete
-                                {
-                                    Enum = enumValues,
-                                    EnumNames = enumNames,
-                                    Default = defaultString,
-                                };
-                            }
-                            else
+                            // UntitledSingleSelectEnumSchema
+                            psd = new UntitledSingleSelectEnumSchema
                             {
-                                // UntitledSingleSelectEnumSchema
-                                psd = new UntitledSingleSelectEnumSchema
-                                {
-                                    Enum = enumValues,
-                                    Default = defaultString,
-                                };
-                            }
+                                Enum = enumValues,
+                                Default = defaultString,
+                            };
                         }
                         else
                         {
@@ -558,25 +536,6 @@ public override void Write(Utf8JsonWriter writer, PrimitiveSchemaDefinition valu
                         }
                         break;
 
-#pragma warning disable CS0618 // Type or member is obsolete
-                    case LegacyTitledEnumSchema legacyEnum:
-#pragma warning restore CS0618 // Type or member is obsolete
-                        if (legacyEnum.Enum is not null)
-                        {
-                            writer.WritePropertyName("enum");
-                            JsonSerializer.Serialize(writer, legacyEnum.Enum, McpJsonUtilities.JsonContext.Default.IListString);
-                        }
-                        if (legacyEnum.EnumNames is not null)
-                        {
-                            writer.WritePropertyName("enumNames");
-                            JsonSerializer.Serialize(writer, legacyEnum.EnumNames, McpJsonUtilities.JsonContext.Default.IListString);
-                        }
-                        if (legacyEnum.Default is not null)
-                        {
-                            writer.WriteString("default", legacyEnum.Default);
-                        }
-                        break;
-
                     default:
                         throw new JsonException($"Unexpected schema type: {value.GetType().Name}");
                 }
@@ -740,49 +699,6 @@ public override string Type
         public bool? Default { get; set; }
     }
 
-    /// <summary>
-    /// Represents a legacy schema for an enum type with enumNames.
-    /// This schema is deprecated in favor of <see cref="TitledSingleSelectEnumSchema"/>.
-    /// </summary>
-    [Obsolete("Use TitledSingleSelectEnumSchema instead. This type will be removed in a future version.")]
-    public class LegacyTitledEnumSchema : PrimitiveSchemaDefinition
-    {
-        /// <inheritdoc/>
-        [JsonPropertyName("type")]
-        public override string Type
-        {
-            get => "string";
-            set
-            {
-                if (value is not "string")
-                {
-                    throw new ArgumentException("Type must be 'string'.", nameof(value));
-                }
-            }
-        }
-
-        /// <summary>Gets or sets the list of allowed string values for the enum.</summary>
-        [JsonPropertyName("enum")]
-        [field: MaybeNull]
-        public IList<string> Enum
-        {
-            get => field ??= [];
-            set
-            {
-                Throw.IfNull(value);
-                field = value;
-            }
-        }
-
-        /// <summary>Gets or sets optional display names corresponding to the enum values.</summary>
-        [JsonPropertyName("enumNames")]
-        public IList<string>? EnumNames { get; set; }
-
-        /// <summary>Gets or sets the default value for the enum.</summary>
-        [JsonPropertyName("default")]
-        public string? Default { get; set; }
-    }
-
     /// <summary>
     /// Represents a schema for single-selection enumeration without display titles for options.
     /// </summary>
@@ -967,11 +883,4 @@ public override string Type
         public IList<string>? Default { get; set; }
     }
 
-    /// <summary>
-    /// Represents a schema for an enum type. This is a compatibility alias for <see cref="LegacyTitledEnumSchema"/>.
-    /// </summary>
-    [Obsolete("Use UntitledSingleSelectEnumSchema or TitledSingleSelectEnumSchema instead. This type will be removed in a future version.")]
-    public sealed class EnumSchema : LegacyTitledEnumSchema
-    {
-    }
 }

tests/ModelContextProtocol.Tests/Protocol/ElicitationDefaultValuesTests.cs

@@ -1,8 +1,6 @@
 using ModelContextProtocol.Protocol;
 using System.Text.Json;
 
-#pragma warning disable CS0618 // Type or member is obsolete
-
 namespace ModelContextProtocol.Tests.Protocol;
 
 public class ElicitationDefaultValuesTests
@@ -112,49 +110,6 @@ public void NumberSchema_Default_Null_DoesNotSerialize()
         Assert.DoesNotContain("\"default\"", json);
     }
 
-    [Fact]
-    public void EnumSchema_Default_Serializes_Correctly()
-    {
-        // Arrange
-        var schema = new ElicitRequestParams.EnumSchema
-        {
-            Title = "Priority",
-            Description = "Task priority",
-            Enum = ["low", "medium", "high"],
-            EnumNames = ["Low Priority", "Medium Priority", "High Priority"],
-            Default = "medium"
-        };
-
-        // Act - serialize as base type to use the converter
-        string json = JsonSerializer.Serialize<ElicitRequestParams.PrimitiveSchemaDefinition>(schema, McpJsonUtilities.DefaultOptions);
-        var deserialized = JsonSerializer.Deserialize<ElicitRequestParams.PrimitiveSchemaDefinition>(json, McpJsonUtilities.DefaultOptions);
-
-        // Assert
-        Assert.NotNull(deserialized);
-        var enumSchema = Assert.IsType<ElicitRequestParams.EnumSchema>(deserialized);
-        Assert.Equal("medium", enumSchema.Default);
-        Assert.Equal("Priority", enumSchema.Title);
-        Assert.Equal("Task priority", enumSchema.Description);
-        Assert.Contains("\"default\":\"medium\"", json);
-    }
-
-    [Fact]
-    public void EnumSchema_Default_Null_DoesNotSerialize()
-    {
-        // Arrange
-        var schema = new ElicitRequestParams.EnumSchema
-        {
-            Title = "Priority",
-            Enum = ["low", "medium", "high"]
-        };
-
-        // Act - serialize as base type to use the converter
-        string json = JsonSerializer.Serialize<ElicitRequestParams.PrimitiveSchemaDefinition>(schema, McpJsonUtilities.DefaultOptions);
-
-        // Assert
-        Assert.DoesNotContain("\"default\"", json);
-    }
-
     [Fact]
     public void BooleanSchema_Default_True_Serializes_Correctly()
     {
@@ -244,29 +199,6 @@ public void PrimitiveSchemaDefinition_NumberSchema_WithDefault_RoundTrips()
         Assert.Equal(100, numberSchema.Maximum);
     }
 
-    [Fact]
-    public void PrimitiveSchemaDefinition_EnumSchema_WithDefault_RoundTrips()
-    {
-        // Arrange
-        var schema = new ElicitRequestParams.EnumSchema
-        {
-            Title = "Status",
-            Enum = ["draft", "published", "archived"],
-            Default = "draft"
-        };
-
-        // Act - serialize as base type to test the converter
-        string json = JsonSerializer.Serialize<ElicitRequestParams.PrimitiveSchemaDefinition>(schema, McpJsonUtilities.DefaultOptions);
-        var deserialized = JsonSerializer.Deserialize<ElicitRequestParams.PrimitiveSchemaDefinition>(json, McpJsonUtilities.DefaultOptions);
-
-        // Assert
-        Assert.NotNull(deserialized);
-        // EnumSchema without enumNames deserializes as UntitledSingleSelectEnumSchema
-        var enumSchema = Assert.IsType<ElicitRequestParams.UntitledSingleSelectEnumSchema>(deserialized);
-        Assert.Equal("draft", enumSchema.Default);
-        Assert.Equal(["draft", "published", "archived"], enumSchema.Enum);
-    }
-
     [Fact]
     public void RequestSchema_WithAllDefaultTypes_Serializes_Correctly()
     {
@@ -299,7 +231,7 @@ public void RequestSchema_WithAllDefaultTypes_Serializes_Correctly()
                         Title = "Active",
                         Default = true
                     },
-                    ["status"] = new ElicitRequestParams.EnumSchema
+                    ["status"] = new ElicitRequestParams.UntitledSingleSelectEnumSchema
                     {
                         Title = "Status",
                         Enum = ["active", "inactive"],

tests/ModelContextProtocol.Tests/Protocol/ElicitationTests.cs

@@ -1,10 +1,8 @@
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using ModelContextProtocol.Client;
 using ModelContextProtocol.Protocol;
 using System.Text.Json;
 
-#pragma warning disable CS0618 // Type or member is obsolete
-
 namespace ModelContextProtocol.Tests.Configuration;
 
 public partial class ElicitationTests : ClientServerTestBase
@@ -46,10 +44,14 @@ protected override void ConfigureServices(ServiceCollection services, IMcpServer
                                 Description = "description4",
                                 Default = true,
                             },
-                            ["prop4"] = new ElicitRequestParams.EnumSchema
+                            ["prop4"] = new ElicitRequestParams.TitledSingleSelectEnumSchema
                             {
-                                Enum = ["option1", "option2", "option3"],
-                                EnumNames = ["Name1", "Name2", "Name3"],
+                                OneOf =
+                                [
+                                    new ElicitRequestParams.EnumSchemaOption { Const = "option1", Title = "Name1" },
+                                    new ElicitRequestParams.EnumSchemaOption { Const = "option2", Title = "Name2" },
+                                    new ElicitRequestParams.EnumSchemaOption { Const = "option3", Title = "Name3" }
+                                ],
                             },
                         },
                     },
@@ -104,9 +106,14 @@ public async Task Can_Elicit_Information()
                                 break;
 
                             case "prop4":
-                                var primitiveEnum = Assert.IsType<ElicitRequestParams.EnumSchema>(entry.Value);
-                                Assert.Equal(["option1", "option2", "option3"], primitiveEnum.Enum);
-                                Assert.Equal(["Name1", "Name2", "Name3"], primitiveEnum.EnumNames);
+                                var primitiveEnum = Assert.IsType<ElicitRequestParams.TitledSingleSelectEnumSchema>(entry.Value);
+                                Assert.Equal(3, primitiveEnum.OneOf.Count);
+                                Assert.Equal("option1", primitiveEnum.OneOf[0].Const);
+                                Assert.Equal("Name1", primitiveEnum.OneOf[0].Title);
+                                Assert.Equal("option2", primitiveEnum.OneOf[1].Const);
+                                Assert.Equal("Name2", primitiveEnum.OneOf[1].Title);
+                                Assert.Equal("option3", primitiveEnum.OneOf[2].Const);
+                                Assert.Equal("Name3", primitiveEnum.OneOf[2].Title);
                                 break;
 
                             default:

tests/ModelContextProtocol.Tests/Protocol/ElicitationTypedTests.cs

@@ -4,8 +4,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#pragma warning disable CS0618 // Type or member is obsolete
-
 namespace ModelContextProtocol.Tests.Configuration;
 
 public partial class ElicitationTypedTests : ClientServerTestBase