Skip to content

Conversation

@dotnet-bot
Copy link
Collaborator

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-20180206-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-20180206-080026 --force

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

sharwell and others added 30 commits May 4, 2017 20:35
This lock is only being used to protect access to an instance which contains
internal synchronization.
Roslyn is designed to have the simplest possible contribution story:
clone then build. Every pre-req needed is either located on the machine
or bootstrapped via NuGet. All the way down to using an xcopy MSBuild if
needed.

The one case which causes a problem is the VS command prompt. In this
case MSBuild is pre-installed on the machine and may or may not be
suitable for building Roslyn.

Previously when building from a VS command prompt we just used whatever
MSBuild was provided. The assumption being a developer command prompt
was an explicit statement of whath MSBuild you wanted to use. Based on
all of our customer reports though this does not seem to be the
assumption that consumers of our repo have. The build gave them no
explicit errors about the provided toolset and hence when the build
failed they assigned flakiness to our repo.

Going forward we are applying the same version validation to MSBuild
when provided via a developer command prompt. If it doesn't match we
will refuse to build asking the user to upgrade VS or build from a
normal command prompt.
Better handle surrounding directives when inlining a local variable.
Support negative null-checks when we offer a fix to use pattern-matching
#24458)

* fix a case where persistent storage registration fails and some clean up code around it.

* added readonly

* address PR feedback

* removed comments no longer relevant

* renamed lock name
…s are defined. (#24512)

* put listener change back in (#24120)

* leave old types in legacy folder until partner teams move to new interface

* added legacy waiter to support partner teams
chborl and others added 19 commits February 2, 2018 10:26
Fix and re-enable test that would catch this error
Verify MSBuild version in Developer CMD prompt
Move to xunit.console for CoreClr tests
* Check fully-qualified names for SuppressIldasmAttribute and ReferenceAssemblyAttribute
* Use correct reference location, or fail decompilation if it's not available
Update optimization data to 2.7.0-beta3-62526-01...
Locate implementations for reference assemblies using the GAC
…0180205-080009

Merge dev15.6.x to dev15.7.x
…version (#24547)

* Fix `is` and pattern-matching behavior in presence of implicit UD conversion
and also an explicit reference conversion. User-defined conversions should
never be considered for `is` and pattern-matching.
Fixes #24522
Port fix for duplicate IDEDiagnosticIDs to 15.7
@AbhitejJohn
Copy link
Contributor

@dotnet-bot retest windows_debug_unit32_prtest please.

@heejaechang heejaechang merged commit b4879f7 into dev15.7.x-vs-deps Feb 7, 2018
@AbhitejJohn AbhitejJohn deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps-20180206-080026 branch February 7, 2018 01:09
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.