Merge main to features/rename_ui_rework #58989
Merged
Conversation
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
… Build ID 1545084
Merge main to main-vs-deps
…to-main-vs-deps Merge release/dev17.1-vs-deps to main-vs-deps
…0-8386f2c611ce Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1545084
This change operates under the assumption that neither the starting state nor the final state include any cycles. By removing all project references from projects that change their reference sets prior to other work, we ensure extraneous references cannot lead to an invalid intermediate state. This increases the amount of work required to complete an incremental update when project references change, but does not impact the more common updates where all project references are unchanged. Fixes #52578
Update proximity expression tests to cover top level statements
Merge main to main-vs-deps
Merge main to main-vs-deps
…to-main-vs-deps Merge release/dev17.1-vs-deps to main-vs-deps
Fix code generation to add default constraint when needed
Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
Update CSharpUseTupleSwapCodeFixProvider for top-level statements
* Remove dependency on Workspace * Annotate codegen source, add missing CancellationTokens * Eliminate optional params * Pass language version instead of ParseOptions * CodeGenerationContext * LanguageVersion passing * Remove CodeGenerator document-specific CodeGenerator helpers * Cleanup * CodeGenerationPreferences * Fixes * Feedback * Generic CodeGenOptions * Split file * Update Public API * Fix * Fix * Fixes * Fix * Fix
Better parse when lambda expressions contain default parameter values.
Co-authored-by: Youssef Victor <youssefvictor00@gmail.com>
Enable CA1822 in Visual Studio layer
…58915) Issue: - Evaluating + expanding `Array myArray = Array.CreateInstance(typeof(int), new int[1] { 12 }, new int[1] { 1 });` while debugging crashes Visual Studio. Changes: 1. ArrayExpansion: - Lower bounds correction wasn't being done for 1D arrays, so add it. - This can't really be tested in C#/VB since Array.CreateInstance with 1D params can't be cast to a 1D array (see Remarks here: https://docs.microsoft.com/en-us/dotnet/api/system.array.createinstance#system-array-createinstance(system-type-system-int32()-system-int32()) - Corner case, will add tests on debugger side. Co-authored-by: Ramkumar Ramesh <ramram@microsoft.com>
* Move reading HideAdvancedMembers option up * CodeActionOptions
Port CSharpCodeActions and CSharpFindReferences to the new test harness
Add Analyzers layer to CODEOWNERS
Simplify SolutionEventMonitor
Update to ICSharpCode.Decompiler 7.1.0.6543
* 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>
dotnet-bot
added
Area-Infrastructure
auto-merge
Merge Conflicts
Collaborator
Author
|
⚠ This PR has merge conflicts. @ryzngard |
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/rename_ui_rework.
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/rename_ui_rework git reset --hard upstream/features/rename_ui_rework git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-features/rename_ui_rework --force