Skip to content

[automated] Merge branch 'release/9.0.3xx' => 'main'#9154

Merged
SimonZhao888 merged 55 commits intomainfrom
merge/release/9.0.3xx-to-main
Jul 4, 2025
Merged

[automated] Merge branch 'release/9.0.3xx' => 'main'#9154
SimonZhao888 merged 55 commits intomainfrom
merge/release/9.0.3xx-to-main

Conversation

@github-actions
Copy link
Copy Markdown

@github-actions github-actions Bot commented Jul 3, 2025

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

  • joeloff
  • vseanreesermsft
  • SimonZhao888
  • dotnet-maestro[bot]
  • MiYanni
  • v-wuzhai
  • marcpopMSFT
  • akoeplinger

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

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

dotnet-maestro Bot and others added 30 commits May 20, 2025 02:02
…ence-packages build 20250519.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.25210.2 -> To Version 8.0.0-alpha.1.25269.2
It got accidentally added due to a darc bug, see dotnet/arcade-services#4837
…6-04-0913-a0178cc7-0c06-43eb-88ab-3c4341532f66

Update branding to 8.0.315
…6-04-0913-bca25e5a-3555-4978-84b6-3681c038de68

Update branding to 8.0.412
…6-04-0913-fbaefc19-84c1-4f38-8e12-1f98b3fc462c

Update branding to 9.0.108
…6-04-1331-f6b43ae4-90a1-4843-805c-7d632abfb3e4

Update branding to 8.0.118
[release/9.0.1xx] Delete src/arcade/eng/common directory
…0e-45c6-bfa6-025e891763d2

[release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages
[release/9.0.1xx] Update dependencies from dotnet/arcade
…into merge/release/8.0.1xx-to-release/8.0.3xx
…into merge/release/9.0.1xx-to-release/9.0.3xx
…into merge/release/8.0.4xx-to-release/9.0.1xx
…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'
…/9.0.1xx

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

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx'
…610.3

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.25264.2 -> To Version 8.0.0-beta.25310.3
…610.3

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.25264.2 -> To Version 8.0.0-beta.25310.3
…610.3

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.25264.2 -> To Version 8.0.0-beta.25310.3
…1d-4e4e-8ab8-49ecbd2a8ea4

[release/8.0.4xx] Update dependencies from dotnet/arcade
…60-420e-a652-b94a058c0b11

[release/8.0.3xx] Update dependencies from dotnet/arcade
…5a-4474-a81e-f91ed9728ae7

[release/8.0.1xx] Update dependencies from dotnet/arcade
…into merge/release/8.0.1xx-to-release/8.0.3xx
…into merge/release/8.0.3xx-to-release/8.0.4xx
…into merge/release/8.0.4xx-to-release/9.0.1xx
v-wuzhai and others added 24 commits June 11, 2025 16:59
…/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'
…/9.0.1xx

[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx'
…ence-packages build 20250616.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.25269.2 -> To Version 8.0.0-alpha.1.25316.2
…into merge/release/8.0.1xx-to-release/8.0.3xx
…/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'
…623.2

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
 From Version 9.0.0-beta.25302.2 -> To Version 9.0.0-beta.25323.2
…64-4ce3-88e1-4603aefff5b6

[release/9.0.3xx] Update dependencies from dotnet/arcade
…623.2 (#9117)

[release/9.0.1xx] Update dependencies from dotnet/arcade
…/9.0.3xx

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx'
…625.4

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
 From Version 9.0.0-beta.25323.2 -> To Version 9.0.0-beta.25325.4
…625.4

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
 From Version 9.0.0-beta.25323.2 -> To Version 9.0.0-beta.25325.4
…86-4cab-9a62-1e921a0d06ad

[release/9.0.3xx] Update dependencies from dotnet/arcade
…3e-4ad5-932d-b38fcef9a84d

[release/9.0.1xx] Update dependencies from dotnet/arcade
…626.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.25310.3 -> To Version 8.0.0-beta.25326.1
…0e-4793-aa3f-63ae88455d7b

[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'
…into merge/release/9.0.1xx-to-release/9.0.3xx
…/9.0.3xx

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx'
…7-03-1035-57d4f918-a286-48fc-a987-883bf8352a6b

Update branding to 9.0.303
@github-actions github-actions Bot requested a review from a team as a code owner July 3, 2025 18:03
@SimonZhao888 SimonZhao888 merged commit 5715045 into main Jul 4, 2025
10 checks passed
mmitche pushed a commit to dotnet/sdk that referenced this pull request Apr 2, 2026
….0.3xx-to-main

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

Commit migrated from dotnet/templating@5715045
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.

6 participants