[automated] Merge branch 'release/10.0.2xx' => 'main'

[github-actions[bot]]

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:

• tmat
• Copilot
• dsplaisted
• jjonescz
• baronfel

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.

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 [email protected]:dotnet/sdk HEAD:merge/release/10.0.2xx-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

:warning: 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 [email protected]:dotnet/sdk merge/release/10.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]: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.

[nagilson]

@jjonescz May you PTAL at this merge conflict? Do you intend to move all of the .NET run command code into this separate function style?

[jjonescz]

Do you intend to move all of the .NET run command code into this separate function style?

No, just pieces that need to be shared with dotnet-watch or roslyn. If you are talking about the refactoring done in https://github.com/dotnet/sdk/pull/52030.

[jjonescz]

The conflicts here seem to be from the combination of these two PRs:

• https://github.com/dotnet/sdk/pull/51914
• https://github.com/dotnet/sdk/pull/51727

Which I'm seeing for the first time. I have resolved the conflicts but @jonathanpeppers @baronfel @tmat should probably also take a look.

[jonathanpeppers]

There should be sufficient unit/integration tests for dotnet run device selection.

Do you have a list of the conflicting file names? I didn't see it on the commit above.

[jjonescz]

Ah, sorry, don't have it anymore, it was RunCommand.cs, RunApiCommand.cs, RunCommandParser.cs IIRC. You can also try merging release/10.0.2xx to main locally to see the exact conflicts (and feel free to re-resolve them and force-push to this PR).

[jonathanpeppers]

For others reviewing:

CONFLICT (content): Merge conflict in src/Cli/dotnet/Commands/Run/RunCommand.cs
CONFLICT (content): Merge conflict in src/Cli/dotnet/Commands/Run/RunCommandParser.cs