[automated] Merge branch 'release/10.0.2xx' => 'main'#52362
Closed
github-actions[bot] wants to merge 37 commits intomainfrom
Closed
[automated] Merge branch 'release/10.0.2xx' => 'main'#52362github-actions[bot] wants to merge 37 commits intomainfrom
github-actions[bot] wants to merge 37 commits intomainfrom
Conversation
Then do a manual update to the 2xx version of all tooling repos
…les (#52159) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: DamianEdwards <249088+DamianEdwards@users.noreply.github.com> Co-authored-by: jjonescz <3669664+jjonescz@users.noreply.github.com> Co-authored-by: Jan Jones <janjones@microsoft.com> Co-authored-by: Fred Silberberg <frsilb@microsoft.com>
Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com>
….details.xml file
Per standard policy, 2xx-4xx will require 18.0 as the minimum VS/MSBuild version.
…mmand definitions (#52124)
… action logic (#52162) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: tmat <41759+tmat@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: jjonescz <3669664+jjonescz@users.noreply.github.com> Co-authored-by: Jan Jones <janjones@microsoft.com>
…0.0.26100.0 Co-authored-by: dsplaisted <145043+dsplaisted@users.noreply.github.com>
…o Windows SDK 10.0.26100.0 (#52357)
…mpilation (#51609) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: jjonescz <3669664+jjonescz@users.noreply.github.com> Co-authored-by: Jan Jones <janjones@microsoft.com>
Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/*
Member
|
@tmat Thanks for that refactoring you did. How would you like that to be applied to the main branch? May you please resolve some of the issues here, there seems to be a decent amount of code churn between then and now. |
added 2 commits
January 13, 2026 10:40
Member
|
@tmat I have resolved the conflict. Could you please check if there are any omissions or errors? |
Member
|
@Youssef1313 could you please take a look at the failure test cases? |
3 tasks
Member
|
@nagilson could you please take a look at the test failures? |
This was referenced Jan 16, 2026
# Conflicts: # src/Cli/dotnet/Commands/Test/MTP/MSBuildUtility.cs # src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs # src/Cli/dotnet/Commands/Test/MTP/TestModulesFilterHandler.cs # src/Cli/dotnet/Commands/Test/MTP/ValidationUtility.cs
Member
|
Talked to @marcpopMSFT. This PR was before flows were changed. We should just use the 10.0.3xx -> main PR at this point. Closing. |
This was referenced Jan 23, 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.
I detected changes in the release/10.0.2xx branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.
This PR merges commits made on release/10.0.2xx 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.2xx-to-main'. 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.