[automated] Merge branch 'release/2.1' => 'release/2.2'#4577
Merged
JunTaoLuo merged 4 commits intoDec 12, 2018
Merged
Conversation
…net#4569) Changes: * Condense Routing.sln into HttpAbstractions.sln * Workaround NU1105 by adding all ProjectReferences to the .sln * Workaround exceptions in the ReferencesHostBridge by moving Reference items to a temporary item group * Add a 'startvs.cmd' script for launching VS with the right env variables * Remove RangeHelper test project * Move RangeHelper tests into StaticFiles.Tests and add target for NPM restore
Contributor
Author
|
This pull request has been updated. This PR merges commits made on release/2.1 by the following committers: |
1 similar comment
Contributor
Author
|
This pull request has been updated. This PR merges commits made on release/2.1 by the following committers: |
Contributor
|
🆙 📅 with resolution to merge conflicts. I'll wait till PR checks pass to merge. |
natemcmaster
approved these changes
Dec 11, 2018
natemcmaster
force-pushed
the
merge/release/2.1-to-release/2.2
branch
from
December 11, 2018 23:38
665d8f2 to
b2b7439
Compare
Contributor
|
Uh oh, looks like that was a squash commit. We need actual merge commits, otherwise the bot gets confused. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.1 branch which have not been merged yet to release/2.2. I'm a robot and am configured to help you automatically keep release/2.2 up to date, so I've opened this PR.
This PR merges commits made on release/2.1 by the following committers:
Instructions for merging
This PR will not be auto-merged. When pull request checks pass, please complete this PR by creating a merge commit, not a squash or rebase commit.
You can also do this on command line:
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/2.1-to-release/2.2'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
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.