Merge release/3.0.1xx to master #3113
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
Also switch from creating lists of filtered libraries, to setting properties on the libraries to indicate if they are filtered out for runtime and compilation
…isn't copy local This metadata is consumed by the new deps file generation code
…ile if old and new versions matched
…file Works around what appears to be a bug in how NuGet writes the assets file for a few packages
This keeps parity between the "old" and "new" methods of generating the deps file
… different library versions
This was logic in ProjectContext.GetRuntimeLibraries that I missed when re-implementing it
… deps file generation
This aligns with current 3.0 templates, and no longer generates warnings
Rewrite deps file generation
This was referenced Apr 11, 2019
|
@dsplaisted can you push this through? IL Linker needs your change in master. cc @sbomer |
dsplaisted
force-pushed
the
merges/release/3.0.1xx-to-master
branch
from
fa9e036 to
643d19e
Compare
|
Thank you @dsplaisted! |
dsplaisted
pushed a commit
to dsplaisted/sdk
that referenced
this pull request
Feb 19, 2020
….1 (dotnet#3113) - Microsoft.DotNet.Cli.Runtime - 3.1.100-preview1.19506.1
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/3.0.1xx into master.
git fetch --all git checkout merges/release/3.0.1xx-to-master git reset --hard upstream/master git merge upstream/release/3.0.1xx # Fix merge conflicts git commit git push upstream merges/release/3.0.1xx-to-master --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.