Merge release/dev17.0-vs-deps to release/dev17.1#57716
Merged
dotnet-bot merged 12 commits intorelease/dev17.1from Nov 15, 2021
Merged
Merge release/dev17.0-vs-deps to release/dev17.1#57716dotnet-bot merged 12 commits intorelease/dev17.1from
dotnet-bot merged 12 commits intorelease/dev17.1from
Conversation
…ementalAnalyzer.StateManager.cs Co-authored-by: Andrew Hall <ryzngard@live.com>
This mitigates https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1423058 which is happening because somehow our tracked project state is getting out of sync with our GeneratorDriver; when we're transforming GeneratorDrivers we already have a mechanism to throw out the driver and simply re-create it later; that's not ideal from a performance perspective but it's better than throwing exceptions and breaking features. This will also force dumps to be created in this situation, even if that's something not being requested via the telemetry service. Since we've discovered that the telemetry service won't correctly let us request dumps for out-of-process work.
Since we are using reflection to copy this value around, we can't use a custom delegate type that won't unify across assemblies. This makes us use Action<T1, T2> instead, and I just comment out the support for non-fatal reporting in the result provider, since we don't actually use it.
…er-issue Mitigate the GeneratorDriver missync issue while capturing dumps
…olution state analyzers.
…ementalAnalyzer.StateManager.HostStates.cs Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com>
* Fix race condition in computing _hostAnalyzerStateMap * Address feedback * Update src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer.StateManager.cs Co-authored-by: Andrew Hall <ryzngard@live.com> * Fix build * Implement IEquatable<HostAnalyzerStateSetKey> * Address feedback * Ensure that GetAllHostStateSets do not return duplicates from prior solution state analyzers. * Update src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer.StateManager.HostStates.cs Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com> Co-authored-by: Andrew Hall <ryzngard@live.com> Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com>
864ec33 to
bbd0654
Compare
This was referenced Nov 11, 2021
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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 release/dev17.0-vs-deps into release/dev17.1.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
Troubleshooting conflicts
Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:
Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.
Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.
git fetch --all git checkout -t upstream/merges/release/dev17.0-vs-deps-to-release/dev17.1 git reset --hard upstream/release/dev17.1 git merge upstream/release/dev17.0-vs-deps # Fix merge conflicts git commit git push upstream merges/release/dev17.0-vs-deps-to-release/dev17.1 --force