Merge dev15.6.x to dev15.7.x #24471
Merged
Merge dev15.6.x to dev15.7.x #24471
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
Disable NuGet package restore in Visual Studio for Roslyn.sln
Add UseCultureAttribute to help with culture-dependent unit tests
Revert "moved waiter from diagnostics.dll to features.dll"
When adding the reference to System.IO.Pipes.AccessControl for the compiler server to use on CoreCLR, I unified the pathway for the desktop and CoreCLR server access control code. This means that System.IO.Pipes.AccessControl needed to be added as a dependent DLL for desktop too, but I forgot to do that. This change adds System.IO.Pipes.AccessControl as a dependent DLL in all the places where the build task is deployed.
Contributor
|
failure is app domin issue. |
Contributor
|
retest windows_debug_vs-integration_prtest please |
heejaechang
approved these changes
Jan 26, 2018
jasonmalinowski
deleted the
merges/dev15.6.x-to-dev15.7.x-20180126-080012
branch
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 dev15.6.x into dev15.7.x.
git fetch --all git checkout merges/dev15.6.x-to-dev15.7.x-20180126-080012 git reset --hard upstream/dev15.7.x git merge upstream/dev15.6.x # Fix merge conflicts git commit git push merges/dev15.6.x-to-dev15.7.x-20180126-080012 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.