Skip to content

[automated] Merge branch 'release/9.0.2xx' => 'release/9.0.3xx' #8734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 30 commits into from
Feb 6, 2025

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Feb 6, 2025

I detected changes in the release/9.0.2xx branch which have not been merged yet to release/9.0.3xx. I'm a robot and am configured to help you automatically keep release/9.0.3xx up to date, so I've opened this PR.

This PR merges commits made on release/9.0.2xx by the following committers:

  • Forgind
  • v-wuzhai
  • joeloff
  • vseanreesermsft
  • dotnet-maestro[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/9.0.2xx
git pull --ff-only
git checkout release/9.0.3xx
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/templating HEAD:merge/release/9.0.2xx-to-release/9.0.3xx
or if you are using SSH
git push [email protected]:dotnet/templating HEAD:merge/release/9.0.2xx-to-release/9.0.3xx

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/9.0.2xx-to-release/9.0.3xx'. 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/9.0.2xx-to-release/9.0.3xx origin/release/9.0.3xx
git pull https://github.com/dotnet/templating merge/release/9.0.2xx-to-release/9.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/templating HEAD:merge/release/9.0.2xx-to-release/9.0.3xx
or if you are using SSH
git fetch
git checkout -b merge/release/9.0.2xx-to-release/9.0.3xx origin/release/9.0.3xx
git pull [email protected]:dotnet/templating merge/release/9.0.2xx-to-release/9.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/templating HEAD:merge/release/9.0.2xx-to-release/9.0.3xx

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.

dotnet-maestro bot and others added 29 commits January 10, 2025 22:22
…als (#8638)

[release/8.0.1xx] Update dependencies from dotnet/source-build-externals
…110.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24623.2 -> To Version 8.0.0-beta.25060.1
…110.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24623.2 -> To Version 8.0.0-beta.25060.1
…97-4549-af4c-769829aaa783

[release/8.0.3xx] Update dependencies from dotnet/arcade
…71-4516-a702-b804482008c4

[release/8.0.1xx] Update dependencies from dotnet/arcade
…ence-packages build 20250110.2 (#8641)

[release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages
…into merge/release/8.0.1xx-to-release/8.0.3xx
…into merge/release/8.0.3xx-to-release/8.0.4xx
…/8.0.3xx

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx'
…/8.0.4xx

[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx'
…114.11

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.25060.1 -> To Version 8.0.0-beta.25064.11
…114.11

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.25060.1 -> To Version 8.0.0-beta.25064.11
…e3-42ba-86b3-a71241036103

[release/8.0.4xx] Update dependencies from dotnet/arcade
…c3-401e-8c41-38dfc9cb00e4

[release/8.0.3xx] Update dependencies from dotnet/arcade
…into merge/release/8.0.3xx-to-release/8.0.4xx
…into merge/release/8.0.4xx-to-release/9.0.1xx
…/8.0.4xx

[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx'
…/9.0.1xx

[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx'
…116.6

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.25064.11 -> To Version 8.0.0-beta.25066.6
…91-4994-bec6-22d032686d1b

[release/8.0.4xx] Update dependencies from dotnet/arcade
…into merge/release/8.0.4xx-to-release/9.0.1xx
…/9.0.1xx

[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx'
…127.4

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
 From Version 9.0.0-beta.25065.2 -> To Version 9.0.0-beta.25077.4
…2-04-1137-01a6a261-5d1d-4f3b-befb-a17d389829cc

Update branding to 9.0.104
…38-4e3f-a74f-dabbda38e80d

[release/9.0.1xx] Update dependencies from dotnet/arcade
…into merge/release/9.0.1xx-to-release/9.0.2xx
…/9.0.2xx

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx'
Fixes #7946

dsplaisted found a stack here that was very helpful in helping me find the source of the parallel call to the workload resolver. As seen in the top stack, this call fairly quickly reaches the WorkloadResolver, where it attempts to initialize everything concurrently, causing the issue. It's called from TemplatePackageCoordinator in the SDK repo, which in turn is called by various things.

This adds a lock around the call to the WorkloadResolver in WorkloadConstraintFactory, which should prevent it from trying to go through the initialization code in parallel.
@github-actions github-actions bot requested a review from a team as a code owner February 6, 2025 00:29
@github-actions github-actions bot force-pushed the merge/release/9.0.2xx-to-release/9.0.3xx branch from d7fce1f to 8c5b547 Compare February 6, 2025 00:29
…into merge/release/9.0.2xx-to-release/9.0.3xx
@v-wuzhai v-wuzhai merged commit be07bbf into release/9.0.3xx Feb 6, 2025
10 checks passed
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.

4 participants