Skip to content

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx'#9120

Merged
SimonZhao888 merged 13 commits intorelease/9.0.3xxfrom
merge/release/9.0.1xx-to-release/9.0.3xx
Jun 24, 2025
Merged

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx'#9120
SimonZhao888 merged 13 commits intorelease/9.0.3xxfrom
merge/release/9.0.1xx-to-release/9.0.3xx

Conversation

@github-actions
Copy link
Copy Markdown

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

  • dotnet-maestro[bot]
  • v-wuzhai
  • marcpopMSFT
  • vseanreesermsft

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

vseanreesermsft and others added 13 commits June 4, 2025 09:13
…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
…into merge/release/8.0.4xx-to-release/9.0.1xx
…into merge/release/8.0.3xx-to-release/8.0.4xx
…/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'
…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
…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'
…623.2 (#9117)

[release/9.0.1xx] Update dependencies from dotnet/arcade
@github-actions github-actions Bot requested a review from a team as a code owner June 24, 2025 03:27
@SimonZhao888 SimonZhao888 merged commit 67bcb8b into release/9.0.3xx Jun 24, 2025
11 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.

3 participants