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

[github-actions[bot]]

I detected changes in the release/9.0.1xx 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/9.0.1xx by the following committers:

• v-wuzhai
• dotnet-maestro[bot]
• marcpopMSFT
• Forgind
• jjonescz
• baronfel
• vseanreesermsft
• dotnet-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.

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/9.0.1xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/9.0.1xx

# 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/9.0.1xx-to-main

or if you are using SSH

git push [email protected]:dotnet/sdk HEAD:merge/release/9.0.1xx-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/9.0.1xx-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/9.0.1xx-to-main main
git pull https://github.com/dotnet/sdk merge/release/9.0.1xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/9.0.1xx-to-main

or if you are using SSH

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

[v-wuzhai]

@Forgind @baronfel Looks like there is a failed test related to the workload. Can you take a look?

[Forgind]

@Forgind @baronfel Looks like there is a failed test related to the workload. Can you take a look?

I just tried running that test locally from this PR, and it didn't fail. I'm going to try rerunning to see if that works.

[Forgind]

Now I looked at the actual failure, and it seems like it's unrelated to the test that's failing. It's basically just saying some workloads are out of alignment, which probably means one or more were pushed to nuget without their dependencies being pushed.

[dsplaisted]

Workload update failed: Workload manifest dependency 'Microsoft.NET.Workload.Emscripten.Current' version '9.0.0-rc.1.24420.5' is lower than version '10.0.0-alpha.1.24421.1' required by manifest 'microsoft.net.workload.mono.toolchain.current' [/private/tmp/helix/working/9BE1090C/p/d/sdk-manifests/9.0.100-rc.1/microsoft.net.workload.mono.toolchain.current/9.0.0-rc.1.24423.3/WorkloadManifest.json]

This looks similar to issues we've had in the past where the branding for dotnet/runtime went in before dotnet/emscripten and the manifest version dependency breaks.

@steveisok Will we have a 10.0 manifest for emscripten soon, and do you think that will fix this?

FYI @marcpopMSFT

[dsplaisted]

Looks like the emscripten update may be coming in via #43061, but that has issues related to the switch to .NET 10.