Skip to content
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

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

Open
wants to merge 64 commits into
base: release/9.0.2xx
Choose a base branch
from

Conversation

github-actions[bot]
Copy link
Contributor

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

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

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

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.2xx
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.2xx
or if you are using SSH
git push [email protected]:dotnet/templating HEAD:merge/release/9.0.1xx-to-release/9.0.2xx

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

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 September 16, 2024 22:35
…913.3

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24463.3
…b2-4f46-86ce-c949450cdbaf

[release/8.0.1xx] Update dependencies from dotnet/arcade
…0-01-1549-c19d2ac6-bd6d-47a0-b025-c6bcd7d81c4e

Update branding to 8.0.111
…0-01-1549-5929ae0f-ae05-4d51-a0f2-9a78a8293bc8

Update branding to 8.0.307
[release/8.0.3xx] Update dependencies from dotnet/arcade
[release/8.0.1xx] Update dependencies from dotnet/arcade
…004.2 (#8432)

[release/8.0.3xx] Update dependencies from dotnet/arcade
…004.2 (#8431)

[release/8.0.1xx] Update dependencies from dotnet/arcade
…008.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24504.2 -> To Version 8.0.0-beta.24508.1
…008.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24504.2 -> To Version 8.0.0-beta.24508.1
…nals build 20241010.2

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.24379.1 -> To Version 8.0.0-alpha.1.24510.2
…7e-463c-bb0c-a799e4a75970

[release/8.0.1xx] Update dependencies from dotnet/source-build-externals
…b6-4d0d-ab8e-4756b37a70a8

[release/8.0.3xx] Update dependencies from dotnet/arcade
…into merge/release/8.0.3xx-to-release/8.0.4xx
…81-4582-b235-f29133ec2d84

[release/8.0.1xx] Update dependencies from dotnet/arcade
…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'
…016.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24508.1 -> To Version 8.0.0-beta.24516.1
…016.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24508.1 -> To Version 8.0.0-beta.24516.1
…016.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24508.1 -> To Version 8.0.0-beta.24516.1
…nals build 20241016.2

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.24510.2 -> To Version 8.0.0-alpha.1.24516.2
…be-4d95-978c-328163777598

[release/8.0.1xx] Update dependencies from dotnet/source-build-externals
…52-42cc-a160-ef6c4e1dd0b9

[release/8.0.4xx] Update dependencies from dotnet/arcade
…67-4ed4-89fe-54db5f8e382d

[release/8.0.3xx] Update dependencies from dotnet/arcade
…5c-4f2f-9c43-452b6b00d52a

[release/8.0.1xx] Update dependencies from dotnet/arcade
…016.2 (#8472)

[release/9.0.1xx] Update dependencies from dotnet/arcade
…into merge/release/8.0.1xx-to-release/8.0.3xx
dotnet-maestro bot and others added 28 commits October 17, 2024 21:22
…nals build 20241016.3 (#8481)

[release/9.0.1xx] Update dependencies from dotnet/source-build-externals
Removing the post-build template skipped promotion for templating builds
…025.2

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24516.1 -> To Version 8.0.0-beta.24525.2
…025.2

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24516.1 -> To Version 8.0.0-beta.24525.2
…1-05-1041-38c4c500-85a5-43e1-9d6f-00c3a2803db0

Update branding to 9.0.101
…1-05-1041-787c5d3b-0c39-4563-8103-4f6167d07dea

Update branding to 8.0.308
…1-05-1041-4d631699-6772-4b96-bd37-256745b54f45

Update branding to 8.0.405
…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'
…112.12

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24562.12
…112.13

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
 From Version 9.0.0-beta.24516.2 -> To Version 9.0.0-beta.24562.13
…4d-4505-b506-5cf3462afd54

[release/8.0.4xx] Update dependencies from dotnet/arcade
…into merge/release/8.0.4xx-to-release/9.0.1xx
…8f-4b8d-a09c-b67a2b9fecbf

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

[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx'
…nals build 20241118.2

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 9.0.0-alpha.1.24516.3 -> To Version 9.0.0-alpha.1.24568.2
…24-4a18-8ed1-424333e95316

[release/9.0.1xx] Update dependencies from dotnet/source-build-externals
Increment branding to allow for post-GA hotfixes
@github-actions github-actions bot force-pushed the merge/release/9.0.1xx-to-release/9.0.2xx branch from cb5b9b4 to 2be9b56 Compare November 21, 2024 19:34
@github-actions github-actions bot requested a review from a team as a code owner November 21, 2024 19:34
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.

5 participants