Skip to content

Merge dev15.7.x to master#24596

Merged
agocke merged 36 commits intomasterfrom
merges/dev15.7.x-to-master-20180202-080014
Feb 2, 2018
Merged

Merge dev15.7.x to master#24596
agocke merged 36 commits intomasterfrom
merges/dev15.7.x-to-master-20180202-080014

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-20180202-080014
git reset --hard upstream/master
git merge upstream/dev15.7.x
# Fix merge conflicts
git commit
git push merges/dev15.7.x-to-master-20180202-080014 --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.
Better handle surrounding directives when inlining a local variable.
…st-processed operation from original action. This results in another PostProcess being called on the codeaction. If postprocess was overriden in originalaction that'll be ignored the second time (#23920)
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
…ectReference

This field is documented as being written and read from any thread,
but in practice all uses are guarded by an AssertIsForeground(). Thus
we can get rid of the helper methods that are trying to "help" by
locking before accessing the fields, making it really hard to track all
the real uses of it.
It turns out we had some tests, but the tests were disabled. This was
because the tests weren't working properly anyways: they were calling
into UpdateProjectBinPath which only updated some (but not all) of
the project state. That was an internal helper method that shouldn't
be used by tests. Updating the tests to use
SetBinOutputPathAndRelatedData works better.
This was some legacy code that tried to verify that the references
we have from the project system match up to what DTE and other sources
say. This was debug-only, and the actual asserts were commented out.
This is deadweight at this point, so delete it.
also added RoslynActivityLogger that can be enabled through project-system-tool
sharwell and others added 6 commits February 1, 2018 11:00
@dotnet-bot dotnet-bot requested review from a team as code owners February 2, 2018 08:00
@agocke agocke merged commit 5092197 into master Feb 2, 2018
@agocke agocke deleted the merges/dev15.7.x-to-master-20180202-080014 branch February 2, 2018 17:41
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