Fix build issues

Author: localden

samples/AspNetCoreSseServer/Program.cs

@@ -2,6 +2,7 @@
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Trace;
 using OpenTelemetry;
+using ModelContextProtocol.AspNetCore;
 
 var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddMcpServer()

src/ModelContextProtocol.AspNetCore/Auth/McpAuthorizationExtensions.cs

@@ -1,4 +1,3 @@
-// filepath: c:\Users\ddelimarsky\source\csharp-sdk-anm\src\ModelContextProtocol.AspNetCore\Auth\McpAuthorizationExtensions.cs
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
@@ -31,68 +30,4 @@ public static AuthenticationBuilder AddMcpAuthorization(
             "MCP Authentication", 
             configureOptions ?? (options => { }));
     }
-
-    /// <summary>
-    /// Maps the resource metadata endpoint for MCP OAuth authorization.
-    /// </summary>
-    /// <param name="endpoints">The endpoint route builder.</param>
-    /// <param name="pattern">The route pattern.</param>
-    /// <param name="configure">An action to configure the resource metadata.</param>
-    /// <returns>An endpoint convention builder for further configuration.</returns>
-    public static IEndpointConventionBuilder MapMcpResourceMetadata(
-        this IEndpointRouteBuilder endpoints,
-        string pattern = "/.well-known/oauth-protected-resource",
-        Action<ProtectedResourceMetadata>? configure = null)
-    {
-        var metadataService = endpoints.ServiceProvider.GetRequiredService<ResourceMetadataService>();
-        
-        if (configure != null)
-        {
-            metadataService.ConfigureMetadata(configure);
-        }
-
-        return endpoints.MapGet(pattern, async (HttpContext context) =>
-        {
-            var metadata = metadataService.GetMetadata();
-            
-            // Set default resource if not set
-            if (metadata.Resource == null)
-            {
-                var request = context.Request;
-                var hostString = request.Host.Value;
-                var scheme = request.Scheme;
-                metadata.Resource = new Uri($"{scheme}://{hostString}");
-            }
-            
-            return Results.Json(metadata);
-        })
-        .AllowAnonymous()
-        .WithDisplayName("MCP Resource Metadata");
-    }
 }
-
-/// <summary>
-/// Service for managing MCP resource metadata.
-/// </summary>
-public class ResourceMetadataService
-{
-    private readonly ProtectedResourceMetadata _metadata = new();
-
-    /// <summary>
-    /// Configures the resource metadata.
-    /// </summary>
-    /// <param name="configure">Configuration action.</param>
-    public void ConfigureMetadata(Action<ProtectedResourceMetadata> configure)
-    {
-        configure(_metadata);
-    }
-
-    /// <summary>
-    /// Gets the resource metadata.
-    /// </summary>
-    /// <returns>The resource metadata.</returns>
-    public ProtectedResourceMetadata GetMetadata()
-    {
-        return _metadata;
-    }
-}

src/ModelContextProtocol.AspNetCore/Auth/ResourceMetadataEndpointHandler.cs

@@ -0,0 +1,24 @@
+using Microsoft.AspNetCore.Http;
+using ModelContextProtocol.AspNetCore.Auth;
+
+namespace ModelContextProtocol.AspNetCore;
+
+public static partial class McpEndpointRouteBuilderExtensions
+{
+    // This class handles the resource metadata endpoint in an AOT-compatible way
+    private sealed class ResourceMetadataEndpointHandler
+    {
+        private readonly ResourceMetadataService _resourceMetadataService;
+        
+        public ResourceMetadataEndpointHandler(ResourceMetadataService resourceMetadataService)
+        {
+            _resourceMetadataService = resourceMetadataService;
+        }
+        
+        public Task HandleRequest(HttpContext httpContext)
+        {
+            var result = _resourceMetadataService.HandleResourceMetadataRequest(httpContext);
+            return result.ExecuteAsync(httpContext);
+        }
+    }
+}

src/ModelContextProtocol.AspNetCore/Auth/ResourceMetadataService.cs

@@ -0,0 +1,52 @@
+using Microsoft.AspNetCore.Http;
+using ModelContextProtocol.Auth;
+using ModelContextProtocol.Utils.Json;
+
+namespace ModelContextProtocol.AspNetCore.Auth;
+
+/// <summary>
+/// Service for managing MCP resource metadata.
+/// </summary>
+public class ResourceMetadataService
+{
+    private readonly ProtectedResourceMetadata _metadata = new();
+
+    /// <summary>
+    /// Configures the resource metadata.
+    /// </summary>
+    /// <param name="configure">Configuration action.</param>
+    public void ConfigureMetadata(Action<ProtectedResourceMetadata> configure)
+    {
+        configure(_metadata);
+    }
+
+    /// <summary>
+    /// Gets the resource metadata.
+    /// </summary>
+    /// <returns>The resource metadata.</returns>
+    public ProtectedResourceMetadata GetMetadata()
+    {
+        return _metadata;
+    }
+    
+    /// <summary>
+    /// Handles the resource metadata request.
+    /// </summary>
+    /// <param name="context">The HTTP context.</param>
+    /// <returns>An IResult containing the resource metadata.</returns>
+    public IResult HandleResourceMetadataRequest(HttpContext context)
+    {
+        var metadata = GetMetadata();
+        
+        // Set default resource if not set
+        if (metadata.Resource == null)
+        {
+            var request = context.Request;
+            var hostString = request.Host.Value;
+            var scheme = request.Scheme;
+            metadata.Resource = new Uri($"{scheme}://{hostString}");
+        }
+        
+        return Results.Json(metadata, McpJsonUtilities.DefaultOptions.GetTypeInfo(typeof(ProtectedResourceMetadata)));
+    }
+}

src/ModelContextProtocol.AspNetCore/McpEndpointRouteBuilderExtensions.cs

@@ -1,19 +1,19 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Metadata;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
-using ModelContextProtocol.AspNetCore;
 using ModelContextProtocol.AspNetCore.Auth;
 using ModelContextProtocol.Auth;
 using ModelContextProtocol.Protocol.Messages;
 using System.Diagnostics.CodeAnalysis;
 
-namespace Microsoft.AspNetCore.Builder;
+namespace ModelContextProtocol.AspNetCore;
 
 /// <summary>
 /// Provides extension methods for <see cref="IEndpointRouteBuilder"/> to add MCP endpoints.
 /// </summary>
-public static class McpEndpointRouteBuilderExtensions
+public static partial class McpEndpointRouteBuilderExtensions
 {
     /// <summary>
     /// Sets up endpoints for handling MCP Streamable HTTP transport.
@@ -59,8 +59,13 @@ public static IEndpointConventionBuilder MapMcp(this IEndpointRouteBuilder endpo
             // Authorization is configured, so automatically map the OAuth protected resource endpoint
             var resourceMetadataService = endpoints.ServiceProvider.GetRequiredService<ResourceMetadataService>();
 
-            // Map the OAuth protected resource endpoint
-            endpoints.MapMcpResourceMetadata("/.well-known/oauth-protected-resource");
+            // Use an AOT-compatible approach with a statically compiled RequestDelegate
+            var handler = new ResourceMetadataEndpointHandler(resourceMetadataService);
+            
+            sseGroup.MapGet("/.well-known/oauth-protected-resource", handler.HandleRequest)
+                .WithMetadata(new ProducesResponseTypeMetadata(StatusCodes.Status200OK, contentTypes: ["application/json"]))
+                .AllowAnonymous()
+                .WithDisplayName("MCP Resource Metadata");
 
             // Apply authorization to MCP endpoints
             mcpGroup.RequireAuthorization("McpAuth");

tests/ModelContextProtocol.AspNetCore.Tests/MapMcpSseTests.cs

@@ -1,5 +1,4 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using ModelContextProtocol.Client;
 
 namespace ModelContextProtocol.AspNetCore.Tests;

tests/ModelContextProtocol.AspNetCore.Tests/MapMcpStreamableHttpTests.cs

@@ -1,5 +1,4 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace ModelContextProtocol.AspNetCore.Tests;
 

tests/ModelContextProtocol.AspNetCore.Tests/MapMcpTests.cs

@@ -1,5 +1,4 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using ModelContextProtocol.AspNetCore.Tests.Utils;
 using ModelContextProtocol.Client;

tests/ModelContextProtocol.TestSseServer/Program.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Connections;
+using ModelContextProtocol.AspNetCore;
 using ModelContextProtocol.Protocol.Types;
 using ModelContextProtocol.Server;
 using ModelContextProtocol.Utils.Json;