This repository was archived by the owner on Apr 20, 2023. It is now read-only.
Merge release/2.1.3xx to master #8850
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
Merge master into release/2.1.3xx
Other than change source to source-feed and make it additional instead of exclusive. I changed source to be multiple. Because restore support multiple source microsoft/dotnet#361 As for mock. The offline feed and source feed is considered the same, so remove the category of “source”. I renamed source to “AdditionalFeed” because that is more accurate on implementation level. Note: NuGet feed don’t have order. Whichever responses the fastest, is the first. No change on restore. scripts/cli-test-env.sh change is due to mac 10.13 is finally added to RID graph. And it is “considered” one of the CLI supported RID
|
@wli3 |
|
Should i review of fix? There is still merge conflicts |
|
let me just fix it |
|
@johnbeisner I merged master to merge branch again, the conflict automatically resolved. The diff for tools looks correct cc @peterhuene |
|
@dotnet/dotnet-cli I merged master back to the merge branch. I think it is right thing. Help me double check |
|
@dotnet/dotnet-cli ping |
peterhuene
approved these changes
Mar 22, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This is an automatically generated pull request from release/2.1.3xx into master.
git fetch --all git checkout merges/release/2.1.3xx-to-master git reset --hard upstream/master git merge upstream/release/2.1.3xx # Fix merge conflicts git commit git push merges/release/2.1.3xx-to-master --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.