Skip to content

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Jan 8, 2026

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:

  • Copilot
  • dsplaisted
  • invalid-email-address
  • tmat
  • jjonescz
  • martinrrm
  • marcpopMSFT
  • github-actions[bot]

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.

merge button instructions

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.

git fetch
git checkout release/10.0.2xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/10.0.2xx

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/sdk HEAD:merge/release/10.0.2xx-to-main
or if you are using SSH
git push git@github.com:dotnet/sdk HEAD:merge/release/10.0.2xx-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

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.

git fetch
git checkout -b merge/release/10.0.2xx-to-main origin/main
git pull https://github.com/dotnet/sdk merge/release/10.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/10.0.2xx-to-main
or if you are using SSH
git fetch
git checkout -b merge/release/10.0.2xx-to-main origin/main
git pull git@github.com:dotnet/sdk merge/release/10.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sdk HEAD:merge/release/10.0.2xx-to-main

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.

marcpopMSFT and others added 24 commits December 11, 2025 16:24
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>
Per standard policy, 2xx-4xx will require 18.0 as the minimum VS/MSBuild version.
… 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>
…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/*
@github-actions github-actions bot requested review from a team, MiYanni and tmat as code owners January 8, 2026 12:05
@nagilson
Copy link
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.

@SimonZhao888
Copy link
Member

@tmat I have resolved the conflict. Could you please check if there are any omissions or errors?

@SimonZhao888
Copy link
Member

@Youssef1313 could you please take a look at the failure test cases?

@SimonZhao888
Copy link
Member

@nagilson could you please take a look at the test failures?

DonnaChen888 and others added 6 commits January 19, 2026 09:48
# 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
@MiYanni
Copy link
Member

MiYanni commented Jan 23, 2026

Talked to @marcpopMSFT. This PR was before flows were changed. We should just use the 10.0.3xx -> main PR at this point. Closing.

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.