[automated] Merge branch 'release/10.0.3xx' => 'release/10.0.4xx' - #54872
Merged
dsplaisted merged 10 commits intoJun 25, 2026
Merged
Conversation
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Marc Paine <marcpop@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: DonnaChen888 <v-donnachen@microsoft.com> Co-authored-by: Noah Gilson <noahgilson@microsoft.com>
Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/*
Member
|
@copilot resolve the merge conflicts in this pull request |
…ease/10.0.3xx-to-release/10.0.4xx # Conflicts: # Directory.Build.props # eng/Versions.props Co-authored-by: SimonZhao888 <133954995+SimonZhao888@users.noreply.github.com>
Member
|
@copilot resolve the merge conflicts in this pull request |
Contributor
Resolved the merge conflicts by merging the latest |
Contributor
Merge conflicts for this PR branch are resolved in commit |
SimonZhao888
approved these changes
Jun 23, 2026
SimonZhao888
enabled auto-merge (squash)
June 23, 2026 03:46
Member
|
/azp run dotnet-sdk-public-ci |
|
Azure Pipelines successfully started running 1 pipeline(s). |
The VMR codeflow into release/10.0.4xx removes the repo-local Skip on the MauiBlazor HotReload test, but #54150 (HotReload tests should not use stage 2 SDK) is still open and the skip is deliberately maintained on the servicing branch. Re-apply it after the merge, matching the existing 4xx decision. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
dsplaisted
approved these changes
Jun 24, 2026
This was referenced Jun 25, 2026
Member
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
joeloff
approved these changes
Jun 25, 2026
This was referenced Jun 25, 2026
nagilson
added a commit
that referenced
this pull request
Jul 6, 2026
The forward-merge from release/10.0.3xx brought in the McpServer bundled template reference in BundledTemplates.targets (plus its test and tab-completion approvals), but the "Reset files to release/10.0.4xx" step dropped the MicrosoftMcpServerProjectTemplates100PackageVersion property from eng/Version.Details.props and eng/Version.Details.xml. The empty version expanded to an invalid version range, failing restore on every leg. Align the McpServer footprint with release/10.0.4xx, which intentionally does not yet bundle the McpServer template (matching the prior successful merge #54872), unblocking the build. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I detected changes in the release/10.0.3xx branch which have not been merged yet to release/10.0.4xx. I'm a robot and am configured to help you automatically keep release/10.0.4xx up to date, so I've opened this PR.
This PR merges commits made on release/10.0.3xx by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/10.0.3xx-to-release/10.0.4xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.
or if you are using SSH
Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.