Merge dev15.6.x-vs-deps to dev15.7.x-vs-deps#24703
Merged
AbhitejJohn merged 18 commits intodev15.7.x-vs-depsfrom Feb 8, 2018
Merged
Merge dev15.6.x-vs-deps to dev15.7.x-vs-deps#24703AbhitejJohn merged 18 commits intodev15.7.x-vs-depsfrom
AbhitejJohn merged 18 commits intodev15.7.x-vs-depsfrom
Conversation
Add satellite assemblies for the Roslyn assemblies that we ship in Microsoft.NETCore.Compiler.nupkg. This includes Microsoft.CodeAnalysis.dll, Microsoft.CodeAnalysis.CSharp.dll, Microsoft.CodeAnalysis.VisualBasic.dll, and Microsoft.Build.Tasks.CodeAnalysis.dll. This increases the resulting .nupkg size from about 8,988KB to about 12,000KB.
Move shipped public APIs to PublicAPI.Shipped.txt
There was an issue in the custom PublishWithoutBuilding target that aims to publish the project without rebuilding anything. It has the same dependencies as the built-in Publish, but replaces build with Just ResolveReferences having BuildProjectReferences=false. However, this caused BuildOnlySettings (a dependency of Build) to not run, and therefore BuildingProject was set to false. That put ResolveAssemblyReferences into design-time mode where FindSatellites became false. This fix is required so that the .deps.json that is generated contains satellite assembly information. Without that, satellites will not load load on .NET Core. There was also a missing dependency on PrepareForPublish, which didn't cause any issue (yet), but it's now added for completeness. Also removed a nearby workaround for an unrelated v1 SDK issue with satellite assemblies. It is no longer needed as Roslyn requires v2+ SDK.
This also lets the colors change appropriately when the theme is changed.
…ilersCore Add satellite assemblies to Microsoft.NETCore.Compilers
Choosing dev15.5.x as the base instead.
Choosing dev15.5.x as the base instead.
Lightbulb header accessibility when selected/focused
…0180206-080005 Merge dev15.5.x to dev15.6.x
…s-deps-20180207-080031 Merge dev15.6.x to dev15.6.x-vs-deps
…15.7.x-vs-deps-20180208-080016
Contributor
|
@mavasani : I went ahead and resolved these conflicts today. Can you approve please? |
AbhitejJohn
approved these changes
Feb 8, 2018
Contributor
|
Got an offline signoff from Manish. |
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
6 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.
This is an automatically generated pull request from dev15.6.x-vs-deps into dev15.7.x-vs-deps.
git fetch --all git checkout merges/dev15.6.x-vs-deps-to-dev15.7.x-vs-deps-20180208-080016 git reset --hard upstream/dev15.7.x-vs-deps git merge upstream/dev15.6.x-vs-deps # Fix merge conflicts git commit git push merges/dev15.6.x-vs-deps-to-dev15.7.x-vs-deps-20180208-080016 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.