Merge remote-tracking branch 'origin/main' into mbuck/api-experiments

Author: MackinnonBuck

.editorconfig

@@ -3,6 +3,7 @@ root = true
 
 # C# files
 [*.cs]
+csharp_style_namespace_declarations=file_scoped:warning
 
 # Compiler
 dotnet_diagnostic.CS1998.severity = suggestion      # CS1998: Missing awaits

.github/workflows/ci-build-test.yml

@@ -18,6 +18,7 @@ on:
       - "src/**"
       - "tests/**"
       - "samples/**"
+      - "docs/**"
 
 permissions:
   contents: read

ModelContextProtocol.slnx

@@ -8,7 +8,34 @@
     <File Path=".github/workflows/release.md" />
     <File Path=".github/workflows/release.yml" />
   </Folder>
+  <Folder Name="/docs/" />
+  <Folder Name="/docs/concepts/" />
+  <Folder Name="/docs/concepts/elicitation/" />
+  <Folder Name="/docs/concepts/elicitation/samples/" />
+  <Folder Name="/docs/concepts/elicitation/samples/client/">
+    <Project Path="docs/concepts/elicitation/samples/client/ElicitationClient.csproj" />
+  </Folder>
+  <Folder Name="/docs/concepts/elicitation/samples/server/">
+    <Project Path="docs/concepts/elicitation/samples/server/Elicitation.csproj" />
+  </Folder>
+  <Folder Name="/docs/concepts/logging/" />
+  <Folder Name="/docs/concepts/logging/samples/" />
+  <Folder Name="/docs/concepts/logging/samples/client/">
+    <Project Path="docs/concepts/logging/samples/client/LoggingClient.csproj" />
+  </Folder>
+  <Folder Name="/docs/concepts/logging/samples/server/">
+    <Project Path="docs/concepts/logging/samples/server/Logging.csproj" />
+  </Folder>
+  <Folder Name="/docs/concepts/progress/" />
+  <Folder Name="/docs/concepts/progress/samples/" />
+  <Folder Name="/docs/concepts/progress/samples/client/">
+    <Project Path="docs/concepts/progress/samples/client/ProgressClient.csproj" />
+  </Folder>
+  <Folder Name="/docs/concepts/progress/samples/server/">
+    <Project Path="docs/concepts/progress/samples/server/Progress.csproj" />
+  </Folder>
   <Folder Name="/samples/">
+    <Project Path="samples/AspNetCoreMcpPerSessionTools/AspNetCoreMcpPerSessionTools.csproj" />
     <Project Path="samples/AspNetCoreMcpServer/AspNetCoreMcpServer.csproj" />
     <Project Path="samples/ChatWithTools/ChatWithTools.csproj" />
     <Project Path="samples/EverythingServer/EverythingServer.csproj" />

docs/concepts/elicitation/elicitation.md

@@ -15,8 +15,8 @@ Servers request structured data from users with the [ElicitAsync] extension meth
 The C# SDK registers an instance of [McpServer] with the dependency injection container,
 so tools can simply add a parameter of type [McpServer] to their method signature to access it.
 
-[ElicitAsync]: https://modelcontextprotocol.github.io/csharp-sdk/api/ModelContextProtocol.Server.McpServerExtensions.html#ModelContextProtocol_Server_McpServerExtensions_ElicitAsync_ModelContextProtocol_Server_McpServer_ModelContextProtocol_Protocol_ElicitRequestParams_System_Threading_CancellationToken_
-[McpServer]: https://modelcontextprotocol.github.io/csharp-sdk/api/ModelContextProtocol.Server.McpServer.html
+[ElicitAsync]: https://modelcontextprotocol.github.io/csharp-sdk/api/ModelContextProtocol.Server.McpServerExtensions.html#ModelContextProtocol_Server_McpServerExtensions_ElicitAsync_ModelContextProtocol_Server_IMcpServer_ModelContextProtocol_Protocol_ElicitRequestParams_System_Threading_CancellationToken_
+[IMcpServer]: https://modelcontextprotocol.github.io/csharp-sdk/api/ModelContextProtocol.Server.IMcpServer.html
 
 The MCP Server must specify the schema of each input value it is requesting from the user.
 Only primitive types (string, number, boolean) are supported for elicitation requests.

docs/concepts/elicitation/samples/client/ElicitationClient.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ModelContextProtocol.Core" Version="0.3.0-preview.3" />
+    <ProjectReference Include="../../../../../src/ModelContextProtocol.Core/ModelContextProtocol.Core.csproj" />
   </ItemGroup>
 
 </Project>

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

@@ -56,13 +56,13 @@
 async ValueTask<ElicitResult> HandleElicitationAsync(ElicitRequestParams? requestParams, CancellationToken token)
 {
     // Bail out if the requestParams is null or if the requested schema has no properties
-    if (requestParams?.RequestedSchema?.Properties == null)
+    if (requestParams is null || requestParams.RequestedSchema?.Properties is null)
     {
         return new ElicitResult();
     }
 
     // Process the elicitation request
-    if (requestParams?.Message is not null)
+    if (requestParams.Message is not null)
     {
         Console.WriteLine(requestParams.Message);
     }

docs/concepts/elicitation/samples/server/Elicitation.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ModelContextProtocol.AspNetCore" Version="0.3.0-preview.3" />
+    <ProjectReference Include="../../../../../src/ModelContextProtocol.AspNetCore/ModelContextProtocol.AspNetCore.csproj" />
   </ItemGroup>
 
 </Project>