Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev15.7.x to master #24506

Merged
merged 35 commits into from
Jan 30, 2018
Merged

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from dev15.7.x into master.

git fetch --all
git checkout merges/dev15.7.x-to-master-20180129-080015
git reset --hard upstream/master
git merge upstream/dev15.7.x
# Fix merge conflicts
git commit
git push merges/dev15.7.x-to-master-20180129-080015 --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.
…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.
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.
jaredpar and others added 5 commits January 26, 2018 09:37
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.
@dotnet-bot dotnet-bot requested review from a team as code owners January 29, 2018 08:00
@agocke agocke merged commit c540e07 into master Jan 30, 2018
@agocke agocke deleted the merges/dev15.7.x-to-master-20180129-080015 branch January 30, 2018 00:26
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.

10 participants