Merge release/15.5 to master #1681
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
Updating the SDK version to 15.5.0
…nging in .NET Standard facades
This reverts commit 3a58474.
…ge instead of replacing reference Fixes #1244
…ferences in NuGet packages
These switches are no-ops on core csc, but vital on desktop csc. If a user would reference the desktop compiler package, then we'd end up passing desktop assemblies implied by lack of /noconfig /nostdlib to the compilation of a netstandard assembly. Also passing /nologo consistent with main assembly compilation.
Pass /noconfig, /nostdlib to satellite compilation appropriately
Use .NET Standard facades without reference assembly bit set
…tpath Update simple name references with HintPath from DLL from NuGet package instead of replacing reference
…r NETCore Resolving FrameworkPathOverride slows down evaluation and is not needed for NETStandard and NETCore.
…K project references SDK project
This version of the CLI has a matching NuGet version to the one being inserted.
Set EnableFrameworkPathOverride to false when targeting NETStandard or NETCore
Insert NuGet Build 4.5.0-preview1-4526 into sdk
…k-list In conflict resolution, treat items from FrameworkList.xml as platform assemblies
…ndNETStandardFacades Fix #1499
Insert NuGet Build 4.5.0-preview2-4529 into sdk
…15.5-20171013-070033 Merge release/2.0.0 to release/15.5
Fix incorrect itemspec for references from ImplicitlyExpandNETStandardFacades
…e's also a matching DLL from NuGet Applies the fix from #1454 to framework references that come from NuGet packages
Update framework references from NuGet packages with HintPath if there's also a matching DLL from NuGet
|
Needs a new CLI build. NuGet version is conflicting. |
|
Still waiting for completed CLI master build for Windows. |
nguerrera
force-pushed
the
merges/release/15.5-to-master-20171024-070033
branch
from
b9c625b
to
a11198c
Compare
livarcocc
approved these changes
Oct 26, 2017
JL03-Yue
pushed a commit
that referenced
this pull request
Mar 19, 2024
[main] Update dependencies from dotnet/arcade
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/15.5 into master.
git fetch --all git checkout merges/release/15.5-to-master-20171024-070033 git reset --hard upstream/master git merge upstream/release/15.5 # Fix merge conflicts git commit git push merges/release/15.5-to-master-20171024-070033 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.