-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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
Shyam-Gupta
merged 3 commits into
dev15.7-preview1
from
merges/dev15.6.x-to-dev15.7-preview1
Mar 8, 2018
Merged
Merge dev15.6.x to dev15.7-preview1 #25330
Shyam-Gupta
merged 3 commits into
dev15.7-preview1
from
merges/dev15.6.x-to-dev15.7-preview1
Mar 8, 2018
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
Remove NFW causing delays
@dotnet-bot retest this please. |
Shyam-Gupta
approved these changes
Mar 8, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.