Merge main to features/required-members #61328
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
* Revert to pass isBlocking as a parameter * link
…to-release/dev16.11-vs-deps Merge release/dev16.9-vs-deps to release/dev16.11-vs-deps
Merge release/dev17.3 to main
…rges/release/dev16.11-vs-deps-to-release/dev17.0-vs-deps
…-to-release/dev17.0-vs-deps Merge release/dev16.11-vs-deps to release/dev17.0-vs-deps
…to-release/dev17.1 Merge release/dev17.0-vs-deps to release/dev17.1
…ocal-function Suggest `fixed` keyword in unsafe local functions
…ated property references
The fix for https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1511117 will first be available in 17.3.
Add EA layer for ASP.NET Core.
Hard select item from default source when filter text is empty
With the new experience no longer blocking the UI thread, we want to enable this feature by default in 17.3
* Update dependency versions for 4.2.0 publishing Updates our nuget versions for 4.2.0, so that all published binaries will depend on publicly-available non-prerelease packages. As part of this, I removed explicit MSBuild references where they were unneeded, now that Microsoft.VisualStudio.Shell.15.0 is advertising their MSBuild dependency.
Use SegmentedHashSet<T> to eliminate LOH allocations in AsyncBatchingWorkQueue
More SyntaxContext sharing among CompletionProviders
* Fix several LSP completion kind mappings * Extension method
…se/dev17.3 Merge release/dev17.2 to release/dev17.3
Fix crash when a multi-line raw literal becomes a skipped token.
Add an UWP OptProf test for IDE
Merge release/dev17.3 to main
…rmatter. (#60522) * Implement IDkmClrFullNameProvider2 in Roslyn's ResultProvider Formatter. Issue: - Debugger added IDkmClrFullNameProvider2 API with https://devdiv.visualstudio.com/DevDiv/_git/Concord/pullrequest/301518 - It is currently temporarily implement in Concord, needs to be implemented in Roslyn so implementation can be removed from Concord. Changes: 1. Formatter: - Implement IDkmClrFullNameProvider2. It has 2 methods, one to format local names and the other given field metadata. - Currently only implemented for C#. I'm not that familiar with VB and the GeneratedNames stuff in VB needs some splitting and moving around to get working. 2. Unit tests: - Add unit tests for the common cases of hoisted locals, synthesized locals, etc. 3. Versions.props: Update MicrosoftVSSDKVSDConfigToolVersion to a newer version which recognizes IDkmClrFullNameProvider2. * PR feedback - fix casing of MetadataImport * PR feedback - move GetOriginalLocalVariableName, GetOriginalFieldName back to CSharpFormatter Co-authored-by: Ramkumar Ramesh <[email protected]>
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