Skip to content

[release/11.0.1xx-preview5] Add 'mcpserver' project template as bundled template#54404

Merged
jeffhandley merged 1 commit into
dotnet:release/11.0.1xx-preview5from
jeffhandley:jeffhandley/mcpserver-template-preview5
May 22, 2026
Merged

[release/11.0.1xx-preview5] Add 'mcpserver' project template as bundled template#54404
jeffhandley merged 1 commit into
dotnet:release/11.0.1xx-preview5from
jeffhandley:jeffhandley/mcpserver-template-preview5

Conversation

@jeffhandley

Copy link
Copy Markdown
Member

Backport of #54132 from main into release/11.0.1xx-preview5

This template was merged into 11.0.1xx-preview4 via dotnet/dotnet#6361, but we hit delays getting it merged into main due to template snapshot tests and the macOS CI queues. This is a clean cherry-pick from #54132.

Co-authored-by: Stephen Halter <halter73@gmail.com>
@jeffhandley jeffhandley requested a review from a team as a code owner May 21, 2026 20:24
Copilot AI review requested due to automatic review settings May 21, 2026 20:24

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Backports the new mcpserver project template so it ships as a bundled template in the 11.0.1xx-preview5 SDK, and updates dotnet-new integration coverage/snapshots to reflect the new template presence.

Changes:

  • Bundle Microsoft.McpServer.ProjectTemplates.11.0 as part of the redist template set.
  • Add an integration test that instantiates MCP server template variants and validates restore/build behavior.
  • Update dotnet new list and completion approval snapshots to include the new MCP template/category.

Reviewed changes

Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
test/dotnet-new.IntegrationTests/McpServerTemplateTests.cs Adds integration coverage for dotnet new mcpserver scenarios (with a suggested adjustment to avoid AOT restore/build overhead).
test/dotnet-new.IntegrationTests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt Updates approval snapshot to include “MCP” category.
test/dotnet-new.IntegrationTests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt Updates approval snapshot to include “MCP” category.
test/dotnet-new.IntegrationTests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt Updates approval snapshot to include “MCP” category.
test/dotnet-new.IntegrationTests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt Updates approval snapshot to include “MCP” category.
test/dotnet-new.IntegrationTests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt Updates approval snapshot to include “MCP” category.
test/dotnet-new.IntegrationTests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt Updates approval snapshot to include “MCP” category.
test/dotnet-new.IntegrationTests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt Updates completion snapshot to include mcpserver.
test/dotnet-new.IntegrationTests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt Updates completion snapshot to include mcpserver.
test/dotnet-new.IntegrationTests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt Updates completion snapshot to include mcpserver.
src/Layout/redist/targets/BundledTemplates.targets Adds the MCP server template pack to the bundled templates list.
eng/Version.Details.props Introduces version properties for Microsoft.McpServer.ProjectTemplates.11.0.

Comment thread test/dotnet-new.IntegrationTests/McpServerTemplateTests.cs
@jeffhandley

Copy link
Copy Markdown
Member Author

/ba-g Test timeout - known infrastructure issue that surfaces as a build error

@jeffhandley jeffhandley merged commit d4a2929 into dotnet:release/11.0.1xx-preview5 May 22, 2026
25 of 27 checks passed
@jeffhandley jeffhandley deleted the jeffhandley/mcpserver-template-preview5 branch May 22, 2026 03:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants