Merge branch 'main' into mdk/more-docs

Author: mikekistler

Directory.Packages.props

@@ -3,7 +3,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <System9Version>9.0.5</System9Version>
     <System10Version>10.0.0-preview.4.25258.110</System10Version>
-    <MicrosoftExtensionsAIVersion>9.8.0</MicrosoftExtensionsAIVersion>
+    <MicrosoftExtensionsAIVersion>9.9.0</MicrosoftExtensionsAIVersion>
   </PropertyGroup>
 
   <!-- Product dependencies netstandard -->
@@ -53,7 +53,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageVersion>
     <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
-    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.8.0-preview.1.25412.6" />
+    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.9.0-preview.1.25458.4" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(System9Version)" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(System9Version)" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(System9Version)" />

README.md

@@ -37,8 +37,8 @@ dotnet add package ModelContextProtocol --prerelease
 
 ## Getting Started (Client)
 
-To get started writing a client, the `McpClientFactory.CreateAsync` method is used to instantiate and connect an `IMcpClient`
-to a server. Once you have an `IMcpClient`, you can interact with it, such as to enumerate all available tools and invoke tools.
+To get started writing a client, the `McpClient.CreateAsync` method is used to instantiate and connect an `McpClient`
+to a server. Once you have an `McpClient`, you can interact with it, such as to enumerate all available tools and invoke tools.
 
 ```csharp
 var clientTransport = new StdioClientTransport(new StdioClientTransportOptions
@@ -48,7 +48,7 @@ var clientTransport = new StdioClientTransport(new StdioClientTransportOptions
     Arguments = ["-y", "@modelcontextprotocol/server-everything"],
 });
 
-var client = await McpClientFactory.CreateAsync(clientTransport);
+var client = await McpClient.CreateAsync(clientTransport);
 
 // Print the list of tools available from the server.
 foreach (var tool in await client.ListToolsAsync())
@@ -88,7 +88,7 @@ var response = await chatClient.GetResponseAsync(
 Here is an example of how to create an MCP server and register all tools from the current application.
 It includes a simple echo tool as an example (this is included in the same file here for easy of copy and paste, but it needn't be in the same file...
 the employed overload of `WithTools` examines the current assembly for classes with the `McpServerToolType` attribute, and registers all methods with the
-`McpTool` attribute as tools.)
+`McpServerTool` attribute as tools.)
 
 ```
 dotnet add package ModelContextProtocol --prerelease
@@ -122,14 +122,14 @@ public static class EchoTool
 }
 ```
 
-Tools can have the `IMcpServer` representing the server injected via a parameter to the method, and can use that for interaction with 
+Tools can have the `McpServer` representing the server injected via a parameter to the method, and can use that for interaction with 
 the connected client. Similarly, arguments may be injected via dependency injection. For example, this tool will use the supplied 
-`IMcpServer` to make sampling requests back to the client in order to summarize content it downloads from the specified url via
+`McpServer` to make sampling requests back to the client in order to summarize content it downloads from the specified url via
 an `HttpClient` injected via dependency injection.
 ```csharp
 [McpServerTool(Name = "SummarizeContentFromUrl"), Description("Summarizes content downloaded from a specific URI")]
 public static async Task<string> SummarizeDownloadedContent(
-    IMcpServer thisServer,
+    McpServer thisServer,
     HttpClient httpClient,
     [Description("The url from which to download the content to summarize")] string url,
     CancellationToken cancellationToken)
@@ -224,7 +224,7 @@ McpServerOptions options = new()
     },
 };
 
-await using IMcpServer server = McpServerFactory.Create(new StdioServerTransport("MyServer"), options);
+await using McpServer server = McpServer.Create(new StdioServerTransport("MyServer"), options);
 await server.RunAsync();
 ```
 

docs/concepts/elicitation/samples/client/Program.cs

@@ -4,7 +4,7 @@
 
 var endpoint = Environment.GetEnvironmentVariable("ENDPOINT") ?? "http://localhost:3001";
 
-var clientTransport = new SseClientTransport(new()
+var clientTransport = new HttpClientTransport(new()
 {
     Endpoint = new Uri(endpoint),
     TransportMode = HttpTransportMode.StreamableHttp,
@@ -27,7 +27,7 @@
     }
 };
 
-await using var mcpClient = await McpClientFactory.CreateAsync(clientTransport, options);
+await using var mcpClient = await McpClient.CreateAsync(clientTransport, options);
 // </snippet_McpInitialize>
 
 var tools = await mcpClient.ListToolsAsync();

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

@@ -13,7 +13,7 @@ public sealed class InteractiveTools
     // <snippet_GuessTheNumber>
     [McpServerTool, Description("A simple game where the user has to guess a number between 1 and 10.")]
     public async Task<string> GuessTheNumber(
-        IMcpServer server, // Get the McpServer from DI container
+        McpServer server, // Get the McpServer from DI container
         CancellationToken token
     )
     {

docs/concepts/logging/samples/client/Program.cs

@@ -4,13 +4,13 @@
 
 var endpoint = Environment.GetEnvironmentVariable("ENDPOINT") ?? "http://localhost:3001";
 
-var clientTransport = new SseClientTransport(new()
+var clientTransport = new HttpClientTransport(new()
 {
     Endpoint = new Uri(endpoint),
     TransportMode = HttpTransportMode.StreamableHttp,
 });
 
-await using var mcpClient = await McpClientFactory.CreateAsync(clientTransport);
+await using var mcpClient = await McpClient.CreateAsync(clientTransport);
 
 // <snippet_LoggingCapabilities>
 // Verify that the server supports logging

docs/concepts/progress/samples/client/Program.cs

@@ -5,7 +5,7 @@
 
 var endpoint = Environment.GetEnvironmentVariable("ENDPOINT") ?? "http://localhost:3001";
 
-var clientTransport = new SseClientTransport(new()
+var clientTransport = new HttpClientTransport(new()
 {
     Endpoint = new Uri(endpoint),
     TransportMode = HttpTransportMode.StreamableHttp,
@@ -20,7 +20,7 @@
     }
 };
 
-await using var mcpClient = await McpClientFactory.CreateAsync(clientTransport, options);
+await using var mcpClient = await McpClient.CreateAsync(clientTransport, options);
 
 var tools = await mcpClient.ListToolsAsync();
 foreach (var tool in tools)

docs/concepts/progress/samples/server/Tools/LongRunningTools.cs

@@ -10,7 +10,7 @@ public class LongRunningTools
 {
     [McpServerTool, Description("Demonstrates a long running tool with progress updates")]
     public static async Task<string> LongRunningTool(
-        IMcpServer server,
+        McpServer server,
         RequestContext<CallToolRequestParams> context,
         int duration = 10,
         int steps = 5)

samples/AspNetCoreMcpServer/Tools/SampleLlmTool.cs

@@ -12,7 +12,7 @@ public sealed class SampleLlmTool
 {
     [McpServerTool(Name = "sampleLLM"), Description("Samples from an LLM using MCP's sampling feature")]
     public static async Task<string> SampleLLM(
-        IMcpServer thisServer,
+        McpServer thisServer,
         [Description("The prompt to send to the LLM")] string prompt,
         [Description("Maximum number of tokens to generate")] int maxTokens,
         CancellationToken cancellationToken)

samples/ChatWithTools/Program.cs

@@ -32,7 +32,7 @@
     .UseOpenTelemetry(loggerFactory: loggerFactory, configure: o => o.EnableSensitiveData = true)
     .Build();
 
-var mcpClient = await McpClientFactory.CreateAsync(
+var mcpClient = await McpClient.CreateAsync(
     new StdioClientTransport(new()
     {
         Command = "npx",

samples/EverythingServer/LoggingUpdateMessageSender.cs

@@ -5,7 +5,7 @@
 
 namespace EverythingServer;
 
-public class LoggingUpdateMessageSender(IMcpServer server, Func<LoggingLevel> getMinLevel) : BackgroundService
+public class LoggingUpdateMessageSender(McpServer server, Func<LoggingLevel> getMinLevel) : BackgroundService
 {
     readonly Dictionary<LoggingLevel, string> _loggingLevelMap = new()
     {