Merge master to features/interpolated-string-constants#48086
Merged
2700 commits merged intofeatures/interpolated-string-constantsfrom Sep 29, 2020
Merged
Conversation
Change hang to blocking
…47461) * Use MessagePack for ISB serialization * DocumentHighlighting service * Renamer, EncapsulateField, TupleToStruct services * SymbolFinder and FindUsages services * NavigateToSearch service * FindUsages, References fixes * AddImport service * SymbolSearchUpdate service * ExtensionMethodImportCompletion service * DependentTypeFinder service * GlobalNotificationDelivery service * CodeLensReferences service * Remove CodeAnalysis service * Remove unused code * Fix warnings. * Remove unused * Error reporting and logging * Update StreamJsonRpc to 2.6.86-alpha * Improve callback error handling. * Update Watson reporting * PR feedback * Fix tests * Fixes * Remove unused field * Rename shutdown service * Switch diagnostic serialization from ObjectReader/Writer serializer to MessagePack * Fix diagnostic reporting issue in ASP.NET apps
Update Extract Method to support top-level statements
Initialize FatalError handlers in VS and OOP
Update SyntaxNodeAnalysisContext.Compilation to not return null
Co-authored-by: CyrusNajmabadi <cyrus.najmabadi@gmail.com>
Improve comments for top-level statement insertion
Add tests for renaming records.
…features/lspClassifications
* Don't offer to fix naming on positional record parameters * Nullable enable * Fix formatting * Fix issue with nested constructors and parameters * Rebase and remove ThrowIfNull
…lt instance constructor for a record. (#47850) dotnet/csharplang#3913
…assifications Merge master to features/lspClassifications
…rs_100 Merge 'upstream/master' into VarianceSafetyForStaticMembers
* Simplified convention type checking * Fixed stackoverflow in attribute constructor overload resolution * Added more loop tests.
|
Hello @dotnet-bot! Because this pull request has the Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 12 minutes. No worries though, I will be back when the time is right! 😉 p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (
|
Use switch expressions.
…pace+record+struct) as partial type (#48095)
Don't offer to remove necessary native integer casts
Fix cancellation handling in Parallel.For
Fix failure to dispose RemoteWorkspace in tests
Member
|
@333fred |
Fix xml attribute name classification
…features/interpolated-string-constants * upstream/master: (1950 commits) Delete extra "Return True" (#48089) Remove unused param Extract local Update help service to account for all `TypeDeclarationSyntax` (namespace+record+struct) as partial type (#48095) Don't offer to remove as cast from using statements or declarations (#48110) Cleaner solution Update tests Don't offer to remove necessary native integer casts Fix xml attribute name classification Use switch expressions. Add test for IAsyncEnumerable<string> Fix tests Add tests Update CSharpTypeInferenceService.TypeInferrer.cs Fix failure to dispose RemoteWorkspace in tests [master] Update dependencies from dotnet/roslyn (#48072) Simplify common calls to Parallel.For with a RoslynParallel.For helper Fallback to IEnumerable<> if IAsyncEnumerable<> not found Fix cancellation handling in Parallel.For Update InferTypeInForEachStatement to respect await foreach ...
This was referenced Sep 28, 2020
This pull request was closed.
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
20 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 master into features/interpolated-string-constants.
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/master-to-features/interpolated-string-constants git reset --hard upstream/features/interpolated-string-constants git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-features/interpolated-string-constants --force