Merge branch 'main' into fixes/forecast-sample

Author: stvansolano

src/ModelContextProtocol/Configuration/McpServerOptionsSetup.cs

@@ -27,11 +27,11 @@ public void Configure(McpServerOptions options)
         // if it otherwise lacks server information.
         if (options.ServerInfo is not { } serverInfo)
         {
-            var assemblyName = (Assembly.GetEntryAssembly() ?? Assembly.GetCallingAssembly()).GetName();
+            var assemblyName = Assembly.GetEntryAssembly()?.GetName();
             options.ServerInfo = new()
             {
-                Name = assemblyName.Name ?? "McpServer",
-                Version = assemblyName.Version?.ToString() ?? "1.0.0",
+                Name = assemblyName?.Name ?? "McpServer",
+                Version = assemblyName?.Version?.ToString() ?? "1.0.0",
             };
         }
 

src/ModelContextProtocol/Protocol/Types/Annotated.cs

@@ -39,4 +39,10 @@ public class Content
     /// </summary>
     [JsonPropertyName("resource")]
     public ResourceContents? Resource { get; set; }
+
+    /// <summary>
+    /// Optional annotations for the content.
+    /// </summary>
+    [JsonPropertyName("annotations")]
+    public Annotations? Annotations { get; init; }
 }

src/ModelContextProtocol/Protocol/Types/Content.cs

@@ -6,7 +6,7 @@ namespace ModelContextProtocol.Protocol.Types;
 /// Represents a known resource that the server is capable of reading.
 /// <see href="https://github.com/modelcontextprotocol/specification/blob/main/schema/">See the schema for details</see>
 /// </summary>
-public record Resource : Annotated
+public record Resource
 {
     /// <summary>
     /// The URI of this resource.
@@ -31,4 +31,10 @@ public record Resource : Annotated
     /// </summary>
     [JsonPropertyName("mimeType")]
     public string? MimeType { get; init; }
+
+    /// <summary>
+    /// Optional annotations for the resource.
+    /// </summary>
+    [JsonPropertyName("annotations")]
+    public Annotations? Annotations { get; init; }
 }

src/ModelContextProtocol/Protocol/Types/Resource.cs

@@ -6,7 +6,7 @@ namespace ModelContextProtocol.Protocol.Types;
 /// Represents a known resource template that the server is capable of reading.
 /// <see href="https://github.com/modelcontextprotocol/specification/blob/main/schema/">See the schema for details</see>
 /// </summary>
-public record ResourceTemplate : Annotated
+public record ResourceTemplate
 {
     /// <summary>
     /// The URI template (according to RFC 6570) that can be used to construct resource URIs.
@@ -31,4 +31,10 @@ public record ResourceTemplate : Annotated
     /// </summary>
     [JsonPropertyName("mimeType")]
     public string? MimeType { get; init; }
+
+    /// <summary>
+    /// Optional annotations for the resource template.
+    /// </summary>
+    [JsonPropertyName("annotations")]
+    public Annotations? Annotations { get; init; }
 }