Merge dev15.7.x to dev15.7.x-vs-deps#24509
Merged
agocke merged 23 commits intodev15.7.x-vs-depsfrom Jan 30, 2018
Merged
Conversation
…0180124-080010 Merge dev15.6.x to dev15.7.x
* changed our service name to include roslyn. it is asked from service hub team so that they can more easily identify which team owns which service. * update devdiv insertion tool for the renames.
Localization test failures 3
Changes our blob publish to include the manifest file. Needed by more recent versions of product build. Also decided to just link our two msbuild files together via MSBuild task vs. a powershell script. The point of microbuild.ps1 is to test as much as possible in our jenkins build. There is no way to actually test blob publishing in Jenkins hence this indirection was just causing problems, not helping anything.
Publish manifest for orchestrated build
* Add UseCultureAttribute to help with culture-dependent unit tests * Disable NuGet package restore in Visual Studio for Roslyn.sln * Add named argument for literal * Fix behavior for NET46 and NETCOREAPP2_0 * Revert "moved waiter from diagnostics.dll to features.dll where all interface… (#24120)" This reverts commit 823d973. * Add references to System.IO.Pipes.AccessControl (#24457) 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.
… especially for find all reference cache generation (#24452)
Allow resolving mscorlib with different assembly version numbers
…0180129-080010 Merge dev15.6.x to dev15.7.x
agocke
approved these changes
Jan 29, 2018
agocke
approved these changes
Jan 29, 2018
….x-to-dev15.7.x-vs-deps-20180129-080026
a57b4e8 to
44552fa
Compare
agocke
approved these changes
Jan 30, 2018
Member
|
Test this please |
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
10 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.7.x into dev15.7.x-vs-deps.
git fetch --all git checkout merges/dev15.7.x-to-dev15.7.x-vs-deps-20180129-080026 git reset --hard upstream/dev15.7.x-vs-deps git merge upstream/dev15.7.x # Fix merge conflicts git commit git push merges/dev15.7.x-to-dev15.7.x-vs-deps-20180129-080026 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.