[automated] Merge branch 'release/2.2' => 'master' #7203
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- aspnet/AspNetCore-Internal#1341 - remove Scaffolding references from `build/artifacts.props`, `build/buildorder.props`, `build/submodules.props`, and our templates - add versions for these packages in `build/dependencies.props` to enable their inclusion in the package archives
dougbu
approved these changes
Feb 2, 2019
dougbu
force-pushed
the
merge/release/2.2-to-master
branch
from
4227c2d to
bdb9abb
Compare
dougbu
force-pushed
the
merge/release/2.2-to-master
branch
from
bdb9abb to
b5d8fe9
Compare
This was referenced Aug 12, 2020
This was referenced Oct 21, 2020
This was referenced Aug 27, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I detected changes in the release/2.2 branch which have not been merged yet to master. I'm a robot and am configured to help you automatically keep master up to date, so I've opened this PR.
This PR merges commits made on release/2.2 by the following committers:
Instructions for merging
This repo does not appear to allow merge commits from the GitHub UI, so you will need to update this PR with a merge commit before closing this PR.
git fetch git checkout release/2.2 git pull --ff-only git checkout master git pull --ff-only git merge --no-ff release/2.2 # If there are merge conflicts, resolve them and then run git merge --continue to complete the merge git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.2-to-masteror if you are using SSH
After PR checks are complete push the branch
Please 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.