Merge main to main-vs-deps #61572
Merged
Merge main to main-vs-deps #61572
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
…d-members Merge main to features/required-members
…d-members Merge main to features/required-members
…d-members Merge main to features/required-members
…d-members Merge main to features/required-members
Implements parsing for required members. Test plan: #57046 Spec: dotnet/csharplang#3630
Adding `required` to a member now results in the type having a `RequiredMemberAttribute` emitted on the member and the containing type. Reading this data from metadata is not yet supported, nor is adding the requisite `ObsoleteAttribute` to constructors that depend on such contracts. The rules for when required is allowed and when it is disallowed are documented in dotnet/csharplang#5566. Test plan: #57046
Added support for reading the RequiredMemberAttribute from metadata appropriately and returning the right result for IsRequired and HasDeclaredRequiredMembers for metadata infos.
…ures/required-members * upstream/main: (1291 commits) Revert "Make solution options global (#59168)" (#59537) Update src/VisualStudio/CSharp/Test/F1Help/F1HelpTests.cs Update src/VisualStudio/CSharp/Impl/LanguageService/CSharpHelpContextService.cs Update Language Feature Status.md (#59546) Catch more exceptions (#59526) Fix Peek Definition for Razor files (#59528) Update OneOffInsertion.ps1 path in 17.0 branch (#59541) Use GetBestTypeByMetadataName in 'use System.HashCode' fixer Pass exception into internal error diagnostic (#59443) Provide f1 help for discards Update src/VisualStudio/Core/Def/SymbolSearch/AbstractDelayStartedService.cs Fix formatting move line Simplify Simplify Fixup Explicitly perform some mef loads in teh background Bump Microsoft.DiaSymReader version for release Remove IBoundSwitchStatement (#59516) Make solution options global (#59168) ...
…d-members Merge main to features/required-members
…ures/required-members * upstream/main: (187 commits) Add GlobalOptions.SetBackgroundAnalysisScope and PythiaGlobalOptions External Access API (#59794) Update source-build dependency to source-build-externals (#59549) Do not retry on Clipboard API for StackTraceExplorer (#59658) Remove unnecessary accesses on XML end tag (#59771) Threading lint Improve PDB source document project handling (#59643) Disable Auto-Open behavior for Stack Trace Explorer (#59785) REmove comment Push async up Simplify Remove stale remarks Update src/Tools/ExternalAccess/FSharp/Navigation/FSharpDocumentNavigationService.cs Remove unnecessary code Simplify threading Update tests Make the IDocumentNavigationSerivice entirely async. Disable additional text comparer in generator driver (#59776) [LSP] Cache parsed xml snippets for razor (#59605) Make static ...
…d-members Merge main to features/required-members
…ures/required-members * upstream/main: (78 commits) [main] Update dependencies from dotnet/roslyn (#59792) Annotate BreakpointSpans and fix NREs (#59846) Editor namespaces refactoring - part 1 (#59907) [main] Update dependencies from dotnet/source-build-externals (#59845) Update PublishData.json (#59952) ...and the comment Revert the last change in the compiler layer Force SVsExtensionManager to load before InProcComponent creation Handle nameof situation, moved logic back to workspaces layer Add back OmniSharpInlineHints (#59941) Initialize AsyncCompletionTracker in a fire-and-forget manner Try to load the extension manager from the main thread as well Use the correct GUID for SVsUserNotificationsService Update CodeStyle/format/SDK versions (#59903) Create attribute default arguments during binding (#59750) Undo refactoring part 2 Undo refactoring Move logic of symbol filtering to compiling layer. Refactoring Clean up diagnostic and solution crawler options - take 2 (#59233) Add quotes in string for clarity ...
…d-members Merge main to features/required-members
Implements reading the required members list of a type, and enforces that required members are all set by an initializer on the constructor. Required members must be initialized with values, not with nested object initializers. Test plan #57046. Specification https://github.com/dotnet/csharplang/blob/main/proposals/required-members.md
…d-members Merge main to features/required-members
* Create solution on the main thread in integration tests * Close solution on the main thread in integration tests * Use cached data for completion of unimported types Even if it might be stale. the completion list would be computed with cached data and cache refresh would be done in background. * Use cached data for completion of unimported extension methods Even if it might be stale. the completion list would be computed with cached data and cache refresh would be done in background. * Try to refresh import completion cache in the background whenever completion is triggered * Use AsyncBatchingWorkQueue for background cache updates * Fix tests * clean up * Fix tests * Make sure background task to update cache always run * Expose ForceExpandedCompletionIndexCreation option to O# This can be used to tweak test behavior to make it deterministic * Don't use Workspace.CurrentSolution when refreshing cache in background * Use AsynchronousOperationListener for background workqueues * Update src/Tools/ExternalAccess/OmniSharp/Completion/OmniSharpCompletionOptions.cs Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com> * Pass ThreadingContext.DisposalToken to workqueue for cache refresh * Remove namespace imports * Remove enableRoslynAnalyzers from codespace default settings Follow up to #60165 We don't think this is the right default as users probably don't want this unless they have at least 8 cores. * Fix typo in Apply_namespace_matches_folder_preferences * Remove period at the end to be consistent with other messages * Fix inconsistency in other languages too * Refactoring * Ban incompatible service provider extension methods * Assert window title before closing * Remove outdated comment (#60275) * Don't block on clearing the output window on the UI thread when generating a file (#60281) * Fix issue with remove-unnecessary-cast and necessary explicit casts. * Fix work item * Correct change ObjectCreationExpression to ImplictObjectCreationExpression for SmartBreakline (#60249) * Fix the initializer adding scenario * Fix the initializer removal scenario * Add an Assertion in debug to help if future derive type is added * Remove the check for NewKeyword * Option to always use default symbol servers for GTD (#60053) * pass the listener to the constructor * Edit the breaking change doc for publishing on docs (#60260) Co-authored-by: Rikki Gibson <rikkigibson@gmail.com> * Update SDK version in docs, etc. (#60299) * Fix type parameter scoping for local functions (#60098) Co-authored-by: Youssef1313 <youssefvictor00@gmail.com> * Fix conversion issues in null coalescing operator (#60202) * Revert "Fix a typo and an inconsistency" This reverts #60238 * Fix XLF files that were manually edited * Check for reference assembly before deciding which language to show (#60271) * Update dependencies from https://github.com/dotnet/arcade build 20220321.2 (#60315) [main] Update dependencies from dotnet/arcade * Fix issue when multiple different diagnostics share a single fixer * Add basic TS LSP server (#59639) * Add basic TS LSP server * Add external access layer for TS * Include text sync handlers * Fix build error * Switch to explicit interface impl * Fix namespaces * Remove testing string * Fix * Don't offer convert to switch when an implicit cast is present (#60224) * Initialize MEF parts before switching to the UI thread (#60289) * Add support for CheckedStatement for smart break line (#60308) * Add support for CheckedStatement * Address feedback * Remove a not needed import * Allow VS Mac to access a few options and a helper method (#60333) * [LSP] Don't adjust breakpoints when there are diagnostics in the document (#60334) * Fix our x86 test execution (#60323) * Fix our x86 test execution The transition to `dotnet test` seems to have broken our unit tests that depend on executing on an x86 architecture. This fixes that by using the `--arch` argument to the `dotnet test` execution. This was made more general to facilitate our future arm64 work in this area * Disable test failing on x64 * fix the test * Apply suggestions from code review Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com> * Disable test on spanish * Test fixes Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com> * Avoid resizing array builder while get unaliased references (#60220) This was being resized constantly after opening Orchard Core, allocating about 2 GB. The fact that is being called this many times appears to be another bug that I'm following up on. * Skip CodeDefinitionWindows integration tests * Fix top-level speculation (#60274) Co-authored-by: Youssef Victor <youssefvictor00@gmail.com> Co-authored-by: Sam Harwell <Sam.Harwell@microsoft.com> Co-authored-by: gel@microsoft.com <gel@microsoft.com> Co-authored-by: Gen Lu <genlu@users.noreply.github.com> Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com> Co-authored-by: Jonathon Marolf <jmarolf@users.noreply.github.com> Co-authored-by: Daniel Chalmers <daniel.chalmers@outlook.com> Co-authored-by: astroC86 <66444189+astroC86@users.noreply.github.com> Co-authored-by: David Wengier <david.wengier@microsoft.com> Co-authored-by: Cyrus Najmabadi <cyrusn@microsoft.com> Co-authored-by: Shen Chen <Cosifne@users.noreply.github.com> Co-authored-by: CyrusNajmabadi <cyrus.najmabadi@gmail.com> Co-authored-by: msftbot[bot] <48340428+msftbot[bot]@users.noreply.github.com> Co-authored-by: Bill Wagner <wiwagn@microsoft.com> Co-authored-by: Rikki Gibson <rikkigibson@gmail.com> Co-authored-by: Rikki Gibson <rigibson@microsoft.com> Co-authored-by: Julien Couvreur <jcouv@users.noreply.github.com> Co-authored-by: Youssef1313 <youssefvictor00@gmail.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Joey Robichaud <jorobich@microsoft.com> Co-authored-by: David Barbet <dabarbet@microsoft.com> Co-authored-by: Jared Parsons <jaredpparsons@gmail.com> Co-authored-by: David Kean <davkean@microsoft.com>
…members (#60243) * Suppress nullable property/field initialization warning for required members * Additionally adjust input from chained constructors. * Add additional tests, handle required members from base types.
…d-members Merge main to features/required-members
…d-members Merge main to features/required-members
…ures/required-members * upstream/main: (652 commits) Remove duplicate package references (#60658) Formatting and code generation options (#60127) Trim unnessasary leading lines when removing usings (#60672) Pass options to FixAllAsync, simplify CodeAction registration (#60665) Fallout Lint Restore CodeStyle test projects Update struct field definite assignment tests Global indentation options - take 2 (#60565) Run continuation to dispose of cancellation token source (#60653) Fixup Update tests Cleanup Cleanup move properties Delay starting the work to scan for todo-items Simplify Clean up syntax context Clean up syntax context Clean up syntax context ...
* Simplify * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Excluded Task.CompletionTask from completion list in async member declarations * Fix merge * Use existing assert * Use correct assert * Use isInferred: false when creating BoundArrayInitialization in CreateUTF8ByteRepresentation * Move few 'CodeFixProvider's to Analyzers layer * Fix * Fix * Remove ForegroundThreadAffinitizedObject usage * fix * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Remove ForegroundThreadAffinitizedObject usage * Revert bad changes * Fix errors and remove a hard CodeFixProvider back to Features * Update projitems * Move tests * Remove unused abstract property * Remove the single unused read of CodeFixCategory * Remove overrides in Analyzers * Remove overrides in Features * Fixed char recomendations test * Got rid of AsyncModifierName constants * Remove unnecessary `<Compile Remove` * Fixed tests for all other keywords * Cleaned up keyword tests * Move formatting analyzer to shared Analyzers layer * Move tests to shared Analyzers layer and more other fixes * Few more fixes * Fix bad changes * Fix bad changes * Fix bad changes * Remove IVTs of deleted test projects * Address review comment * Fix failing test * Cleanup unused resources in Features layer * Update Roslyn.Diagnostics.Analyzers and remove RS0005 suppressions * Move to SyntaxEditorBasedCodeFixProvider * Remove some 'MyCodeAction's * Remove more 'MyCodeAction's * One more that's not named MyCodeAction * Fix up changes between main and main-vs-deps * Colorize async as keyword in some cases * Few fixes * Added a bunch of tests, where async can never be a keyword, moved logic one level up * Fix typo * Note auto-default merged in feature status doc (#60564) * Update PublishData.json for 17.3 P1 (#60559) * Fix formatting * Added case with equals syntax, moved logic to a separate method * Add Rebuild badge to README (#60298) * Avoid using --blame-crash with CollectDumps This flag causes the test harness to attach ProcDump, which removes our ability to collect heap dumps on crash using Windows' built-in functionality. * Ensure current OOP calls for the same solution-checksum can share the same OOP solution computation * Update src/Workspaces/Remote/ServiceHub/Services/DocumentHighlights/RemoteDocumentHighlightsService.cs * Update src/Workspaces/Remote/ServiceHub/Services/SemanticClassification/RemoteSemanticClassificationService.cs * Revert name * Update tests * Fix * Add comment * Add comment * Update src/Workspaces/Remote/ServiceHub/Services/CodeLensReferences/RemoteCodeLensReferencesService.cs * fix grammar * Formatting * Revert * revert * Revert * Fix the Compiler VSIX extension so it works with CPS projects again This has been broken for quite some time. We were MEF importing a type that was no longer a MEF part, and referencing very old reference assemblies that needed to be updated as a part of responding to that original breaking change. * Make NotificationOption2 a serializable struct (#60573) * Update status for UTF8 literals and checked operators (#60587) * Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1700800 * Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1700800 * Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1700800 * Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1700800 * Simplify * Simplify * Simplify * Simplify * [LSP] Modify semanticTokens `isFinalized` logic (#60484) * try/finally * Simplify * Move comment * Simplify * Doc * Doc * Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1701033 * Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1701033 * Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1701033 * Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1701033 * Workspace config options (#59790) * REnames * Expand tuple * Rename parameter * Use deconstruction * Fix merge from main * Do not assert we are on the main thread in the constructor * Add support for unsafe local functions in IDE0062 code fix (#59297) * Track "numeric IntPtr" feature (#60579) * Address review comment * Add helpers * Remove unneeded IVTs * Simplify * Simplify * Pause computation of navbar items when a buffer is not visible * Rename * PR feedback part 1 * Change insertion branch * Update PublishData.json * PR feedback part 2 * lint * Implement handling of rename intent (#59410) * Implement handling of rename intent * Use documentId instead of URI * Move record definition up top * feedback * Address feedback * Remove unused files in CodeStyle layer * Remove unused resources in CodeStyle layer * Changed algorithm of detecting IAsyncEnumerable and IAsyncEnumerator, reverted some refactoring * Got rid of IsSystemRuntimeOrMscorlibAssembly method * Fix crash when combining reordered arguments with params array (#60622) * Fix string * Always use text edits in completion for correctness (#60466) * Filter down to task-like types when in an async context * Update providers * Cleanup * Revert * Revert * Revert * Simplify * Restore logic * Update test * Pull feature-specific APIs out of ISyntaxFacts * Extract out IBlockFacts out of ISyntaxFacts * Simplify * Instrument ReferenceCachingCS for flakiness (#60585) * Fix our INavigableSymbol to not root an entire solution-snapshot * Remove the TEmporaryWorkspace entirely from the RemoteWorkspace code. * Lint * Fixed adding a redundant blank line when suppressing with local attribute * [main] Update dependencies from dotnet/source-build-externals (#60359) [main] Update dependencies from dotnet/source-build-externals * Fix * Added more tests & refactoring * Clean up syntax context * Clean up syntax context * Clean up syntax context * Clean up syntax context * Simplify * Delay starting the work to scan for todo-items * move properties * Cleanup * Cleanup * Update tests * Fixup * Run continuation to dispose of cancellation token source (#60653) * Run continuation to dispose of cancellation token source * Remove cancellation token and execute synchronously * Update src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs Co-authored-by: CyrusNajmabadi <cyrus.najmabadi@gmail.com> Co-authored-by: CyrusNajmabadi <cyrus.najmabadi@gmail.com> * Global indentation options - take 2 (#60565) * Revert "Revert "Global indentation options (#59679)" (#60199)" This reverts commit ab57ce8. * Move IFormattingInteractionService to Editor Features and add inferred indentation detection to its implementation. Move GetFormattingChangesOnTypedCharacterAsync, GetFormattingChangesOnPasteAsync to ISyntaxFormattingService - these do not depend on the editor. * Test fix * Update struct field definite assignment tests * Restore CodeStyle test projects * Lint * Fallout * Pass options to FixAllAsync, simplify CodeAction registration (#60665) * Trim unnessasary leading lines when removing usings (#60672) * Formatting and code generation options (#60127) * Remove duplicate package references (#60658) * Remove duplicate package references * Delete additional Tools.props * Update for definite assignment changes Co-authored-by: Cyrus Najmabadi <cyrusn@microsoft.com> Co-authored-by: Joey Robichaud <jorobich@microsoft.com> Co-authored-by: CyrusNajmabadi <cyrus.najmabadi@gmail.com> Co-authored-by: DoctorKrolic <mapmyp03@gmail.com> Co-authored-by: David Barbet <dabarbet@microsoft.com> Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com> Co-authored-by: Youssef1313 <youssefvictor00@gmail.com> Co-authored-by: DoctorKrolic <70431552+DoctorKrolic@users.noreply.github.com> Co-authored-by: Manish Vasani <mavasani@microsoft.com> Co-authored-by: Jason Malinowski <jason.malinowski@microsoft.com> Co-authored-by: Rikki Gibson <rigibson@microsoft.com> Co-authored-by: Allison Chou <allichou@microsoft.com> Co-authored-by: Sam Harwell <Sam.Harwell@microsoft.com> Co-authored-by: Tomáš Matoušek <tmat@users.noreply.github.com> Co-authored-by: msftbot[bot] <48340428+msftbot[bot]@users.noreply.github.com> Co-authored-by: Julien Couvreur <jcouv@users.noreply.github.com> Co-authored-by: Gérald Barré <meziantou@users.noreply.github.com> Co-authored-by: Jonathon Marolf <jmarolf@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com> Co-authored-by: Fredric Silberberg <frsilb@microsoft.com>
…res/required-members * upstream/main: (66 commits) Fix #55183: Add SymbolVisitor<TArgument, TResult> (#56530) Simplifier options (#60174) Remove duplicated asset Do not try to refcount solution syncing when communicating with OOP Delay symbol-search index updating until solution is fully loaded. add more miscellaneous tests for checked operators (#60727) Support checked operators in explicit interface implementation (#60715) Avoid formatting diagnostics with raw strings (#60655) Make heading levels for warning waves documentation consistent (#60721) Clean up IDiagnosticService extension methods Remove #nullable enable Add integration test to flag MEF composition breaks Generate static abstract interface members correctly (#60618) Merge release/dev17.2 to main (#60682) Fix FAR on checked operators (#60698) Add implement interface support for checked operators and cast operators (#60719) Update csc.dll path in launch.json (#60663) Grab bag of UTF8 string support in IDE features (#60599) Allow code actions to retrieve options for any language (#60697) Fix flaky VSTypeScriptHandlerTests (#60706) ...
…-members Merge main to features/required members
The SetsRequiredMembersAttribute prevents the compiler from checking the required member list of a type when calling that constructor, and suppresses any errors from a base type's list being invalid. Specification: https://github.com/dotnet/csharplang/blob/main/proposals/required-members.md Test plan: #57046
…ures/required-members * upstream/main: (156 commits) Pass fallback options (#60803) Rename `CodeStyleHostLanguageServices.cs.cs` to `CodeStyleHostLanguageServices.cs` (#60955) Allow VSMac to access LSP options (#60943) Add configs for 17.3 branch and update main version (#60942) Restore nugetKind config to publish data Remove unnecessary publish data config Remove non-servicing 15.x publish config Let 'arcade' packageFeeds imply all feeds are 'arcade' Remove non-servicing branches from our PublishData Handle unexpected keyword rather than identifier for lambda parameter name (#60825) Correctly return E_NOTIMPL when asked for file code models for non-source Move the resources to top (#60899) Add back deprecated packages to arcade publishing config. Simplify Rename parameter Simplify visibility logic in tagger Simplify visibility logic in tagger Try out some fixes Update StructConstructorTests.cs Use more descriptive variable name ...
…d-members Merge main to features/required-members
…w() (#60788) * Forbid types with required members from substituting for where T : new() Specification: https://github.com/dotnet/csharplang/blob/main/proposals/required-members.md Test plan: #57046
Support emitting ObsoleteAttribute on the constructor of types with required members. Specification: https://github.com/dotnet/csharplang/blob/main/proposals/required-members.md Test plan: #57046
…ures/required-members * upstream/main: (368 commits) Use new helpers Cleanup Update src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs Restore Add docs Fix Update Tools|Options code ordering to match waht is in the UI Use correct directory for loghub logs (#61104) Move usings on paste off the UI thread (#61092) Create shared helper to handle finding extensions in analyzer references Code style to convert byte arrays to UTF8 strings (#60647) Fixup Enable semantic token LSP tests + re-enable quick info tests (#61098) Simplify initialization logic Simplify common CWT pattern Simplify common CWT pattern Simplify common CWT pattern Simplify common CWT pattern Simplify common CWT pattern Simplify common CWT pattern ...
…d-members Merge main to features/required-members
…d-members Merge main to features/required-members
Adds support for decoding and reporting errors when `CompilerFeatureRequiredAttribute` is encountered on metadata type symbols. We also block applying the attribute by hand in both C# and VB.
…types with required members.
…ures/required-members * upstream/main: (73 commits) Allow source link, embedded or decompiled source in Peek Definition (#61427) More instrumentation for ReferenceCachingCS (#61402) Fix build Fix binding for checkbox text in rename dialogs (#61430) Address feedback from numeric IntPtr feature review (#61418) [LSP] Small cleanup for pull diagnostics logging (#61417) Avoid logging work when no logger is specified Wait for async operations to complete before proceeding Fix function id (#61400) More correctly respect background analysis scope (#61392) Add new collapsing option for metadata files that contain source (#61205) Fix typo (#61380) Use AspNetCoreKey to external access assembly Update src/Features/Core/Portable/InheritanceMargin/AbstractInheritanceMarginService_Helpers.cs Update src/Features/Core/Portable/InheritanceMargin/AbstractInheritanceMarginService_Helpers.cs Parse `unchecked` gracefully in operators (#61309) Add lambda parameters in scope in nameof using proper binder (#61382) Verify classification on var pattern (#61376) Verifying interpolation escaping of curlies in content (#61387) Fix ...
…d-members Merge main to features/required-members
* Give a warning when obsolete is applied to a required member and the containing context is not obsolete, or all constructors are not obsolete/setsrequiredmembers. * Restore nullable constructor warnings for constructors with `SetsRequiredMembersAttribute`. * Remove prototype comments.
…61551) Clean up the last of the prototype comments and adjust the parsing of locals named required in top level statements.
* Add required keyword recommender. * Add SyntaxNormalizer test. * Code generation support. * Add SymbolDisplay * F1 help service and test fix. * Add order modifier tests and update.
…ures/required-members * upstream/main: (85 commits) Skip timing test (#61222) Prepare VB iterators for EnC support (#61488) Improve normalization to match idiomatic patterns for nested usings and fixed statements. (#61533) Update unit tests Don't throw in logging when the document path contains curly braces (#61524) Fix AbstractLanguageService constructor (#61513) Remove Utf8StringLiteral conversion (#61481) Use feature attribute Pull token out Make async Make async NRT Add member add docs Expose VirtualChars to asp.net (through EA) to facilitate route classification Fix setup authoring bug (#61508) Update src/EditorFeatures/Core/RenameTracking/RenameTrackingTaggerProvider.RenameTrackingCommitter.cs Update src/EditorFeatures/Core/RenameTracking/RenameTrackingTaggerProvider.RenameTrackingCommitter.cs Update src/EditorFeatures/Core/InlineRename/InlineRenameSession.cs Add support for properties ...
…ed-members Merge main to features/required-members
…ures/required-members * upstream/main: Change natural type of UTF-8 string literals to `ReadOnlySpan<byte>` and null terminate the underlying blob. (#61532)
…and null terminate the underlying blob. (#61532) (#61570) https://github.com/dotnet/csharplang/blob/main/meetings/2022/LDM-2022-04-18.md#natural-type-of-utf8-literals https://github.com/dotnet/csharplang/blob/main/meetings/2022/LDM-2022-04-18.md#should-utf8-literals-be-null-terminated Related to #61517 Closes #60644 Co-authored-by: AlekseyTs <AlekseyTs@users.noreply.github.com>
Merge Required Members to main
ghost
added this to the 
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 main-vs-deps.
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-main-vs-deps git reset --hard upstream/main-vs-deps git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-main-vs-deps --force