Merge main to features/rename_ui_rework#59400
Merged
dotnet-bot merged 453 commits intofeatures/rename_ui_reworkfrom Feb 12, 2022
Merged
Merge main to features/rename_ui_rework#59400dotnet-bot merged 453 commits intofeatures/rename_ui_reworkfrom
dotnet-bot merged 453 commits intofeatures/rename_ui_reworkfrom
Conversation
…nuget-6.2.0.33
…clarationNameCompletionProvider.cs Co-authored-by: CyrusNajmabadi <cyrus.najmabadi@gmail.com>
…erloads Suggest parameter names from matching overloads
…0-windows this appears to be an error. the tests for this assembly target net6.0-windows
…ft.CodeAnalysis.Remote.ServiceHub.CoreComponents-to-net6.0-windows
…to-release/dev16.11-vs-deps Merge release/dev16.9-vs-deps to release/dev16.11-vs-deps
Ensure command handler doesn't index out of bounds when at end of file
Validate Microsoft.CodeAnalysis.Collections.Package on net6.0
* Remove netstandard1.3 from code base The remote debugger components moved to their minimum framework install to 4.6.2 where it was previously 2.0. That means we can remove the uses of `netstandard1.3` in our code base as they existed just to support this specific case. This means we can also remove our use of `net2.0` in the code base and replace it with `net462`. That is a more involved changed though and going to take that a piece at a time. Removing `netstandard1.3` is an important step because presently it's blocking us from updating to the latest System.Collections.Immutable as it dropped support for `netstandard1.3` * Revert change to generated file * Revert changes to our source dist packages * Fix rebuild exclusion * test issues * fix
Fix fading span for unnecessary using
Cascade between position record parameters and properties.
…-to-release/dev17.0-vs-deps Merge release/dev16.11-vs-deps to release/dev17.0-vs-deps
…ease/dev17.0-vs-deps-to-release/dev17.1
…to-release/dev17.1 Merge release/dev17.0-vs-deps to release/dev17.1
Implement Initializer expression wrappers
Improve trivia handling in use-block body.
Remove integration tests that are already ported to the new project
Support wrapping constructs even in the presence of some recoverable errors
Do not use implicit object creation on nullable struct types
Improve 'use pattern matching' to use `is null` instead of `is not object`
Fix build break caused by different merged PRs conflicting
'Add selected parameters to constructor' should respect existing user formatting
Fix a few issues with use object/collection initializer.
Inverting TypeOf should support 'TypeOf x IsNot...'
…merges/main-to-features/rename_ui_rework
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
19 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 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