Merge main to features/required-members #59665
Merged
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
* Avoid relying on GetOpenDocumentInCurrentContext for source generated documents * Clarify documentation * Ensure yield before invoking GetSourceGeneratedDocumentAsync
…203.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22080.1 -> To Version 7.0.0-beta.22103.1
…mentForAlreadyGeneratedId
…208.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22080.1 -> To Version 7.0.0-beta.22108.1
…209.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22080.1 -> To Version 7.0.0-beta.22109.1
The additional telemetry is guarded by a new user facing option. This is an experiment being performed to see gauge if this additional telemetry is valuable/noisy/performant to help us improve the background analysis performance in future. If it turns out to be too much of an overhead, we may turn this off by default or revert it in future.
…210.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22080.1 -> To Version 7.0.0-beta.22110.7
…211.10 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22080.1 -> To Version 7.0.0-beta.22111.10
…oslyn into asyncNavigation
Retrieving clipboard data on open is causing significant problems for some users. Until we solve this, disable that behavior by default Fixes: AB#1467909 AB#1487900 AB#1487925 AB#1488011 AB#1488019 AB#1488430 AB#1488574 AB#1487421 AB#1463413
Make the IDocumentNavigationSerivice entirely async.
Fixed odd naming suggestions
Fixes AB#1467909 Removes usage of Clipboard APIs for StackTrace Explorer in cases where we are looking at the clipboard data on VS activation
Add MetadataAsSource test for records
…External Access API (#59794) * Add GlobalOptions.SetBackgroundAnalysisScope External Access API * Add PythiaGlobalOptions * Add IFSharpEditorFormattingServiceWithOptions
auto-merge was automatically disabled
February 28, 2022 23:01
Pull request was closed
333fred
force-pushed
the
merges/main-to-features/required-members
branch
from
1e091e6
to
c4c397e
Compare
…ures/required-members * upstream/main: (187 commits) Add GlobalOptions.SetBackgroundAnalysisScope and PythiaGlobalOptions External Access API (#59794) Update source-build dependency to source-build-externals (#59549) Do not retry on Clipboard API for StackTraceExplorer (#59658) Remove unnecessary accesses on XML end tag (#59771) Threading lint Improve PDB source document project handling (#59643) Disable Auto-Open behavior for Stack Trace Explorer (#59785) REmove comment Push async up Simplify Remove stale remarks Update src/Tools/ExternalAccess/FSharp/Navigation/FSharpDocumentNavigationService.cs Remove unnecessary code Simplify threading Update tests Make the IDocumentNavigationSerivice entirely async. Disable additional text comparer in generator driver (#59776) [LSP] Cache parsed xml snippets for razor (#59605) Make static ...
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 main into features/required-members.
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/main-to-features/required-members git reset --hard upstream/features/required-members git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-features/required-members --force