[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.3xx' (resolve merge conflicts) - #10312
Merged
SimonZhao888 merged 4 commits intoJun 10, 2026
Conversation
Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.26307.103 -> 10.0.0-beta.26309.104) 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**: [20260609.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2996145) ([318062](https://maestro.dot.net/channel/5173/github:dotnet:dotnet/build/318062)) - **Date Produced**: June 10, 2026 12:18:59 AM UTC - **Commit**: [798ed03c88f360172bccb85b4586041bb26da21d](dotnet/dotnet@798ed03) - **Commit Diff**: [fe7283f...798ed03](dotnet/dotnet@fe7283f...798ed03) - **Branch**: [release/10.0.1xx](https://github.com/dotnet/dotnet/tree/release/10.0.1xx) **Updated Dependencies** - From [10.0.0-beta.26307.103 to 10.0.0-beta.26309.104][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@fe7283f...798ed03 [marker]: <> (Start:Footer:CodeFlow PR) ## Associated changes in source repos - dotnet/efcore@c3f27f5...a036cbb - dotnet/runtime@993f5ec...5ffb31d - dotnet/sdk@50dd91b...5c60093 - f492a20...07c790b <details> <summary>Diff the source with this PR branch</summary> ```bash darc vmr diff --name-only https://github.com/dotnet/dotnet:798ed03c88f360172bccb85b4586041bb26da21d..https://github.com/dotnet/templating:darc-release/10.0.1xx-72ea8a88-fc64-454c-9642-66edf0ee51d6 ``` </details> [marker]: <> (End:Footer:CodeFlow PR)
Member
|
@copilot resolve the merge conflicts in this pull request. |
…ease/10.0.1xx-to-release/10.0.3xx # Conflicts: # NuGet.config # eng/Version.Details.props # eng/Version.Details.xml # global.json
Resolved the merge conflicts and pushed the merge commit: |
Copilot
AI
changed the title
[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.3xx'
[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.3xx' (resolve merge conflicts)
Jun 10, 2026
SimonZhao888
approved these changes
Jun 10, 2026
This was referenced 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 inter-branch merge from
release/10.0.1xxintorelease/10.0.3xxencountered merge conflicts that prevented completion.Solution
Resolved merge conflicts in:
NuGet.configeng/Version.Details.propseng/Version.Details.xmlglobal.jsonKept the merge commit flow intact and reconciled dependency/version values so the merged branch remains consistent with
release/10.0.3xxpackage availability while preserving incoming changes fromrelease/10.0.1xx.Checks: