Updating from merge

Author: aaronpowell

samples/EverythingServer/Program.cs

@@ -72,17 +72,30 @@
 
         var resource = ResourceGenerator.Resources[index];
 
-        return Task.FromResult(new ReadResourceResult
+        if (resource.MimeType == "text/plain")
         {
-            Contents = [new ResourceContents
+            return Task.FromResult(new ReadResourceResult
+            {
+                Contents = [new TextResourceContents
                 {
+                    Text = resource.Description!,
+                    MimeType = resource.MimeType,
                     Uri = resource.Uri,
+                }]
+            });
+        }
+        else
+        {
+            return Task.FromResult(new ReadResourceResult
+            {
+                Contents = [new BlobResourceContents
+                {
+                    Blob = resource.Description!,
                     MimeType = resource.MimeType,
-                    Blob = resource.Description,
-                    Name = resource.Description
-                }
-            ]
-        });
+                    Uri = resource.Uri,
+                }]
+            });
+        }
     })
     ;
 

samples/EverythingServer/Tools/AddTool.cs

@@ -6,6 +6,6 @@ namespace EverythingServer.Tools;
 [McpServerToolType]
 public static class AddTool
 {
-    [McpServerTool("add"), Description("Adds two numbers.")]
+    [McpServerTool(Name = "add"), Description("Adds two numbers.")]
     public static string Add(int a, int b) => $"The sum of {a} and {b} is {a + b}";
 }

samples/EverythingServer/Tools/AnnotatedMessageTool.cs

@@ -13,7 +13,7 @@ public enum MessageType
         Debug,
     }
 
-    [McpServerTool("annotatedMessage"), Description("Generates an annotated message")]
+    [McpServerTool(Name = "annotatedMessage"), Description("Generates an annotated message")]
     public static IEnumerable<string> AnnotatedMessage(MessageType messageType, bool includeImage = true)
     {
         throw new NotSupportedException("Unable to write annotations to the output.");

samples/EverythingServer/Tools/EchoTool.cs

@@ -6,6 +6,6 @@ namespace EverythingServer.Tools;
 [McpServerToolType]
 public static class EchoTool
 {
-    [McpServerTool("echo"), Description("Echoes the message back to the client.")]
+    [McpServerTool(Name = "echo"), Description("Echoes the message back to the client.")]
     public static string Echo(string message) => $"Echo: {message}";
 }

samples/EverythingServer/Tools/LongRunningTool.cs

@@ -8,7 +8,7 @@ namespace EverythingServer.Tools;
 [McpServerToolType]
 public static class LongRunningTool
 {
-    [McpServerTool("longRunningOperation"), Description("Demonstrates a long running operation with progress updates")]
+    [McpServerTool(Name = "longRunningOperation"), Description("Demonstrates a long running operation with progress updates")]
     public static async Task<string> LongRunningOperation(
         IMcpServer server,
         RequestContext<CallToolRequestParams> context,

samples/EverythingServer/Tools/PrintEnvTool.cs

@@ -13,7 +13,7 @@ public static class PrintEnvTool
         WriteIndented = true
     };
 
-    [McpServerTool("printEnv"), Description("Prints all environment variables, helpful for debugging MCP server configuration")]
+    [McpServerTool(Name = "printEnv"), Description("Prints all environment variables, helpful for debugging MCP server configuration")]
     public static string PrintEnv()
     {
         Debugger.Launch();

samples/EverythingServer/Tools/SampleLlmTool.cs

@@ -9,7 +9,7 @@ public class SampleLlmTool(IMcpServer server)
 {
     private readonly IMcpServer _server = server ?? throw new ArgumentNullException(nameof(server));
 
-    [McpServerTool("sampleLLM"), Description("Samples from an LLM using MCP's sampling feature")]
+    [McpServerTool(Name = "sampleLLM"), Description("Samples from an LLM using MCP's sampling feature")]
     public async Task<string> SampleLLM(
         [Description("The prompt to send to the LLM")] string prompt,
         [Description("Maximum number of tokens to generate")] int maxTokens,

samples/EverythingServer/Tools/TinyImageTool.cs

@@ -8,7 +8,7 @@ namespace EverythingServer.Tools;
 [McpServerToolType]
 public static class TinyImageTool
 {
-    [McpServerTool("getTinyImage"), Description("Get a tiny image from the server")]
+    [McpServerTool(Name = "getTinyImage"), Description("Get a tiny image from the server")]
     public static IEnumerable<AIContent> GetTinyImage()
     {
         Debugger.Launch();