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

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

ivanbasov and others added 2 commits May 15, 2018 16:53
See #26339 for the primary RCA.

This change corrects an additional edge case for ITextBuffer instances created before VisualStudioWorkspace attaches event handlers to ITextBufferFactoryService and IProjectionBufferFactoryService. This case is only believed to occur in IDE initialization scenarios where the workspace load is triggered by opening a document.
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approval

@ghost ghost merged commit 561df89 into dev15.7.x-vs-deps May 16, 2018
@ghost ghost deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 16, 2018 01:45
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 16, 2018 07:00
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 16, 2018 07:00
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 16, 2018 07:10
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 16, 2018 07:10
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 16, 2018 07:20
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 16, 2018 07:20
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 16, 2018 07:30
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 16, 2018 07:30
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 16, 2018 07:40
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 16, 2018 07:40
@dotnet-bot dotnet-bot restored the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 16, 2018 07:50
@dotnet-bot dotnet-bot deleted the merges/dev15.7.x-to-dev15.7.x-vs-deps branch May 16, 2018 07:50
This pull request was closed.
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.

5 participants