From d8183558c9163c494f4df03b73d4c7cd2f8875d0 Mon Sep 17 00:00:00 2001 From: Bela VanderVoort Date: Sun, 21 Jan 2024 15:20:15 -0600 Subject: [PATCH 1/2] After invocation-regression --- .../Resources/FormatManager.cs | 15 +- .../Test/DictionaryModelBinderTest.cs | 3 +- .../src/IntegrationTests/IncludeMembers.cs | 3 +- AutoMapper/src/UnitTests/NullBehavior.cs | 6 +- .../Projection/ParameterizedQueriesTests.cs | 3 +- .../CustomModifiersTestCase.cs | 12 +- .../Schema/JsonSchemaNodeTests.cs | 3 +- .../samples/AzureAppServicesSample/Startup.cs | 3 +- .../EndpointHtmlRenderer.PrerenderingState.cs | 3 +- .../src/Rendering/SSRRenderModeBoundary.cs | 3 +- .../ServerFixtures/WebHostServerFixture.cs | 3 +- .../Controllers/UserController.cs | 3 +- .../WebApplicationTests.cs | 9 +- ...onTranscodingServiceMethodProviderTests.cs | 3 +- .../Internal/HostingApplicationDiagnostics.cs | 3 +- .../Routing/src/EndpointRoutingMiddleware.cs | 3 +- .../test/InMemory.Test/InMemoryUserStore.cs | 19 +- .../src/RateLimitingMiddleware.cs | 8 +- .../src/RequestDecompressionMiddleware.cs | 3 +- .../src/Mvc/Mvc.Core/src/ControllerBase.cs | 20 +- .../Infrastructure/ActionSelectionTable.cs | 6 +- ...ControllerActionDescriptorProviderTests.cs | 3 +- .../Mvc/Mvc.ViewFeatures/src/Controller.cs | 5 +- .../BearerToken/src/BearerTokenHandler.cs | 5 +- .../Cookies/samples/CookieSample/Program.cs | 3 +- .../test/AuthenticationMiddlewareTests.cs | 3 +- .../Microbenchmarks/FirstRequestConfig.cs | 3 +- .../GlobalVersionTests.cs | 3 +- .../testassets/InProcessWebSite/Startup.cs | 23 +- .../samples/IISSample/Startup.cs | 3 +- .../IHostPortExtensions.cs | 3 +- .../BindTests/AddressRegistrationTests.cs | 9 +- .../BenchmarkRunner/DefaultCoreConfig.cs | 61 ++-- .../test/HttpConnectionDispatcherTests.cs | 24 +- .../src/EncoderServiceCollectionExtensions.cs | 3 +- .../SyntaxReceiver.cs | 3 +- .../Help/HelpBuilder.Default.cs | 6 +- ...ringUsageInRawQueriesDiagnosticAnalyzer.cs | 6 +- .../Internal/LinqToCSharpSyntaxTranslator.cs | 12 +- .../Internal/TextTemplatingEngineHost.cs | 3 +- .../RelationalEntityTypeExtensions.cs | 3 +- .../Internal/RelationalKeyExtensions.cs | 6 +- .../Internal/TableMappingBaseComparer.cs | 27 +- .../Internal/MigrationsModelDiffer.cs | 9 +- ...ServerValueGenerationStrategyConvention.cs | 4 +- .../SqliteMigrationsSqlGenerator.cs | 5 +- .../ChangeTracking/Internal/IdentityMap.cs | 3 +- .../Builders/OwnedNavigationBuilder.cs | 3 +- .../ForeignKeyPropertyDiscoveryConvention.cs | 9 +- .../InversePropertyAttributeConvention.cs | 13 +- ...pendencyInjectionMethodParameterBinding.cs | 3 +- .../Internal/InternalForeignKeyBuilder.cs | 19 +- .../Internal/PropertyBaseExtensions.cs | 3 +- .../CosmosModelBuilderGenericTest.cs | 3 +- .../RelationalScaffoldingModelFactoryTest.cs | 3 +- .../Query/QueryBugsInMemoryTest.cs | 34 +- ...rencyDetectorDisabledRelationalTestBase.cs | 8 +- .../Query/JsonQueryTestBase.cs | 123 ++++--- .../ApiConsistencyTestBase.cs | 3 +- .../CustomConvertersTestBase.cs | 3 +- .../ManyToManyLoadTestBase.cs | 3 +- .../Query/ComplexNavigationsQueryTestBase.cs | 127 ++++--- .../Query/CompositeKeysQueryTestBase.cs | 144 ++++---- .../Query/GearsOfWarQueryTestBase.cs | 292 ++++++++++------ .../Query/ManyToManyQueryTestBase.cs | 25 +- ...orthwindAggregateOperatorsQueryTestBase.cs | 18 +- .../Query/NorthwindGroupByQueryTestBase.cs | 28 +- .../Query/NorthwindIncludeQueryTestBase.cs | 3 +- .../NorthwindNavigationsQueryTestBase.cs | 18 +- .../Query/OwnedEntityQueryTestBase.cs | 9 +- .../PrimitiveCollectionsQueryTestBase.cs | 6 +- .../TestUtilities/TestHelpers.cs | 6 +- .../OptimisticConcurrencySqlServerTest.cs | 15 +- .../Query/QueryBugsTest.cs | 83 +++-- .../QueryTests.cs | 9 +- .../SqlServerModelBuilderTestBase.cs | 7 +- .../ChangeTracking/TrackGraphTestBase.cs | 3 +- format/perf/RealWorldSolution.cs | 3 +- .../ProjectRootElement.cs | 14 +- .../Microsoft.Build.Evaluation/Project.cs | 6 +- .../ProjectInstance.cs | 21 +- .../ProjectPropertyGroupTaskInstance.cs | 5 +- .../Mono.CodeContracts.Static.AST/Method.cs | 3 +- .../OldScanStateMachine.cs | 6 +- .../Mono.Debugger.Soft/MethodBodyMirror.cs | 31 +- .../class/Mono.Debugger.Soft/Test/dtest.cs | 3 +- .../Composition/CompositionException.cs | 13 +- ...ryCatalog.DirectoryCatalogDebuggerProxy.cs | 5 +- .../Composition/Hosting/TypeCatalog.cs | 5 +- .../ReflectionComposablePartDefinition.cs | 3 +- .../Client/ALinq/ProjectionAnalyzer.cs | 6 +- .../Client/ALinq/ProjectionRewriter.cs | 3 +- .../Services/Client/ALinq/ResourceBinder.cs | 6 +- .../Data/Services/Client/ALinq/UriWriter.cs | 12 +- .../Services/Client/Binding/BindingGraph.cs | 6 +- .../System/Data/Services/Client/ClientType.cs | 9 +- .../Services/Client/DataServiceContext.cs | 9 +- .../Services/Client/ProjectionPlanCompiler.cs | 5 +- .../DataSet/DataSet_ReadXml_Strg.cs | 40 ++- .../System.Data/DataSet/DataSet_ReadXml_X.cs | 38 +- .../DuplicateNameException_Generate.cs | 14 +- .../System.Data/DataColumnCollectionTest2.cs | 14 +- .../DataRelationCollectionTest2.cs | 16 +- .../Test/System.Data/DataSetTest.cs | 26 +- .../System.Data/DataTableReadXmlSchemaTest.cs | 168 +++++---- .../DynamicEndpointTest.cs | 9 +- .../UdpAnnouncementEndpointTest.cs | 3 +- .../ContractDescriptionGenerator.cs | 6 +- .../ContractDescriptionTest.cs | 6 +- .../ChangePasswordTest.cs | 24 +- .../System.Xaml/TypeExtensionMethods.cs | 3 +- .../System.Xaml/System.Xaml/XamlXmlReader.cs | 7 +- .../class/System/System.Net/WebConnection.cs | 16 +- .../Test/System.Net/HttpWebRequestTest.cs | 3 +- .../System.Reflection.Emit/DynamicILInfo.cs | 3 +- .../IsolatedStorageFileTest.cs | 3 +- .../Test/System.Reflection/MethodInfoTest.cs | 10 +- .../CallContextTest.cs | 3 +- .../Presentation/FlowDecisionDesigner.xaml.cs | 3 +- .../Presentation/FlowSwitchDesigner.xaml.cs | 11 +- .../Core/Presentation/FlowSwitchLink.cs | 26 +- .../InvokeDelegateDesigner.xaml.cs | 3 +- .../StateContainerEditor.CompositeView.cs | 42 +-- .../StateContainerEditor.ModelChanges.cs | 26 +- .../Presentation/StateContainerEditor.xaml.cs | 25 +- .../Presentation/TransitionDesigner.xaml.cs | 54 +-- .../DynamicArgumentDesigner.xaml.cs | 8 +- .../CorrelationDataDesigner.xaml.cs | 6 +- .../Presentation/ReceiveReplyDesigner.xaml.cs | 9 +- .../Presentation/SendDesigner.xaml.cs | 15 +- .../Activities/Statements/InternalState.cs | 6 +- .../System/Activities/WorkflowApplication.cs | 12 +- .../System/threading/Tasks/TaskExtensions.cs | 50 +-- .../Data/Common/Utils/MetadataHelper.cs | 5 +- ...onImportMapping.ReturnTypeRenameMapping.cs | 18 +- ...ageMappingItemCollection.ViewDictionary.cs | 6 +- .../ViewGeneration/CqlGeneration/CqlBlock.cs | 3 +- .../Structures/ScalarRestriction.cs | 6 +- .../Structures/TypeRestriction.cs | 7 +- .../System/Data/Mapping/ViewValidator.cs | 3 +- .../ObjectQuery_EntitySqlExtensions.cs | 3 +- .../Data/Query/InternalTrees/NodeInfo.cs | 6 +- .../Data/Query/PlanCompiler/PreProcessor.cs | 6 +- .../System.Data.Linq/DataServices.cs | 16 +- .../SqlClient/Query/QueryConverter.cs | 6 +- .../System.Data.Linq/SqlClient/SqlProvider.cs | 3 +- .../System/Data/SqlClient/TdsParser.cs | 3 +- .../Selectors/SecurityTokenResolver.cs | 6 +- .../DurableInstancing/InstanceStore.cs | 5 +- .../System/Runtime/PersistencePipeline.cs | 12 +- .../Dispatcher/BufferedReceiveManager.cs | 6 +- .../PersistenceProviderDirectory.cs | 6 +- .../System/ServiceModel/Activities/Receive.cs | 7 +- .../Channels/ByteStreamMessage.cs | 5 +- .../WCFServiceClientProxyGenerator.cs | 6 +- .../FormatSelectingMessageInspector.cs | 26 +- .../MultiplexingDispatchMessageFormatter.cs | 8 +- ...yParameterXmlSerializerMessageFormatter.cs | 6 +- .../ComPlusInstanceContextInitializer.cs | 3 +- .../Configuration/SecurityElementBase.cs | 3 +- .../ServiceModelExtensionCollectionElement.cs | 6 +- .../ImportedPolicyConversionContext.cs | 33 +- .../EndpointPerformanceCountersV2.cs | 6 +- .../OperationPerformanceCountersV2.cs | 6 +- .../Dispatcher/MessageFilterTable.cs | 7 +- .../Dispatcher/QueryTreeBuilder.cs | 6 +- .../ServiceModel/Dispatcher/XPathParser.cs | 8 +- .../ReceiveSecurityHeaderElementManager.cs | 40 ++- .../Security/SecurityMessageProperty.cs | 6 +- .../Common/ChartTypes/FunnelChart.cs | 6 +- .../Common/DataManager/DataPoint.cs | 3 +- .../ClientServices/Providers/ClientData.cs | 7 +- .../System.Web/FileChangesMonitor.cs | 3 +- .../UI/WebControls/MenuRendererClassic.cs | 20 +- .../AuthoringOM/Design/ActivityDesigner.cs | 6 +- .../AuthoringOM/Design/Connector.cs | 12 +- .../AuthoringOM/Design/DesignerHelpers.cs | 3 +- .../System/Activities/Statements/Interop.cs | 12 +- .../Net/Cache/FtpRequestCacheValidator.cs | 6 +- .../Tasks/Xaml/PartialClassGenerationTask.cs | 8 +- .../security/permissions/fileiopermission.cs | 3 +- mono/mcs/mcs/assign.cs | 3 +- mono/mcs/tests/test-async-07.cs | 43 +-- mono/mcs/tests/test-async-11.cs | 17 +- mono/mcs/tests/test-async-17.cs | 54 +-- .../mono-symbolicate/LocationProvider.cs | 8 +- .../FirebirdExpressionTranslator.cs | 3 +- .../SqlServerExpressionTranslator.cs | 3 +- .../Moq/Matchers/MatcherAttributeMatcher.cs | 3 +- moq4/src/Moq/MethodExpectation.cs | 7 +- .../ConvertProgramAnalysis_ProgramMain.cs | 3 +- ...sionInInterpolatedStringCodeFixProvider.cs | 3 +- ...bstractUseCollectionInitializerAnalyzer.cs | 7 +- .../UseNamedMemberInitializerAnalyzer.cs | 10 +- .../CSharp/Portable/Binder/Binder_Crefs.cs | 3 +- .../Portable/Binder/Binder_Statements.cs | 7 +- .../Portable/Binder/ForEachLoopBinder.cs | 20 +- .../Portable/Binder/SwitchExpressionBinder.cs | 12 +- .../Portable/FlowAnalysis/NullableWalker.cs | 14 +- .../AsyncMethodToStateMachineRewriter.cs | 16 +- .../SymbolDisplayVisitor.Types.cs | 7 +- .../Portable/Symbols/ReferenceManager.cs | 3 +- .../Symbols/Source/SourceAssemblySymbol.cs | 20 +- ...berContainerSymbol_ImplementationChecks.cs | 14 +- .../Symbols/Source/SourceNamedTypeSymbol.cs | 5 +- .../Records/SynthesizedRecordClone.cs | 7 +- .../Test/CommandLine/CommandLineTests.cs | 3 +- .../CodeGen/CodeGenOverridingAndHiding.cs | 3 +- .../CSharp/Test/Emit/CodeGen/SwitchTests.cs | 3 +- .../Test/Emit/CodeGen/WinMdDelegateTests.cs | 3 +- .../Test/Emit/Emit/CompilationEmitTests.cs | 12 +- .../CSharp/Test/Emit/Emit/NoPiaEmbedTypes.cs | 6 +- .../Attributes/AttributeTests_Assembly.cs | 6 +- .../Attributes/AttributeTests_Nullable.cs | 18 +- .../Attributes/AttributeTests_Synthesized.cs | 3 +- .../Emit2/Emit/UnmanagedTypeModifierTests.cs | 3 +- .../Test/Emit2/Semantics/RecordTests.cs | 27 +- .../IOperation/IOperation/IOperationTests.cs | 3 +- ...perationTests_IObjectCreationExpression.cs | 18 +- .../Test/Semantic/Semantics/ArglistTests.cs | 24 +- .../Test/Semantic/Semantics/ForEachTests.cs | 3 +- .../Test/Semantic/Semantics/LookupTests.cs | 9 +- .../Test/Semantic/Semantics/OperatorTests.cs | 13 +- .../Test/Semantic/Semantics/RecordTests.cs | 27 +- .../Compilation/ReferenceManagerTests.cs | 3 +- .../SymbolDisplay/SymbolDisplayTests.cs | 6 +- .../Symbols/AnonymousTypesSemanticsTests.cs | 26 +- .../Symbol/Symbols/ArrayTypeSymbolTests.cs | 3 +- .../Test/Symbol/Symbols/ConversionTests.cs | 3 +- .../DefaultInterfaceImplementationTests.cs | 36 +- .../Symbols/FunctionPointerTypeSymbolTests.cs | 21 +- .../Symbol/Symbols/IndexedPropertyTests.cs | 3 +- .../Symbols/Metadata/MetadataTypeTests.cs | 3 +- .../Symbols/Metadata/PE/TypeForwarders.cs | 14 +- .../Source/ExpressionBodiedMethodTests.cs | 3 +- .../Test/Symbol/Symbols/Source/MethodTests.cs | 12 +- .../Symbol/Symbols/Source/PropertyTests.cs | 3 +- .../Test/Syntax/Diagnostics/LocationsTests.cs | 10 +- .../Parsing/LocalFunctionParsingTests.cs | 3 +- .../Portable/CommandLine/CommonCompiler.cs | 9 +- .../Operations/ControlFlowGraphBuilder.cs | 6 +- .../SourceGeneration/GlobalAliases.cs | 3 +- .../Symbols/Attributes/CommonAttributeData.cs | 6 +- .../Compilation/ControlFlowGraphVerifier.cs | 12 +- .../Core/Diagnostics/DiagnosticDescription.cs | 6 +- .../Test/Core/Syntax/TokenUtilities.cs | 6 +- .../Resources/Core/PerfTests/CSPerfTest.cs | 3 +- .../Utilities/CSharp/CompilationTestUtils.cs | 3 +- .../CodeActionEditHandlerService.cs | 9 +- .../DefinitionContextTracker.cs | 6 +- ....SingleDiagnosticKindPullTaggerProvider.cs | 3 +- ...tractDocumentationCommentCommandHandler.cs | 5 +- .../EditAndContinueDiagnosticAnalyzer.cs | 3 +- .../NavigationBar/NavigationBarItem.cs | 6 +- ...tractRenameCommandHandler_RenameHandler.cs | 6 +- ...lineRenameSession.OpenTextBufferManager.cs | 3 +- .../Core/IntelliSense/ModelComputation.cs | 49 +-- .../Extensions/IBufferGraphExtensions.cs | 3 +- .../DiagnosticAnalyzerServiceTests.cs | 7 +- .../Test/Workspaces/DefaultMefHostTests.cs | 6 +- .../Expansion/DebuggerTypeProxyExpansion.cs | 24 +- .../Debugger/MemberInfo/FieldInfoImpl.cs | 3 +- .../Debugger/MemberInfo/PropertyInfoImpl.cs | 9 +- ...actCurlyBraceOrBracketCompletionService.cs | 6 +- .../CrefCompletionProvider.cs | 3 +- .../NamedParameterCompletionProvider.cs | 10 +- .../ConvertProgramTransform_ProgramMain.cs | 3 +- .../CSharpProximityExpressionsService.cs | 3 +- .../Portable/Debugging/LocationInfoGetter.cs | 6 +- .../CSharpEditAndContinueAnalyzer.cs | 6 +- .../EditAndContinue/SyntaxUtilities.cs | 3 +- .../CSharpSelectionResult.ExpressionResult.cs | 3 +- ...uctorFromMembersCodeRefactoringProvider.cs | 6 +- ...tractDocumentationCommentSnippetService.cs | 3 +- .../DebuggingSessionTelemetry.cs | 3 +- .../API/UnitTestingDocumentSpan.cs | 3 +- .../MethodExtractor.CodeGenerator.cs | 9 +- .../AbstractGenerateVariableService.State.cs | 8 +- .../Portable/QuickInfo/IndentationHelper.cs | 12 +- .../Portable/Rename/SymbolicRenameInfo.cs | 10 +- ...AbstractSimplifyThisOrMeCodeFixProvider.cs | 7 +- .../SolutionCrawler/WorkCoordinator.cs | 3 +- .../ProjectAssets/ProjectAssetsReader.cs | 4 +- .../Portable/ValueTracking/ValueTracker.cs | 7 +- .../FileWatching/LspFileChangeWatcher.cs | 3 +- .../LspMiscellaneousFilesWorkspaceTests.cs | 3 +- .../InteractiveSessionReferencesTests.cs | 3 +- .../Editor/FSharpEditorInlineRenameService.cs | 6 +- .../CSharpSyntaxGenerator/SourceWriter.cs | 15 +- .../IOperationClassWriter.cs | 16 +- .../Core/Def/FindReferences/Entries/Entry.cs | 3 +- ...tractLanguageService`2.IVsLanguageBlock.cs | 6 +- .../Def/Library/ObjectBrowser/ObjectList.cs | 11 +- ...alStudioMoveStaticMembersOptionsService.cs | 11 +- .../Storage/CloudCachePersistentStorage.cs | 3 +- .../TableDataSource/OpenDocumentTracker.cs | 5 +- ...anguage.IVsContainedLanguageCodeSupport.cs | 3 +- .../Impl/CodeModel/ProjectCodeModelFactory.cs | 3 +- .../Core/Impl/CodeModel/RootCodeModel.cs | 3 +- .../Options/GridOptionPreviewControl.xaml.cs | 3 +- .../OptionPages/ForceLowMemoryMode.cs | 13 +- .../Handler/Hover/HoverHandler.cs | 7 +- .../Classification/ClassificationHelpers.cs | 3 +- .../CSharpDeclaredSymbolInfoFactoryService.cs | 6 +- .../CSharpSimplificationService.Expander.cs | 7 +- .../Providers/FormatCodeCleanupProvider.cs | 7 +- .../FixAllOccurrences/FixAllState.cs | 3 +- .../Core/Portable/Editing/SyntaxGenerator.cs | 3 +- .../SymbolTree/SymbolTreeInfoCacheService.cs | 13 +- .../MutableConflictResolution.cs | 3 +- ...ystemProject.BatchingDocumentCollection.cs | 6 +- .../Portable/Workspace/Solution/Document.cs | 17 +- .../Solution/SolutionState_Checksum.cs | 3 +- .../Remote/ServiceHub/Host/RemoteWorkspace.cs | 5 +- .../ForEachStatementSyntaxExtensions.cs | 4 +- .../CastExpressionSyntaxExtensions.cs | 8 +- .../Runtime/TypeLoader/TypeBuilder.cs | 3 +- .../TypeSystem/Common/DefType.FieldLayout.cs | 9 +- .../TestCasesRunner/AssemblyChecker.cs | 10 +- .../src/coreclr/tools/dotnet-pgo/Program.cs | 19 +- .../Common/src/Roslyn/GlobalAliases.cs | 3 +- .../tests/StaticTestGenerator/Program.cs | 326 +++++++++--------- .../Http/HttpClientHandlerTest.Asynchrony.cs | 3 +- .../tests/DependencyContextBuilderTests.cs | 30 +- .../tests/UseWindowsServiceTests.cs | 6 +- .../System/CodeDom/CodeTypeReferenceTests.cs | 7 +- .../Composition/Hosting/TypeCatalog.cs | 5 +- ...viderFactory.RecomposableExportProvider.cs | 3 +- .../tests/DescriptorTestAttribute.cs | 7 +- .../src/System/Data/DataColumn.cs | 16 +- .../System/Data/DataColumnCollectionTest2.cs | 14 +- .../tests/System/Data/DataColumnTest.cs | 12 +- .../tests/System/Data/DataSetTest2.cs | 32 +- .../tests/System/Data/DataTableTest.cs | 26 +- .../System/Data/DuplicateNameExceptionTest.cs | 12 +- .../tests/ProcessStartInfoTests.cs | 8 +- .../tests/ProcessThreadTests.cs | 3 +- .../tests/Reader/ReadBMPString.cs | 3 +- ...FormatInfoAbbreviatedMonthGenitiveNames.cs | 12 +- .../tests/ReadAsyncCancellationTests.cs | 15 +- .../tests/ExchangeTests.cs | 8 +- .../tests/QueryOperators/ZipTests.cs | 3 +- .../BrowserHttpHandler/BrowserHttpHandler.cs | 36 +- .../StressTests/HttpStress/StressServer.cs | 3 +- .../FunctionalTests/CreateSocketTests.cs | 11 +- .../SendReceive/SendReceive.cs | 52 +-- .../ConfiguredValueTaskAwaitable.cs | 12 +- .../TreeManipulation/XNodeSequenceRemove.cs | 12 +- .../tests/axes/AxisOrderValidation.cs | 3 +- .../src/System/Xml/Core/XmlTextReaderImpl.cs | 3 +- .../System/Xml/Core/XmlTextReaderImplAsync.cs | 10 +- .../System/Reflection/Metadata/BlobBuilder.cs | 3 +- .../tests/src/TestUtils/TestUtils.cs | 10 +- .../ComInterfaceGenerator.cs | 3 +- .../CompileFails.cs | 6 +- .../System/Reflection/SignatureTypes.cs | 5 +- .../CESchedulerPairTests.cs | 23 +- .../AsyncTaskMethodBuilderTests.cs | 30 +- .../YieldAwaitableTests.cs | 173 +++++----- .../Task/ExecutionContextFlowTest.cs | 13 +- .../Task/TaskContinueWithTests.cs | 63 ++-- .../Task/TaskRtTests_Core.cs | 13 +- .../TaskFactory/TaskFactory_FromAsyncTests.cs | 6 +- .../tests/System/Reflection/SignatureTypes.cs | 5 +- .../tests/EnvelopedCms/DecryptTests.cs | 3 +- .../tests/SignedCms/SignedCmsTests.cs | 6 +- .../AuthorityInformationAccessTests.cs | 15 +- .../Syndication/Rss20ItemFormatterTests.cs | 3 +- .../SyndicationItemFormatterTests.cs | 6 +- ...nTypeInfoResolverTests.JsonPropertyInfo.cs | 6 +- .../MetadataTests.JsonSerializer.cs | 5 +- .../gen/RegexGenerator.Parser.cs | 12 +- .../tests/UnboundedChannelTests.cs | 3 +- .../tests/Task/TaskRunSyncTests.cs | 13 +- .../tests/UnwrapTests.cs | 95 ++--- .../tests/AsyncTransactionScopeTests.cs | 139 ++++---- .../EvaluateOnCallFrame2Tests.cs | 6 +- .../DebuggerTestSuite/SteppingTests.cs | 6 +- runtime/src/mono/wasm/host/WebServer.cs | 5 +- .../explicit/coverage/body_double.cs | 8 +- .../Methodical/explicit/coverage/body_int.cs | 12 +- .../Methodical/explicit/coverage/body_obj.cs | 14 +- .../explicit/coverage/body_safe_double.cs | 8 +- .../explicit/coverage/body_safe_int.cs | 12 +- .../explicit/coverage/body_safe_obj.cs | 14 +- .../explicit/coverage/body_safe_val.cs | 14 +- .../Methodical/explicit/coverage/body_val.cs | 14 +- .../Regressions/coreclr/0041/body_double.cs | 8 +- .../SmokeTests/UnitTests/BasicThreading.cs | 7 +- .../DiagnosticsServerRouterFactory.cs | 3 +- .../RequiresAnalyzerBase.cs | 3 +- .../linker/Linker.Dataflow/FlowAnnotations.cs | 6 +- .../TestCasesRunner/ResultChecker.cs | 6 +- 393 files changed, 2980 insertions(+), 2380 deletions(-) diff --git a/AspNetWebStack/src/Microsoft.Web.Mvc/Resources/FormatManager.cs b/AspNetWebStack/src/Microsoft.Web.Mvc/Resources/FormatManager.cs index 5697548ef6b..4a8655cfef0 100644 --- a/AspNetWebStack/src/Microsoft.Web.Mvc/Resources/FormatManager.cs +++ b/AspNetWebStack/src/Microsoft.Web.Mvc/Resources/FormatManager.cs @@ -90,11 +90,9 @@ out object model { if (this.RequestFormatHandlers[i].CanDeserialize(requestFormat)) { - model = this.RequestFormatHandlers[i].Deserialize( - controllerContext, - bindingContext, - requestFormat - ); + model = this + .RequestFormatHandlers[i] + .Deserialize(controllerContext, bindingContext, requestFormat); return true; } } @@ -144,10 +142,9 @@ public bool TryMapFormatFriendlyName(string formatName, out ContentType contentT for (int i = 0; i < this.ResponseFormatHandlers.Count; ++i) { if ( - this.ResponseFormatHandlers[i].TryMapFormatFriendlyName( - formatName, - out contentType - ) + this + .ResponseFormatHandlers[i] + .TryMapFormatFriendlyName(formatName, out contentType) ) { return true; diff --git a/AspNetWebStack/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/DictionaryModelBinderTest.cs b/AspNetWebStack/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/DictionaryModelBinderTest.cs index 01fe44a1c93..6b705664553 100644 --- a/AspNetWebStack/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/DictionaryModelBinderTest.cs +++ b/AspNetWebStack/test/Microsoft.Web.Mvc.Test/ModelBinding/Test/DictionaryModelBinderTest.cs @@ -39,7 +39,8 @@ public void BindModel() .Returns( delegate(ControllerContext cc, ExtensibleModelBindingContext mbc) { - mbc.Model = mbc.ValueProvider.GetValue(mbc.ModelName) + mbc.Model = mbc + .ValueProvider.GetValue(mbc.ModelName) .ConvertTo(mbc.ModelType); return true; } diff --git a/AutoMapper/src/IntegrationTests/IncludeMembers.cs b/AutoMapper/src/IntegrationTests/IncludeMembers.cs index 0cc9b7884e0..126d6951850 100644 --- a/AutoMapper/src/IntegrationTests/IncludeMembers.cs +++ b/AutoMapper/src/IntegrationTests/IncludeMembers.cs @@ -626,7 +626,8 @@ protected override MapperConfiguration CreateConfiguration() => d => d.Details, o => o.MapFrom(s => - s.InnerSourceDetailsWrapper.Select(s => s.InnerSourceDetails) + s + .InnerSourceDetailsWrapper.Select(s => s.InnerSourceDetails) .FirstOrDefault() ) ); diff --git a/AutoMapper/src/UnitTests/NullBehavior.cs b/AutoMapper/src/UnitTests/NullBehavior.cs index e7271148e7d..8b0b5d49b8f 100644 --- a/AutoMapper/src/UnitTests/NullBehavior.cs +++ b/AutoMapper/src/UnitTests/NullBehavior.cs @@ -752,9 +752,9 @@ protected override MapperConfiguration CreateConfiguration() => d => d.SubExpressionName, opt => opt.MapFrom(src => - src.Subs.FirstOrDefault(spt => - spt.Sub.Something == src.Id - ).Something + src + .Subs.FirstOrDefault(spt => spt.Sub.Something == src.Id) + .Something ) ) .ForMember( diff --git a/AutoMapper/src/UnitTests/Projection/ParameterizedQueriesTests.cs b/AutoMapper/src/UnitTests/Projection/ParameterizedQueriesTests.cs index f87706ab284..dbc07d04097 100644 --- a/AutoMapper/src/UnitTests/Projection/ParameterizedQueriesTests.cs +++ b/AutoMapper/src/UnitTests/Projection/ParameterizedQueriesTests.cs @@ -201,7 +201,8 @@ public void Should_only_replace_outer_parameters() { var db = new DB(); - var user = db.Users.ProjectTo(Configuration, new { db }) + var user = db + .Users.ProjectTo(Configuration, new { db }) .FirstOrDefault(a => a.Id == 2); user.position.ShouldBe(1); diff --git a/Core/src/Castle.Core.Tests/DynamicProxy.Tests/CustomModifiersTestCase.cs b/Core/src/Castle.Core.Tests/DynamicProxy.Tests/CustomModifiersTestCase.cs index 9f1ff99abf0..5d0093e76c4 100644 --- a/Core/src/Castle.Core.Tests/DynamicProxy.Tests/CustomModifiersTestCase.cs +++ b/Core/src/Castle.Core.Tests/DynamicProxy.Tests/CustomModifiersTestCase.cs @@ -180,7 +180,8 @@ public void ReflectionReturnsCorrectModoptOnParamTypeForGeneratedType(string typ var typeNameWithoutSuffix = typeName.Substring(0, typeName.Length - suffix.Length); Assume.That(CustomModifiersTestCase.customModifiers.ContainsKey(typeNameWithoutSuffix)); - var modopts = this.generatedTypes[typeName] + var modopts = this + .generatedTypes[typeName] .GetMethod("Foo") .GetParameters()[0] .GetOptionalCustomModifiers(); @@ -221,7 +222,8 @@ public void ReflectionReturnsCorrectModreqsOnParamTypeForGeneratedType(string ty var typeNameWithoutSuffix = typeName.Substring(0, typeName.Length - suffix.Length); Assume.That(CustomModifiersTestCase.customModifiers.ContainsKey(typeNameWithoutSuffix)); - var modreqs = this.generatedTypes[typeName] + var modreqs = this + .generatedTypes[typeName] .GetMethod("Foo") .GetParameters()[0] .GetRequiredCustomModifiers(); @@ -249,7 +251,8 @@ public void ReflectionReturnsCorrectModoptOnReturnTypeForGeneratedType(string ty var typeNameWithoutSuffix = typeName.Substring(0, typeName.Length - suffix.Length); Assume.That(CustomModifiersTestCase.customModifiers.ContainsKey(typeNameWithoutSuffix)); - var modopts = this.generatedTypes[typeName] + var modopts = this + .generatedTypes[typeName] .GetMethod("Foo") .ReturnParameter.GetOptionalCustomModifiers(); Assume.That(modopts.Length > 0); // If this fails on mono/linux we have to revisit the commits and issues for IL method custom modifiers. https://github.com/castleproject/Core/issues/277 @@ -276,7 +279,8 @@ public void ReflectionReturnsCorrectModreqOnReturnTypeForGeneratedType(string ty var typeNameWithoutSuffix = typeName.Substring(0, typeName.Length - suffix.Length); Assume.That(CustomModifiersTestCase.customModifiers.ContainsKey(typeNameWithoutSuffix)); - var modreqs = this.generatedTypes[typeName] + var modreqs = this + .generatedTypes[typeName] .GetMethod("Foo") .ReturnParameter.GetRequiredCustomModifiers(); Assume.That(modreqs.Length > 0); // If this fails on mono/linux we have to revisit the commits and issues for IL method custom modifiers. https://github.com/castleproject/Core/issues/277 diff --git a/Newtonsoft.Json/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaNodeTests.cs b/Newtonsoft.Json/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaNodeTests.cs index 649ad7b82e5..3eb87d93126 100644 --- a/Newtonsoft.Json/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaNodeTests.cs +++ b/Newtonsoft.Json/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaNodeTests.cs @@ -99,7 +99,8 @@ public void AddSchema() Assert.AreEqual(3, node.Properties["secondproperty"].Schemas.Count); Assert.AreEqual( 3, - node.Properties["secondproperty"] + node + .Properties["secondproperty"] .Properties["secondproperty_firstproperty"] .Schemas .Count diff --git a/aspnetcore/src/Azure/samples/AzureAppServicesSample/Startup.cs b/aspnetcore/src/Azure/samples/AzureAppServicesSample/Startup.cs index 8e6cd1d5891..3d245d92b3a 100644 --- a/aspnetcore/src/Azure/samples/AzureAppServicesSample/Startup.cs +++ b/aspnetcore/src/Azure/samples/AzureAppServicesSample/Startup.cs @@ -82,7 +82,8 @@ await context.Response.WriteAsync( await context.Response.WriteAsync("Environment Variables:" + Environment.NewLine); var vars = Environment.GetEnvironmentVariables(); foreach ( - var key in vars.Keys.Cast() + var key in vars + .Keys.Cast() .OrderBy(key => key, StringComparer.OrdinalIgnoreCase) ) { diff --git a/aspnetcore/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.PrerenderingState.cs b/aspnetcore/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.PrerenderingState.cs index 699f92c7d35..8e465638dc7 100644 --- a/aspnetcore/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.PrerenderingState.cs +++ b/aspnetcore/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.PrerenderingState.cs @@ -25,8 +25,7 @@ public async ValueTask PrerenderPersistedStateAsync(HttpContext ht var renderModesMetadata = httpContext .GetEndpoint() - ?.Metadata - .GetMetadata(); + ?.Metadata.GetMetadata(); IPersistentComponentStateStore? store = null; diff --git a/aspnetcore/src/Components/Endpoints/src/Rendering/SSRRenderModeBoundary.cs b/aspnetcore/src/Components/Endpoints/src/Rendering/SSRRenderModeBoundary.cs index b2031c9bcee..32d51f6e103 100644 --- a/aspnetcore/src/Components/Endpoints/src/Rendering/SSRRenderModeBoundary.cs +++ b/aspnetcore/src/Components/Endpoints/src/Rendering/SSRRenderModeBoundary.cs @@ -62,8 +62,7 @@ IComponentRenderMode renderMode { var configuredRenderModesMetadata = httpContext .GetEndpoint() - ?.Metadata - .GetMetadata(); + ?.Metadata.GetMetadata(); if (configuredRenderModesMetadata is null) { // This is not a Razor Components endpoint. It might be that the app is using RazorComponentResult, diff --git a/aspnetcore/src/Components/test/E2ETest/Infrastructure/ServerFixtures/WebHostServerFixture.cs b/aspnetcore/src/Components/test/E2ETest/Infrastructure/ServerFixtures/WebHostServerFixture.cs index 3fe1c027d21..5f3cd7c29dc 100644 --- a/aspnetcore/src/Components/test/E2ETest/Infrastructure/ServerFixtures/WebHostServerFixture.cs +++ b/aspnetcore/src/Components/test/E2ETest/Infrastructure/ServerFixtures/WebHostServerFixture.cs @@ -15,7 +15,8 @@ protected override string StartAndGetRootUri() { Host = CreateWebHost(); RunInBackgroundThread(Host.Start); - return Host.Services.GetRequiredService() + return Host + .Services.GetRequiredService() .Features.Get() .Addresses.Single(); } diff --git a/aspnetcore/src/Components/test/testassets/Components.TestServer/Controllers/UserController.cs b/aspnetcore/src/Components/test/testassets/Components.TestServer/Controllers/UserController.cs index e7d9f49e500..7101ef6455a 100644 --- a/aspnetcore/src/Components/test/testassets/Components.TestServer/Controllers/UserController.cs +++ b/aspnetcore/src/Components/test/testassets/Components.TestServer/Controllers/UserController.cs @@ -24,7 +24,8 @@ public ClientSideAuthenticationStateData Get() { IsAuthenticated = User.Identity.IsAuthenticated, UserName = User.Identity.Name, - ExposedClaims = User.Claims.Where(c => c.Type == "test-claim" || IsExposedRole(c)) + ExposedClaims = User + .Claims.Where(c => c.Type == "test-claim" || IsExposedRole(c)) .Select(c => new ExposedClaim { Type = c.Type, Value = c.Value }) .ToList() }; diff --git a/aspnetcore/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs b/aspnetcore/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs index 509eef36905..b2cc6eaf4d7 100644 --- a/aspnetcore/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs +++ b/aspnetcore/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs @@ -1756,7 +1756,8 @@ CreateBuilderFunc createBuilder var env0 = app.Services.GetRequiredService(); - var env1 = app.Services.GetRequiredService() + var env1 = app + .Services.GetRequiredService() .BuildServiceProvider() .GetRequiredService(); @@ -1790,7 +1791,8 @@ CreateBuilderFunc createBuilder var service0 = app.Services.GetRequiredService(); - var service1 = app.Services.GetRequiredService() + var service1 = app + .Services.GetRequiredService() .BuildServiceProvider() .GetRequiredService(); @@ -1844,7 +1846,8 @@ CreateBuilderFunc createBuilder var app = builder.Build(); var hostLifetime0 = app.Services.GetRequiredService(); - var childServiceProvider = app.Services.GetRequiredService() + var childServiceProvider = app + .Services.GetRequiredService() .BuildServiceProvider(); var hostLifetime1 = childServiceProvider.GetRequiredService(); diff --git a/aspnetcore/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/JsonTranscodingServiceMethodProviderTests.cs b/aspnetcore/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/JsonTranscodingServiceMethodProviderTests.cs index 675cfc61637..4881d10f1dc 100644 --- a/aspnetcore/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/JsonTranscodingServiceMethodProviderTests.cs +++ b/aspnetcore/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/JsonTranscodingServiceMethodProviderTests.cs @@ -86,8 +86,7 @@ public void AddMethod_OptionAdditionalBindings_ResolveMethods() "/v1/additional_bindings/{name}", additionalMethodModel .Metadata.GetMetadata() - ?.HttpRule - .Delete + ?.HttpRule.Delete ); Assert.Equal("/v1/additional_bindings/{name}", additionalMethodModel.RoutePattern.RawText); } diff --git a/aspnetcore/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs b/aspnetcore/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs index b8c933a1ac3..ea0d7e8c128 100644 --- a/aspnetcore/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs +++ b/aspnetcore/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs @@ -171,8 +171,7 @@ HostingApplication.Context context { var route = httpContext .GetEndpoint() - ?.Metadata - .GetMetadata() + ?.Metadata.GetMetadata() ?.Route; var customTags = context.MetricsTagsFeature?.TagsList; diff --git a/aspnetcore/src/Http/Routing/src/EndpointRoutingMiddleware.cs b/aspnetcore/src/Http/Routing/src/EndpointRoutingMiddleware.cs index 9d301d62a17..21bd4772263 100644 --- a/aspnetcore/src/Http/Routing/src/EndpointRoutingMiddleware.cs +++ b/aspnetcore/src/Http/Routing/src/EndpointRoutingMiddleware.cs @@ -340,8 +340,7 @@ private void SetMaxRequestBodySize(HttpContext context) { var sizeLimitMetadata = context .GetEndpoint() - ?.Metadata - ?.GetMetadata(); + ?.Metadata?.GetMetadata(); if (sizeLimitMetadata == null) { Log.RequestSizeLimitMetadataNotFound(_logger); diff --git a/aspnetcore/src/Identity/test/InMemory.Test/InMemoryUserStore.cs b/aspnetcore/src/Identity/test/InMemory.Test/InMemoryUserStore.cs index 3fe333adf10..6dcac714765 100644 --- a/aspnetcore/src/Identity/test/InMemory.Test/InMemoryUserStore.cs +++ b/aspnetcore/src/Identity/test/InMemory.Test/InMemoryUserStore.cs @@ -66,9 +66,8 @@ public Task ReplaceClaimAsync( CancellationToken cancellationToken = default(CancellationToken) ) { - var matchedClaims = user.Claims.Where(uc => - uc.ClaimValue == claim.Value && uc.ClaimType == claim.Type - ) + var matchedClaims = user + .Claims.Where(uc => uc.ClaimValue == claim.Value && uc.ClaimType == claim.Type) .ToList(); foreach (var matchedClaim in matchedClaims) { @@ -268,11 +267,12 @@ public Task> GetLoginsAsync( CancellationToken cancellationToken = default(CancellationToken) ) { - IList result = user.Logins.Select(l => new UserLoginInfo( - l.LoginProvider, - l.ProviderKey, - l.ProviderDisplayName - )) + IList result = user + .Logins.Select(l => new UserLoginInfo( + l.LoginProvider, + l.ProviderKey, + l.ProviderDisplayName + )) .ToList(); return Task.FromResult(result); } @@ -496,7 +496,8 @@ public Task> GetUsersForClaimAsync( var query = from user in Users where - user.Claims.Where(x => x.ClaimType == claim.Type && x.ClaimValue == claim.Value) + user + .Claims.Where(x => x.ClaimType == claim.Type && x.ClaimValue == claim.Value) .FirstOrDefault() != null select user; diff --git a/aspnetcore/src/Middleware/RateLimiting/src/RateLimitingMiddleware.cs b/aspnetcore/src/Middleware/RateLimiting/src/RateLimitingMiddleware.cs index c94538ee86f..e53533733de 100644 --- a/aspnetcore/src/Middleware/RateLimiting/src/RateLimitingMiddleware.cs +++ b/aspnetcore/src/Middleware/RateLimiting/src/RateLimitingMiddleware.cs @@ -79,9 +79,8 @@ public Task Invoke(HttpContext context) { return _next(context); } - var enableRateLimitingAttribute = endpoint - ?.Metadata - .GetMetadata(); + var enableRateLimitingAttribute = + endpoint?.Metadata.GetMetadata(); // If this endpoint has no EnableRateLimitingAttribute & there's no global limiter, don't apply any rate limits. if (enableRateLimitingAttribute is null && _globalLimiter is null) { @@ -318,8 +317,7 @@ private PartitionedRateLimiter CreateEndpointLimiter() DefaultRateLimiterPolicy? policy; var enableRateLimitingAttribute = context .GetEndpoint() - ?.Metadata - .GetMetadata(); + ?.Metadata.GetMetadata(); if (enableRateLimitingAttribute is null) { return RateLimitPartition.GetNoLimiter(_defaultPolicyKey); diff --git a/aspnetcore/src/Middleware/RequestDecompression/src/RequestDecompressionMiddleware.cs b/aspnetcore/src/Middleware/RequestDecompression/src/RequestDecompressionMiddleware.cs index 682610afa88..90318c9e395 100644 --- a/aspnetcore/src/Middleware/RequestDecompression/src/RequestDecompressionMiddleware.cs +++ b/aspnetcore/src/Middleware/RequestDecompression/src/RequestDecompressionMiddleware.cs @@ -62,8 +62,7 @@ private async Task InvokeCore(HttpContext context, Stream decompressionStream) var sizeLimit = context .GetEndpoint() - ?.Metadata - ?.GetMetadata() + ?.Metadata?.GetMetadata() ?.MaxRequestBodySize ?? context.Features.Get()?.MaxRequestBodySize; diff --git a/aspnetcore/src/Mvc/Mvc.Core/src/ControllerBase.cs b/aspnetcore/src/Mvc/Mvc.Core/src/ControllerBase.cs index d5f9af59701..ddcb7f32301 100644 --- a/aspnetcore/src/Mvc/Mvc.Core/src/ControllerBase.cs +++ b/aspnetcore/src/Mvc/Mvc.Core/src/ControllerBase.cs @@ -95,9 +95,8 @@ public IModelMetadataProvider MetadataProvider { if (_metadataProvider == null) { - _metadataProvider = HttpContext - ?.RequestServices - ?.GetRequiredService(); + _metadataProvider = + HttpContext?.RequestServices?.GetRequiredService(); } return _metadataProvider!; @@ -120,9 +119,8 @@ public IModelBinderFactory ModelBinderFactory { if (_modelBinderFactory == null) { - _modelBinderFactory = HttpContext - ?.RequestServices - ?.GetRequiredService(); + _modelBinderFactory = + HttpContext?.RequestServices?.GetRequiredService(); } return _modelBinderFactory!; @@ -169,9 +167,8 @@ public IObjectModelValidator ObjectValidator { if (_objectValidator == null) { - _objectValidator = HttpContext - ?.RequestServices - ?.GetRequiredService(); + _objectValidator = + HttpContext?.RequestServices?.GetRequiredService(); } return _objectValidator!; @@ -194,9 +191,8 @@ public ProblemDetailsFactory ProblemDetailsFactory { if (_problemDetailsFactory == null) { - _problemDetailsFactory = HttpContext - ?.RequestServices - ?.GetRequiredService(); + _problemDetailsFactory = + HttpContext?.RequestServices?.GetRequiredService(); } return _problemDetailsFactory!; diff --git a/aspnetcore/src/Mvc/Mvc.Core/src/Infrastructure/ActionSelectionTable.cs b/aspnetcore/src/Mvc/Mvc.Core/src/Infrastructure/ActionSelectionTable.cs index d8bbc7ad6e3..7d3035bfdc1 100644 --- a/aspnetcore/src/Mvc/Mvc.Core/src/Infrastructure/ActionSelectionTable.cs +++ b/aspnetcore/src/Mvc/Mvc.Core/src/Infrastructure/ActionSelectionTable.cs @@ -88,9 +88,9 @@ public static ActionSelectionTable Create(IEnumerable endpoi getRouteValue: (e, key) => { string? value = null; - e.Metadata.GetMetadata() - ?.RouteValues - ?.TryGetValue(key, out value); + e + .Metadata.GetMetadata() + ?.RouteValues?.TryGetValue(key, out value); return Convert.ToString(value, CultureInfo.InvariantCulture) ?? string.Empty; } ); diff --git a/aspnetcore/src/Mvc/Mvc.Core/test/ApplicationModels/ControllerActionDescriptorProviderTests.cs b/aspnetcore/src/Mvc/Mvc.Core/test/ApplicationModels/ControllerActionDescriptorProviderTests.cs index ee381eece6f..7682aa04ec7 100644 --- a/aspnetcore/src/Mvc/Mvc.Core/test/ApplicationModels/ControllerActionDescriptorProviderTests.cs +++ b/aspnetcore/src/Mvc/Mvc.Core/test/ApplicationModels/ControllerActionDescriptorProviderTests.cs @@ -719,7 +719,8 @@ public void AttributeRouting_AllowsDuplicateAttributeRoutedActions_WithTheSameTe var action = Assert.Single( actions, a => - a.ActionConstraints.OfType() + a + .ActionConstraints.OfType() .SelectMany(c => c.HttpMethods) .Contains(method) ); diff --git a/aspnetcore/src/Mvc/Mvc.ViewFeatures/src/Controller.cs b/aspnetcore/src/Mvc/Mvc.ViewFeatures/src/Controller.cs index 344cc7eb6f8..487747209ec 100644 --- a/aspnetcore/src/Mvc/Mvc.ViewFeatures/src/Controller.cs +++ b/aspnetcore/src/Mvc/Mvc.ViewFeatures/src/Controller.cs @@ -74,9 +74,8 @@ public ITempDataDictionary TempData { if (_tempData == null) { - var factory = HttpContext - ?.RequestServices - ?.GetRequiredService(); + var factory = + HttpContext?.RequestServices?.GetRequiredService(); _tempData = factory?.GetTempData(HttpContext); } diff --git a/aspnetcore/src/Security/Authentication/BearerToken/src/BearerTokenHandler.cs b/aspnetcore/src/Security/Authentication/BearerToken/src/BearerTokenHandler.cs index 3a364235f56..a59d3aac31c 100644 --- a/aspnetcore/src/Security/Authentication/BearerToken/src/BearerTokenHandler.cs +++ b/aspnetcore/src/Security/Authentication/BearerToken/src/BearerTokenHandler.cs @@ -100,9 +100,8 @@ HttpContext httpContext var typeInfo = httpContext .RequestServices.GetService>() - ?.Value - ?.SerializerOptions - ?.GetTypeInfo(typeof(AccessTokenResponse)) as JsonTypeInfo; + ?.Value?.SerializerOptions?.GetTypeInfo(typeof(AccessTokenResponse)) + as JsonTypeInfo; return typeInfo ?? BearerTokenJsonSerializerContext.Default.AccessTokenResponse; } diff --git a/aspnetcore/src/Security/Authentication/Cookies/samples/CookieSample/Program.cs b/aspnetcore/src/Security/Authentication/Cookies/samples/CookieSample/Program.cs index 3e6ff76a2a5..01ad842c4fe 100644 --- a/aspnetcore/src/Security/Authentication/Cookies/samples/CookieSample/Program.cs +++ b/aspnetcore/src/Security/Authentication/Cookies/samples/CookieSample/Program.cs @@ -23,8 +23,7 @@ // Don't renew on API endpoints that use JWT. var authData = context .HttpContext.GetEndpoint() - ?.Metadata - .GetMetadata(); + ?.Metadata.GetMetadata(); if ( authData != null && string.Equals( diff --git a/aspnetcore/src/Security/Authentication/test/AuthenticationMiddlewareTests.cs b/aspnetcore/src/Security/Authentication/test/AuthenticationMiddlewareTests.cs index a2061328876..f2895b63711 100644 --- a/aspnetcore/src/Security/Authentication/test/AuthenticationMiddlewareTests.cs +++ b/aspnetcore/src/Security/Authentication/test/AuthenticationMiddlewareTests.cs @@ -254,7 +254,8 @@ public async Task WebApplicationBuilder_RegistersAuthenticationAndAuthorizationM Assert.True(app.Properties.ContainsKey("__AuthenticationMiddlewareSet")); Assert.True(app.Properties.ContainsKey("__AuthorizationMiddlewareSet")); - var options = app.Services.GetService>() + var options = app + .Services.GetService>() .Get(JwtBearerDefaults.AuthenticationScheme); Assert.Equal(new[] { "SomeIssuer" }, options.TokenValidationParameters.ValidIssuers); Assert.Equal( diff --git a/aspnetcore/src/Servers/IIS/IIS/perf/Microbenchmarks/FirstRequestConfig.cs b/aspnetcore/src/Servers/IIS/IIS/perf/Microbenchmarks/FirstRequestConfig.cs index b5e1cf4ded4..5832ea5d9d1 100644 --- a/aspnetcore/src/Servers/IIS/IIS/perf/Microbenchmarks/FirstRequestConfig.cs +++ b/aspnetcore/src/Servers/IIS/IIS/perf/Microbenchmarks/FirstRequestConfig.cs @@ -28,7 +28,8 @@ public FirstRequestConfig() AddValidator(JitOptimizationsValidator.FailOnError); AddJob( - Job.Default.WithToolchain(CsProjCoreToolchain.From(NetCoreAppSettings.NetCoreApp21)) + Job + .Default.WithToolchain(CsProjCoreToolchain.From(NetCoreAppSettings.NetCoreApp21)) .WithGcMode(new GcMode { Server = true }) .WithIterationCount(10) .WithInvocationCount(1) diff --git a/aspnetcore/src/Servers/IIS/IIS/test/Common.FunctionalTests/GlobalVersionTests.cs b/aspnetcore/src/Servers/IIS/IIS/test/Common.FunctionalTests/GlobalVersionTests.cs index 725cc16d284..7f891e99e49 100644 --- a/aspnetcore/src/Servers/IIS/IIS/test/Common.FunctionalTests/GlobalVersionTests.cs +++ b/aspnetcore/src/Servers/IIS/IIS/test/Common.FunctionalTests/GlobalVersionTests.cs @@ -253,8 +253,7 @@ private static void CopyShimToOutput(IISDeploymentParameters parameters) element.Name == "add" && element .Attribute("name") - ?.Value - .StartsWith("AspNetCoreModule", StringComparison.Ordinal) == true + ?.Value.StartsWith("AspNetCoreModule", StringComparison.Ordinal) == true && element.Attribute("image") != null ); diff --git a/aspnetcore/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs b/aspnetcore/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs index 45db9e51303..0b2afa710ef 100644 --- a/aspnetcore/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs +++ b/aspnetcore/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs @@ -57,12 +57,16 @@ public void ConfigureServices(IServiceCollection serviceCollection) #if FORWARDCOMPAT private async Task ContentRootPath(HttpContext ctx) => await ctx.Response.WriteAsync( - ctx.RequestServices.GetService().ContentRootPath + ctx + .RequestServices.GetService() + .ContentRootPath ); private async Task WebRootPath(HttpContext ctx) => await ctx.Response.WriteAsync( - ctx.RequestServices.GetService().WebRootPath + ctx + .RequestServices.GetService() + .WebRootPath ); #else private async Task ContentRootPath(HttpContext ctx) => @@ -116,7 +120,8 @@ await ctx.Response.WriteAsync( #if !FORWARDCOMPAT private async Task IIISEnvironmentFeature(HttpContext ctx) { - var envFeature = ctx.RequestServices.GetService() + var envFeature = ctx + .RequestServices.GetService() .Features.Get(); await ctx.Response.WriteAsync( @@ -150,7 +155,8 @@ await ctx.Response.WriteAsync( private async Task ServerAddresses(HttpContext ctx) { - var serverAddresses = ctx.RequestServices.GetService() + var serverAddresses = ctx + .RequestServices.GetService() .Features.Get(); await ctx.Response.WriteAsync(string.Join(",", serverAddresses.Addresses)); } @@ -1055,7 +1061,8 @@ private async Task Shutdown(HttpContext ctx) { await ctx.Response.WriteAsync("Shutting down"); #if FORWARDCOMPAT - ctx.RequestServices.GetService() + ctx + .RequestServices.GetService() .StopApplication(); #else ctx.RequestServices.GetService().StopApplication(); @@ -1138,9 +1145,9 @@ public Task HttpsHelloWorld(HttpContext ctx) => public Task BodyLimit(HttpContext ctx) => ctx.Response.WriteAsync( - ctx.Features.Get() - ?.MaxRequestBodySize - ?.ToString(CultureInfo.InvariantCulture) ?? "null" + ctx + .Features.Get() + ?.MaxRequestBodySize?.ToString(CultureInfo.InvariantCulture) ?? "null" ); public Task Anonymous(HttpContext context) => diff --git a/aspnetcore/src/Servers/IIS/IISIntegration/samples/IISSample/Startup.cs b/aspnetcore/src/Servers/IIS/IISIntegration/samples/IISSample/Startup.cs index 5b09cbd3f83..905d7e2b6e4 100644 --- a/aspnetcore/src/Servers/IIS/IISIntegration/samples/IISSample/Startup.cs +++ b/aspnetcore/src/Servers/IIS/IISIntegration/samples/IISSample/Startup.cs @@ -108,7 +108,8 @@ await context.Response.WriteAsync( await context.Response.WriteAsync("Environment Variables:" + Environment.NewLine); var vars = Environment.GetEnvironmentVariables(); foreach ( - var key in vars.Keys.Cast() + var key in vars + .Keys.Cast() .OrderBy(key => key, StringComparer.OrdinalIgnoreCase) ) { diff --git a/aspnetcore/src/Servers/Kestrel/shared/test/TransportTestHelpers/IHostPortExtensions.cs b/aspnetcore/src/Servers/Kestrel/shared/test/TransportTestHelpers/IHostPortExtensions.cs index abb424b323a..fdd199e7fcd 100644 --- a/aspnetcore/src/Servers/Kestrel/shared/test/TransportTestHelpers/IHostPortExtensions.cs +++ b/aspnetcore/src/Servers/Kestrel/shared/test/TransportTestHelpers/IHostPortExtensions.cs @@ -26,7 +26,8 @@ public static IEnumerable GetPorts(this IHost host) public static IEnumerable GetUris(this IHost host) { - return host.Services.GetRequiredService() + return host + .Services.GetRequiredService() .Features.Get() .Addresses.Select(a => new Uri(a)); } diff --git a/aspnetcore/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs b/aspnetcore/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs index 0406842a9a1..36abf2c65e8 100644 --- a/aspnetcore/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs +++ b/aspnetcore/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs @@ -752,7 +752,8 @@ public async Task OverrideDirectConfigurationWithIServerAddressesFeature_Succeed // If this isn't working properly, we'll get the HTTPS endpoint defined in UseKestrel // instead of the HTTP endpoint defined in UseUrls. - var serverAddresses = host.Services.GetRequiredService() + var serverAddresses = host + .Services.GetRequiredService() .Features.Get() .Addresses; Assert.Equal(1, serverAddresses.Count); @@ -819,7 +820,8 @@ public async Task DoesNotOverrideDirectConfigurationWithIServerAddressesFeature_ // If this isn't working properly, we'll get the HTTP endpoint defined in UseUrls // instead of the HTTPS endpoint defined in UseKestrel. - var serverAddresses = host.Services.GetRequiredService() + var serverAddresses = host + .Services.GetRequiredService() .Features.Get() .Addresses; Assert.Equal(1, serverAddresses.Count); @@ -875,7 +877,8 @@ public async Task DoesNotOverrideDirectConfigurationWithIServerAddressesFeature_ var port = host.GetPort(); // If this isn't working properly, we'll not get the HTTPS endpoint defined in UseKestrel. - var serverAddresses = host.Services.GetRequiredService() + var serverAddresses = host + .Services.GetRequiredService() .Features.Get() .Addresses; Assert.Equal(1, serverAddresses.Count); diff --git a/aspnetcore/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs b/aspnetcore/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs index bd26f1d00b1..69c1ee59cfe 100644 --- a/aspnetcore/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs +++ b/aspnetcore/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs @@ -28,41 +28,52 @@ public DefaultCoreConfig() AddValidator(JitOptimizationsValidator.FailOnError); AddJob( - Job.Default + Job + .Default #if NETCOREAPP2_1 - .WithToolchain(CsProjCoreToolchain.From(NetCoreAppSettings.NetCoreApp21)) + .WithToolchain(CsProjCoreToolchain.From(NetCoreAppSettings.NetCoreApp21)) #elif NETCOREAPP3_0 - .WithToolchain( - CsProjCoreToolchain.From( - new NetCoreAppSettings("netcoreapp3.0", null, ".NET Core 3.0") + .WithToolchain( + CsProjCoreToolchain.From( + new NetCoreAppSettings("netcoreapp3.0", null, ".NET Core 3.0") + ) ) - ) #elif NETCOREAPP3_1 - .WithToolchain( - CsProjCoreToolchain.From( - new NetCoreAppSettings("netcoreapp3.1", null, ".NET Core 3.1") + .WithToolchain( + CsProjCoreToolchain.From( + new NetCoreAppSettings("netcoreapp3.1", null, ".NET Core 3.1") + ) ) - ) #elif NET5_0 - .WithToolchain( - CsProjCoreToolchain.From(new NetCoreAppSettings("net5.0", null, ".NET Core 5.0")) - ) + .WithToolchain( + CsProjCoreToolchain.From( + new NetCoreAppSettings("net5.0", null, ".NET Core 5.0") + ) + ) #elif NET6_0 - .WithToolchain( - CsProjCoreToolchain.From(new NetCoreAppSettings("net6.0", null, ".NET Core 6.0")) - ) + .WithToolchain( + CsProjCoreToolchain.From( + new NetCoreAppSettings("net6.0", null, ".NET Core 6.0") + ) + ) #elif NET7_0 - .WithToolchain( - CsProjCoreToolchain.From(new NetCoreAppSettings("net7.0", null, ".NET Core 7.0")) - ) + .WithToolchain( + CsProjCoreToolchain.From( + new NetCoreAppSettings("net7.0", null, ".NET Core 7.0") + ) + ) #elif NET8_0 - .WithToolchain( - CsProjCoreToolchain.From(new NetCoreAppSettings("net8.0", null, ".NET Core 8.0")) - ) + .WithToolchain( + CsProjCoreToolchain.From( + new NetCoreAppSettings("net8.0", null, ".NET Core 8.0") + ) + ) #elif NET9_0 - .WithToolchain( - CsProjCoreToolchain.From(new NetCoreAppSettings("net9.0", null, ".NET Core 9.0")) - ) + .WithToolchain( + CsProjCoreToolchain.From( + new NetCoreAppSettings("net9.0", null, ".NET Core 9.0") + ) + ) #else #error Target frameworks need to be updated. #endif diff --git a/aspnetcore/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs b/aspnetcore/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs index a016c6b1e59..794facfa3e1 100644 --- a/aspnetcore/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs +++ b/aspnetcore/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs @@ -2427,11 +2427,13 @@ public async Task PollCanReceiveFinalMessageAfterAppCompletes() ConnectionDelegate connectionDelegate = async c => { await waitForMessageTcs1.Task.DefaultTimeout(); - await c.Transport.Output.WriteAsync(Encoding.UTF8.GetBytes("Message1")) + await c + .Transport.Output.WriteAsync(Encoding.UTF8.GetBytes("Message1")) .DefaultTimeout(); messageTcs1.TrySetResult(); await waitForMessageTcs2.Task.DefaultTimeout(); - await c.Transport.Output.WriteAsync(Encoding.UTF8.GetBytes("Message2")) + await c + .Transport.Output.WriteAsync(Encoding.UTF8.GetBytes("Message2")) .DefaultTimeout(); messageTcs2.TrySetResult(); }; @@ -3583,7 +3585,8 @@ string GenerateToken(HttpContext httpContext) host.Start(); var manager = host.Services.GetRequiredService(); - var url = host.Services.GetService() + var url = host + .Services.GetService() .Features.Get() .Addresses.Single(); @@ -3664,7 +3667,8 @@ await context.SignInAsync( host.Start(); var manager = host.Services.GetRequiredService(); - var url = host.Services.GetService() + var url = host + .Services.GetService() .Features.Get() .Addresses.Single(); @@ -3794,7 +3798,8 @@ string GenerateToken(HttpContext httpContext) host.Start(); var manager = host.Services.GetRequiredService(); - var url = host.Services.GetService() + var url = host + .Services.GetService() .Features.Get() .Addresses.Single(); @@ -3851,7 +3856,8 @@ public async Task AuthenticationExpirationSetToMaxValueByDefault() host.Start(); var manager = host.Services.GetRequiredService(); - var url = host.Services.GetService() + var url = host + .Services.GetService() .Features.Get() .Addresses.Single(); @@ -3940,7 +3946,8 @@ public async Task RequestTimeoutDisabledWhenConnected(HttpTransportType transpor host.Start(); var manager = host.Services.GetRequiredService(); - var url = host.Services.GetService() + var url = host + .Services.GetService() .Features.Get() .Addresses.Single(); @@ -3969,8 +3976,7 @@ public async Task RequestTimeoutDisabledWhenConnected(HttpTransportType transpor var feature = Assert.IsType( context .Features.Get() - ?.HttpContext - .Features.Get() + ?.HttpContext.Features.Get() ); Assert.False(feature.Enabled); diff --git a/aspnetcore/src/WebEncoders/src/EncoderServiceCollectionExtensions.cs b/aspnetcore/src/WebEncoders/src/EncoderServiceCollectionExtensions.cs index af0def2f083..fd28f96ae23 100644 --- a/aspnetcore/src/WebEncoders/src/EncoderServiceCollectionExtensions.cs +++ b/aspnetcore/src/WebEncoders/src/EncoderServiceCollectionExtensions.cs @@ -68,8 +68,7 @@ Func customSettingsFactory { var settings = serviceProvider ?.GetService>() - ?.Value - ?.TextEncoderSettings; + ?.Value?.TextEncoderSettings; return (settings != null) ? customSettingsFactory(settings) : defaultFactory(); }; } diff --git a/command-line-api/src/System.CommandLine.Generator/SyntaxReceiver.cs b/command-line-api/src/System.CommandLine.Generator/SyntaxReceiver.cs index f45ecce7950..453aaa9d0f1 100644 --- a/command-line-api/src/System.CommandLine.Generator/SyntaxReceiver.cs +++ b/command-line-api/src/System.CommandLine.Generator/SyntaxReceiver.cs @@ -123,7 +123,8 @@ var parameter in PopulateParameters( var ctor in modelType.Constructors.OrderByDescending(x => x.Parameters.Length) ) { - var targetTypes = ctor.Parameters.Select(x => x.Type) + var targetTypes = ctor + .Parameters.Select(x => x.Type) .Concat(delegateParameters.Skip(1)) .ToArray(); if (IsMatch(targetTypes, givenParameters, wellKnownTypes)) diff --git a/command-line-api/src/System.CommandLine/Help/HelpBuilder.Default.cs b/command-line-api/src/System.CommandLine/Help/HelpBuilder.Default.cs index 4a70f4a8e7a..b7aca62e441 100644 --- a/command-line-api/src/System.CommandLine/Help/HelpBuilder.Default.cs +++ b/command-line-api/src/System.CommandLine/Help/HelpBuilder.Default.cs @@ -169,10 +169,8 @@ public static Func CommandUsageSection() => public static Func CommandArgumentsSection() => ctx => { - TwoColumnHelpRow[] commandArguments = ctx.HelpBuilder.GetCommandArgumentRows( - ctx.Command, - ctx - ) + TwoColumnHelpRow[] commandArguments = ctx + .HelpBuilder.GetCommandArgumentRows(ctx.Command, ctx) .ToArray(); if (commandArguments.Length > 0) diff --git a/efcore/src/EFCore.Analyzers/InterpolatedStringUsageInRawQueriesDiagnosticAnalyzer.cs b/efcore/src/EFCore.Analyzers/InterpolatedStringUsageInRawQueriesDiagnosticAnalyzer.cs index 072aa906b1d..d9b63ab27e4 100644 --- a/efcore/src/EFCore.Analyzers/InterpolatedStringUsageInRawQueriesDiagnosticAnalyzer.cs +++ b/efcore/src/EFCore.Analyzers/InterpolatedStringUsageInRawQueriesDiagnosticAnalyzer.cs @@ -243,7 +243,8 @@ private static bool AnalyzeInterpolatedString(IInterpolatedStringOperation inter private static IEnumerable ExecuteSqlRawMethods(Compilation compilation) { var type = compilation.RelationalDatabaseFacadeExtensionsType(); - return type?.GetMembers("ExecuteSqlRaw") + return type + ?.GetMembers("ExecuteSqlRaw") .Where(s => s is IMethodSymbol) .Cast() ?? Array.Empty(); } @@ -251,7 +252,8 @@ private static IEnumerable ExecuteSqlRawMethods(Compilation compi private static IEnumerable ExecuteSqlRawAsyncMethods(Compilation compilation) { var type = compilation.RelationalDatabaseFacadeExtensionsType(); - return type?.GetMembers("ExecuteSqlRawAsync") + return type + ?.GetMembers("ExecuteSqlRawAsync") .Where(s => s is IMethodSymbol) .Cast() ?? Array.Empty(); } diff --git a/efcore/src/EFCore.Design/Query/Internal/LinqToCSharpSyntaxTranslator.cs b/efcore/src/EFCore.Design/Query/Internal/LinqToCSharpSyntaxTranslator.cs index b9e5ee51f69..b377cbd8352 100644 --- a/efcore/src/EFCore.Design/Query/Internal/LinqToCSharpSyntaxTranslator.cs +++ b/efcore/src/EFCore.Design/Query/Internal/LinqToCSharpSyntaxTranslator.cs @@ -1859,13 +1859,15 @@ protected override Expression VisitNew(NewExpression node) // instantiation expression. // TODO: Currently matching attributes by name since we target .NET 6.0. If/when we target .NET 7.0 and above, match the type. if ( - node.Type.GetCustomAttributes(inherit: true) + node + .Type.GetCustomAttributes(inherit: true) .Any(a => a.GetType().FullName == "System.Runtime.CompilerServices.RequiredMemberAttribute" ) && node.Constructor is not null - && node.Constructor.GetCustomAttributes() + && node + .Constructor.GetCustomAttributes() .Any(a => a.GetType().FullName == "System.Diagnostics.CodeAnalysis.SetsRequiredMembersAttribute" @@ -2231,7 +2233,8 @@ static ConditionalExpression RewriteSwitchToConditionals(SwitchExpression node) if (node.Type == typeof(void)) { return (ConditionalExpression)( - node.Cases.SelectMany(c => c.TestValues, (c, tv) => new { c.Body, Label = tv }) + node + .Cases.SelectMany(c => c.TestValues, (c, tv) => new { c.Body, Label = tv }) .Reverse() .Aggregate( node.DefaultBody, @@ -2253,7 +2256,8 @@ expression is null ); return (ConditionalExpression) - node.Cases.SelectMany(c => c.TestValues, (c, tv) => new { c.Body, Label = tv }) + node + .Cases.SelectMany(c => c.TestValues, (c, tv) => new { c.Body, Label = tv }) .Reverse() .Aggregate( node.DefaultBody, diff --git a/efcore/src/EFCore.Design/Scaffolding/Internal/TextTemplatingEngineHost.cs b/efcore/src/EFCore.Design/Scaffolding/Internal/TextTemplatingEngineHost.cs index c70219eec01..9409c3645f3 100644 --- a/efcore/src/EFCore.Design/Scaffolding/Internal/TextTemplatingEngineHost.cs +++ b/efcore/src/EFCore.Design/Scaffolding/Internal/TextTemplatingEngineHost.cs @@ -191,8 +191,7 @@ public virtual string ResolveAssemblyReference(string assemblyReference) } var path = DependencyContext - .Default?.CompileLibraries - .FirstOrDefault(l => + .Default?.CompileLibraries.FirstOrDefault(l => l.Assemblies.Any(a => Path.GetFileNameWithoutExtension(a) == assemblyReference) ) ?.ResolveReferencePaths() diff --git a/efcore/src/EFCore.Relational/Extensions/RelationalEntityTypeExtensions.cs b/efcore/src/EFCore.Relational/Extensions/RelationalEntityTypeExtensions.cs index 50b55dc08f9..dc6e3d96f1e 100644 --- a/efcore/src/EFCore.Relational/Extensions/RelationalEntityTypeExtensions.cs +++ b/efcore/src/EFCore.Relational/Extensions/RelationalEntityTypeExtensions.cs @@ -189,8 +189,7 @@ this IConventionEntityType entityType .GetForeignKeys() .SelectMany(fk => fk.GetReferencingSkipNavigations()) .FirstOrDefault(n => !n.IsOnDependent) - ?.DeclaringEntityType - .GetSchema(); + ?.DeclaringEntityType.GetSchema(); if ( skipNavigationSchema != null && entityType diff --git a/efcore/src/EFCore.Relational/Metadata/Internal/RelationalKeyExtensions.cs b/efcore/src/EFCore.Relational/Metadata/Internal/RelationalKeyExtensions.cs index b82c91561fd..3c8cd9e9521 100644 --- a/efcore/src/EFCore.Relational/Metadata/Internal/RelationalKeyExtensions.cs +++ b/efcore/src/EFCore.Relational/Metadata/Internal/RelationalKeyExtensions.cs @@ -175,7 +175,8 @@ bool shouldThrow { var table = storeObject; if ( - key.DeclaringEntityType.GetMappingFragments(StoreObjectType.Table) + key + .DeclaringEntityType.GetMappingFragments(StoreObjectType.Table) .Any(t => t.StoreObject != table && key.Properties.GetColumnNames(t.StoreObject) != null @@ -188,7 +189,8 @@ bool shouldThrow if ( key.DeclaringEntityType.GetMappingStrategy() != RelationalAnnotationNames.TphMappingStrategy - && key.DeclaringEntityType.GetDerivedTypes() + && key + .DeclaringEntityType.GetDerivedTypes() .Select(e => StoreObjectIdentifier.Create(e, StoreObjectType.Table)) .Any(t => t != null && key.Properties.GetColumnNames(t.Value) != null) ) diff --git a/efcore/src/EFCore.Relational/Metadata/Internal/TableMappingBaseComparer.cs b/efcore/src/EFCore.Relational/Metadata/Internal/TableMappingBaseComparer.cs index afe14850491..0ca5cdea3de 100644 --- a/efcore/src/EFCore.Relational/Metadata/Internal/TableMappingBaseComparer.cs +++ b/efcore/src/EFCore.Relational/Metadata/Internal/TableMappingBaseComparer.cs @@ -122,19 +122,20 @@ public int Compare(ITableMappingBase? x, ITableMappingBase? y) return result; } - return x.ColumnMappings.Zip( - y.ColumnMappings, - (xc, yc) => - { - var columnResult = StringComparer.Ordinal.Compare( - xc.Property.Name, - yc.Property.Name - ); - return columnResult != 0 - ? columnResult - : StringComparer.Ordinal.Compare(xc.Column.Name, yc.Column.Name); - } - ) + return x + .ColumnMappings.Zip( + y.ColumnMappings, + (xc, yc) => + { + var columnResult = StringComparer.Ordinal.Compare( + xc.Property.Name, + yc.Property.Name + ); + return columnResult != 0 + ? columnResult + : StringComparer.Ordinal.Compare(xc.Column.Name, yc.Column.Name); + } + ) .FirstOrDefault(r => r != 0); } diff --git a/efcore/src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs b/efcore/src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs index 9d7f2ce5b2e..a11db38b3d9 100644 --- a/efcore/src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs +++ b/efcore/src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs @@ -1490,7 +1490,8 @@ DiffContext diffContext Remove, (s, t, c) => s.Name == t.Name - && s.Columns.Select(p => p.Name) + && s + .Columns.Select(p => p.Name) .SequenceEqual(t.Columns.Select(p => c.FindSource(p)?.Name)) && s.GetIsPrimaryKey() == t.GetIsPrimaryKey() && !HasDifferences(s.GetAnnotations(), t.GetAnnotations()) @@ -1591,10 +1592,12 @@ DiffContext diffContext Remove, (s, t, context) => s.Name == t.Name - && s.Columns.Select(c => c.Name) + && s + .Columns.Select(c => c.Name) .SequenceEqual(t.Columns.Select(c => context.FindSource(c)?.Name)) && s.PrincipalTable == context.FindSource(t.PrincipalTable) - && s.PrincipalColumns.Select(c => c.Name) + && s + .PrincipalColumns.Select(c => c.Name) .SequenceEqual(t.PrincipalColumns.Select(c => context.FindSource(c)?.Name)) && s.OnDeleteAction == t.OnDeleteAction && !HasDifferences(s.GetAnnotations(), t.GetAnnotations()) diff --git a/efcore/src/EFCore.SqlServer/Metadata/Conventions/SqlServerValueGenerationStrategyConvention.cs b/efcore/src/EFCore.SqlServer/Metadata/Conventions/SqlServerValueGenerationStrategyConvention.cs index a8ff4edc825..5867f6b10a7 100644 --- a/efcore/src/EFCore.SqlServer/Metadata/Conventions/SqlServerValueGenerationStrategyConvention.cs +++ b/efcore/src/EFCore.SqlServer/Metadata/Conventions/SqlServerValueGenerationStrategyConvention.cs @@ -146,9 +146,7 @@ bool IsStrategyNoneNeeded(IReadOnlyProperty property, StoreObjectIdentifier stor property.FindRelationalTypeMapping(storeObject) ?? Dependencies.TypeMappingSource.FindMapping((IProperty)property) )?.Converter - ) - ?.ProviderClrType - .UnwrapNullableType(); + )?.ProviderClrType.UnwrapNullableType(); return providerClrType != null && (providerClrType.IsInteger() || providerClrType == typeof(decimal)); diff --git a/efcore/src/EFCore.Sqlite.Core/Migrations/SqliteMigrationsSqlGenerator.cs b/efcore/src/EFCore.Sqlite.Core/Migrations/SqliteMigrationsSqlGenerator.cs index 57e20524718..04bb9b2929a 100644 --- a/efcore/src/EFCore.Sqlite.Core/Migrations/SqliteMigrationsSqlGenerator.cs +++ b/efcore/src/EFCore.Sqlite.Core/Migrations/SqliteMigrationsSqlGenerator.cs @@ -177,8 +177,9 @@ out var rebuild ? model ?.GetRelationalModel() .FindTable(renameIndexOperation.Table, renameIndexOperation.Schema) - ?.Indexes - .FirstOrDefault(i => i.Name == renameIndexOperation.NewName) + ?.Indexes.FirstOrDefault(i => + i.Name == renameIndexOperation.NewName + ) : null; if (index != null) { diff --git a/efcore/src/EFCore/ChangeTracking/Internal/IdentityMap.cs b/efcore/src/EFCore/ChangeTracking/Internal/IdentityMap.cs index 1fdd6d1fe9a..882db3ee3d8 100644 --- a/efcore/src/EFCore/ChangeTracking/Internal/IdentityMap.cs +++ b/efcore/src/EFCore/ChangeTracking/Internal/IdentityMap.cs @@ -40,7 +40,8 @@ bool sensitiveLoggingEnabled if (key.IsPrimaryKey()) { - _foreignKeys = key.DeclaringEntityType.GetDerivedTypesInclusive() + _foreignKeys = key + .DeclaringEntityType.GetDerivedTypesInclusive() .SelectMany(t => t.GetDeclaredForeignKeys()) .ToArray(); } diff --git a/efcore/src/EFCore/Metadata/Builders/OwnedNavigationBuilder.cs b/efcore/src/EFCore/Metadata/Builders/OwnedNavigationBuilder.cs index 316b583e8e9..094c335b465 100644 --- a/efcore/src/EFCore/Metadata/Builders/OwnedNavigationBuilder.cs +++ b/efcore/src/EFCore/Metadata/Builders/OwnedNavigationBuilder.cs @@ -61,8 +61,7 @@ protected virtual InternalForeignKeyBuilder Builder { _builder = PrincipalEntityType .FindNavigation(_builder.Metadata.PrincipalToDependent!.Name) - ?.ForeignKey - .Builder!; + ?.ForeignKey.Builder!; } return _builder; diff --git a/efcore/src/EFCore/Metadata/Conventions/ForeignKeyPropertyDiscoveryConvention.cs b/efcore/src/EFCore/Metadata/Conventions/ForeignKeyPropertyDiscoveryConvention.cs index 9a4a5502798..32bc6e6745d 100644 --- a/efcore/src/EFCore/Metadata/Conventions/ForeignKeyPropertyDiscoveryConvention.cs +++ b/efcore/src/EFCore/Metadata/Conventions/ForeignKeyPropertyDiscoveryConvention.cs @@ -297,8 +297,7 @@ invertedRelationshipBuilder is not null || ( foreignKey .DeclaringEntityType.FindPrimaryKey() - ?.Properties - .All(p => !p.IsShadowProperty()) ?? false + ?.Properties.All(p => !p.IsShadowProperty()) ?? false ) ) ) @@ -930,7 +929,8 @@ IConventionContext context { var key = keyBuilder.Metadata; foreach ( - var foreignKey in key.DeclaringEntityType.GetDerivedTypesInclusive() + var foreignKey in key + .DeclaringEntityType.GetDerivedTypesInclusive() .SelectMany(t => t.GetDeclaredForeignKeys()) .ToList() ) @@ -957,7 +957,8 @@ IConventionContext context return; } - var foreignKeys = key.DeclaringEntityType.GetDerivedTypesInclusive() + var foreignKeys = key + .DeclaringEntityType.GetDerivedTypesInclusive() .SelectMany(t => t.GetDeclaredForeignKeys()) .ToList(); foreach (var foreignKey in foreignKeys) diff --git a/efcore/src/EFCore/Metadata/Conventions/InversePropertyAttributeConvention.cs b/efcore/src/EFCore/Metadata/Conventions/InversePropertyAttributeConvention.cs index 5ee53db657b..36d2c139411 100644 --- a/efcore/src/EFCore/Metadata/Conventions/InversePropertyAttributeConvention.cs +++ b/efcore/src/EFCore/Metadata/Conventions/InversePropertyAttributeConvention.cs @@ -396,12 +396,10 @@ is IConventionSkipNavigation existingSkipNavigation )! .FindSkipNavigation(ambiguousInverse.Value.Item1); - existingAmbiguousNavigation - ?.DeclaringEntityType - .Builder.HasNoSkipNavigation( - existingAmbiguousNavigation, - fromDataAnnotation: true - ); + existingAmbiguousNavigation?.DeclaringEntityType.Builder.HasNoSkipNavigation( + existingAmbiguousNavigation, + fromDataAnnotation: true + ); remainingInverseNavigation = entityType .FindSkipNavigation(navigationMemberInfo) @@ -442,8 +440,7 @@ is IConventionSkipNavigation existingSkipNavigation remainingInverseNavigation = entityType .FindNavigation(navigationMemberInfo) - ?.ForeignKey - .Builder; + ?.ForeignKey.Builder; return true; } } diff --git a/efcore/src/EFCore/Metadata/DependencyInjectionMethodParameterBinding.cs b/efcore/src/EFCore/Metadata/DependencyInjectionMethodParameterBinding.cs index 21552f7c736..4d8155f263a 100644 --- a/efcore/src/EFCore/Metadata/DependencyInjectionMethodParameterBinding.cs +++ b/efcore/src/EFCore/Metadata/DependencyInjectionMethodParameterBinding.cs @@ -129,7 +129,8 @@ object entity var entityTypeParam = Expression.Parameter(typeof(IEntityType)); var entityParam = Expression.Parameter(typeof(object)); - var parameters = b.Method.GetParameters() + var parameters = b + .Method.GetParameters() .Select((p, i) => Expression.Parameter(p.ParameterType, "param" + i)) .ToArray(); diff --git a/efcore/src/EFCore/Metadata/Internal/InternalForeignKeyBuilder.cs b/efcore/src/EFCore/Metadata/Internal/InternalForeignKeyBuilder.cs index 0c8f84f49fa..cee747000c7 100644 --- a/efcore/src/EFCore/Metadata/Internal/InternalForeignKeyBuilder.cs +++ b/efcore/src/EFCore/Metadata/Internal/InternalForeignKeyBuilder.cs @@ -1099,9 +1099,9 @@ ConfigurationSource configurationSource && configurationSource == ConfigurationSource.Explicit ) { - Metadata - .DeclaringEntityType.Model.ScopedModelDependencies?.Logger - .AmbiguousEndRequiredWarning(Metadata); + Metadata.DeclaringEntityType.Model.ScopedModelDependencies?.Logger.AmbiguousEndRequiredWarning( + Metadata + ); } IConventionForeignKey? foreignKey = Metadata; @@ -3467,12 +3467,10 @@ out var existingRelationshipInverted : navigationEntityType.FindSkipNavigation(skipNavigation.Name); } - skipNavigation - ?.Builder - .HasForeignKey( - newRelationshipBuilder.Metadata, - referencingNavigationTuple.ConfigurationSource - ); + skipNavigation?.Builder.HasForeignKey( + newRelationshipBuilder.Metadata, + referencingNavigationTuple.ConfigurationSource + ); } } @@ -3628,8 +3626,7 @@ out var resolvableRelationships var removedForeignKeys = new List(); var referencingSkipNavigationName = Metadata .ReferencingSkipNavigations?.FirstOrDefault() - ?.Inverse - ?.Name; + ?.Inverse?.Name; if (!Metadata.IsInModel) { removedForeignKeys.Add(Metadata); diff --git a/efcore/src/EFCore/Metadata/Internal/PropertyBaseExtensions.cs b/efcore/src/EFCore/Metadata/Internal/PropertyBaseExtensions.cs index 01a6e85b724..ad6925a5d87 100644 --- a/efcore/src/EFCore/Metadata/Internal/PropertyBaseExtensions.cs +++ b/efcore/src/EFCore/Metadata/Internal/PropertyBaseExtensions.cs @@ -382,8 +382,7 @@ private static string GetNoFieldErrorMessage(IPropertyBase propertyBase) => .GetServiceProperties() .Any(p => typeof(ILazyLoader).IsAssignableFrom(p.ClrType)) || ((EntityType)propertyBase.DeclaringType) - .ConstructorBinding?.ParameterBindings - .OfType() + .ConstructorBinding?.ParameterBindings.OfType() .Any(b => b.ServiceType == typeof(ILazyLoader)) == true ? CoreStrings.NoBackingFieldLazyLoading( propertyBase.Name, diff --git a/efcore/test/EFCore.Cosmos.Tests/ModelBuilding/CosmosModelBuilderGenericTest.cs b/efcore/test/EFCore.Cosmos.Tests/ModelBuilding/CosmosModelBuilderGenericTest.cs index a42ec428d77..315ef67e70d 100644 --- a/efcore/test/EFCore.Cosmos.Tests/ModelBuilding/CosmosModelBuilderGenericTest.cs +++ b/efcore/test/EFCore.Cosmos.Tests/ModelBuilding/CosmosModelBuilderGenericTest.cs @@ -1070,7 +1070,8 @@ public override void Base_type_can_be_discovered_after_creating_foreign_keys_on_ mb.Entity(); mb.Entity(); - var mutableEntityTypes = mb.Model.GetEntityTypes() + var mutableEntityTypes = mb + .Model.GetEntityTypes() .Where(e => e.ClrType == typeof(Q)) .ToList(); diff --git a/efcore/test/EFCore.Design.Tests/Scaffolding/Internal/RelationalScaffoldingModelFactoryTest.cs b/efcore/test/EFCore.Design.Tests/Scaffolding/Internal/RelationalScaffoldingModelFactoryTest.cs index 150a3eeab49..375f75f69c2 100644 --- a/efcore/test/EFCore.Design.Tests/Scaffolding/Internal/RelationalScaffoldingModelFactoryTest.cs +++ b/efcore/test/EFCore.Design.Tests/Scaffolding/Internal/RelationalScaffoldingModelFactoryTest.cs @@ -489,7 +489,8 @@ public void Unmappable_column_type(string StoreType) } }; - info.Tables.First() + info + .Tables.First() .Columns.Add( new DatabaseColumn { diff --git a/efcore/test/EFCore.InMemory.FunctionalTests/Query/QueryBugsInMemoryTest.cs b/efcore/test/EFCore.InMemory.FunctionalTests/Query/QueryBugsInMemoryTest.cs index da1d4f7d659..89e821b2bf7 100644 --- a/efcore/test/EFCore.InMemory.FunctionalTests/Query/QueryBugsInMemoryTest.cs +++ b/efcore/test/EFCore.InMemory.FunctionalTests/Query/QueryBugsInMemoryTest.cs @@ -508,7 +508,8 @@ public virtual void Repro5456_include_group_join_is_per_query_context_async() async i => { using var ctx = new MyContext5456(); - var result = await ctx.Posts.Where(x => x.Blog.Id > 1) + var result = await ctx + .Posts.Where(x => x.Blog.Id > 1) .Include(x => x.Blog) .ToListAsync(); @@ -529,7 +530,8 @@ public virtual void Repro5456_multiple_include_group_join_is_per_query_context() i => { using var ctx = new MyContext5456(); - var result = ctx.Posts.Where(x => x.Blog.Id > 1) + var result = ctx + .Posts.Where(x => x.Blog.Id > 1) .Include(x => x.Blog) .Include(x => x.Comments) .ToList(); @@ -551,7 +553,8 @@ public virtual void Repro5456_multiple_include_group_join_is_per_query_context_a async i => { using var ctx = new MyContext5456(); - var result = await ctx.Posts.Where(x => x.Blog.Id > 1) + var result = await ctx + .Posts.Where(x => x.Blog.Id > 1) .Include(x => x.Blog) .Include(x => x.Comments) .ToListAsync(); @@ -573,7 +576,8 @@ public virtual void Repro5456_multi_level_include_group_join_is_per_query_contex i => { using var ctx = new MyContext5456(); - var result = ctx.Posts.Where(x => x.Blog.Id > 1) + var result = ctx + .Posts.Where(x => x.Blog.Id > 1) .Include(x => x.Blog) .ThenInclude(b => b.Author) .ToList(); @@ -595,7 +599,8 @@ public virtual void Repro5456_multi_level_include_group_join_is_per_query_contex async i => { using var ctx = new MyContext5456(); - var result = await ctx.Posts.Where(x => x.Blog.Id > 1) + var result = await ctx + .Posts.Where(x => x.Blog.Id > 1) .Include(x => x.Blog) .ThenInclude(b => b.Author) .ToListAsync(); @@ -862,9 +867,11 @@ public virtual void Using_explicit_interface_implementation_as_navigation_works( ) != null ? new PageViewModel21768 { - Uri = b.FrontCover.Illustrations.FirstOrDefault(i => - i.State >= IllustrationState21768.Approved - ).Uri + Uri = b + .FrontCover.Illustrations.FirstOrDefault(i => + i.State >= IllustrationState21768.Approved + ) + .Uri } : null, }; @@ -2029,11 +2036,12 @@ public virtual void Ordering_of_collection_result_is_correct() : new BDto18394 { Id = x.PropertyB.Id, - PropertyCList = x.PropertyB.PropertyCList.Select(y => new CDto18394 - { - Id = y.Id, - SomeText = y.SomeText - }) + PropertyCList = x + .PropertyB.PropertyCList.Select(y => new CDto18394 + { + Id = y.Id, + SomeText = y.SomeText + }) .ToList() } }) diff --git a/efcore/test/EFCore.Relational.Specification.Tests/ConcurrencyDetectorDisabledRelationalTestBase.cs b/efcore/test/EFCore.Relational.Specification.Tests/ConcurrencyDetectorDisabledRelationalTestBase.cs index d9140eb53c4..83d8699302d 100644 --- a/efcore/test/EFCore.Relational.Specification.Tests/ConcurrencyDetectorDisabledRelationalTestBase.cs +++ b/efcore/test/EFCore.Relational.Specification.Tests/ConcurrencyDetectorDisabledRelationalTestBase.cs @@ -20,11 +20,11 @@ protected string NormalizeDelimitersInRawString(string sql) => public virtual Task FromSql(bool async) => ConcurrencyDetectorTest(async c => async - ? await c.Products.FromSqlRaw( - NormalizeDelimitersInRawString("select * from [Products]") - ) + ? await c + .Products.FromSqlRaw(NormalizeDelimitersInRawString("select * from [Products]")) .ToListAsync() - : c.Products.FromSqlRaw(NormalizeDelimitersInRawString("select * from [Products]")) + : c + .Products.FromSqlRaw(NormalizeDelimitersInRawString("select * from [Products]")) .ToList() ); } diff --git a/efcore/test/EFCore.Relational.Specification.Tests/Query/JsonQueryTestBase.cs b/efcore/test/EFCore.Relational.Specification.Tests/Query/JsonQueryTestBase.cs index 8c22729293c..da72afefa92 100644 --- a/efcore/test/EFCore.Relational.Specification.Tests/Query/JsonQueryTestBase.cs +++ b/efcore/test/EFCore.Relational.Specification.Tests/Query/JsonQueryTestBase.cs @@ -1023,7 +1023,8 @@ public virtual Task Json_collection_ElementAtOrDefault_project_collection(bool a ss => ss.Set() .Select(x => - x.OwnedCollectionRoot.AsQueryable() + x + .OwnedCollectionRoot.AsQueryable() .ElementAtOrDefault(1) .OwnedCollectionBranch ) @@ -1311,7 +1312,8 @@ public virtual Task Json_collection_index_in_predicate_nested_mix(bool async) ss => ss.Set() .Where(x => - x.OwnedCollectionRoot[1] + x + .OwnedCollectionRoot[1] .OwnedCollectionBranch[prm] .OwnedCollectionLeaf[x.Id - 1] .SomethingSomething == "e1_c2_c1_c1" @@ -1329,7 +1331,8 @@ public virtual Task Json_collection_ElementAt_and_pushdown(bool async) => .Select(x => new { x.Id, - CollectionElement = x.OwnedCollectionRoot.Select(xx => xx.Number) + CollectionElement = x + .OwnedCollectionRoot.Select(xx => xx.Number) .ElementAt(0) }) ); @@ -1356,9 +1359,10 @@ public virtual Task Json_collection_Where_ElementAt(bool async) => ss => ss.Set() .Where(j => - j.OwnedReferenceRoot.OwnedCollectionBranch.Where(o => - o.Enum == JsonEnum.Three - ) + j + .OwnedReferenceRoot.OwnedCollectionBranch.Where(o => + o.Enum == JsonEnum.Three + ) .ElementAt(0) .OwnedReferenceLeaf.SomethingSomething == "e1_r_c2_r" ) @@ -1372,7 +1376,8 @@ public virtual Task Json_collection_Skip(bool async) => ss => ss.Set() .Where(j => - j.OwnedReferenceRoot.OwnedCollectionBranch.Skip(1) + j + .OwnedReferenceRoot.OwnedCollectionBranch.Skip(1) .ElementAt(0) .OwnedReferenceLeaf.SomethingSomething == "e1_r_c2_r" ) @@ -1386,7 +1391,8 @@ public virtual Task Json_collection_OrderByDescending_Skip_ElementAt(bool async) ss => ss.Set() .Where(j => - j.OwnedReferenceRoot.OwnedCollectionBranch.OrderByDescending(b => b.Date) + j + .OwnedReferenceRoot.OwnedCollectionBranch.OrderByDescending(b => b.Date) .Skip(1) .ElementAt(0) .OwnedReferenceLeaf.SomethingSomething == "e1_r_c1_r" @@ -1406,7 +1412,8 @@ public virtual Task Json_collection_Distinct_Count_with_predicate(bool async) => ss => ss.Set() .Where(j => - j.OwnedReferenceRoot.OwnedCollectionBranch.Distinct() + j + .OwnedReferenceRoot.OwnedCollectionBranch.Distinct() .Count(b => b.OwnedReferenceLeaf.SomethingSomething == "e1_r_c2_r") == 1 ) ); @@ -1458,7 +1465,8 @@ bool async ss.Set() .OrderBy(x => x.Id) .Select(x => - x.OwnedCollectionRoot.Where(xx => xx.Name == "Foo") + x + .OwnedCollectionRoot.Where(xx => xx.Name == "Foo") .Select(xx => new { xx.Name, xx.Number }) .ToList() ) @@ -1475,7 +1483,8 @@ bool async ss.Set() .OrderBy(x => x.Id) .Select(x => - x.OwnedCollectionRoot.Where(xx => xx.Name == "Foo") + x + .OwnedCollectionRoot.Where(xx => xx.Name == "Foo") .Select(xx => new { xx.Names, xx.Numbers }) .ToList() ) @@ -1513,9 +1522,10 @@ public virtual Task Json_nested_collection_filter_in_projection(bool async) => .OrderBy(x => x.Id) .Select(x => x.OwnedCollectionRoot.Select(xx => - xx.OwnedCollectionBranch.Where(xxx => - xxx.Date != new DateTime(2000, 1, 1) - ) + xx + .OwnedCollectionBranch.Where(xxx => + xxx.Date != new DateTime(2000, 1, 1) + ) .ToList() ) ) @@ -1540,15 +1550,16 @@ public virtual Task Json_nested_collection_anonymous_projection_in_projection(bo .OrderBy(x => x.Id) .Select(x => x.OwnedCollectionRoot.Select(xx => - xx.OwnedCollectionBranch.Select(xxx => new - { - xxx.Date, - xxx.Enum, - xxx.Enums, - xxx.Fraction, - xxx.OwnedReferenceLeaf, - xxx.OwnedCollectionLeaf - }) + xx + .OwnedCollectionBranch.Select(xxx => new + { + xxx.Date, + xxx.Enum, + xxx.Enums, + xxx.Fraction, + xxx.OwnedReferenceLeaf, + xxx.OwnedCollectionLeaf + }) .ToList() ) ) @@ -1608,7 +1619,8 @@ bool async ss.Set() .OrderBy(x => x.Id) .Select(x => - x.OwnedCollectionRoot.OrderBy(xx => xx.Name) + x + .OwnedCollectionRoot.OrderBy(xx => xx.Name) .Skip(1) .Take(5) .Select(xx => new @@ -1658,7 +1670,8 @@ bool async ss.Set() .OrderBy(x => x.Id) .Select(x => - x.OwnedCollectionRoot.OrderBy(xx => xx.Name) + x + .OwnedCollectionRoot.OrderBy(xx => xx.Name) .Skip(1) .Take(5) .Select(xx => xx.OwnedReferenceBranch) @@ -1707,9 +1720,10 @@ public virtual Task Json_collection_leaf_filter_in_projection(bool async) => ss.Set() .OrderBy(x => x.Id) .Select(x => - x.OwnedReferenceRoot.OwnedReferenceBranch.OwnedCollectionLeaf.Where(xx => - xx.SomethingSomething != "Baz" - ) + x + .OwnedReferenceRoot.OwnedReferenceBranch.OwnedCollectionLeaf.Where(xx => + xx.SomethingSomething != "Baz" + ) .ToList() ) .AsNoTracking(), @@ -1727,15 +1741,17 @@ public virtual Task Json_multiple_collection_projections(bool async) => .OrderBy(x => x.Id) .Select(x => new { - First = x.OwnedReferenceRoot.OwnedReferenceBranch.OwnedCollectionLeaf.Where( - xx => xx.SomethingSomething != "Baz" - ) + First = x + .OwnedReferenceRoot.OwnedReferenceBranch.OwnedCollectionLeaf.Where(xx => + xx.SomethingSomething != "Baz" + ) .ToList(), Second = x.OwnedCollectionRoot.Distinct().ToList(), Third = x.OwnedCollectionRoot.Select(xx => - xx.OwnedCollectionBranch.Where(xxx => - xxx.Date != new DateTime(2000, 1, 1) - ) + xx + .OwnedCollectionBranch.Where(xxx => + xxx.Date != new DateTime(2000, 1, 1) + ) .ToList() ), Fourth = x.EntityCollection.ToList() @@ -1788,7 +1804,8 @@ public virtual Task Json_leaf_collection_distinct_and_other_collection(bool asyn .OrderBy(x => x.Id) .Select(x => new { - First = x.OwnedReferenceRoot.OwnedReferenceBranch.OwnedCollectionLeaf.Distinct() + First = x + .OwnedReferenceRoot.OwnedReferenceBranch.OwnedCollectionLeaf.Distinct() .ToList(), Second = x.EntityCollection.ToList() }) @@ -1882,7 +1899,8 @@ await AssertQuery( .Select(x => new { x.Id, - CollectionElement = x.OwnedCollectionRoot[prm] + CollectionElement = x + .OwnedCollectionRoot[prm] .OwnedCollectionBranch.Select(xx => "Foo") .ElementAt(0) }) @@ -1900,7 +1918,8 @@ await AssertQuery( ss => ss.Set() .Select(j => - j.OwnedCollectionRoot[prm + j.Id] + j + .OwnedCollectionRoot[prm + j.Id] .OwnedCollectionBranch.Select(b => b.OwnedReferenceLeaf.SomethingSomething ) @@ -1910,7 +1929,8 @@ await AssertQuery( ss.Set() .Select(j => j.OwnedCollectionRoot.Count > prm + j.Id - ? j.OwnedCollectionRoot[prm + j.Id] + ? j + .OwnedCollectionRoot[prm + j.Id] .OwnedCollectionBranch.Select(b => b.OwnedReferenceLeaf.SomethingSomething ) @@ -1966,7 +1986,8 @@ await AssertQuery( .AsNoTracking() .OrderBy(x => x.Id) .Select(x => - x.OwnedCollectionRoot.Select(xx => new { xx.OwnedReferenceBranch }) + x + .OwnedCollectionRoot.Select(xx => new { xx.OwnedReferenceBranch }) .ElementAt(0) ), assertOrder: true, @@ -1986,7 +2007,8 @@ await AssertQuery( ss => ss.Set() .Select(x => - x.OwnedCollectionRoot.Select(xx => new JsonEntityBasic { Id = x.Id }) + x + .OwnedCollectionRoot.Select(xx => new JsonEntityBasic { Id = x.Id }) .ElementAt(0) ) ); @@ -2005,7 +2027,8 @@ bool async x.Id, Duplicate1 = x.OwnedCollectionRoot[0].OwnedReferenceBranch, Original = x.OwnedCollectionRoot[0], - Duplicate2 = x.OwnedCollectionRoot[0] + Duplicate2 = x + .OwnedCollectionRoot[0] .OwnedReferenceBranch .OwnedCollectionLeaf }) @@ -2388,13 +2411,15 @@ bool async { x, CollectionElement1 = x.OwnedCollectionRoot[prm].OwnedCollectionBranch[1], - CollectionElement2 = x.OwnedCollectionRoot[1] + CollectionElement2 = x + .OwnedCollectionRoot[1] .OwnedCollectionBranch[1] .OwnedReferenceLeaf, CollectionElement3 = x.OwnedCollectionRoot[1].OwnedReferenceBranch, CollectionElement4 = x.OwnedCollectionRoot[prm].OwnedReferenceBranch, CollectionElement5 = x.OwnedCollectionRoot[prm].OwnedCollectionBranch[x.Id], - CollectionElement6 = x.OwnedCollectionRoot[x.Id] + CollectionElement6 = x + .OwnedCollectionRoot[x.Id] .OwnedCollectionBranch[1] .OwnedReferenceLeaf, CollectionElement7 = x.OwnedCollectionRoot[1].OwnedReferenceBranch, @@ -2437,13 +2462,15 @@ bool async { x.Id, CollectionElement1 = x.OwnedCollectionRoot[prm].OwnedCollectionBranch[1], - CollectionElement2 = x.OwnedCollectionRoot[1] + CollectionElement2 = x + .OwnedCollectionRoot[1] .OwnedCollectionBranch[1] .OwnedReferenceLeaf, CollectionElement3 = x.OwnedCollectionRoot[1].OwnedReferenceBranch, CollectionElement4 = x.OwnedCollectionRoot[prm].OwnedReferenceBranch, CollectionElement5 = x.OwnedCollectionRoot[prm].OwnedCollectionBranch[x.Id], - CollectionElement6 = x.OwnedCollectionRoot[x.Id] + CollectionElement6 = x + .OwnedCollectionRoot[x.Id] .OwnedCollectionBranch[1] .OwnedReferenceLeaf, CollectionElement7 = x.OwnedCollectionRoot[1].OwnedReferenceBranch, @@ -2680,10 +2707,12 @@ bool async Reference1 = x.OwnedReferenceRoot, Reference2 = x.OwnedCollectionRoot[0].OwnedReferenceBranch, x.EntityCollection, - Reference3 = x.OwnedCollectionRoot[1] + Reference3 = x + .OwnedCollectionRoot[1] .OwnedReferenceBranch .OwnedReferenceLeaf, - Reference4 = x.OwnedCollectionRoot[0] + Reference4 = x + .OwnedCollectionRoot[0] .OwnedCollectionBranch[0] .OwnedReferenceLeaf, }) diff --git a/efcore/test/EFCore.Specification.Tests/ApiConsistencyTestBase.cs b/efcore/test/EFCore.Specification.Tests/ApiConsistencyTestBase.cs index 90c969c23ec..a4ab93de06f 100644 --- a/efcore/test/EFCore.Specification.Tests/ApiConsistencyTestBase.cs +++ b/efcore/test/EFCore.Specification.Tests/ApiConsistencyTestBase.cs @@ -1254,7 +1254,8 @@ from type in GetAllTypes(TargetAssembly.GetTypes()) type.IsNestedPrivate && !type.IsSealed && !type.IsAbstract - && !type.DeclaringType.GetNestedTypes(BindingFlags.NonPublic) + && !type + .DeclaringType.GetNestedTypes(BindingFlags.NonPublic) .Any(t => t.BaseType == type) select type.FullName ).ToList(); diff --git a/efcore/test/EFCore.Specification.Tests/CustomConvertersTestBase.cs b/efcore/test/EFCore.Specification.Tests/CustomConvertersTestBase.cs index 12f899b80f9..f0a6a66dde9 100644 --- a/efcore/test/EFCore.Specification.Tests/CustomConvertersTestBase.cs +++ b/efcore/test/EFCore.Specification.Tests/CustomConvertersTestBase.cs @@ -843,7 +843,8 @@ public virtual void Composition_over_collection_of_complex_mapped_as_scalar() { d.Id, d.Name, - Layouts = d.Layouts.Select(l => new { H = l.Height, W = l.Width }) + Layouts = d + .Layouts.Select(l => new { H = l.Height, W = l.Width }) .ToList() }) .ToList() diff --git a/efcore/test/EFCore.Specification.Tests/ManyToManyLoadTestBase.cs b/efcore/test/EFCore.Specification.Tests/ManyToManyLoadTestBase.cs index 5aaec4ad3fd..a74248e0276 100644 --- a/efcore/test/EFCore.Specification.Tests/ManyToManyLoadTestBase.cs +++ b/efcore/test/EFCore.Specification.Tests/ManyToManyLoadTestBase.cs @@ -237,7 +237,8 @@ public virtual void Attached_collections_are_not_marked_as_loaded(EntityState st if (state != EntityState.Unchanged) { foreach ( - var child in left.TwoSkip.Cast() + var child in left + .TwoSkip.Cast() .Concat(left.TwoSkipShared) .Concat(left.SelfSkipPayloadLeft) .Concat(left.SelfSkipPayloadRight) diff --git a/efcore/test/EFCore.Specification.Tests/Query/ComplexNavigationsQueryTestBase.cs b/efcore/test/EFCore.Specification.Tests/Query/ComplexNavigationsQueryTestBase.cs index 5f02462fbfd..2c655fc5be1 100644 --- a/efcore/test/EFCore.Specification.Tests/Query/ComplexNavigationsQueryTestBase.cs +++ b/efcore/test/EFCore.Specification.Tests/Query/ComplexNavigationsQueryTestBase.cs @@ -1945,13 +1945,15 @@ bool async async, ss => from l1 in ss.Set() - from l3 in l1.OneToOne_Optional_FK1.OneToMany_Optional2.Where(l => l.Id > 5) + from l3 in l1 + .OneToOne_Optional_FK1.OneToMany_Optional2.Where(l => l.Id > 5) .DefaultIfEmpty() where l3 != null select l1, ss => from l1 in ss.Set().Where(l => l.OneToOne_Optional_FK1 != null) - from l3 in l1.OneToOne_Optional_FK1.OneToMany_Optional2.Where(l => l.Id > 5) + from l3 in l1 + .OneToOne_Optional_FK1.OneToMany_Optional2.Where(l => l.Id > 5) .DefaultIfEmpty() where l3 != null select l1 @@ -1966,13 +1968,15 @@ bool async async, ss => from l1 in ss.Set() - from l3 in l1.OneToOne_Required_FK1.OneToMany_Required2.Where(l => l.Id > 5) + from l3 in l1 + .OneToOne_Required_FK1.OneToMany_Required2.Where(l => l.Id > 5) .DefaultIfEmpty() where l3 != null select l1, ss => from l1 in ss.Set().Where(l => l.OneToOne_Required_FK1 != null) - from l3 in l1.OneToOne_Required_FK1.OneToMany_Required2.Where(l => l.Id > 5) + from l3 in l1 + .OneToOne_Required_FK1.OneToMany_Required2.Where(l => l.Id > 5) .DefaultIfEmpty() where l3 != null select l1 @@ -2181,7 +2185,8 @@ bool async async, ss => from l1 in ss.Set() - from l2 in l1.OneToMany_Required1.Where(l => l.Id > 5) + from l2 in l1 + .OneToMany_Required1.Where(l => l.Id > 5) .OrderBy(l => l.Id) .Take(3) .DefaultIfEmpty() @@ -2236,7 +2241,8 @@ public virtual Task Contains_with_subquery_optional_navigation_and_constant_item ss => ss.Set() .Where(l1 => - l1.OneToOne_Optional_FK1.OneToMany_Optional2.Distinct() + l1 + .OneToOne_Optional_FK1.OneToMany_Optional2.Distinct() .Select(l3 => l3.Id) .Contains(6) ), @@ -2259,7 +2265,8 @@ bool async ss => ss.Set() .Where(l1 => - l1.OneToOne_Optional_FK1.OneToMany_Optional2.Select(l3 => l3.Name.Length) + l1 + .OneToOne_Optional_FK1.OneToMany_Optional2.Select(l3 => l3.Name.Length) .Distinct() .Contains(5) ), @@ -2283,18 +2290,22 @@ bool async ss.Set() .Where(l1 => l1.Id < 3 - && !l1.OneToMany_Optional1.Select(l2 => - l2.OneToOne_Optional_FK2.OneToOne_Optional_FK3.Id - ) + && !l1 + .OneToMany_Optional1.Select(l2 => + l2.OneToOne_Optional_FK2.OneToOne_Optional_FK3.Id + ) .All(l4 => ClientMethod(l4)) ), ss => ss.Set() .Where(l1 => l1.Id < 3 - && !l1.OneToMany_Optional1.Select(l2 => - l2.OneToOne_Optional_FK2.OneToOne_Optional_FK3.MaybeScalar(x => x.Id) - ) + && !l1 + .OneToMany_Optional1.Select(l2 => + l2.OneToOne_Optional_FK2.OneToOne_Optional_FK3.MaybeScalar(x => + x.Id + ) + ) .All(a => true) ), assertEmpty: true @@ -3150,9 +3161,10 @@ public virtual Task Navigations_compared_to_each_other4(bool async) => ss => from l2 in ss.Set() where - l2.OneToOne_Required_FK2.OneToMany_Optional3.Select(i => - i.OneToOne_Optional_PK_Inverse4 == l2.OneToOne_Required_FK2 - ) + l2 + .OneToOne_Required_FK2.OneToMany_Optional3.Select(i => + i.OneToOne_Optional_PK_Inverse4 == l2.OneToOne_Required_FK2 + ) .Any() select l2.Name, ss => @@ -3173,9 +3185,10 @@ public virtual Task Navigations_compared_to_each_other5(bool async) => ss => from l2 in ss.Set() where - l2.OneToOne_Required_FK2.OneToMany_Optional3.Select(i => - i.OneToOne_Optional_PK_Inverse4 == l2.OneToOne_Optional_PK2 - ) + l2 + .OneToOne_Required_FK2.OneToMany_Optional3.Select(i => + i.OneToOne_Optional_PK_Inverse4 == l2.OneToOne_Optional_PK2 + ) .Any() select l2.Name, ss => @@ -3340,7 +3353,8 @@ public virtual Task Select_optional_navigation_property_string_concat(bool async async, ss => from l1 in ss.Set() - from l2 in l1.OneToMany_Optional1.Where(l => l.Id > 5) + from l2 in l1 + .OneToMany_Optional1.Where(l => l.Id > 5) .OrderByDescending(l => l.Name) .DefaultIfEmpty() select l1.Name + " " + (l2 != null ? l2.Name : "NULL") @@ -3889,11 +3903,12 @@ public virtual Task Include14(bool async) => public virtual Task Include17(bool async) { using var ctx = CreateContext(); - var query = ctx.LevelOne.Select(l1 => new - { - foo = l1.OneToOne_Optional_FK1, - bar = l1.OneToOne_Optional_PK1 - }) + var query = ctx + .LevelOne.Select(l1 => new + { + foo = l1.OneToOne_Optional_FK1, + bar = l1.OneToOne_Optional_PK1 + }) .Include(x => x.foo.OneToOne_Optional_FK2) .Distinct(); @@ -3954,7 +3969,8 @@ public virtual async Task Include18_3(bool async) { using var ctx = CreateContext(); - var query = ctx.LevelOne.OrderBy(x => x.OneToOne_Required_FK1.Name) + var query = ctx + .LevelOne.OrderBy(x => x.OneToOne_Required_FK1.Name) .Include(x => x.OneToOne_Optional_FK1) .Select(l1 => new { foo = l1, bar = l1 }) .Take(10); @@ -3968,7 +3984,8 @@ public virtual async Task Include18_3_1(bool async) { using var ctx = CreateContext(); - var query = ctx.LevelOne.OrderBy(x => x.OneToOne_Required_FK1.Name) + var query = ctx + .LevelOne.OrderBy(x => x.OneToOne_Required_FK1.Name) .Include(x => x.OneToOne_Optional_FK1) .Select(l1 => new { foo = l1, bar = l1 }) .Take(10) @@ -3983,7 +4000,8 @@ public virtual async Task Include18_3_2(bool async) { using var ctx = CreateContext(); - var query = ctx.LevelOne.OrderBy(x => x.OneToOne_Required_FK1.Name) + var query = ctx + .LevelOne.OrderBy(x => x.OneToOne_Required_FK1.Name) .Include(x => x.OneToOne_Optional_FK1) .Select(l1 => new { @@ -4015,7 +4033,8 @@ public virtual async Task Include18_4(bool async) { using var ctx = CreateContext(); - var query = ctx.LevelOne.Include(x => x.OneToOne_Optional_FK1) + var query = ctx + .LevelOne.Include(x => x.OneToOne_Optional_FK1) .Select(l1 => new { foo = l1, bar = l1 }) .Distinct(); @@ -4028,7 +4047,8 @@ public virtual async Task Include18(bool async) { using var ctx = CreateContext(); - var query = ctx.LevelOne.Include(x => x.OneToOne_Optional_FK1) + var query = ctx + .LevelOne.Include(x => x.OneToOne_Optional_FK1) .Select(l1 => new { foo = l1, bar = l1.OneToOne_Optional_PK1 }) .OrderBy(x => x.foo.Id) .Take(10); @@ -4042,7 +4062,8 @@ public virtual async Task Include19(bool async) { using var ctx = CreateContext(); - var query = ctx.LevelOne.Include(x => x.OneToOne_Optional_FK1) + var query = ctx + .LevelOne.Include(x => x.OneToOne_Optional_FK1) .Select(l1 => new { foo = l1.OneToOne_Optional_FK1, bar = l1.OneToOne_Optional_PK1 }) .Distinct(); @@ -4167,14 +4188,15 @@ orderby l1.Id from l2 in ctx.LevelTwo orderby l2.Id where l2.Level1_Required_Id == l1.Id - select l2.OneToMany_Optional2.Select(l3 => - ( - from l4 in ctx.LevelFour - where l4.Level3_Required_Id == l3.Id - orderby l4.Id - select l4 - ).FirstOrDefault() - ) + select l2 + .OneToMany_Optional2.Select(l3 => + ( + from l4 in ctx.LevelFour + where l4.Level3_Required_Id == l3.Id + orderby l4.Id + select l4 + ).FirstOrDefault() + ) .FirstOrDefault() ) .FirstOrDefault() @@ -4191,7 +4213,8 @@ public virtual Task Member_pushdown_with_multiple_collections(bool async) => ss => ss.Set() .Select(l1 => - l1.OneToMany_Optional1.OrderBy(l2 => l2.Id) + l1 + .OneToMany_Optional1.OrderBy(l2 => l2.Id) .FirstOrDefault() .OneToMany_Optional2.OrderBy(l3 => l3.Id) .FirstOrDefault() @@ -4200,10 +4223,12 @@ public virtual Task Member_pushdown_with_multiple_collections(bool async) => ss => ss.Set() .Select(l1 => - l1.OneToMany_Optional1.OrderBy(l2 => l2.Id) + l1 + .OneToMany_Optional1.OrderBy(l2 => l2.Id) .FirstOrDefault() .Maybe(x => - x.OneToMany_Optional2.OrderBy(l3 => l3.Id) + x + .OneToMany_Optional2.OrderBy(l3 => l3.Id) .FirstOrDefault() .Maybe(xx => xx.Name) ) @@ -4434,9 +4459,11 @@ bool async ss => ss.Set() .SelectMany(l1 => - l1.OneToMany_Optional1.DefaultIfEmpty() + l1 + .OneToMany_Optional1.DefaultIfEmpty() .SelectMany(l2 => - l2.OneToOne_Required_PK2.OneToMany_Optional3.DefaultIfEmpty() + l2 + .OneToOne_Required_PK2.OneToMany_Optional3.DefaultIfEmpty() .Select(l4 => new { l1Name = l1.Name, @@ -4832,7 +4859,8 @@ public virtual Task Collection_FirstOrDefault_property_accesses_in_projection(bo .Select(l1 => new { l1.Id, - Pushdown = l1.OneToMany_Optional1.Where(x => x.Name == "L2 02") + Pushdown = l1 + .OneToMany_Optional1.Where(x => x.Name == "L2 02") .FirstOrDefault() .Name }) @@ -4853,7 +4881,8 @@ bool async .Select(l1 => new { l1.Id, - Pushdown = l1.OneToMany_Optional1.Where(x => x.Name == "L2 02") + Pushdown = l1 + .OneToMany_Optional1.Where(x => x.Name == "L2 02") .FirstOrDefault() .OneToOne_Optional_FK2 }) @@ -4872,7 +4901,8 @@ bool async .Select(l1 => new { l1.Id, - Pushdown = l1.OneToMany_Optional1.Where(x => x.Name == "L2 02") + Pushdown = l1 + .OneToMany_Optional1.Where(x => x.Name == "L2 02") .FirstOrDefault() .OneToMany_Optional2.ToList() }), @@ -4897,7 +4927,8 @@ bool async .Select(l1 => new { l1.Id, - Pushdown = l1.OneToMany_Optional1.Where(x => x.Name == "L2 02") + Pushdown = l1 + .OneToMany_Optional1.Where(x => x.Name == "L2 02") .FirstOrDefault() .OneToMany_Optional2.OrderBy(x => x.Id) .FirstOrDefault() diff --git a/efcore/test/EFCore.Specification.Tests/Query/CompositeKeysQueryTestBase.cs b/efcore/test/EFCore.Specification.Tests/Query/CompositeKeysQueryTestBase.cs index f951af3c30b..7b7461da09c 100644 --- a/efcore/test/EFCore.Specification.Tests/Query/CompositeKeysQueryTestBase.cs +++ b/efcore/test/EFCore.Specification.Tests/Query/CompositeKeysQueryTestBase.cs @@ -126,7 +126,8 @@ orderby e1.Id2 select new { e1.Name, - Middle = e1.OneToMany_Optional1.OrderBy(e2 => e2.Id2) + Middle = e1 + .OneToMany_Optional1.OrderBy(e2 => e2.Id2) .Select(e2 => new { e2.Name, @@ -163,43 +164,49 @@ from e1 in ss.Set() select new { e1.Name, - Outer1 = e1.OneToMany_Optional1.Select(e2 => new - { - e2.Name, - Middle1 = e2.OneToMany_Required2.Select(e3 => new - { - e3.Name, - Inner1 = e3.OneToMany_Optional3.ToList(), - Inner2 = e3.OneToMany_Required3.ToList() - }) - .ToList(), - Middle2 = e2.OneToMany_Optional2.Select(e3 => new + Outer1 = e1 + .OneToMany_Optional1.Select(e2 => new { - e3.Name, - Inner1 = e3.OneToMany_Required3.ToList(), - Inner2 = e3.OneToMany_Optional3.ToList() + e2.Name, + Middle1 = e2 + .OneToMany_Required2.Select(e3 => new + { + e3.Name, + Inner1 = e3.OneToMany_Optional3.ToList(), + Inner2 = e3.OneToMany_Required3.ToList() + }) + .ToList(), + Middle2 = e2 + .OneToMany_Optional2.Select(e3 => new + { + e3.Name, + Inner1 = e3.OneToMany_Required3.ToList(), + Inner2 = e3.OneToMany_Optional3.ToList() + }) + .ToList(), }) - .ToList(), - }) .ToList(), - Outer2 = e1.OneToMany_Required1.Select(e2 => new - { - e2.Name, - Middle1 = e2.OneToMany_Optional2.Select(e3 => new + Outer2 = e1 + .OneToMany_Required1.Select(e2 => new { - e3.Name, - Inner1 = e3.OneToMany_Required3.ToList(), - Inner2 = e3.OneToMany_Optional3.ToList() - }) - .ToList(), - Middle2 = e2.OneToMany_Optional2.Select(e3 => new - { - e3.Name, - Inner1 = e3.OneToMany_Optional3.ToList(), - Inner2 = e3.OneToMany_Required3.ToList() + e2.Name, + Middle1 = e2 + .OneToMany_Optional2.Select(e3 => new + { + e3.Name, + Inner1 = e3.OneToMany_Required3.ToList(), + Inner2 = e3.OneToMany_Optional3.ToList() + }) + .ToList(), + Middle2 = e2 + .OneToMany_Optional2.Select(e3 => new + { + e3.Name, + Inner1 = e3.OneToMany_Optional3.ToList(), + Inner2 = e3.OneToMany_Required3.ToList() + }) + .ToList(), }) - .ToList(), - }) .ToList(), }, elementSorter: e => e.Name, @@ -285,46 +292,51 @@ from e1 in ss.Set() orderby e1.Name select new { - Outer1 = e1.OneToMany_Optional1.Select(e2 => new - { - e2.Name, - Middle1 = e2.OneToMany_Required2.OrderByDescending(e3 => e3.Id2) - .ThenByDescending(e3 => e3.Id1) - .Select(e3 => new - { - Inner1 = e3.OneToMany_Optional3.ToList(), - Inner2 = e3.OneToMany_Required3.ToList() - }) - .ToList(), - Middle2 = e2.OneToMany_Optional2.Select(e3 => new + Outer1 = e1 + .OneToMany_Optional1.Select(e2 => new { - e3.Name, - Inner1 = e3.OneToMany_Required3.ToList(), - Inner2 = e3.OneToMany_Optional3.ToList() + e2.Name, + Middle1 = e2 + .OneToMany_Required2.OrderByDescending(e3 => e3.Id2) + .ThenByDescending(e3 => e3.Id1) + .Select(e3 => new + { + Inner1 = e3.OneToMany_Optional3.ToList(), + Inner2 = e3.OneToMany_Required3.ToList() + }) + .ToList(), + Middle2 = e2 + .OneToMany_Optional2.Select(e3 => new + { + e3.Name, + Inner1 = e3.OneToMany_Required3.ToList(), + Inner2 = e3.OneToMany_Optional3.ToList() + }) + .ToList(), }) - .ToList(), - }) .ToList(), - Outer2 = e1.OneToMany_Required1.OrderBy(e2 => e2.Name.Length) + Outer2 = e1 + .OneToMany_Required1.OrderBy(e2 => e2.Name.Length) .Select(e2 => new { e2.Name, - Middle1 = e2.OneToMany_Optional2.Select(e3 => new - { - e3.Name, - Inner1 = e3.OneToMany_Required3.ToList(), - Inner2 = e3.OneToMany_Optional3.ToList() - }) + Middle1 = e2 + .OneToMany_Optional2.Select(e3 => new + { + e3.Name, + Inner1 = e3.OneToMany_Required3.ToList(), + Inner2 = e3.OneToMany_Optional3.ToList() + }) .ToList(), - Middle2 = e2.OneToMany_Optional2.Select(e3 => new - { - e3.Name, - Inner1 = e3.OneToMany_Optional3.ToList(), - Inner2 = e3.OneToMany_Required3.OrderByDescending(x => - x.Id1 + x.Id2 - ) - .ToList() - }) + Middle2 = e2 + .OneToMany_Optional2.Select(e3 => new + { + e3.Name, + Inner1 = e3.OneToMany_Optional3.ToList(), + Inner2 = e3 + .OneToMany_Required3.OrderByDescending(x => x.Id1 + x.Id2) + .ToList() + }) .ToList(), }) .ToList(), diff --git a/efcore/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs b/efcore/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs index 779ece9e70d..cff332e1540 100644 --- a/efcore/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs +++ b/efcore/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs @@ -1486,7 +1486,8 @@ public virtual Task Where_subquery_distinct_firstordefault_boolean(bool async) = ss.Set() .Where(g => g.HasSoulPatch - && g.Weapons.Distinct() + && g + .Weapons.Distinct() .OrderBy(w => w.Id) .Select(w => w.IsAutomatic) .FirstOrDefault() @@ -1531,7 +1532,8 @@ public virtual Task Where_subquery_distinct_singleordefault_boolean1(bool async) .OrderBy(g => g.Nickname) .Where(g => g.HasSoulPatch - && g.Weapons.Where(w => w.Name.Contains("Lancer")) + && g + .Weapons.Where(w => w.Name.Contains("Lancer")) .Distinct() .Select(w => w.IsAutomatic) .SingleOrDefault() @@ -1549,7 +1551,8 @@ public virtual Task Where_subquery_distinct_singleordefault_boolean2(bool async) .OrderBy(g => g.Nickname) .Where(g => g.HasSoulPatch - && g.Weapons.Where(w => w.Name.Contains("Lancer")) + && g + .Weapons.Where(w => w.Name.Contains("Lancer")) .Select(w => w.IsAutomatic) .Distinct() .SingleOrDefault() @@ -1567,7 +1570,8 @@ public virtual Task Where_subquery_distinct_singleordefault_boolean_with_pushdow .OrderBy(g => g.Nickname) .Where(g => g.HasSoulPatch - && g.Weapons.Where(w => w.Name.Contains("Lancer")) + && g + .Weapons.Where(w => w.Name.Contains("Lancer")) .Distinct() .SingleOrDefault() .IsAutomatic @@ -1613,7 +1617,8 @@ public virtual Task Where_subquery_distinct_orderby_firstordefault_boolean(bool ss.Set() .Where(g => g.HasSoulPatch - && g.Weapons.Distinct() + && g + .Weapons.Distinct() .OrderBy(w => w.Id) .Select(w => w.IsAutomatic) .FirstOrDefault() @@ -1644,7 +1649,8 @@ public virtual Task Where_subquery_union_firstordefault_boolean(bool async) => ss.Set() .Where(g => g.HasSoulPatch - && g.Weapons.Union(g.Weapons) + && g + .Weapons.Union(g.Weapons) .OrderBy(w => w.Id) .FirstOrDefault() .IsAutomatic @@ -1660,7 +1666,8 @@ public virtual Task Where_subquery_join_firstordefault_boolean(bool async) => ss.Set() .Where(g => g.HasSoulPatch - && g.Weapons.Join(g.Weapons, e => e.Id, e => e.Id, (e1, e2) => e1) + && g + .Weapons.Join(g.Weapons, e => e.Id, e => e.Id, (e1, e2) => e1) .OrderBy(w => w.Id) .FirstOrDefault() .IsAutomatic @@ -1697,7 +1704,8 @@ public virtual Task Where_subquery_concat_firstordefault_boolean(bool async) => ss.Set() .Where(g => g.HasSoulPatch - && g.Weapons.Concat(g.Weapons) + && g + .Weapons.Concat(g.Weapons) .OrderBy(w => w.Id) .FirstOrDefault() .IsAutomatic @@ -4280,12 +4288,14 @@ public virtual Task Correlated_collections_nested_with_custom_ordering(bool asyn .Select(o => new { o.FullName, - OuterCollection = o.Reports.Where(r => r.FullName != "Foo") + OuterCollection = o + .Reports.Where(r => r.FullName != "Foo") .OrderBy(r => r.Rank) .Select(g => new { g.FullName, - InnerCollection = g.Weapons.Where(w => w.Name != "Bar") + InnerCollection = g + .Weapons.Where(w => w.Name != "Bar") .OrderBy(w => w.IsAutomatic) .ToList() }) @@ -4345,10 +4355,12 @@ orderby g.Rank select new { g.FullName, - First = g.Weapons.OrderBy(w1 => w1.OwnerFullName) + First = g + .Weapons.OrderBy(w1 => w1.OwnerFullName) .Where(w1 => w1.IsAutomatic) .ToList(), - Second = g.Weapons.OrderBy(w2 => w2.IsAutomatic) + Second = g + .Weapons.OrderBy(w2 => w2.IsAutomatic) .Where(w2 => !w2.IsAutomatic) .ToArray() }, @@ -4372,10 +4384,12 @@ orderby o.FullName select new { o.Nickname, - First = o.Weapons.Where(w => w.IsAutomatic) + First = o + .Weapons.Where(w => w.IsAutomatic) .Select(w => new { w.Name, w.IsAutomatic }) .ToArray(), - Second = o.Reports.OrderBy(r => r.FullName) + Second = o + .Reports.OrderBy(r => r.FullName) .Select(r => new { r.Nickname, r.Rank }) .ToList() }, @@ -4514,13 +4528,11 @@ orderby w.IsAutomatic select new { w.Id, - InnerFirst = w.Owner.Weapons.Select(ww => new - { - ww.Name, - ww.IsAutomatic - }) + InnerFirst = w + .Owner.Weapons.Select(ww => new { ww.Name, ww.IsAutomatic }) .ToList(), - InnerSecond = w.Owner.Squad.Members.OrderBy(mm => mm.Nickname) + InnerSecond = w + .Owner.Squad.Members.OrderBy(mm => mm.Nickname) .Select(mm => new { mm.Nickname, mm.HasSoulPatch }) .ToList() } @@ -4884,7 +4896,8 @@ from t in ss.Set() join g in ss.Set() on t.GearNickName equals g.Nickname into grouping from g in grouping.DefaultIfEmpty() orderby t.Note, g.Nickname descending - select g.Squad.Members.Where(m => m.HasSoulPatch) + select g + .Squad.Members.Where(m => m.HasSoulPatch) .Select(m => new { m.Nickname, @@ -4897,7 +4910,8 @@ join g in ss.Set() on t.GearNickName equals g.Nickname into grouping from g in grouping.DefaultIfEmpty() orderby t.Note, g.Nickname descending select g != null - ? g.Squad.Members.Where(m => m.HasSoulPatch) + ? g + .Squad.Members.Where(m => m.HasSoulPatch) .OrderBy(m => m.Nickname) .Select(m => new { @@ -4938,10 +4952,12 @@ bool async ss.Set() .OrderBy(w => w.Name) .Select(w => - w.Owner.Squad.Members.OrderByDescending(m => m.FullName) + w + .Owner.Squad.Members.OrderByDescending(m => m.FullName) .Select(m => new { - Weapons = m.Weapons.Where(ww => !ww.IsAutomatic) + Weapons = m + .Weapons.Where(ww => !ww.IsAutomatic) .OrderBy(ww => ww.Id) .ToList(), m.Rank @@ -4953,10 +4969,12 @@ bool async .OrderBy(w => w.Name) .Select(w => w.Owner != null - ? w.Owner.Squad.Members.OrderByDescending(m => m.FullName) + ? w + .Owner.Squad.Members.OrderByDescending(m => m.FullName) .Select(m => new { - Weapons = m.Weapons.Where(ww => !ww.IsAutomatic) + Weapons = m + .Weapons.Where(ww => !ww.IsAutomatic) .OrderBy(ww => ww.Id) .ToList(), m.Rank @@ -4999,7 +5017,8 @@ from w in r.Weapons select new { w.Id, - InnerCollection = w.Owner.Squad.Members.OrderBy(mm => mm.Nickname) + InnerCollection = w + .Owner.Squad.Members.OrderBy(mm => mm.Nickname) .Select(mm => new { mm.Nickname, mm.HasSoulPatch }) .ToList() } @@ -5046,7 +5065,8 @@ from w in r.Weapons select new { w.Id, - InnerSecond = w.Owner.Squad.Members.OrderBy(mm => mm.Nickname) + InnerSecond = w + .Owner.Squad.Members.OrderBy(mm => mm.Nickname) .Select(mm => new { mm.Nickname, mm.HasSoulPatch }) .ToList() } @@ -5100,7 +5120,8 @@ from w in r.Weapons select new { w.Id, - InnerCollection = w.Owner.Squad.Members.OrderBy(mm => mm.Nickname) + InnerCollection = w + .Owner.Squad.Members.OrderBy(mm => mm.Nickname) .Select(mm => new { mm.Nickname, mm.HasSoulPatch }) .ToList() } @@ -5150,7 +5171,8 @@ from w in r.Weapons select new { w.Id, - InnerSecond = w.Owner.Squad.Members.OrderBy(mm => mm.Nickname) + InnerSecond = w + .Owner.Squad.Members.OrderBy(mm => mm.Nickname) .Select(mm => new { mm.Nickname, mm.HasSoulPatch }) .ToList() } @@ -5661,7 +5683,8 @@ public virtual Task Project_one_value_type_from_empty_collection(bool async) => .Select(s => new { s.Name, - SquadId = s.Members.Where(m => m.HasSoulPatch) + SquadId = s + .Members.Where(m => m.HasSoulPatch) .Select(m => m.SquadId) .FirstOrDefault() }) @@ -5680,7 +5703,8 @@ bool async .Select(s => new { s.Name, - SquadId = s.Members.Where(m => m.HasSoulPatch) + SquadId = s + .Members.Where(m => m.HasSoulPatch) .Select(m => (int?)m.SquadId) .FirstOrDefault() }) @@ -5699,7 +5723,8 @@ bool async .Select(s => new { s.Name, - SquadId = s.Members.Where(m => m.HasSoulPatch) + SquadId = s + .Members.Where(m => m.HasSoulPatch) .Select(m => ClientFunction(m.SquadId, m.LeaderSquadId)) .FirstOrDefault() }), @@ -5750,7 +5775,8 @@ public virtual Task Select_subquery_projecting_single_constant_string(bool async .Select(s => new { s.Name, - Gear = s.Members.Where(g => g.HasSoulPatch) + Gear = s + .Members.Where(g => g.HasSoulPatch) .Select(g => "Foo") .FirstOrDefault() }) @@ -5766,7 +5792,8 @@ public virtual Task Select_subquery_projecting_single_constant_bool(bool async) .Select(s => new { s.Name, - Gear = s.Members.Where(g => g.HasSoulPatch) + Gear = s + .Members.Where(g => g.HasSoulPatch) .Select(g => true) .FirstOrDefault() }) @@ -5782,7 +5809,8 @@ public virtual Task Select_subquery_projecting_single_constant_inside_anonymous( .Select(s => new { s.Name, - Gear = s.Members.Where(g => g.HasSoulPatch) + Gear = s + .Members.Where(g => g.HasSoulPatch) .Select(g => new { One = 1 }) .FirstOrDefault() }) @@ -5800,7 +5828,8 @@ bool async .Select(s => new { s.Name, - Gear = s.Members.Where(g => g.HasSoulPatch) + Gear = s + .Members.Where(g => g.HasSoulPatch) .Select(g => new { True1 = true, False1 = false }) .FirstOrDefault() }) @@ -5852,7 +5881,8 @@ bool async .Select(s => new { s.Name, - Gear = s.Members.Where(g => g.HasSoulPatch) + Gear = s + .Members.Where(g => g.HasSoulPatch) .Select(g => (MyDTO)null) .FirstOrDefault() }) @@ -5868,7 +5898,8 @@ public virtual Task Select_subquery_projecting_single_constant_of_non_mapped_typ .Select(s => new { s.Name, - Gear = s.Members.Where(g => g.HasSoulPatch) + Gear = s + .Members.Where(g => g.HasSoulPatch) .Select(g => new MyDTO()) .FirstOrDefault() }), @@ -5980,13 +6011,14 @@ public virtual Task Correlated_collection_with_very_complex_order_by(bool async) ss.Set() .OfType() .OrderBy(o => - o.Weapons.Where(w => - w.IsAutomatic - == ss.Set() - .Where(g => g.Nickname == "Marcus") - .Select(g => g.HasSoulPatch) - .FirstOrDefault() - ) + o + .Weapons.Where(w => + w.IsAutomatic + == ss.Set() + .Where(g => g.Nickname == "Marcus") + .Select(g => g.HasSoulPatch) + .FirstOrDefault() + ) .Count() ) .ThenBy(g => g.Nickname) @@ -6084,7 +6116,8 @@ public virtual Task Select_subquery_boolean_empty(bool async) => ss => ss.Set() .Select(g => - g.Weapons.Where(w => w.Name == "BFG") + g + .Weapons.Where(w => w.Name == "BFG") .OrderBy(w => w.Id) .Select(w => w.IsAutomatic) .FirstOrDefault() @@ -6100,7 +6133,8 @@ public virtual Task Select_subquery_boolean_empty_with_pushdown(bool async) => ss.Set() .Select(g => (bool?) - g.Weapons.Where(w => w.Name == "BFG") + g + .Weapons.Where(w => w.Name == "BFG") .OrderBy(w => w.Id) .FirstOrDefault() .IsAutomatic @@ -6117,7 +6151,8 @@ public virtual Task Select_subquery_distinct_singleordefault_boolean1(bool async ss.Set() .Where(g => g.HasSoulPatch) .Select(g => - g.Weapons.Where(w => w.Name.Contains("Lancer")) + g + .Weapons.Where(w => w.Name.Contains("Lancer")) .Distinct() .Select(w => w.IsAutomatic) .SingleOrDefault() @@ -6134,7 +6169,8 @@ public virtual Task Select_subquery_distinct_singleordefault_boolean2(bool async ss.Set() .Where(g => g.HasSoulPatch) .Select(g => - g.Weapons.Where(w => w.Name.Contains("Lancer")) + g + .Weapons.Where(w => w.Name.Contains("Lancer")) .Select(w => w.IsAutomatic) .Distinct() .SingleOrDefault() @@ -6153,7 +6189,8 @@ bool async ss.Set() .Where(g => g.HasSoulPatch) .Select(g => - g.Weapons.Where(w => w.Name.Contains("Lancer")) + g + .Weapons.Where(w => w.Name.Contains("Lancer")) .Distinct() .SingleOrDefault() .IsAutomatic @@ -6170,7 +6207,8 @@ public virtual Task Select_subquery_distinct_singleordefault_boolean_empty1(bool ss.Set() .Where(g => g.HasSoulPatch) .Select(g => - g.Weapons.Where(w => w.Name == "BFG") + g + .Weapons.Where(w => w.Name == "BFG") .Distinct() .Select(w => w.IsAutomatic) .SingleOrDefault() @@ -6186,7 +6224,8 @@ public virtual Task Select_subquery_distinct_singleordefault_boolean_empty2(bool ss.Set() .Where(g => g.HasSoulPatch) .Select(g => - g.Weapons.Where(w => w.Name == "BFG") + g + .Weapons.Where(w => w.Name == "BFG") .Select(w => w.IsAutomatic) .Distinct() .SingleOrDefault() @@ -6205,7 +6244,8 @@ bool async .Where(g => g.HasSoulPatch) .Select(g => (bool?) - g.Weapons.Where(w => w.Name == "BFG") + g + .Weapons.Where(w => w.Name == "BFG") .Distinct() .SingleOrDefault() .IsAutomatic @@ -6223,17 +6263,18 @@ public virtual Task Cast_subquery_to_base_type_using_typed_ToList(bool async) => ss.Set() .Where(c => c.Name == "Ephyra") .Select(c => - c.StationedGears.Select(g => new Officer - { - CityOfBirthName = g.CityOfBirthName, - FullName = g.FullName, - HasSoulPatch = g.HasSoulPatch, - LeaderNickname = g.LeaderNickname, - LeaderSquadId = g.LeaderSquadId, - Nickname = g.Nickname, - Rank = g.Rank, - SquadId = g.SquadId - }) + c + .StationedGears.Select(g => new Officer + { + CityOfBirthName = g.CityOfBirthName, + FullName = g.FullName, + HasSoulPatch = g.HasSoulPatch, + LeaderNickname = g.LeaderNickname, + LeaderSquadId = g.LeaderSquadId, + Nickname = g.Nickname, + Rank = g.Rank, + SquadId = g.SquadId + }) .ToList() ), assertOrder: true, @@ -6249,7 +6290,8 @@ public virtual Task Cast_ordered_subquery_to_base_type_using_typed_ToArray(bool ss.Set() .Where(c => c.Name == "Ephyra") .Select(c => - c.StationedGears.OrderByDescending(g => g.Nickname) + c + .StationedGears.OrderByDescending(g => g.Nickname) .Select(g => new Officer { CityOfBirthName = g.CityOfBirthName, @@ -6656,7 +6698,8 @@ bool async public virtual Task Multiple_includes_with_client_method_around_entity_and_also_projecting_included_collection() { using var ctx = CreateContext(); - var query = ctx.Squads.Include(s => s.Members) + var query = ctx + .Squads.Include(s => s.Members) .ThenInclude(g => g.Weapons) .Where(s => s.Name == "Delta") .Select(s => new { s.Name, Client(s).Members }); @@ -6788,7 +6831,8 @@ bool async ss => from g in ss.Set() where g.Nickname != "Dom" - let automaticWeapons = g.Weapons.OrderByDescending(w => w.AmmunitionType) + let automaticWeapons = g + .Weapons.OrderByDescending(w => w.AmmunitionType) .Where(w => w.IsAutomatic) select new { g.Nickname, WeaponName = automaticWeapons.FirstOrDefault().Name }, elementSorter: e => e.Nickname, @@ -6903,7 +6947,8 @@ public virtual Task Nav_rewrite_Distinct_with_convert() AssertTranslationFailed(() => { using var ctx = CreateContext(); - _ = ctx.Factions.Include(f => ((LocustHorde)f).Commander) + _ = ctx + .Factions.Include(f => ((LocustHorde)f).Commander) .Where(f => f.Capital.Name != "Foo") .Select(f => (LocustHorde)f) .Distinct() @@ -6919,7 +6964,8 @@ public virtual Task Nav_rewrite_Distinct_with_convert_anonymous() AssertTranslationFailed(() => { using var ctx = CreateContext(); - _ = ctx.Factions.Include(f => ((LocustHorde)f).Commander) + _ = ctx + .Factions.Include(f => ((LocustHorde)f).Commander) .Where(f => f.Capital.Name != "Foo") .Select(f => new { horde = (LocustHorde)f }) .Distinct() @@ -8837,7 +8883,8 @@ public virtual Task FirstOrDefault_over_int_compared_to_zero(bool async) => ss.Set() .Where(s => s.Name == "Delta") .Where(s => - s.Members.Where(m => m.HasSoulPatch) + s + .Members.Where(m => m.HasSoulPatch) .OrderBy(m => m.FullName) .Select(m => m.SquadId) .FirstOrDefault() != 0 @@ -9452,12 +9499,13 @@ bool async .Select(g => new { Key = g.Nickname, - Subquery = g.Weapons.Select(w => new - { - w.Id, - w.Name, - w.OwnerFullName - }) + Subquery = g + .Weapons.Select(w => new + { + w.Id, + w.Name, + w.OwnerFullName + }) .Distinct() .ToList() }), @@ -9491,12 +9539,13 @@ bool async .Select(s => new { Key = s.Id, - Subquery = s.Members.Select(m => new - { - m.Nickname, - m.SquadId, - m.HasSoulPatch - }) + Subquery = s + .Members.Select(m => new + { + m.Nickname, + m.SquadId, + m.HasSoulPatch + }) .Distinct() .ToList() }), @@ -9530,7 +9579,8 @@ bool async .Select(g => new { Key = g.Nickname, - Subquery = g.Weapons.Select(w => new { w.Name, w.IsAutomatic }) + Subquery = g + .Weapons.Select(w => new { w.Name, w.IsAutomatic }) .Distinct() .ToList() }), @@ -9563,12 +9613,13 @@ bool async .Select(g => new { Key = g.Nickname, - Subquery = g.Weapons.Select(w => new - { - w.Name, - w.IsAutomatic, - w.OwnerFullName.Length - }) + Subquery = g + .Weapons.Select(w => new + { + w.Name, + w.IsAutomatic, + w.OwnerFullName.Length + }) .Distinct() .ToList() }), @@ -9602,7 +9653,8 @@ bool async .Select(g => new { Key = g.Nickname, - Subquery = g.Weapons.Select(w => new { w.Name, w.IsAutomatic }) + Subquery = g + .Weapons.Select(w => new { w.Name, w.IsAutomatic }) .GroupBy(x => x.IsAutomatic) .Select(x => new { x.Key }) .ToList() @@ -9635,7 +9687,8 @@ bool async .Select(g => new { Key = g.Nickname, - Subquery = g.Weapons.Select(w => new { w.Name, w.IsAutomatic }) + Subquery = g + .Weapons.Select(w => new { w.Name, w.IsAutomatic }) .GroupBy(x => x.IsAutomatic) .Select(x => new { x.Key, Count = x.Count() }) .ToList() @@ -9669,7 +9722,8 @@ bool async .Select(g => new { Key = g.Nickname, - Subquery = g.Weapons.Select(w => new { w.Name, w.IsAutomatic }) + Subquery = g + .Weapons.Select(w => new { w.Name, w.IsAutomatic }) .GroupBy(x => new { x.IsAutomatic, x.Name }) .Select(x => new { x.Key, Count = x.Count() }) .ToList() @@ -9704,7 +9758,8 @@ bool async .Select(g => new { Key = g.Nickname, - Subquery = g.Weapons.Select(w => new { w.Name, w.IsAutomatic }) + Subquery = g + .Weapons.Select(w => new { w.Name, w.IsAutomatic }) .GroupBy(x => x.Name.Length) .Select(x => new { x.Key, Count = x.Count() }) .ToList() @@ -9737,7 +9792,8 @@ bool async ss.Set() .OrderBy(g => g.Nickname) .Select(g => - g.Weapons.SelectMany(x => x.Owner.AssignedCity.BornGears) + g + .Weapons.SelectMany(x => x.Owner.AssignedCity.BornGears) .Select(x => (bool?)x.HasSoulPatch) .Distinct() .ToList() @@ -9746,9 +9802,10 @@ bool async ss.Set() .OrderBy(g => g.Nickname) .Select(g => - g.Weapons.SelectMany(x => - x.Owner.AssignedCity.Maybe(x => x.BornGears) ?? new List() - ) + g + .Weapons.SelectMany(x => + x.Owner.AssignedCity.Maybe(x => x.BornGears) ?? new List() + ) .Select(x => (bool?)x.HasSoulPatch) .Distinct() .ToList() @@ -9860,11 +9917,14 @@ public virtual Task Correlated_collection_with_distinct_3_levels(bool async) => .Select(s => new { s, - Members = s.Members.Select(m => new - { - m, - Weapons = m.Weapons.Where(w => w.OwnerFullName == m.FullName).ToList() - }) + Members = s + .Members.Select(m => new + { + m, + Weapons = m + .Weapons.Where(w => w.OwnerFullName == m.FullName) + .ToList() + }) .Distinct() }) .Distinct(), @@ -10452,7 +10512,8 @@ bool async ss => ss.Set() .Where(s => - s.Members.Where(m => m.FullName == "Anthony Carmine") + s + .Members.Where(m => m.FullName == "Anthony Carmine") .OrderBy(e => e.Nickname) .FirstOrDefault() == null ) @@ -10478,7 +10539,8 @@ bool async ss => ss.Set() .Where(s => - s.Weapons.Where(w => w.Name == "Hammer of Dawn") + s + .Weapons.Where(w => w.Name == "Hammer of Dawn") .OrderBy(e => e.Name) .FirstOrDefault() == null ) @@ -10571,9 +10633,10 @@ public virtual Task DateTimeOffset_to_unix_time_milliseconds(bool async) ss.Set() .Include(g => g.Squad.Missions) .Where(s => - s.Squad.Missions.Where(m => - unixEpochMilliseconds == m.Mission.Timeline.ToUnixTimeMilliseconds() - ) + s + .Squad.Missions.Where(m => + unixEpochMilliseconds == m.Mission.Timeline.ToUnixTimeMilliseconds() + ) .FirstOrDefault() == null ) ); @@ -10591,9 +10654,10 @@ public virtual Task DateTimeOffset_to_unix_time_seconds(bool async) ss.Set() .Include(g => g.Squad.Missions) .Where(s => - s.Squad.Missions.Where(m => - unixEpochSeconds == m.Mission.Timeline.ToUnixTimeSeconds() - ) + s + .Squad.Missions.Where(m => + unixEpochSeconds == m.Mission.Timeline.ToUnixTimeSeconds() + ) .FirstOrDefault() == null ) ); @@ -10657,7 +10721,8 @@ public virtual Task Subquery_inside_Take_argument(bool async) ss.Set() .OrderBy(x => x.Nickname) .Select(x => - x.Weapons.OrderBy(g => g.Id) + x + .Weapons.OrderBy(g => g.Id) .Take(numbers.OrderBy(xx => xx).Skip(1).FirstOrDefault()) ), assertOrder: true, @@ -10707,7 +10772,8 @@ bool async ss.Set() .OrderBy(x => x.Nickname) .Select(x => - x.Weapons.OrderBy(g => g.Id) + x + .Weapons.OrderBy(g => g.Id) .Take( ss.Set() .OrderBy(xx => xx.Nickname) diff --git a/efcore/test/EFCore.Specification.Tests/Query/ManyToManyQueryTestBase.cs b/efcore/test/EFCore.Specification.Tests/Query/ManyToManyQueryTestBase.cs index 3a95e399cd2..6f8a21fd0aa 100644 --- a/efcore/test/EFCore.Specification.Tests/Query/ManyToManyQueryTestBase.cs +++ b/efcore/test/EFCore.Specification.Tests/Query/ManyToManyQueryTestBase.cs @@ -241,9 +241,10 @@ public virtual Task Left_join_with_skip_navigation(bool async) => ss => from t in ss.Set() join s in ss.Set() - on t.TwoSkipShared.OrderBy(e => e.Id) + on t.TwoSkipShared.OrderBy(e => e.Id).FirstOrDefault().Id equals s + .ThreeSkipFull.OrderBy(e => e.Id) .FirstOrDefault() - .Id equals s.ThreeSkipFull.OrderBy(e => e.Id).FirstOrDefault().Id + .Id into grouping from s in grouping.DefaultIfEmpty() orderby t.Key1, s.Key1, t.Key2, s.Key2 @@ -251,9 +252,11 @@ from s in grouping.DefaultIfEmpty() ss => from t in ss.Set() join s in ss.Set() - on t.TwoSkipShared.OrderBy(e => e.Id) + on t + .TwoSkipShared.OrderBy(e => e.Id) .FirstOrDefault() - .MaybeScalar(e => e.Id) equals s.ThreeSkipFull.OrderBy(e => e.Id) + .MaybeScalar(e => e.Id) equals s + .ThreeSkipFull.OrderBy(e => e.Id) .FirstOrDefault() .MaybeScalar(e => e.Id) into grouping @@ -377,7 +380,8 @@ public virtual Task Select_skip_navigation_first_or_default(bool async) => ss => from r in ss.Set() orderby r.Id - select r.CompositeKeySkipFull.OrderBy(e => e.Key1) + select r + .CompositeKeySkipFull.OrderBy(e => e.Key1) .ThenBy(e => e.Key2) .FirstOrDefault(), assertOrder: true @@ -1233,9 +1237,10 @@ public virtual Task Left_join_with_skip_navigation_unidirectional(bool async) => ss => from t in ss.Set() join s in ss.Set() - on t.TwoSkipShared.OrderBy(e => e.Id) + on t.TwoSkipShared.OrderBy(e => e.Id).FirstOrDefault().Id equals s + .ThreeSkipFull.OrderBy(e => e.Id) .FirstOrDefault() - .Id equals s.ThreeSkipFull.OrderBy(e => e.Id).FirstOrDefault().Id + .Id into grouping from s in grouping.DefaultIfEmpty() orderby t.Key1, s.Key1, t.Key2, s.Key2 @@ -1243,9 +1248,11 @@ from s in grouping.DefaultIfEmpty() ss => from t in ss.Set() join s in ss.Set() - on t.TwoSkipShared.OrderBy(e => e.Id) + on t + .TwoSkipShared.OrderBy(e => e.Id) .FirstOrDefault() - .MaybeScalar(e => e.Id) equals s.ThreeSkipFull.OrderBy(e => e.Id) + .MaybeScalar(e => e.Id) equals s + .ThreeSkipFull.OrderBy(e => e.Id) .FirstOrDefault() .MaybeScalar(e => e.Id) into grouping diff --git a/efcore/test/EFCore.Specification.Tests/Query/NorthwindAggregateOperatorsQueryTestBase.cs b/efcore/test/EFCore.Specification.Tests/Query/NorthwindAggregateOperatorsQueryTestBase.cs index 9d749580757..40548f2bd60 100644 --- a/efcore/test/EFCore.Specification.Tests/Query/NorthwindAggregateOperatorsQueryTestBase.cs +++ b/efcore/test/EFCore.Specification.Tests/Query/NorthwindAggregateOperatorsQueryTestBase.cs @@ -803,7 +803,8 @@ public virtual Task Multiple_collection_navigation_with_FirstOrDefault_chained(b .Where(c => c.CustomerID.StartsWith("F")) .OrderBy(c => c.CustomerID) .Select(c => - c.Orders.OrderBy(o => o.OrderID) + c + .Orders.OrderBy(o => o.OrderID) .FirstOrDefault() .OrderDetails.OrderBy(od => od.ProductID) .FirstOrDefault() @@ -813,7 +814,8 @@ public virtual Task Multiple_collection_navigation_with_FirstOrDefault_chained(b .Where(c => c.CustomerID.StartsWith("F")) .OrderBy(c => c.CustomerID) .Select(c => - c.Orders.OrderBy(o => o.OrderID) + c + .Orders.OrderBy(o => o.OrderID) .FirstOrDefault() .Maybe(x => x.OrderDetails) .Maybe(xx => xx.OrderBy(od => od.ProductID).FirstOrDefault()) @@ -833,7 +835,8 @@ bool async .OrderBy(c => c.CustomerID) .Select(c => (int?) - c.Orders.OrderBy(o => o.OrderID) + c + .Orders.OrderBy(o => o.OrderID) .FirstOrDefault() .OrderDetails.OrderBy(od => od.ProductID) .FirstOrDefault() @@ -844,7 +847,8 @@ bool async .Where(c => c.CustomerID.StartsWith("A")) .OrderBy(c => c.CustomerID) .Select(c => - c.Orders.OrderBy(o => o.OrderID) + c + .Orders.OrderBy(o => o.OrderID) .FirstOrDefault() .Maybe(x => x.OrderDetails) .MaybeScalar(x => @@ -2112,7 +2116,8 @@ public virtual Task Collection_Last_member_access_in_projection_translated(bool ss.Set() .Where(c => c.CustomerID.StartsWith("F")) .Where(c => - c.Orders.OrderByDescending(o => o.OrderID) + c + .Orders.OrderByDescending(o => o.OrderID) .LastOrDefault() .Maybe(x => x.CustomerID) == c.CustomerID ) @@ -2136,7 +2141,8 @@ bool async ss.Set() .Where(c => c.CustomerID.StartsWith("F")) .Where(c => - c.Orders.OrderByDescending(o => o.OrderID) + c + .Orders.OrderByDescending(o => o.OrderID) .LastOrDefault() .Maybe(x => x.CustomerID) == c.CustomerID ) diff --git a/efcore/test/EFCore.Specification.Tests/Query/NorthwindGroupByQueryTestBase.cs b/efcore/test/EFCore.Specification.Tests/Query/NorthwindGroupByQueryTestBase.cs index 8ce9d98eef7..28469d25b77 100644 --- a/efcore/test/EFCore.Specification.Tests/Query/NorthwindGroupByQueryTestBase.cs +++ b/efcore/test/EFCore.Specification.Tests/Query/NorthwindGroupByQueryTestBase.cs @@ -3837,7 +3837,8 @@ public virtual Task GroupBy_Count_in_projection(bool async) => info.o.OrderID, info.o.OrderDate, HasOrderDetails = info.OrderDetails.Any(), - HasMultipleProducts = info.OrderDetails.GroupBy(e => e.Product.ProductName) + HasMultipleProducts = info + .OrderDetails.GroupBy(e => e.Product.ProductName) .Count() > 1 }) ); @@ -3874,11 +3875,8 @@ public virtual Task Complex_query_with_groupBy_in_subquery1(bool async) => .Select(c => new { Key = c.CustomerID, - Subquery = c.Orders.Select(o => new - { - First = o.CustomerID, - Second = o.OrderID - }) + Subquery = c + .Orders.Select(o => new { First = o.CustomerID, Second = o.OrderID }) .GroupBy(x => x.First) .Select(g => new { Sum = g.Sum(x => x.Second) }) .ToList() @@ -3901,11 +3899,8 @@ public virtual Task Complex_query_with_groupBy_in_subquery2(bool async) => .Select(c => new { Key = c.CustomerID, - Subquery = c.Orders.Select(o => new - { - First = o.CustomerID, - Second = o.OrderID - }) + Subquery = c + .Orders.Select(o => new { First = o.CustomerID, Second = o.OrderID }) .GroupBy(x => x.First) .Select(g => new { @@ -3960,11 +3955,12 @@ public virtual Task Complex_query_with_groupBy_in_subquery4(bool async) => .Select(c => new { Key = c.CustomerID, - Subquery = c.Orders.Select(o => new - { - First = o.OrderID, - Second = o.Customer.City + o.CustomerID - }) + Subquery = c + .Orders.Select(o => new + { + First = o.OrderID, + Second = o.Customer.City + o.CustomerID + }) .GroupBy(x => x.Second) .Select(g => new { diff --git a/efcore/test/EFCore.Specification.Tests/Query/NorthwindIncludeQueryTestBase.cs b/efcore/test/EFCore.Specification.Tests/Query/NorthwindIncludeQueryTestBase.cs index 0ea3563dbc5..a2500b117cd 100644 --- a/efcore/test/EFCore.Specification.Tests/Query/NorthwindIncludeQueryTestBase.cs +++ b/efcore/test/EFCore.Specification.Tests/Query/NorthwindIncludeQueryTestBase.cs @@ -568,7 +568,8 @@ public virtual Task Include_collection_order_by_subquery(bool async) => .Include(c => c.Orders) .Where(c => c.CustomerID == "ALFKI") .OrderBy(c => - c.Orders.OrderBy(o => o.EmployeeID) + c + .Orders.OrderBy(o => o.EmployeeID) .Select(o => o.OrderDate) .FirstOrDefault() ), diff --git a/efcore/test/EFCore.Specification.Tests/Query/NorthwindNavigationsQueryTestBase.cs b/efcore/test/EFCore.Specification.Tests/Query/NorthwindNavigationsQueryTestBase.cs index 7ed271553f5..b377b31496c 100644 --- a/efcore/test/EFCore.Specification.Tests/Query/NorthwindNavigationsQueryTestBase.cs +++ b/efcore/test/EFCore.Specification.Tests/Query/NorthwindNavigationsQueryTestBase.cs @@ -203,7 +203,8 @@ public virtual Task Select_collection_FirstOrDefault_project_anonymous_type(bool .OrderBy(c => c.CustomerID) .Take(2) .Select(c => - c.Orders.OrderBy(o => o.OrderID) + c + .Orders.OrderBy(o => o.OrderID) .Select(o => new { o.CustomerID, o.OrderID }) .FirstOrDefault() ), @@ -223,7 +224,8 @@ bool async .OrderBy(c => c.CustomerID) .Take(2) .Select(c => - c.Orders.OrderBy(o => o.OrderID) + c + .Orders.OrderBy(o => o.OrderID) .Select(o => new { o.CustomerID, @@ -976,7 +978,8 @@ public virtual Task Where_subquery_on_navigation_client_eval(bool async) => from c in ss.Set() orderby c.CustomerID where - c.Orders.Select(o => o.OrderID) + c + .Orders.Select(o => o.OrderID) .Contains( ss.Set() .OrderByDescending(o => ClientMethod(o.OrderID)) @@ -1039,7 +1042,8 @@ from c in ss.Set() select new { c.CustomerID, - OrderId = c.Orders.OrderBy(o => o.OrderID) + OrderId = c + .Orders.OrderBy(o => o.OrderID) .Select(o => (int?)o.OrderID) .FirstOrDefault() }, @@ -1048,7 +1052,8 @@ from c in ss.Set() select new { c.CustomerID, - OrderId = c.Orders.OrderBy(o => o.OrderID) + OrderId = c + .Orders.OrderBy(o => o.OrderID) .Select(o => (int?)o.OrderID) .FirstOrDefault() }, @@ -1086,7 +1091,8 @@ orderby o.OrderID select new { o.OrderID, - OrderDetail = o.OrderDetails.OrderBy(od => od.OrderID) + OrderDetail = o + .OrderDetails.OrderBy(od => od.OrderID) .ThenBy(od => od.ProductID) .Select(od => od.OrderID) .FirstOrDefault(), diff --git a/efcore/test/EFCore.Specification.Tests/Query/OwnedEntityQueryTestBase.cs b/efcore/test/EFCore.Specification.Tests/Query/OwnedEntityQueryTestBase.cs index 9c8457233a5..a52f204deed 100644 --- a/efcore/test/EFCore.Specification.Tests/Query/OwnedEntityQueryTestBase.cs +++ b/efcore/test/EFCore.Specification.Tests/Query/OwnedEntityQueryTestBase.cs @@ -24,11 +24,13 @@ bool async .Select(e => new { e.Id, - FirstChild = e.Children.Where(c => c.Type == 1) + FirstChild = e + .Children.Where(c => c.Type == 1) .AsQueryable() .Select(_project) .FirstOrDefault(), - SecondChild = e.Children.Where(c => c.Type == 2) + SecondChild = e + .Children.Where(c => c.Type == 2) .AsQueryable() .Select(_project) .FirstOrDefault(), @@ -230,7 +232,8 @@ public virtual async Task Projecting_correlated_collection_property_for_owned_en .Warehouses.Select(x => new WarehouseModel { WarehouseCode = x.WarehouseCode, - DestinationCountryCodes = x.DestinationCountries.Select(c => c.CountryCode) + DestinationCountryCodes = x + .DestinationCountries.Select(c => c.CountryCode) .ToArray() }) .AsNoTracking(); diff --git a/efcore/test/EFCore.Specification.Tests/Query/PrimitiveCollectionsQueryTestBase.cs b/efcore/test/EFCore.Specification.Tests/Query/PrimitiveCollectionsQueryTestBase.cs index d7c1da7e113..143fb54269a 100644 --- a/efcore/test/EFCore.Specification.Tests/Query/PrimitiveCollectionsQueryTestBase.cs +++ b/efcore/test/EFCore.Specification.Tests/Query/PrimitiveCollectionsQueryTestBase.cs @@ -851,7 +851,8 @@ public virtual Task Parameter_collection_in_subquery_Union_column_collection_nes .Where(p => ints.Skip(1) .Union( - p.Ints.OrderBy(x => x) + p + .Ints.OrderBy(x => x) .Skip(1) .Distinct() .OrderByDescending(x => x) @@ -1062,7 +1063,8 @@ public virtual Task Project_multiple_collections(bool async) => Ints = x.Ints.ToList(), OrderedInts = x.Ints.OrderByDescending(xx => xx).ToList(), FilteredDateTimes = x.DateTimes.Where(xx => xx.Day != 1).ToList(), - FilteredDateTimes2 = x.DateTimes.Where(xx => xx > new DateTime(2000, 1, 1)) + FilteredDateTimes2 = x + .DateTimes.Where(xx => xx > new DateTime(2000, 1, 1)) .ToList() }), elementAsserter: (e, a) => diff --git a/efcore/test/EFCore.Specification.Tests/TestUtilities/TestHelpers.cs b/efcore/test/EFCore.Specification.Tests/TestUtilities/TestHelpers.cs index ad6c28f1b4e..c9f7714e796 100644 --- a/efcore/test/EFCore.Specification.Tests/TestUtilities/TestHelpers.cs +++ b/efcore/test/EFCore.Specification.Tests/TestUtilities/TestHelpers.cs @@ -407,7 +407,8 @@ public static void ExecuteWithStrategyInTransaction( where TContext : DbContext { using var c = createContext(); - c.Database.CreateExecutionStrategy() + c + .Database.CreateExecutionStrategy() .Execute( c, context => @@ -464,7 +465,8 @@ public static async Task ExecuteWithStrategyInTransactionAsync( where TContext : DbContext { using var c = createContext(); - await c.Database.CreateExecutionStrategy() + await c + .Database.CreateExecutionStrategy() .ExecuteAsync( c, async context => diff --git a/efcore/test/EFCore.SqlServer.FunctionalTests/OptimisticConcurrencySqlServerTest.cs b/efcore/test/EFCore.SqlServer.FunctionalTests/OptimisticConcurrencySqlServerTest.cs index 578989141e5..b1db4bfecb4 100644 --- a/efcore/test/EFCore.SqlServer.FunctionalTests/OptimisticConcurrencySqlServerTest.cs +++ b/efcore/test/EFCore.SqlServer.FunctionalTests/OptimisticConcurrencySqlServerTest.cs @@ -182,7 +182,8 @@ string propertyName { await using var c = CreateF1Context(); - await c.Database.CreateExecutionStrategy() + await c + .Database.CreateExecutionStrategy() .ExecuteAsync( c, async context => @@ -309,7 +310,8 @@ string propertyName { await using var c = CreateF1Context(); - await c.Database.CreateExecutionStrategy() + await c + .Database.CreateExecutionStrategy() .ExecuteAsync( c, async context => @@ -442,7 +444,8 @@ await Assert.ThrowsAnyAsync( public async Task Modifying_concurrency_token_only_is_noop() { using var c = CreateF1Context(); - await c.Database.CreateExecutionStrategy() + await c + .Database.CreateExecutionStrategy() .ExecuteAsync( c, async context => @@ -491,7 +494,8 @@ await c.Database.CreateExecutionStrategy() public async Task Database_concurrency_token_value_is_updated_for_all_sharing_entities() { using var c = CreateF1Context(); - await c.Database.CreateExecutionStrategy() + await c + .Database.CreateExecutionStrategy() .ExecuteAsync( c, async context => @@ -540,7 +544,8 @@ await c.Database.CreateExecutionStrategy() public async Task Original_concurrency_token_value_is_used_when_replacing_owned_instance() { using var c = CreateF1Context(); - await c.Database.CreateExecutionStrategy() + await c + .Database.CreateExecutionStrategy() .ExecuteAsync( c, async context => diff --git a/efcore/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs b/efcore/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs index 6d00ccf4b99..452ebbd8e00 100644 --- a/efcore/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs +++ b/efcore/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs @@ -616,7 +616,8 @@ public async Task Include_on_entity_with_composite_key_One_To_Many_Issues_925_92 var contextFactory = await InitializeAsync(); using var ctx = contextFactory.CreateContext(); - var query = ctx.Customers.Include(c => c.Orders) + var query = ctx + .Customers.Include(c => c.Orders) .OrderBy(c => c.FirstName) .ThenBy(c => c.LastName); var result = query.ToList(); @@ -907,7 +908,8 @@ private void Execute1742(CustomerDetails_1742 details) using var ctx = contextFactory.CreateContext(); var firstName = details.FirstName; - ctx.Customers.Where(c => c.FirstName == firstName && c.LastName == details.LastName) + ctx + .Customers.Where(c => c.FirstName == firstName && c.LastName == details.LastName) .ToList(); // No AssertSQL since compiler generated variable names are different between local and CI @@ -1616,7 +1618,8 @@ public virtual async Task Repro5456_include_group_join_is_per_query_context() i => { using var ctx = contextFactory.CreateContext(); - var result = ctx.Posts.Where(x => x.Blog.Id > 1) + var result = ctx + .Posts.Where(x => x.Blog.Id > 1) .Include(x => x.Blog) .Include(x => x.Comments) .ToList(); @@ -1631,7 +1634,8 @@ public virtual async Task Repro5456_include_group_join_is_per_query_context() i => { using var ctx = contextFactory.CreateContext(); - var result = ctx.Posts.Where(x => x.Blog.Id > 1) + var result = ctx + .Posts.Where(x => x.Blog.Id > 1) .Include(x => x.Blog) .ThenInclude(b => b.Author) .ToList(); @@ -1652,7 +1656,8 @@ await Task.WhenAll( .Select(async i => { using var ctx = contextFactory.CreateContext(); - var result = await ctx.Posts.Where(x => x.Blog.Id > 1) + var result = await ctx + .Posts.Where(x => x.Blog.Id > 1) .Include(x => x.Blog) .ToListAsync(); @@ -1666,7 +1671,8 @@ await Task.WhenAll( .Select(async i => { using var ctx = contextFactory.CreateContext(); - var result = await ctx.Posts.Where(x => x.Blog.Id > 1) + var result = await ctx + .Posts.Where(x => x.Blog.Id > 1) .Include(x => x.Blog) .Include(x => x.Comments) .ToListAsync(); @@ -1681,7 +1687,8 @@ await Task.WhenAll( .Select(async i => { using var ctx = contextFactory.CreateContext(); - var result = await ctx.Posts.Where(x => x.Blog.Id > 1) + var result = await ctx + .Posts.Where(x => x.Blog.Id > 1) .Include(x => x.Blog) .ThenInclude(b => b.Author) .ToListAsync(); @@ -3728,7 +3735,8 @@ public virtual async Task Include_collection_with_OfType_base() { var query = context .Employees.Select(e => - e.Devices.Where(d => d.Device != "foo") + e + .Devices.Where(d => d.Device != "foo") .Cast() ) .ToList(); @@ -4218,10 +4226,11 @@ public virtual async Task Correlated_subquery_with_owned_navigation_being_compar var partners = context .Partners.Select(x => new { - Addresses = x.Addresses.Select(y => new - { - Turnovers = y.Turnovers == null ? null : new { y.Turnovers.AmountIn } - }) + Addresses = x + .Addresses.Select(y => new + { + Turnovers = y.Turnovers == null ? null : new { y.Turnovers.AmountIn } + }) .ToList() }) .ToList(); @@ -6183,9 +6192,10 @@ FROM [CompetitionSeasons] AS [c1] a.Activity, CompetitionSeasonId = a.CompetitionSeason.Id, Points = a.Activity.Points - ?? a.Activity.ActivityType.Points.Where(p => - p.CompetitionSeason == a.CompetitionSeason - ) + ?? a + .Activity.ActivityType.Points.Where(p => + p.CompetitionSeason == a.CompetitionSeason + ) .Select(p => p.Points) .SingleOrDefault() }) @@ -6276,7 +6286,8 @@ public virtual async Task Max_in_multi_level_nested_subquery() .Trades.Select(x => new { x.Id, - Assets = x.Assets.AsQueryable() + Assets = x + .Assets.AsQueryable() .Select(y => new { y.Id, @@ -7816,9 +7827,11 @@ public virtual async Task Using_explicit_interface_implementation_as_navigation_ ) != null ? new MyContext21768.PageViewModel21768 { - Uri = b.FrontCover.Illustrations.FirstOrDefault(i => - i.State >= MyContext21768.IllustrationState21768.Approved - ).Uri + Uri = b + .FrontCover.Illustrations.FirstOrDefault(i => + i.State >= MyContext21768.IllustrationState21768.Approved + ) + .Uri } : null, }; @@ -10382,15 +10395,17 @@ public virtual async Task Projection_with_multiple_includes_and_subquery_with_se x.Hometown, x.Bio, x.AvatarUrl, - Images = x.Images.Select(i => new - { - i.Id, - i.ImageUrl, - i.Height, - i.Width - }) + Images = x + .Images.Select(i => new + { + i.Id, + i.ImageUrl, + i.Height, + i.Width + }) .ToList(), - KnownByFilms = x.Actor.Movies.Select(m => m.Movie) + KnownByFilms = x + .Actor.Movies.Select(m => m.Movie) .Union(x.Director.Movies.Select(m => m.Movie)) .Select(m => new { @@ -10683,7 +10698,8 @@ public virtual async Task SelectMany_and_collection_in_projection_in_FirstOrDefa { IdentityDocuments = o.IdentityDocuments.Select(id => new { - Images = o.IdentityDocuments.SelectMany(id => id.Images) + Images = o + .IdentityDocuments.SelectMany(id => id.Images) .Select(i => new { i.Image }), }) }) @@ -11248,11 +11264,12 @@ Guid parentId .Select(p => new ParentViewModel25225 { Id = p.Id, - Collection = p.Collection.Select(c => new CollectionViewModel25225 - { - Id = c.Id, - ParentId = c.ParentId, - }) + Collection = p + .Collection.Select(c => new CollectionViewModel25225 + { + Id = c.Id, + ParentId = c.ParentId, + }) .ToArray() }); diff --git a/efcore/test/EFCore.SqlServer.HierarchyId.Tests/QueryTests.cs b/efcore/test/EFCore.SqlServer.HierarchyId.Tests/QueryTests.cs index 78fbc98a275..6e0b51a5680 100644 --- a/efcore/test/EFCore.SqlServer.HierarchyId.Tests/QueryTests.cs +++ b/efcore/test/EFCore.SqlServer.HierarchyId.Tests/QueryTests.cs @@ -260,7 +260,8 @@ public void Can_insert_HierarchyId() _db.SaveChanges(); _db.ChangeTracker.Clear(); - var queried = _db.Patriarchy.Where(e => e.Name.StartsWith("Th")) + var queried = _db + .Patriarchy.Where(e => e.Name.StartsWith("Th")) .OrderBy(e => e.Id) .ToList(); @@ -297,7 +298,8 @@ public void Can_insert_and_update_converted_HierarchyId() _db.SaveChanges(); _db.ChangeTracker.Clear(); - var queried = _db.ConvertedPatriarchy.Where(e => e.Name.StartsWith("Th")) + var queried = _db + .ConvertedPatriarchy.Where(e => e.Name.StartsWith("Th")) .OrderBy(e => e.Id) .ToList(); @@ -317,7 +319,8 @@ public void Can_insert_and_update_converted_HierarchyId() _db.SaveChanges(); _db.ChangeTracker.Clear(); - queried = _db.ConvertedPatriarchy.Where(e => e.Name.StartsWith("Th")) + queried = _db + .ConvertedPatriarchy.Where(e => e.Name.StartsWith("Th")) .OrderBy(e => e.Id) .ToList(); diff --git a/efcore/test/EFCore.SqlServer.Tests/ModelBuilding/SqlServerModelBuilderTestBase.cs b/efcore/test/EFCore.SqlServer.Tests/ModelBuilding/SqlServerModelBuilderTestBase.cs index 14a0c9ef606..d6d23b020bf 100644 --- a/efcore/test/EFCore.SqlServer.Tests/ModelBuilding/SqlServerModelBuilderTestBase.cs +++ b/efcore/test/EFCore.SqlServer.Tests/ModelBuilding/SqlServerModelBuilderTestBase.cs @@ -1156,9 +1156,10 @@ public virtual void Owned_types_can_be_mapped_to_different_tables() .Ignore(l => l.Book) .Ignore(l => l.BookLabel); - ab.OwnedEntityType.FindNavigation( - nameof(BookLabel.SpecialBookLabel) - )! + ab + .OwnedEntityType.FindNavigation( + nameof(BookLabel.SpecialBookLabel) + )! .AddAnnotation("Foo", "Bar"); } ); diff --git a/efcore/test/EFCore.Tests/ChangeTracking/TrackGraphTestBase.cs b/efcore/test/EFCore.Tests/ChangeTracking/TrackGraphTestBase.cs index bf6a0b87c0a..e96c335153d 100644 --- a/efcore/test/EFCore.Tests/ChangeTracking/TrackGraphTestBase.cs +++ b/efcore/test/EFCore.Tests/ChangeTracking/TrackGraphTestBase.cs @@ -1628,7 +1628,8 @@ public KeyValueEntityTracker(bool updateExistingEntities) } public virtual void TrackEntity(EntityEntryGraphNode node) => - node.Entry.GetInfrastructure() + node + .Entry.GetInfrastructure() .SetEntityState(DetermineState(node.Entry), acceptChanges: true); public virtual EntityState DetermineState(EntityEntry entry) => diff --git a/format/perf/RealWorldSolution.cs b/format/perf/RealWorldSolution.cs index 6dbb5bd8d98..49db9d2d783 100644 --- a/format/perf/RealWorldSolution.cs +++ b/format/perf/RealWorldSolution.cs @@ -94,7 +94,8 @@ private class RealWorldConfig : ManualConfig { public RealWorldConfig() { - var job = Job.Dry.WithWarmupCount(1) + var job = Job + .Dry.WithWarmupCount(1) .WithIterationCount(12) .WithOutlierMode(Perfolizer.Mathematics.OutlierDetection.OutlierMode.RemoveAll); Add( diff --git a/mono/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ProjectRootElement.cs b/mono/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ProjectRootElement.cs index c66d00cd6c9..9ab7e551804 100644 --- a/mono/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ProjectRootElement.cs +++ b/mono/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ProjectRootElement.cs @@ -347,9 +347,10 @@ IEnumerable> metadata var @group = ItemGroups .Where(p => string.IsNullOrEmpty(p.Condition) - && p.Items.Where(s => - s.ItemType.Equals(itemType, StringComparison.OrdinalIgnoreCase) - ) + && p + .Items.Where(s => + s.ItemType.Equals(itemType, StringComparison.OrdinalIgnoreCase) + ) .FirstOrDefault() != null ) .FirstOrDefault(); @@ -363,9 +364,10 @@ public ProjectItemDefinitionElement AddItemDefinition(string itemType) var @group = ItemDefinitionGroups .Where(p => string.IsNullOrEmpty(p.Condition) - && p.ItemDefinitions.Where(s => - s.ItemType.Equals(itemType, StringComparison.OrdinalIgnoreCase) - ) + && p + .ItemDefinitions.Where(s => + s.ItemType.Equals(itemType, StringComparison.OrdinalIgnoreCase) + ) .FirstOrDefault() != null ) .FirstOrDefault(); diff --git a/mono/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs b/mono/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs index c39a91b6b11..4dc8603cc75 100644 --- a/mono/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs +++ b/mono/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs @@ -621,10 +621,8 @@ string[] GetDefaultTargets(ProjectRootElement xml, bool fromAttribute, bool chec { if (fromAttribute) { - var ret = xml.DefaultTargets.Split( - item_target_sep, - StringSplitOptions.RemoveEmptyEntries - ) + var ret = xml + .DefaultTargets.Split(item_target_sep, StringSplitOptions.RemoveEmptyEntries) .Select(s => s.Trim()) .ToArray(); if (checkImports && ret.Length == 0) diff --git a/mono/mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectInstance.cs b/mono/mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectInstance.cs index 006582e00be..156d5a43690 100644 --- a/mono/mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectInstance.cs +++ b/mono/mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectInstance.cs @@ -133,10 +133,8 @@ string[] GetDefaultTargets(ProjectRootElement xml, bool fromAttribute, bool chec { if (fromAttribute) { - var ret = xml.DefaultTargets.Split( - item_target_sep, - StringSplitOptions.RemoveEmptyEntries - ) + var ret = xml + .DefaultTargets.Split(item_target_sep, StringSplitOptions.RemoveEmptyEntries) .Select(s => s.Trim()) .ToArray(); if (checkImports && ret.Length == 0) @@ -174,10 +172,8 @@ void InitializeProperties(ProjectRootElement xml) directory = string.IsNullOrWhiteSpace(xml.DirectoryPath) ? System.IO.Directory.GetCurrentDirectory() : xml.DirectoryPath; - InitialTargets = xml.InitialTargets.Split( - item_target_sep, - StringSplitOptions.RemoveEmptyEntries - ) + InitialTargets = xml + .InitialTargets.Split(item_target_sep, StringSplitOptions.RemoveEmptyEntries) .Select(s => s.Trim()) .ToList(); @@ -345,10 +341,11 @@ void EvaluateItems(ProjectRootElement xml, IEnumerable elements) Func creator = s => new ProjectItemInstance( this, p.ItemType, - p.Metadata.Select(m => new KeyValuePair( - m.Name, - m.Value - )) + p + .Metadata.Select(m => new KeyValuePair( + m.Name, + m.Value + )) .ToList(), s ); diff --git a/mono/mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectPropertyGroupTaskInstance.cs b/mono/mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectPropertyGroupTaskInstance.cs index 955c2a1fa23..d96540b15ad 100644 --- a/mono/mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectPropertyGroupTaskInstance.cs +++ b/mono/mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectPropertyGroupTaskInstance.cs @@ -41,9 +41,8 @@ internal ProjectPropertyGroupTaskInstance(ProjectPropertyGroupElement xml) //this.FullPath = fullPath; location = xml.Location; - Properties = xml.Properties.Select(prop => new ProjectPropertyGroupTaskPropertyInstance( - prop - )) + Properties = xml + .Properties.Select(prop => new ProjectPropertyGroupTaskPropertyInstance(prop)) .ToArray(); } diff --git a/mono/mcs/class/Mono.CodeContracts/Mono.CodeContracts.Static.AST/Method.cs b/mono/mcs/class/Mono.CodeContracts/Mono.CodeContracts.Static.AST/Method.cs index 40e8e885daa..116a388aeb3 100644 --- a/mono/mcs/class/Mono.CodeContracts/Mono.CodeContracts.Static.AST/Method.cs +++ b/mono/mcs/class/Mono.CodeContracts/Mono.CodeContracts.Static.AST/Method.cs @@ -244,7 +244,8 @@ public List Parameters get { if (this.parameters == null) - this.parameters = this.definition.Parameters.Select(i => new Parameter(i)) + this.parameters = this + .definition.Parameters.Select(i => new Parameter(i)) .ToList(); return this.parameters; } diff --git a/mono/mcs/class/Mono.CodeContracts/Mono.CodeContracts.Static.ControlFlow.Subroutines/OldScanStateMachine.cs b/mono/mcs/class/Mono.CodeContracts/Mono.CodeContracts.Static.ControlFlow.Subroutines/OldScanStateMachine.cs index 949a91d0323..929bed8cf30 100644 --- a/mono/mcs/class/Mono.CodeContracts/Mono.CodeContracts.Static.ControlFlow.Subroutines/OldScanStateMachine.cs +++ b/mono/mcs/class/Mono.CodeContracts/Mono.CodeContracts.Static.ControlFlow.Subroutines/OldScanStateMachine.cs @@ -148,9 +148,9 @@ EnsuresBlock