Merge main to main-vs-deps #58729
Merged
Merge main to main-vs-deps #58729
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
…ed when converting switch to expression
Closes #57802. Implements the GetTypesByMetadataName API, which returns all named types in the current compilation and referenced assemblies that match the given CLR metatdata name. Also updates the IDE's GetBestTypeByMetadataName to use this API under the hood, rather than the existing manual walk they were doing, simplyfing that codepath and proving out the API itself.
Merge release/dev17.1 to main
This was causing source indexers that use this API to make projects to break when they ironically tried to index Roslyn itself.
Move suggestion mode configuration to state reset service
…-duplicate-handling Deduplicate references in CommandLineProject.CreateProjectInfo
dotnet-bot
added
Area-Infrastructure
auto-merge
Merge Conflicts
|
⚠ This PR has merge conflicts. @Cosifne |
… source for `ReadOnlySpan<T>`. (#58724) There is no such operator in real type. Instead `string` type declares an implicit conversion to ```ReadOnlySpan<char>```.
The mentioned PR has been merged a long time ago and we're already using a newer version that includes that fix. Co-authored-by: Tomáš Matoušek <[email protected]>
* Remove IntelliCodeCompletionOptions * Remove PythiaCompletionProviderBase.HideAdvancedMembersOption
Cosifne
removed
the
Merge Conflicts
ghost
added this to the 
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 main-vs-deps.
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-main-vs-deps git reset --hard upstream/main-vs-deps git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-main-vs-deps --force