Merge main to features/caller-argument-expression #52551
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
dotnet-bot
added
Area-Infrastructure
auto-merge
Merge Conflicts
|
⚠ This PR has merge conflicts. @333fred |
The Contract.ThrowIfNull() in InlineMethod is safe (I think) because of 8d59b35 where we previously filtered it out.
…ons-and-parameter-validation Null annotate and add some checks for SymbolFinder.cs
Merge release/dev16.11 to main
IDE shoudl not attempt to replicate the compiler to generate diagnostics inside lambdas for constructors.
Switch pattern matching to use TemporaryArray
Only require telemetry validation in CI
Revert changes to TypeScriptWaitContext wrappers
Port 'Fix out of bound crash in lsp navto' to dev 16.11
Fix locked comment
The PR #53138 moved us to using .NET 6 Preview 3 but did not update our documentation. Historically moving to new .NET SDK versions was manual process and we "knew" to update the docs when we updated the version. Now though it's flowing automatically via arcade and we missed it. Short term this will get the docs in line with the requirements. Longer term though working on a way to make sure automation doesn't silently break our docs here.
Merge release/dev16.11 to main
Fix global state corruption in EditorConfig UI
Maintain the same parse option when add symbol to destination
…ase/dev16.11 Merge release/dev16.10 to release/dev16.11
Only generate build number on first run
…checkchangesupported Check the workspace supports ApplyChangesKind.ChangeDocumentInfo
|
@333fred Anything I need to do here? |
|
I can take a look at this in the morning, it just needs to have the conflicts merged. |
…ase/dev16.11 Merge release/dev16.10 to release/dev16.11
Merge release/dev16.11 to main
Merge release/dev16.11 to main
Fix timeout
* upstream/main: (1224 commits) Fix NotNullIfNotNull delegate conversion (#53409) Verify quick info session in InvokeQuickInfo Remove unnecessary retry Enable nullable reference types Fix timeout behavior in GetQuickInfo Only generate build number on first run Update contrib documentation (#53504) update test to wait for workspace to be updated SImplify Fix out of bound crash in lsp navto. Revert changes to TypeScriptWaitContext wrappers Switch to ROSLYN_TEST_CI for CI detection Disable modification to CodeStyleOption<T> SImplify Simplify LoggerTestChannel using BlockingCollection Only require telemetry validation in CI Fix out of bound crash in lsp navto. Track fire-and-forget operations Avoid global option corruption Fix locked comment ...
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/caller-argument-expression.
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 merges/main-to-features/caller-argument-expression git reset --hard upstream/features/caller-argument-expression git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-features/caller-argument-expression --force