Revert "Merge main branch and resolve conflicts (PR #976 integration)"

This reverts commit 4443cfc.

Author: MackinnonBuck

.github/dependabot.yml

@@ -17,6 +17,7 @@ updates:
         patterns:
           - "xunit.*"
           - "Microsoft.NET.Test.Sdk"
+          - "Microsoft.Testing.*"
           - "coverlet.*"
           - "GitHubActionsTestLogger"
           - "Moq"

Directory.Build.props

@@ -29,8 +29,9 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VSTestLogger Condition="'$(VSTestLogger)' == ''">trx%3bLogFileName=$(MSBuildProjectName).$(TargetFramework).$(OS).trx</VSTestLogger>
-    <VSTestResultsDirectory Condition="'$(VSTestResultsDirectory)' == ''">$(ArtifactsTestResultsDir)</VSTestResultsDirectory>
+    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
+    <_MTPResultsDirectory>$(ArtifactsTestResultsDir)</_MTPResultsDirectory>
+    <TestingPlatformCommandLineArguments>$(TestingPlatformCommandLineArguments) --results-directory $(_MTPResultsDirectory) --report-trx --report-trx-filename $(MSBuildProjectName).$(TargetFramework).$(OS).trx</TestingPlatformCommandLineArguments>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

Directory.Packages.props

@@ -4,6 +4,7 @@
     <System8Version>8.0.22</System8Version>
     <System9Version>9.0.11</System9Version>
     <System10Version>10.0.0</System10Version>
+    <MicrosoftTestingPlatformVersion>2.0.2</MicrosoftTestingPlatformVersion>
   </PropertyGroup>
 
   <!-- Product dependencies shared -->
@@ -46,33 +47,23 @@
     <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
   </ItemGroup>
 
-  <!-- Source Generator & Analyzer dependencies -->
-  <ItemGroup>
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
-  </ItemGroup>
-
-  <!-- Build Infra & Packaging dependencies-->
   <ItemGroup>
+    <!-- Build Infra & Packaging -->
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-  </ItemGroup>
 
-  <!-- Testing dependencies -->
-  <ItemGroup>
+    <!-- Testing dependencies -->
     <PackageVersion Include="Anthropic.SDK" Version="5.8.0" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.4">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageVersion>
-    <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="$(MicrosoftTestingPlatformVersion)" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="$(MicrosoftTestingPlatformVersion)" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingPlatformVersion)" />
     <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.0.0-preview.1.25559.3" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(System10Version)" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(System10Version)" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(System10Version)" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(System10Version)" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="$(System10Version)" />
     <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="$(System10Version)" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="OpenTelemetry" Version="1.14.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.14.0" />
@@ -81,14 +72,13 @@
     <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
     <PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />
-    <PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.2" />
-    <PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
+    <PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.1" />
+    <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
     <PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
     <PackageVersion Include="Serilog" Version="4.3.0" />
     <PackageVersion Include="System.Linq.AsyncEnumerable" Version="$(System10Version)" />
-    <PackageVersion Include="xunit.v3" Version="3.2.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
+    <PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.0" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="JsonSchema.Net" Version="7.4.0" />
   </ItemGroup>

Makefile

@@ -18,18 +18,15 @@ build: restore
 test: build
 	dotnet test \
 		--no-build \
+		--no-progress \
 		--configuration $(CONFIGURATION) \
-		--filter '(Execution!=Manual)' \
-		--blame \
-		--blame-crash \
-		--blame-hang-timeout 7m \
-		--diag "$(ARTIFACT_PATH)/diag.txt" \
-		--logger "trx" \
-		--logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true" \
-		--collect "XPlat Code Coverage" \
-		--results-directory $(ARTIFACT_PATH)/testresults \
-		-- \
-		RunConfiguration.CollectSourceInformation=true
+		--filter-not-trait 'Execution=Manual' \
+		--crashdump \
+		--hangdump \
+		--hangdump-timeout 7m \
+		--coverage \
+		--coverage-output-format cobertura \
+		-p:_MTPResultsDirectory=$(ARTIFACT_PATH)/testresults \
 
 pack: restore
 	dotnet pack --no-restore --configuration $(CONFIGURATION)

ModelContextProtocol.slnx

@@ -62,13 +62,11 @@
   </Folder>
   <Folder Name="/src/">
     <File Path="src/Directory.Build.props" />
-    <Project Path="src/ModelContextProtocol.Analyzers/ModelContextProtocol.Analyzers.csproj" />
     <Project Path="src/ModelContextProtocol.AspNetCore/ModelContextProtocol.AspNetCore.csproj" />
     <Project Path="src/ModelContextProtocol.Core/ModelContextProtocol.Core.csproj" />
     <Project Path="src/ModelContextProtocol/ModelContextProtocol.csproj" />
   </Folder>
   <Folder Name="/tests/">
-    <Project Path="tests/ModelContextProtocol.Analyzers.Tests/ModelContextProtocol.Analyzers.Tests.csproj" />
     <Project Path="tests/ModelContextProtocol.AspNetCore.Tests/ModelContextProtocol.AspNetCore.Tests.csproj" />
     <Project Path="tests/ModelContextProtocol.TestOAuthServer/ModelContextProtocol.TestOAuthServer.csproj" />
     <Project Path="tests/ModelContextProtocol.Tests/ModelContextProtocol.Tests.csproj" />

README.md

@@ -41,9 +41,6 @@ To get started writing a client, the `McpClient.CreateAsync` method is used to i
 to a server. Once you have an `McpClient`, you can interact with it, such as to enumerate all available tools and invoke tools.
 
 ```csharp
-using ModelContextProtocol.Client;
-using ModelContextProtocol.Protocol;
-
 var clientTransport = new StdioClientTransport(new StdioClientTransportOptions
 {
     Name = "Everything",
@@ -66,7 +63,7 @@ var result = await client.CallToolAsync(
     cancellationToken:CancellationToken.None);
 
 // echo always returns one and only one text content object
-Console.WriteLine(result.Content.OfType<TextContentBlock>().First().Text);
+Console.WriteLine(result.Content.First(c => c.Type == "text").Text);
 ```
 
 You can find samples demonstrating how to use ModelContextProtocol with an LLM SDK in the [samples](samples) directory, and also refer to the [tests](tests/ModelContextProtocol.Tests) project for more examples. Additional examples and documentation will be added as in the near future.
@@ -228,11 +225,6 @@ await using McpServer server = McpServer.Create(new StdioServerTransport("MyServ
 await server.RunAsync();
 ```
 
-Descriptions can be added to tools, prompts, and resources in a variety of ways, including via the `[Description]` attribute from `System.ComponentModel`.
-This attribute may be placed on a method to provide for the tool, prompt, or resource, or on individual parameters to describe each's purpose.
-XML comments may also be used; if an `[McpServerTool]`, `[McpServerPrompt]`, or `[McpServerResource]`-attributed method is marked as `partial`,
-XML comments placed on the method will be used automatically to generate `[Description]` attributes for the method and its parameters.
-
 ## Acknowledgements
 
 The starting point for this library was a project called [mcpdotnet](https://github.com/PederHP/mcpdotnet), initiated by [Peder Holdgaard Pedersen](https://github.com/PederHP). We are grateful for the work done by Peder and other contributors to that repository, which created a solid foundation for this library.

docs/concepts/elicitation/elicitation.md

@@ -16,16 +16,9 @@ The C# SDK registers an instance of <xref:ModelContextProtocol.Server.McpServer>
 so tools can simply add a parameter of type <xref:ModelContextProtocol.Server.McpServer> to their method signature to access it.
 
 The MCP Server must specify the schema of each input value it is requesting from the user.
-Primitive types (string, number, boolean) and enum types are supported for elicitation requests.
+Only primitive types (string, number, boolean) are supported for elicitation requests.
 The schema may include a description to help the user understand what is being requested.
 
-For enum types, the SDK supports several schema formats:
-- **UntitledSingleSelectEnumSchema**: A single-select enum where the enum values serve as both the value and display text
-- **TitledSingleSelectEnumSchema**: A single-select enum with separate display titles for each option (using JSON Schema `oneOf` with `const` and `title`)
-- **UntitledMultiSelectEnumSchema**: A multi-select enum allowing multiple values to be selected
-- **TitledMultiSelectEnumSchema**: A multi-select enum with display titles for each option
-- **LegacyTitledEnumSchema** (deprecated): The legacy enum schema using `enumNames` for backward compatibility
-
 The server can request a single input or multiple inputs at once.
 To help distinguish multiple inputs, each input has a unique name.
 

docs/concepts/elicitation/samples/server/Tools/InteractiveTools.cs

@@ -123,152 +123,4 @@ CancellationToken token
             }
         }
     }
-
-    // <snippet_EnumExamples>
-    [McpServerTool, Description("Example tool demonstrating various enum schema types")]
-    public async Task<string> EnumExamples(
-        McpServer server,
-        CancellationToken token
-    )
-    {
-        // Example 1: UntitledSingleSelectEnumSchema - Simple enum without display titles
-        var prioritySchema = new RequestSchema
-        {
-            Properties =
-            {
-                ["Priority"] = new UntitledSingleSelectEnumSchema
-                {
-                    Title = "Priority Level",
-                    Description = "Select the priority level",
-                    Enum = ["low", "medium", "high", "critical"],
-                    Default = "medium"
-                }
-            }
-        };
-
-        var priorityResponse = await server.ElicitAsync(new ElicitRequestParams
-        {
-            Message = "Select a priority level:",
-            RequestedSchema = prioritySchema
-        }, token);
-
-        if (priorityResponse.Action != "accept")
-        {
-            return "Operation cancelled";
-        }
-
-        string? priority = priorityResponse.Content?["Priority"].GetString();
-
-        // Example 2: TitledSingleSelectEnumSchema - Enum with custom display titles
-        var severitySchema = new RequestSchema
-        {
-            Properties =
-            {
-                ["Severity"] = new TitledSingleSelectEnumSchema
-                {
-                    Title = "Issue Severity",
-                    Description = "Select the issue severity level",
-                    OneOf =
-                    [
-                        new EnumSchemaOption { Const = "p0", Title = "P0 - Critical (Immediate attention required)" },
-                        new EnumSchemaOption { Const = "p1", Title = "P1 - High (Urgent, within 24 hours)" },
-                        new EnumSchemaOption { Const = "p2", Title = "P2 - Medium (Within a week)" },
-                        new EnumSchemaOption { Const = "p3", Title = "P3 - Low (As time permits)" }
-                    ],
-                    Default = "p2"
-                }
-            }
-        };
-
-        var severityResponse = await server.ElicitAsync(new ElicitRequestParams
-        {
-            Message = "Select the issue severity:",
-            RequestedSchema = severitySchema
-        }, token);
-
-        if (severityResponse.Action != "accept")
-        {
-            return "Operation cancelled";
-        }
-
-        string? severity = severityResponse.Content?["Severity"].GetString();
-
-        // Example 3: UntitledMultiSelectEnumSchema - Select multiple values
-        var tagsSchema = new RequestSchema
-        {
-            Properties =
-            {
-                ["Tags"] = new UntitledMultiSelectEnumSchema
-                {
-                    Title = "Tags",
-                    Description = "Select one or more tags",
-                    MinItems = 1,
-                    MaxItems = 3,
-                    Items = new UntitledEnumItemsSchema
-                    {
-                        Type = "string",
-                        Enum = ["bug", "feature", "documentation", "enhancement", "question"]
-                    },
-                    Default = ["bug"]
-                }
-            }
-        };
-
-        var tagsResponse = await server.ElicitAsync(new ElicitRequestParams
-        {
-            Message = "Select up to 3 tags:",
-            RequestedSchema = tagsSchema
-        }, token);
-
-        if (tagsResponse.Action != "accept")
-        {
-            return "Operation cancelled";
-        }
-
-        // For multi-select, the value is an array
-        var tags = tagsResponse.Content?["Tags"].EnumerateArray()
-            .Select(e => e.GetString())
-            .ToArray();
-
-        // Example 4: TitledMultiSelectEnumSchema - Multi-select with custom titles
-        var featuresSchema = new RequestSchema
-        {
-            Properties =
-            {
-                ["Features"] = new TitledMultiSelectEnumSchema
-                {
-                    Title = "Features",
-                    Description = "Select desired features",
-                    Items = new TitledEnumItemsSchema
-                    {
-                        AnyOf =
-                        [
-                            new EnumSchemaOption { Const = "auth", Title = "Authentication & Authorization" },
-                            new EnumSchemaOption { Const = "api", Title = "RESTful API" },
-                            new EnumSchemaOption { Const = "ui", Title = "Modern UI Components" },
-                            new EnumSchemaOption { Const = "db", Title = "Database Integration" }
-                        ]
-                    }
-                }
-            }
-        };
-
-        var featuresResponse = await server.ElicitAsync(new ElicitRequestParams
-        {
-            Message = "Select desired features:",
-            RequestedSchema = featuresSchema
-        }, token);
-
-        if (featuresResponse.Action != "accept")
-        {
-            return "Operation cancelled";
-        }
-
-        var features = featuresResponse.Content?["Features"].EnumerateArray()
-            .Select(e => e.GetString())
-            .ToArray();
-
-        return $"Selected: Priority={priority}, Severity={severity}, Tags=[{string.Join(", ", tags ?? [])}], Features=[{string.Join(", ", features ?? [])}]";
-    }
-    // </snippet_EnumExamples>
 }

docs/index.md

@@ -18,12 +18,6 @@ For more information about MCP:
 
 For how-to guides, tutorials, and additional guidance, refer to the [official MCP documentation](https://modelcontextprotocol.io/).
 
-## Official SDK packages
-
-The official C# SDK packages for stable and pre-release versions are published to the [NuGet Gallery](https://www.nuget.org) under the [ModelContextProtocolOfficial](https://www.nuget.org/profiles/ModelContextProtocolOfficial) profile.
-
-Continuous integration builds are published to the modelcontextprotocol organization's [GitHub NuGet package registry](https://github.com/orgs/modelcontextprotocol/packages?ecosystem=nuget).
-
 ## License
 
 This project is licensed under the [MIT License](https://github.com/modelcontextprotocol/csharp-sdk/blob/main/LICENSE).

docs/toc.yml

@@ -3,7 +3,5 @@ items:
   href: concepts/index.md
 - name: API Reference
   href: api/ModelContextProtocol.yml
-- name: Versioning
-  href: versioning.md
-- name: GitHub
-  href: https://github.com/ModelContextProtocol/csharp-sdk
+- name: Github
+  href: https://github.com/ModelContextProtocol/csharp-sdk