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.6.x to dev15.7-preview1 #25330

Merged
merged 3 commits into from
Mar 8, 2018

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from dev15.6.x into dev15.7-preview1.

git fetch --all
git checkout merges/dev15.6.x-to-dev15.7-preview1
git reset --hard upstream/dev15.7-preview1
git merge upstream/dev15.6.x
# Fix merge conflicts
git commit
git push merges/dev15.6.x-to-dev15.7-preview1 --force

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

tmeschter and others added 3 commits March 6, 2018 14:34
Remove a non-fatal Watson report that was triggering frequently and
causing UI delays. We expected that all references to a project would be
removed before the project itself was unloaded, and this report was
added to help us diagnose the rare occasion when that did not occur. It
turns out that it happens quite frequently: when a solution closes, when
a project changes externally and needs to be reloaded, and when a
project is deleted from the solution. We're getting a lot more of these
events than expected, and worse, collecting the Watson data sometimes
causes long pauses in the UI.

We do not have a concrete plan for dealing with the underlying issue,
but the data we've already collected from these reports demonstrates the
scope of the problem and collecting more won't help at this point. Since
the collection itself is causing problems, it's time to just remove it.
Add a comment to make it clear that we don't expect other projects to
still be referencing the project being `Disconnect`ed, and why we're
protecting against it.
@dotnet-bot dotnet-bot requested a review from a team as a code owner March 7, 2018 23:28
@jasonmalinowski
Copy link
Member

@dotnet-bot retest this please.

@Shyam-Gupta Shyam-Gupta self-requested a review March 8, 2018 22:22
@Shyam-Gupta Shyam-Gupta merged commit 77bf781 into dev15.7-preview1 Mar 8, 2018
@Shyam-Gupta Shyam-Gupta deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 8, 2018 22:22
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 9, 2018 08:00
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 9, 2018 08:00
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 9, 2018 08:10
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 9, 2018 08:10
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 9, 2018 08:20
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 9, 2018 08:20
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 9, 2018 08:30
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 9, 2018 08:30
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 9, 2018 08:40
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 9, 2018 08:40
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 9, 2018 08:50
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 9, 2018 08:50
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 12, 2018 07:00
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 12, 2018 07:00
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 12, 2018 07:10
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 12, 2018 07:10
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 12, 2018 07:20
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 12, 2018 07:20
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 12, 2018 07:30
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 12, 2018 07:30
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 12, 2018 07:40
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 12, 2018 07:40
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 12, 2018 07:50
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 12, 2018 07:50
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 13, 2018 07:00
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 13, 2018 07:00
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 13, 2018 07:10
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 13, 2018 07:10
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 13, 2018 07:20
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 13, 2018 07:20
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 13, 2018 07:30
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 13, 2018 07:30
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 13, 2018 07:40
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 13, 2018 07:40
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 13, 2018 07:50
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 13, 2018 07:50
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 14, 2018 07:00
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 14, 2018 07:00
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 14, 2018 07:10
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 14, 2018 07:10
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 14, 2018 07:20
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 14, 2018 07:20
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 14, 2018 07:30
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 14, 2018 07:30
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 14, 2018 07:40
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 14, 2018 07:40
@dotnet-bot dotnet-bot restored the merges/dev15.6.x-to-dev15.7-preview1 branch March 14, 2018 07:50
@dotnet-bot dotnet-bot deleted the merges/dev15.6.x-to-dev15.7-preview1 branch March 14, 2018 07:50
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