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 dev16.0-preview2 to dev16.0-preview2-vs-deps #32381

Merged
merged 5 commits into from Jan 11, 2019

Conversation

Projects
None yet
5 participants
@dotnet-bot
Copy link
Collaborator

dotnet-bot commented Jan 11, 2019

This is an automatically generated pull request from dev16.0-preview2 into dev16.0-preview2-vs-deps.

git fetch --all
git checkout merges/dev16.0-preview2-to-dev16.0-preview2-vs-deps
git reset --hard upstream/dev16.0-preview2-vs-deps
git merge upstream/dev16.0-preview2
# Fix merge conflicts
git commit
git push merges/dev16.0-preview2-to-dev16.0-preview2-vs-deps --force

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

sharwell and others added some commits Jan 4, 2019

Merge pull request #32159 from sharwell/fix-nre
Fix null check combined with nullable bool test
fixed 2 issues. (#32248)
1. we never disposed tag aggregator leaking all taggers ever created on the buffer involved in contained document

2. we hold on to taggers not related to our buffer but ones that are related to other buffers. for example, our subject buffer is actually subject buffer which involves template C# buffer + html buffer where portion of html buffer are mapped to the subject buffer. that we end up holding on to all html taggers.

@dotnet-bot dotnet-bot requested a review from dotnet/roslyn-ide as a code owner Jan 11, 2019

@dotnet-automerge-bot
Copy link
Collaborator

dotnet-automerge-bot left a comment

Auto-approval

@dotnet-automerge-bot dotnet-automerge-bot merged commit f56fff1 into dev16.0-preview2-vs-deps Jan 11, 2019

2 of 3 checks passed

roslyn-integration-CI in progress
Details
license/cla All CLA requirements met.
roslyn-CI #20190110.116 succeeded
Details

@dotnet-automerge-bot dotnet-automerge-bot deleted the merges/dev16.0-preview2-to-dev16.0-preview2-vs-deps branch Jan 11, 2019

@dotnet-bot dotnet-bot restored the merges/dev16.0-preview2-to-dev16.0-preview2-vs-deps branch Jan 11, 2019

@dotnet-bot dotnet-bot deleted the merges/dev16.0-preview2-to-dev16.0-preview2-vs-deps branch Jan 11, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment