Merge main to main-vs-deps#62160
Merged
dotnet-bot merged 37 commits intomain-vs-depsfrom Jun 27, 2022
Merged
Conversation
…Provider_ForAttributeWithSimpleName.cs
…badi/roslyn into syntaxTreeIncremental
…and adding Unit Test
… to be used as the ".constrained" type for invoking abstract static methods Closes #53803.
* Separate out connection failures This changes the compiler to have a specific failure when it cannot connect to the server. This lets us treat it separately from cases where the server connected succeeded but the server rejected the request. The reason for this change is cannot connect failures are not necessarily an indicator of a code issue. A fully functional build can hit connection issues for a variety of reasons. For example if the server is too busy and can't respond to a connection event in time. Having a separate response means we can handle the failures differently in bootstrap builds. The bootstrap build will not fail now until it sees more than three of these. That should reduce the false positive rate we see in our infra. * PR feedback
…tation (#62074) From a framework naming perspective, “Utf8” is preferred, because it’s a 3 letter abbreviation (for Unicode Transformation Format), and 3+ letter abbreviations should be PascalCased, like Html and Uri. From a documentation/conceptual perspective, the preferred spelling of the Unicode Consortium seems to be “UTF-8” (all caps, with a hyphen). Closes #61847. Also fixes a typo and closes #61846.
…edConversion to incorporate abstract statics in interfaces (#62076) https://github.com/dotnet/csharplang/blob/main/proposals/static-abstracts-in-interfaces.md#1054-user-defined-implicit-conversions https://github.com/dotnet/csharplang/blob/main/proposals/static-abstracts-in-interfaces.md#1055--user-defined-explicit-conversions Closes #53798.
Add members to PythiaCompletionProviderBase to move IntelliCode off internal APIs
Cover additional cases where nullable directives can be removed
* Add first Integration Test for Inheritance Margin * Add second test to test multiple items on same line * Add the third test to navigate to metadata * Add a test to navigate across projects * Polishing * Add comment * Simplify workspace kind verification * Simplify inheritance margin test interaction * Convert input handling to InputSimulatorPlus * Use mouse for true input testing * Use VirtualKeyCode.RETURN * Await the navigation operation of inheritance margin Co-authored-by: Sam Harwell <Sam.Harwell@microsoft.com>
Fix NRE in VisualBasicAddExplicitCastCodeFixProvider
Use syntaxtrees in incremental processing to avoid unnecessary work
…inder (#62104) * Allow for parsing delegate*<...>? and add binder diagnostic for this case
Issue/50181
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
13 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 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