[automated] Merge branch 'release/10.0.3xx' => 'release/10.0.4xx' (conflicts resolved) - #10318
Merged
SimonZhao888 merged 9 commits intoJun 11, 2026
Merged
Conversation
> [!NOTE] > This is a codeflow update. It may contain both source code changes from > [the VMR](https://github.com/dotnet/dotnet) > as well as dependency updates. Learn more [here](https://github.com/dotnet/dotnet/tree/main/docs/Codeflow-PRs.md). This pull request brings the following source code changes [marker]: <> (Begin:bbf9aa7e-217b-4275-99d1-5f23eb747967) ## From https://github.com/dotnet/dotnet - **Subscription**: [bbf9aa7e-217b-4275-99d1-5f23eb747967](https://maestro.dot.net/subscriptions?search=bbf9aa7e-217b-4275-99d1-5f23eb747967) - **Build**: [20260610.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2996791) ([318145](https://maestro.dot.net/channel/9626/github:dotnet:dotnet/build/318145)) - **Date Produced**: June 10, 2026 12:33:33 PM UTC - **Commit**: [fa0030577339ddb7707463aed4073f3e4560ce40](dotnet/dotnet@fa00305) - **Commit Diff**: [4cf4b61...fa00305](dotnet/dotnet@4cf4b61...fa00305) - **Branch**: [release/10.0.3xx](https://github.com/dotnet/dotnet/tree/release/10.0.3xx) **Updated Dependencies** - From [10.0.0-beta.26305.116 to 10.0.0-beta.26310.103](dotnet/dotnet@4cf4b61...fa00305) - Microsoft.DotNet.Arcade.Sdk [marker]: <> (End:bbf9aa7e-217b-4275-99d1-5f23eb747967) [marker]: <> (Start:Footer:CodeFlow PR) ## Associated changes in source repos - dotnet/msbuild@dfd2b27...2a32f1f <details> <summary>Diff the source with this PR branch</summary> ```bash darc vmr diff --name-only https://github.com/dotnet/dotnet:fa0030577339ddb7707463aed4073f3e4560ce40..https://github.com/dotnet/templating:darc-release/10.0.3xx-a5e682e0-8d5a-4949-9b73-2dc14a44345a ``` </details> [marker]: <> (End:Footer:CodeFlow PR) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.26309.104 -> 10.0.0-beta.26310.111) System.CommandLine (Version 2.0.10 -> 2.0.10) [[ commit created by automation ]]
> [!NOTE] > This is a codeflow update. It may contain both source code changes from > [the VMR](https://github.com/dotnet/dotnet) > as well as dependency updates. Learn more [here](https://github.com/dotnet/dotnet/tree/main/docs/Codeflow-PRs.md). This pull request brings the following source code changes [marker]: <> (Begin:2146351c-d624-4a08-bc4e-875e6191f66e) ## From https://github.com/dotnet/dotnet - **Subscription**: [2146351c-d624-4a08-bc4e-875e6191f66e](https://maestro.dot.net/subscriptions?search=2146351c-d624-4a08-bc4e-875e6191f66e) - **Build**: [20260610.11](https://dev.azure.com/dnceng/internal/_build/results?buildId=2997122) ([318234](https://maestro.dot.net/channel/5173/github:dotnet:dotnet/build/318234)) - **Date Produced**: June 10, 2026 11:06:49 PM UTC - **Commit**: [e8558e6339cd4fccd998b5cdecb76eeb6ec75363](dotnet/dotnet@e8558e6) - **Commit Diff**: [798ed03...e8558e6](dotnet/dotnet@798ed03...e8558e6) - **Branch**: [release/10.0.1xx](https://github.com/dotnet/dotnet/tree/release/10.0.1xx) **Updated Dependencies** - From [10.0.0-beta.26309.104 to 10.0.0-beta.26310.111][1] - Microsoft.DotNet.Arcade.Sdk - From [2.0.10 to 2.0.10][1] - System.CommandLine [marker]: <> (End:2146351c-d624-4a08-bc4e-875e6191f66e) [1]: dotnet/dotnet@798ed03...e8558e6 [marker]: <> (Start:Footer:CodeFlow PR) ## Associated changes in source repos - dotnet/aspnetcore@1e3275c...bef316c - dotnet/efcore@a036cbb...9d1b795 - dotnet/sdk@5c60093...4421d8c - dotnet/sourcelink@5b7195a...0ab0100 - 07c790b...0f368cf - dotnet/windowsdesktop@3aedc12...74cad43 - dotnet/wpf@7e2fc50...2236bae <details> <summary>Diff the source with this PR branch</summary> ```bash darc vmr diff --name-only https://github.com/dotnet/dotnet:e8558e6339cd4fccd998b5cdecb76eeb6ec75363..https://github.com/dotnet/templating:darc-release/10.0.1xx-f0cb154c-1d43-4305-9895-4fac2e38ee98 ``` </details> [marker]: <> (End:Footer:CodeFlow PR)
…ease/10.0.1xx-to-release/10.0.3xx # Conflicts: # NuGet.config # eng/Version.Details.props # eng/Version.Details.xml # global.json
…nflicts resolved) (#10317) ### Problem Automated inter-branch merge from `release/10.0.1xx` into `release/10.0.3xx` hit merge conflicts in dependency/versioning files, so the PR could not be merged cleanly as-is. ### Solution Manually resolved merge conflicts in: - `NuGet.config` - `eng/Version.Details.props` - `eng/Version.Details.xml` - `global.json` The conflict resolution preserves the `release/10.0.3xx` runtime dependency line while keeping the newer `dotnet-dotnet` dependency updates brought from `release/10.0.1xx`, then finalizes the merge commit. ### Checks: - [ ] Added unit tests
github-actions
Bot
force-pushed
the
merge/release/10.0.3xx-to-release/10.0.4xx
branch
from
June 11, 2026 06:08
e0df850 to
d817556
Compare
Member
|
@copilot resolve the merge conflicts in this pull request |
Resolved. I merged |
Copilot
AI
changed the title
[automated] Merge branch 'release/10.0.3xx' => 'release/10.0.4xx'
[automated] Merge branch 'release/10.0.3xx' => 'release/10.0.4xx' (conflicts resolved)
Jun 11, 2026
SimonZhao888
approved these changes
Jun 11, 2026
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.
Problem
Automated merge changes from
release/10.0.3xxintorelease/10.0.4xxencountered merge conflicts in dependency/version files, preventing the PR from being merge-ready.Solution
Resolved merge conflicts by merging
release/10.0.4xxinto the PR branch and finalizing conflict resolution in:eng/Version.Details.propseng/Version.Details.xmlglobal.jsonAdditionally, addressed follow-up review feedback in
test/Microsoft.TemplateEngine.TestHelper/PackageManager.csby improving debug logging for null package metadata results.Checks: