Introduce local vs. remote mcpserver template option

eng/packages/ProjectTemplates.props

@@ -26,7 +26,8 @@
     <PackageVersion Include="Microsoft.SemanticKernel.Connectors.AzureAISearch" Version="1.67.1-preview" />
     <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Qdrant" Version="1.67.1-preview" />
     <PackageVersion Include="Microsoft.SemanticKernel.Connectors.SqliteVec" Version="1.67.1-preview" />
-    <PackageVersion Include="ModelContextProtocol" Version="0.4.0-preview.3" />
+    <PackageVersion Include="ModelContextProtocol" Version="0.5.0-preview.1" />
+    <PackageVersion Include="ModelContextProtocol.AspNetCore" Version="0.5.0-preview.1" />
     <PackageVersion Include="OllamaSharp" Version="5.4.12" />
     <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
     <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/Microsoft.Extensions.AI.Templates.csproj

@@ -38,24 +38,14 @@
     <Compile Remove="**\*" />
 
     <Content
-      Include="templates\AIChatWeb-CSharp\**\*"
-      Exclude="templates\AIChatWeb-CSharp\**\*.csproj-in"
-      PackagePath="content\AIChatWeb-CSharp" />
+      Include="templates\**\*"
+      Exclude="templates\**\*.csproj-in"
+      PackagePath="content" />
 
     <TemplateContent
-      Include="templates\AIChatWeb-CSharp\**\*.csproj-in"
+      Include="templates\**\*.csproj-in"
       ChangeExtension=".csproj"
-      PackagePath="content\AIChatWeb-CSharp" />
-
-    <Content
-      Include="templates\McpServer-CSharp\**\*"
-      Exclude="templates\McpServer-CSharp\**\*.csproj-in"
-      PackagePath="content\McpServer-CSharp" />
-
-    <TemplateContent
-      Include="templates\McpServer-CSharp\**\*.csproj-in"
-      ChangeExtension=".csproj"
-      PackagePath="content\McpServer-CSharp" />
+      PackagePath="content" />
 
     <None
       Include="THIRD-PARTY-NOTICES.TXT"

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/.template.config/template.json

@@ -2,7 +2,7 @@
   "$schema": "http://json.schemastore.org/template",
   "author": "Microsoft",
   "classifications": [ "Common", "AI", "Web", "Blazor", "Aspire" ],
-  "identity": "Microsoft.Extensions.AI.Templates.WebChat.CSharp",
+  "identity": "Microsoft.Extensions.AI.Templates.AIChatWeb.CSharp",
   "name": "AI Chat Web App",
   "description": "A project template for creating an AI chat application, which uses retrieval-augmented generation (RAG) to chat with your own data.",
   "shortName": "aichatweb",

src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/Microsoft.McpServer.ProjectTemplates.csproj

@@ -0,0 +1,40 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <PackageType>Template</PackageType>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Description>MCP Server project templates.</Description>
+    <PackageTags>dotnet-new;templates;ai</PackageTags>
+
+    <Stage>preview</Stage>
+    <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
+    <Workstream>AI</Workstream>
+    <MinCodeCoverage>0</MinCodeCoverage>
+    <MinMutationScore>0</MinMutationScore>
+
+    <IsPackable>true</IsPackable>
+    <IsProjectReferenceProvider>false</IsProjectReferenceProvider>
+    <IncludeContentInPack>true</IncludeContentInPack>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <IncludeSymbols>false</IncludeSymbols>
+    <ContentTargetFolders>content</ContentTargetFolders>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <NoDefaultExcludes>true</NoDefaultExcludes>
+    <NoPackageAnalysis>true</NoPackageAnalysis>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="**\*" />
+
+    <Content
+      Include="templates\**\*"
+      Exclude="templates\**\*.csproj-in"
+      PackagePath="content" />
+
+    <TemplateContent
+      Include="templates\**\*.csproj-in"
+      ChangeExtension=".csproj"
+      PackagePath="content" />
+
+  </ItemGroup>
+</Project>

src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/README.md

@@ -0,0 +1,3 @@
+# Microsoft.McpServer.ProjectTemplates
+
+Provides MCP Server Project Templates.

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/McpServer-CSharp/.template.config/dotnetcli.host.json → src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/.template.config/dotnetcli.host.json

@@ -1,13 +1,9 @@
 {
   "$schema": "https://json.schemastore.org/dotnetcli.host",
   "symbolInfo": {
-    "TargetFrameworkOverride": {
-      "isHidden": "true",
-      "longName": "target-framework-override",
-      "shortName": ""
-    },
-    "Framework": {
-      "longName": "framework"
+    "Transport": {
+      "longName": "transport",
+      "shortName": "t"
     },
     "NativeAot": {
       "longName": "aot",
@@ -16,6 +12,15 @@
     "SelfContained": {
       "longName": "self-contained",
       "shortName": ""
+    },
+    "Framework": {
+      "longName": "framework"
+    },
+    "httpPort": {
+      "isHidden": true
+    },
+    "httpsPort": {
+      "isHidden": true
     }
   },
   "usageExamples": [

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/McpServer-CSharp/.template.config/ide.host.json → src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/.template.config/ide.host.json

@@ -3,6 +3,10 @@
   "order": 0,
   "icon": "ide/icon.ico",
   "symbolInfo": [
+    {
+      "id": "Transport",
+      "isVisible": true
+    },
     {
       "id": "NativeAot",
       "isVisible": true