Merge main to features/list-patterns #59024
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
Spelling fixes
…plicitInterfaceMemberCompletionProvider.CompletionSymbolDisplay.cs Co-authored-by: CyrusNajmabadi <cyrus.najmabadi@gmail.com>
…llable parameters
* Fix ParseVBErrorOrWarning * Update Vbc.cs * internal -> private * Added test to verify error reporting from the VB compiler. Verifies the text used for Microsoft.Build.Tasks.CodeAnalysis.UnitTests.CheckErrorAndWarningParsing. * Added test to verify that column numbers insert correctly. ErrorLoggerEngine was added to capture the parse results as produced by Microsoft.Build.Shared.EventArgsFormatting. * Needs a space between the end parenthesis and the colon. * Update ErrorLoggerEngine.cs * Update Vbc.cs * Update VbcTests.cs * Make internal and fix spanish test failure * Address feedback Co-authored-by: Adam Biser <adambiser@gmail.com> Co-authored-by: Julien Couvreur <julien.couvreur@gmail.com>
…57667) * Allow xml docs to still be created when 'emit metadata only' is on. * Add VB tests * Simplify * Simplify * Update src/Compilers/Core/Portable/Compilation/Compilation.cs * Fix * Remove parameter * Pass in doc mode explicitly * Actually show the full xml docs we get * Update src/Compilers/CSharp/Test/Emit/Emit/CompilationEmitTests.cs * Update src/Compilers/CSharp/Test/Emit/Emit/CompilationEmitTests.cs * Update src/Compilers/CSharp/Test/Emit/Emit/CompilationEmitTests.cs
Clarify parameters
…quire it in the constructor This change defers the MEF part creation exception in MEF 2 scenarios from the call to GetExports to the call (if any) to Lazy<>.Value. Rather than reject the part from the catalog entirely, this change allows the part to be included as long as it is not accessed.
Assert compiler diagnostics in param-null checking test
Update CompilerNuGetCheckerUtil.cs
…mpletion don't include implicit/explicit keywords when completing explicit interface operator
Export VSTypeScriptFormattingService using a factory instead of directly
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/list-patterns.
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/list-patterns git reset --hard upstream/features/list-patterns git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-features/list-patterns --force