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/8.0.3xx' => 'release/8.0.4xx' #8095

Conversation

dotnet-maestro-bot
Copy link

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

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

  • marcpopMSFT
  • dotnet-maestro[bot]
  • 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/8.0.3xx
git pull --ff-only
git checkout release/8.0.4xx
git pull --ff-only
git merge --no-ff release/8.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-maestro-bot/templating-1 HEAD:merge/release/8.0.3xx-to-release/8.0.4xx
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/templating-1 HEAD:merge/release/8.0.3xx-to-release/8.0.4xx

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/8.0.3xx-to-release/8.0.4xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/8.0.3xx-to-release/8.0.4xx release/8.0.4xx
git pull https://github.com/dotnet-maestro-bot/templating-1 merge/release/8.0.3xx-to-release/8.0.4xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/templating-1 HEAD:merge/release/8.0.3xx-to-release/8.0.4xx
or if you are using SSH
git checkout -b merge/release/8.0.3xx-to-release/8.0.4xx release/8.0.4xx
git pull [email protected]:dotnet-maestro-bot/templating-1 merge/release/8.0.3xx-to-release/8.0.4xx
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/templating-1 HEAD:merge/release/8.0.3xx-to-release/8.0.4xx

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

vseanreesermsft and others added 8 commits May 16, 2024 17:32
…2024-05-16-1732

Update branding to 8.0.302
* Update dependencies from https://github.com/dotnet/arcade build 20240514.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24225.1 -> To Version 8.0.0-beta.24264.1

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

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24225.1 -> To Version 8.0.0-beta.24266.3

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

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24225.1 -> To Version 8.0.0-beta.24266.3

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

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24225.1 -> To Version 8.0.0-beta.24266.3

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

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24225.1 -> To Version 8.0.0-beta.24266.3

* Remove redundant equality

* Remove unused parameter

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <[email protected]>
Increment branding to allow for razor hotfix
* Update dependencies from https://github.com/dotnet/arcade build 20240520.4

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24266.3 -> To Version 8.0.0-beta.24270.4

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

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24266.3 -> To Version 8.0.0-beta.24270.4

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

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24266.3 -> To Version 8.0.0-beta.24270.4

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

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24266.3 -> To Version 8.0.0-beta.24270.4

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

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24266.3 -> To Version 8.0.0-beta.24270.4

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

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24266.3 -> To Version 8.0.0-beta.24270.4

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

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24266.3 -> To Version 8.0.0-beta.24270.4

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

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24266.3 -> To Version 8.0.0-beta.24270.4

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

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24266.3 -> To Version 8.0.0-beta.24270.4

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

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24266.3 -> To Version 8.0.0-beta.24270.4

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

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24266.3 -> To Version 8.0.0-beta.24270.4

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

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24266.3 -> To Version 8.0.0-beta.24270.4

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…610.5

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24270.4 -> To Version 8.0.0-beta.24310.5
…6de-2594-4cf4-8f4d-594b37cc072b

[release/8.0.3xx] Update dependencies from dotnet/arcade
@dotnet-maestro-bot dotnet-maestro-bot force-pushed the merge/release/8.0.3xx-to-release/8.0.4xx branch from 0ee08a3 to 7248c3c Compare June 11, 2024 20:39
@dotnet-maestro-bot dotnet-maestro-bot requested a review from a team as a code owner June 11, 2024 20:39
@v-wuzhai v-wuzhai force-pushed the merge/release/8.0.3xx-to-release/8.0.4xx branch from c7b1853 to 19a9c4b Compare June 12, 2024 02:31
@ViktorHofer ViktorHofer merged commit 70c1a10 into dotnet:release/8.0.4xx Jun 12, 2024
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.

6 participants