Merge remote-tracking branch 'origin/main' into stateless

Author: halter73

.github/workflows/release.md

@@ -15,8 +15,7 @@ The following process is used when publishing new releases to NuGet.org:
     - Click the 'Target' dropdown button
         - Choose the 'Recent Commits' tab
         - Select the commit to use for the release, ensuring it's one from above where CI is known to be green
-    - Click the 'Previous tag' dropdown button
-        - Choose the previous release to use for generating release notes
+    - The 'Previous tag' dropdown can remain on 'Auto' unless the previous release deviated from this process
     - Click the 'Generate release notes button'
         - This will add release notes into the Release description
         - The generated release notes include what has changed and the list of new contributors
@@ -26,7 +25,7 @@ The following process is used when publishing new releases to NuGet.org:
     - Augment the Release description as desired
         - This content is presented used on GitHub and is not persisted into any artifacts
     - Check the 'Set as a pre-release' button under the release description if appropriate
-    - Click 'Public release'
+    - Click 'Publish release'
 
 3. **Monitor the Release workflow**
     - After publishing the release, a workflow will begin for producing the release's build artifacts and publishing the NuGet package to NuGet.org

Directory.Packages.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <System10Version>10.0.0-preview.3.25171.5</System10Version>
-    <MicrosoftExtensionsAIVersion>9.4.3-preview.1.25230.7</MicrosoftExtensionsAIVersion>
+    <MicrosoftExtensionsAIVersion>9.4.4-preview.1.25259.16</MicrosoftExtensionsAIVersion>
   </PropertyGroup>
 
   <!-- Product dependencies netstandard -->
@@ -31,7 +31,7 @@
 
   <!-- Product dependencies shared -->
   <ItemGroup>
-    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="$(MicrosoftExtensionsAIVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.4.4-preview.1.25259.16" />
     <PackageVersion Include="Microsoft.Extensions.AI" Version="$(MicrosoftExtensionsAIVersion)" />
     <PackageVersion Include="System.Net.ServerSentEvents" Version="$(System10Version)" />
   </ItemGroup>

THIRD-PARTY-NOTICES.txt

@@ -59,3 +59,20 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+License notice for URI Template Tests
+-------------------------------------
+
+Copyright 2011- The Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

samples/EverythingServer/Program.cs

@@ -1,5 +1,6 @@
 using EverythingServer;
 using EverythingServer.Prompts;
+using EverythingServer.Resources;
 using EverythingServer.Tools;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.DependencyInjection;
@@ -14,8 +15,6 @@
 using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
 
-#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
-
 var builder = Host.CreateApplicationBuilder(args);
 builder.Logging.AddConsole(consoleLogOptions =>
 {
@@ -38,82 +37,7 @@
     .WithTools<TinyImageTool>()
     .WithPrompts<ComplexPromptType>()
     .WithPrompts<SimplePromptType>()
-    .WithListResourcesHandler(async (ctx, ct) =>
-    {
-        return new ListResourcesResult
-        {
-            Resources =
-            [
-                new ModelContextProtocol.Protocol.Types.Resource { Name = "Direct Text Resource", Description = "A direct text resource", MimeType = "text/plain", Uri = "test://direct/text/resource" },
-            ]
-        };
-    })
-    .WithListResourceTemplatesHandler(async (ctx, ct) =>
-    {
-        return new ListResourceTemplatesResult
-        {
-            ResourceTemplates =
-            [
-                new ResourceTemplate { Name = "Template Resource", Description = "A template resource with a numeric ID", UriTemplate = "test://template/resource/{id}" }
-            ]
-        };
-    })
-    .WithReadResourceHandler(async (ctx, ct) =>
-    {
-        var uri = ctx.Params?.Uri;
-
-        if (uri == "test://direct/text/resource")
-        {
-            return new ReadResourceResult
-            {
-                Contents = [new TextResourceContents
-                {
-                    Text = "This is a direct resource",
-                    MimeType = "text/plain",
-                    Uri = uri,
-                }]
-            };
-        }
-
-        if (uri is null || !uri.StartsWith("test://template/resource/"))
-        {
-            throw new NotSupportedException($"Unknown resource: {uri}");
-        }
-
-        int index = int.Parse(uri["test://template/resource/".Length..]) - 1;
-
-        if (index < 0 || index >= ResourceGenerator.Resources.Count)
-        {
-            throw new NotSupportedException($"Unknown resource: {uri}");
-        }
-
-        var resource = ResourceGenerator.Resources[index];
-
-        if (resource.MimeType == "text/plain")
-        {
-            return new ReadResourceResult
-            {
-                Contents = [new TextResourceContents
-                {
-                    Text = resource.Description!,
-                    MimeType = resource.MimeType,
-                    Uri = resource.Uri,
-                }]
-            };
-        }
-        else
-        {
-            return new ReadResourceResult
-            {
-                Contents = [new BlobResourceContents
-                {
-                    Blob = resource.Description!,
-                    MimeType = resource.MimeType,
-                    Uri = resource.Uri,
-                }]
-            };
-        }
-    })
+    .WithResources<SimpleResourceType>()
     .WithSubscribeToResourcesHandler(async (ctx, ct) =>
     {
         var uri = ctx.Params?.Uri;

samples/EverythingServer/Resources/SimpleResourceType.cs

@@ -0,0 +1,39 @@
+using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Server;
+using System.ComponentModel;
+
+namespace EverythingServer.Resources;
+
+[McpServerResourceType]
+public class SimpleResourceType
+{
+    [McpServerResource(UriTemplate = "test://direct/text/resource", Name = "Direct Text Resource", MimeType = "text/plain")]
+    [Description("A direct text resource")]
+    public static string DirectTextResource() => "This is a direct resource";
+
+    [McpServerResource(UriTemplate = "test://template/resource/{id}", Name = "Template Resource")]
+    [Description("A template resource with a numeric ID")]
+    public static ResourceContents TemplateResource(RequestContext<ReadResourceRequestParams> requestContext, int id)
+    {
+        int index = id - 1;
+        if ((uint)index >= ResourceGenerator.Resources.Count)
+        {
+            throw new NotSupportedException($"Unknown resource: {requestContext.Params?.Uri}");
+        }
+
+        var resource = ResourceGenerator.Resources[index];
+        return resource.MimeType == "text/plain" ?
+            new TextResourceContents
+            {
+                Text = resource.Description!,
+                MimeType = resource.MimeType,
+                Uri = resource.Uri,
+            } :
+            new BlobResourceContents
+            {
+                Blob = resource.Description!,
+                MimeType = resource.MimeType,
+                Uri = resource.Uri,
+            };
+    }
+}