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.2xx' => 'main' #8489

Merged
merged 1 commit into from
Oct 23, 2024

Conversation

github-actions[bot]
Copy link
Contributor

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:

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

* Update dependencies from https://github.com/dotnet/arcade build 20240913.3

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24463.3

* Update branding to 8.0.111

* Update branding to 8.0.307

* [release/8.0.3xx] Update dependencies from dotnet/arcade (#8368)

[release/8.0.3xx] Update dependencies from dotnet/arcade

* [release/8.0.1xx] Update dependencies from dotnet/arcade (#8394)

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

* Update dependencies from https://github.com/dotnet/arcade build 20241004.2 (#8432)

[release/8.0.3xx] Update dependencies from dotnet/arcade

* Update dependencies from https://github.com/dotnet/arcade build 20241004.2 (#8431)

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

* Update dependencies from https://github.com/dotnet/arcade build 20241008.1

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

* Update dependencies from https://github.com/dotnet/arcade build 20241008.1

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

* Update dependencies from https://github.com/dotnet/source-build-externals 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

* Update dependencies from https://github.com/dotnet/arcade build 20241016.1

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

* Update dependencies from https://github.com/dotnet/arcade build 20241016.1

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

* Update dependencies from https://github.com/dotnet/arcade build 20241016.2 (#8472)

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

* [release/9.0.1xx] Update dependencies from dotnet/runtime (#8467)

[release/9.0.1xx] Update dependencies from dotnet/runtime


 - Fix ignore patterns

* Update dependencies from https://github.com/dotnet/source-build-externals build 20241016.3 (#8481)

[release/9.0.1xx] Update dependencies from dotnet/source-build-externals

* Enable publish assets immediately (#8483)

Removing the post-build template skipped promotion for templating builds

* Revert changes made to the eng/ directory and nuget

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: vseanreesermsft <[email protected]>
Co-authored-by: Sean Reeser <[email protected]>
Co-authored-by: Marc Paine <[email protected]>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: v-wuzhai <[email protected]>
Co-authored-by: Matt Mitchell <[email protected]>
@github-actions github-actions bot requested a review from a team as a code owner October 23, 2024 10:49
@github-actions github-actions bot force-pushed the merge/release/9.0.2xx-to-main branch from cf61b12 to 44a0b49 Compare October 23, 2024 10:49
@ViktorHofer ViktorHofer enabled auto-merge (squash) October 23, 2024 10:50
@ViktorHofer ViktorHofer disabled auto-merge October 23, 2024 10:51
@ViktorHofer ViktorHofer enabled auto-merge October 23, 2024 10:51
@ViktorHofer ViktorHofer merged commit ee17678 into main Oct 23, 2024
11 checks passed
@ViktorHofer ViktorHofer deleted the merge/release/9.0.2xx-to-main branch October 23, 2024 11:04
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.

1 participant