dotnet
[automated] Merge branch 'release/9.0.2xx' => 'main'
I detected changes in the release/9.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/9.0.2xx by the following committers:
- tmat
- marcpopMSFT
- v-wuzhai
- Evangelink
- dotnet-maestro[bot]
- github-actions[bot]
- jonathanpeppers
- dotnet-sb-bot
- nagilson
- MichaelSimons
- manodasanW
- mmitche
- anvillan
- ellahathaway
- invalid-email-address
- vseanreesermsft
- baronfel
- surayya-MS
- NikolaMilosavljevic
- nohwnd
- joeloff
- dsplaisted
- am11
- dotnet-bot
- Cosifne
- javiercn
- DL444
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.2xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/9.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/9.0.2xx-to-main
or if you are using SSH
git push [email protected]:dotnet/sdk HEAD:merge/release/9.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/9.0.2xx-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.2xx-to-main main
git pull https://github.com/dotnet/sdk merge/release/9.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/9.0.2xx-to-main
or if you are using SSH
git checkout -b merge/release/9.0.2xx-to-main main
git pull [email protected]:dotnet/sdk merge/release/9.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/sdk HEAD:merge/release/9.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.
![github-actions[bot] avatar](https://avatars.githubusercontent.com/in/15368?v=4 "Published by a pub.dev verified publisher"){kind=small}
This is going to be blocked until we port the WiX changes from 9 to main. Will have to take an Arcade update once https://github.com/dotnet/arcade/pull/15184 is merged and a new validation build is available
@dotnet/source-build-internal Could you take a look at the failures here?
I suspect this is from updating the sdk source-build is using but not the previously source-built artifacts. I will push a changed to try this.
@dotnet/source-build-internal Could you take a look at the failures here?
I suspect this is from updating the sdk source-build is using but not the previously source-built artifacts. I will push a changed to try this.
I was looking at the wrong version. Everything looks correct.
The SB failure is likely related to this in the Versions.props file. Likely should be a darc dependency so the value is the same as the rest of the runtime . There are other properties as well that I wonder if will need to be updated. @ellahathaway can you investigate?
<SystemReflectionMetadataLoadContextVersion>9.0.0-rc.1.24431.7</SystemReflectionMetadataLoadContextVersion>
Maybe this happens because of the pinned dependency? https://github.com/dotnet/sdk/blob/4c6814f597b91a06c6d1816aa533b9d9914c4be8/eng/Version.Details.xml#L632
I agree that the issue is probably the pinned dependency. Hopefully bumping it will fix the issue. Thanks for pushing that commit Viktor.
