Skip to content
This repository has been archived by the owner on Sep 26, 2024. It is now read-only.

[automated] Merge branch 'release/6.0.2xx' => 'main' #80

Merged

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

  • dotnet-maestro[bot]
  • TanayParikh

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/6.0.2xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/6.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-maestro-bot/razor-compiler HEAD:merge/release/6.0.2xx-to-main
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/razor-compiler HEAD:merge/release/6.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/6.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/6.0.2xx-to-main main
git pull https://github.com/dotnet-maestro-bot/razor-compiler merge/release/6.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/razor-compiler HEAD:merge/release/6.0.2xx-to-main
or if you are using SSH
git checkout -b merge/release/6.0.2xx-to-main main
git pull git@github.com:dotnet-maestro-bot/razor-compiler merge/release/6.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/razor-compiler HEAD:merge/release/6.0.2xx-to-main

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.

dotnet-maestro bot and others added 5 commits January 31, 2022 16:29
…130.1 (dotnet#57)

Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22071.6 -> To Version 7.0.0-beta.22080.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
So we get appropriate notifications. Extension of dotnet#54.
…203.1 (dotnet#66)

Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22080.1 -> To Version 7.0.0-beta.22103.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…211.10 (dotnet#71)

Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22103.1 -> To Version 7.0.0-beta.22111.10

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…217.2 (dotnet#78)

[release/6.0.2xx] Update dependencies from dotnet/arcade
@dotnet-maestro-bot dotnet-maestro-bot requested a review from a team as a code owner February 25, 2022 21:09
@dougbu
Copy link
Member

dougbu commented Mar 21, 2022

@mkArtakMSFT @dotnet/aspnet-blazor-eng who is responsible for merges into 'main' in this repo❔ @dotnet/aspnet-build gets pinged when Versions.props changes but we are definitely not the right people to keep on top of these PRs.

@TanayParikh
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Contributor

@TanayParikh TanayParikh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving this PR. In terms of who's responsible for these merge/dependency update PRs, I don't think it has ever really been finalized. Will follow-up with @mkArtakMSFT offline.

@TanayParikh TanayParikh merged commit 51942e6 into dotnet:main Mar 23, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants