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/6.0-rc1' => 'release/6.0' #35706

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

This PR merges commits made on release/6.0-rc1 by the following committers:

  • github-actions[bot]
  • dotnet-maestro[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/6.0-rc1
git pull --ff-only
git checkout release/6.0
git pull --ff-only
git merge --no-ff release/6.0-rc1

# 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/AspNetCore HEAD:merge/release/6.0-rc1-to-release/6.0
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/AspNetCore HEAD:merge/release/6.0-rc1-to-release/6.0

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-rc1-to-release/6.0'. 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-rc1-to-release/6.0 release/6.0
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/6.0-rc1-to-release/6.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/6.0-rc1-to-release/6.0
or if you are using SSH
git checkout -b merge/release/6.0-rc1-to-release/6.0 release/6.0
git pull git@github.com:dotnet-maestro-bot/AspNetCore merge/release/6.0-rc1-to-release/6.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/AspNetCore HEAD:merge/release/6.0-rc1-to-release/6.0

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 4 commits August 24, 2021 22:50
…824.20 (dotnet#35675)

[release/6.0-rc1] Update dependencies from dotnet/efcore
…me (dotnet#35677)

[release/6.0-rc1] Update dependencies from dotnet/efcore dotnet/runtime
…824.28 (dotnet#35681)

[release/6.0-rc1] Update dependencies from dotnet/efcore
* Don't cache CanReuse value

* Comment on when to use CanReuse

Co-authored-by: Sebastien Ros <sebastienros@gmail.com>
@dotnet-maestro-bot dotnet-maestro-bot force-pushed the merge/release/6.0-rc1-to-release/6.0 branch from 5e092de to a5f72e7 Compare August 25, 2021 16:23
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels Aug 25, 2021
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Auto-approving branch merge.

@ghost ghost added tell-mode Indicates a PR which is being merged during tell-mode community-contribution Indicates that the PR has been added by a community member labels Aug 25, 2021
github-actions bot and others added 2 commits August 25, 2021 10:17
…onary (dotnet#35705)

Co-authored-by: Brennan <brecon@microsoft.com>
…hen the dotnet process is ungracefully terminated (dotnet#35701)

* Adds a script to terminate the spawned NPM processes automatically when the host dotnet process is ungracefully terminated.

Co-authored-by: Javier Calvarro Nelson <jacalvar@microsoft.com>
@captainsafia
Copy link
Member

Merging because failures are due to:

  • Flakiness in the build
  • Issues with the Public API analyzer which we are intentionally ignoring

@captainsafia captainsafia merged commit be00dc2 into dotnet:release/6.0 Aug 26, 2021
@ghost ghost added this to the 6.0-rc2 milestone Aug 26, 2021
@mkArtakMSFT mkArtakMSFT removed the community-contribution Indicates that the PR has been added by a community member label Feb 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework tell-mode Indicates a PR which is being merged during tell-mode Type: Merge Forward ⏩
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants