Merge release/2.1.4xx to master #2224
Merged
Conversation
This file contains 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
…version of Microsoft.NET.Build.Extensions.Tasks
Insert NuGet Build 4.7.0-rtm.5148 into sdk
…t via global properties Two properties are needed since global properties flow to referenced projects so there needs to be a way to specify which project the override applies to
…t via global properties Two properties are needed since global properties flow to referenced projects so there needs to be a way to specify which project the override applies to
Support overriding MSBuildProjectExtensionsPath for a specific project via global properties
Support overriding MSBuildProjectExtensionsPath for a specific project via global properties
…hem in our build targets so adding this one to follow suit.
Update version to RTM
[release/2.1.3xx] Add a tiered compilation build variable
Updating crossgen to pass -nologo by default
…e/2.1.3xx Merge release/2.1.2xx to release/2.1.3xx
…e/2.1.4xx Merge release/2.1.3xx to release/2.1.4xx
…e/2.1.3xx Merge release/2.1.2xx to release/2.1.3xx
…e/2.1.4xx Merge release/2.1.3xx to release/2.1.4xx
…ss code review feedback
LOC CHECKIN | dotnet/sdk release/2.1.3xx | 20180427
…e/2.1.4xx Merge release/2.1.3xx to release/2.1.4xx
Updating the obsolete cli tool package message.
…esolve Harden against failure to resolve packages or produce assets cache
…ution Use MetadataReader to get assembly versions for conflict resolution
agocke
approved these changes
May 7, 2018
|
test this please |
…e/2.1.4xx Merge release/2.1.3xx to release/2.1.4xx
johnbeisner
force-pushed
the
merges/release/2.1.4xx-to-master
branch
from
1c5285c
to
61fa3cf
Compare
…nflict resolution.
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.
This is an automatically generated pull request from release/2.1.4xx into master.
git fetch --all git checkout merges/release/2.1.4xx-to-master git reset --hard upstream/master git merge upstream/release/2.1.4xx # Fix merge conflicts git commit git push merges/release/2.1.4xx-to-master --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.