Skip to content

Merge dev15.6.x-vs-deps to dev15.7.x-vs-deps#24505

Merged
agocke merged 32 commits intodev15.7.x-vs-depsfrom
merges/dev15.6.x-vs-deps-to-dev15.7.x-vs-deps-20180129-080013
Jan 29, 2018
Merged

Merge dev15.6.x-vs-deps to dev15.7.x-vs-deps#24505
agocke merged 32 commits intodev15.7.x-vs-depsfrom
merges/dev15.6.x-vs-deps-to-dev15.7.x-vs-deps-20180129-080013

Conversation

@dotnet-bot
Copy link
Copy Markdown
Collaborator

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-20180129-080013
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-20180129-080013 --force

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.

zaytsev-victor and others added 30 commits November 30, 2017 22:56
…xplicitInterface

Suppress analyzer for properties with explicit interface implementation
Added support for pattern matching syntax to smart variable completion provider
…ild (#24239)

This PR fixes the CoreCLR compiler server on Windows and changes our bootstrap 
build to act as a test case. The build was previously failing during pipe ownership verification
because the required API was not available through reflection. This change
uses the System.IO.Pipes.AccessControl API to do pipe ownership verification
instead. However, System.IO.Pipes.AccessControl is operating system dependent 
and thus ends up in the runtimes subdirectory next to the build task.
Unfortunately, there is no mechanism for automatic assembly resolution
of plugin DLLs like MSBuild tasks, so we have to implement something
similar ourselves. This change hooks assembly resolution and, when we
see a well-known DLL request, we redirect it to the appropriate path.

Fixes #20900 and #24072
Fixed VS2017 crash with :: operator
…vertedToExpression

'Use local function' suppress if used in expression tree.
Disable NuGet package restore in Visual Studio for Roslyn.sln
Add UseCultureAttribute to help with culture-dependent unit tests
…s-deps-20180124-080023

Merge dev15.6.x to dev15.6.x-vs-deps
Revert "moved waiter from diagnostics.dll to features.dll"
…ev15.6.x-vs-deps

Merge dev15.6.x into dev15.6.x-vs-deps
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.
Merge dev15.6.x to dev15.6.x-vs-deps
@dotnet-bot dotnet-bot requested review from a team as code owners January 29, 2018 08:00
@mavasani
Copy link
Copy Markdown
Contributor

@dotnet-bot retest windows_debug_unit32_prtest please

@agocke agocke merged commit 5918094 into dev15.7.x-vs-deps Jan 29, 2018
@agocke agocke deleted the merges/dev15.6.x-vs-deps-to-dev15.7.x-vs-deps-20180129-080013 branch January 29, 2018 21:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants