From 61c2cc1889adaca2890cb2e645183e6ba89ae5ea Mon Sep 17 00:00:00 2001 From: Hisham Bin Ateya Date: Sat, 7 Mar 2026 20:32:53 +0300 Subject: [PATCH 1/2] Move extension methods to Extensions folder --- .../OrchardCore.Admin/Startup.cs | 2 +- .../OrchardCore.Alias/GraphQL/Startup.cs | 2 -- .../OrchardCore.AuditTrail/Startup.cs | 2 +- .../OrchardCore.Autoroute/GraphQL/Startup.cs | 2 -- .../OrchardCore.ContentFields/GraphQL/Startup.cs | 2 -- .../GraphQL/Startup.cs | 2 -- .../OrchardCore.ContentLocalization/Startup.cs | 2 +- .../OrchardCore.Contents/AuditTrail/Startup.cs | 2 +- .../AddToDeploymentPlanStartup.cs | 2 +- .../ExportContentToDeploymentTargetStartup.cs | 2 +- .../OrchardCore.Contents/GraphQL/Startup.cs | 1 - .../OrchardCore.Contents/Startup.cs | 3 +-- .../OrchardCore.CustomSettings/Startup.cs | 2 +- .../OrchardCore.Demo/Startup.cs | 2 +- .../OrchardCore.Deployment/Startup.cs | 2 +- .../OrchardCore.Email.Azure/Startup.cs | 2 +- .../OrchardCore.Email.Smtp/Startup.cs | 2 +- .../OrchardCore.Email/Startup.cs | 2 +- .../OrchardCore.Facebook/Startup.cs | 2 +- .../OrchardCore.Facebook/StartupLogin.cs | 2 +- .../OrchardCore.Facebook/StartupPixel.cs | 2 +- .../OrchardCore.Flows/GraphQL/Startup.cs | 1 - .../OrchardCore.Forms/GraphQL/Startup.cs | 1 - .../OrchardCore.GitHub/Startup.cs | 2 +- .../GoogleAuthenticationStartup.cs | 2 +- .../OrchardCore.Html/GraphQL/Startup.cs | 1 - .../OrchardCore.Https/Startup.cs | 2 +- .../OrchardCore.Indexing/Startup.cs | 2 +- .../OrchardCore.Layers/Startup.cs | 2 +- .../OrchardCore.Lists/GraphQL/Startup.cs | 2 -- .../OrchardCore.Lists/Startup.cs | 2 +- .../Views/ListPartNavigationAdmin.cshtml | 2 +- .../OrchardCore.Localization/Startup.cs | 2 +- .../OrchardCore.Markdown/GraphQL/Startup.cs | 1 - .../OrchardCore.Media/GraphQL/Startup.cs | 1 - .../OrchardCore.Menu/GraphQL/Startup.cs | 1 - .../AzureADStartup.cs | 2 +- .../MicrosoftAccountStartup.cs | 2 +- .../OrchardCore.Notifications/Startup.cs | 2 +- .../OrchardCore.OpenId/Startup.cs | 2 +- .../OrchardCore.Queries/Sql/Startup.cs | 2 +- .../OrchardCore.Queries/Startup.cs | 2 +- .../OrchardCore.ReCaptcha/Startup.cs | 2 +- .../OrchardCore.ReverseProxy/Startup.cs | 2 +- .../OrchardCore.Rules/Startup.cs | 2 +- .../OrchardCore.Search.AzureAI/Startup.cs | 2 +- .../OrchardCore.Search.Elasticsearch/Startup.cs | 2 +- .../OrchardCore.Search.Lucene/Startup.cs | 2 +- .../OrchardCore.Search/Startup.cs | 2 +- .../OrchardCore.Security/Startup.cs | 2 +- .../OrchardCore.Seo/GraphQL/Startup.cs | 1 - src/OrchardCore.Modules/OrchardCore.Seo/Startup.cs | 2 +- .../OrchardCore.Settings/Startup.cs | 2 +- .../OrchardCore.Shortcodes/Startup.cs | 2 +- .../OrchardCore.Sitemaps/Startup.cs | 2 +- .../OrchardCore.Sms.Azure/Startup.cs | 2 +- src/OrchardCore.Modules/OrchardCore.Sms/Startup.cs | 2 +- .../OrchardCore.Spatial/GraphQL/Startup.cs | 1 - .../OrchardCore.Taxonomies/Startup.cs | 3 +-- .../OrchardCore.Themes/Startup.cs | 2 +- .../OrchardCore.Twitter/Startup.cs | 2 +- .../OrchardCore.UrlRewriting/Startup.cs | 2 +- .../OrchardCore.Users/AuditTrail/Startup.cs | 2 +- .../OrchardCore.Users/Localization/Startup.cs | 2 +- .../OrchardCore.Users/Startup.cs | 2 +- .../OrchardCore.Users/TimeZone/Startup.cs | 2 +- .../TwoFactorAuthenticationStartup.cs | 2 +- .../OrchardCore.Workflows/Startup.cs | 2 +- .../Extensions/ServiceCollectionExtensions.cs | 2 +- src/OrchardCore.Themes/TheAdmin/Startup.cs | 2 +- src/OrchardCore.Themes/TheTheme/Startup.cs | 2 +- .../AdminMenuExtensions.cs | 1 + .../ObjectGraphTypeServiceCollectionExtensions.cs} | 5 ++--- .../ContentLocalizationOrchardHelperExtensions.cs | 3 ++- .../ContentDefinitionManagerExtensions.cs | 0 .../{ => Extensions}/ContentItemExtensions.cs | 0 .../{ => Extensions}/ContentManagerExtensions.cs | 0 .../{ => Extensions}/ContentQueryExtensions.cs | 0 .../ContentQueryOfTIndexExtensions.cs | 0 ...anagementDisplayServiceCollectionExtensions.cs} | 6 +++--- .../GraphQLServiceCollectionExtensions.cs} | 7 ++++--- ...ontentManagementServiceCollectionExtensions.cs} | 6 +++--- .../AuthorizationServiceExtensions.cs | 0 .../ContentsServiceCollectionExtensions.cs} | 5 ++--- .../{ => Extensions}/SiteServiceExtensions.cs | 0 .../ServiceCollectionExtensions.cs | 1 + .../DisplayDriverServiceCollectionExtensions.cs} | 6 +++--- .../OrchardCoreBuilderExtensions.cs | 0 ...perExtensions.cs => OrchardHelperExtensions.cs} | 14 ++++---------- .../{ => Extensions}/ShapeFactoryExtensions.cs | 0 ...apeTableProviderServiceCollectionExtensions.cs} | 2 +- ...cs => TagHelpersServiceCollectionExtensions.cs} | 2 +- .../Extensions/ServiceCollectionExtensions.cs | 1 + 93 files changed, 85 insertions(+), 109 deletions(-) rename src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/{ServiceCollectionExtensions.cs => Extensions/ObjectGraphTypeServiceCollectionExtensions.cs} (92%) rename src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/{ => Extensions}/ContentLocalizationOrchardHelperExtensions.cs (97%) rename src/OrchardCore/OrchardCore.ContentManagement.Abstractions/{ => Extensions}/ContentDefinitionManagerExtensions.cs (100%) rename src/OrchardCore/OrchardCore.ContentManagement.Abstractions/{ => Extensions}/ContentItemExtensions.cs (100%) rename src/OrchardCore/OrchardCore.ContentManagement.Abstractions/{ => Extensions}/ContentManagerExtensions.cs (100%) rename src/OrchardCore/OrchardCore.ContentManagement.Abstractions/{ => Extensions}/ContentQueryExtensions.cs (100%) rename src/OrchardCore/OrchardCore.ContentManagement.Abstractions/{ => Extensions}/ContentQueryOfTIndexExtensions.cs (100%) rename src/OrchardCore/OrchardCore.ContentManagement.Display/{ServiceCollectionExtensions.cs => Extensions/ContentManagementDisplayServiceCollectionExtensions.cs} (89%) rename src/OrchardCore/OrchardCore.ContentManagement.GraphQL/{ServiceCollectionExtensions.cs => Extensions/GraphQLServiceCollectionExtensions.cs} (93%) rename src/OrchardCore/OrchardCore.ContentManagement/{ServiceCollectionExtensions.cs => Extensions/ContentManagementServiceCollectionExtensions.cs} (92%) rename src/OrchardCore/OrchardCore.Contents.Core/{ => Extensions}/AuthorizationServiceExtensions.cs (100%) rename src/OrchardCore/OrchardCore.Contents.Core/{ServiceCollectionExtensions.cs => Extensions/ContentsServiceCollectionExtensions.cs} (71%) rename src/OrchardCore/OrchardCore.Contents.Core/{ => Extensions}/SiteServiceExtensions.cs (100%) rename src/OrchardCore/OrchardCore.DisplayManagement/{ServiceCollectionExtensions.cs => Extensions/DisplayDriverServiceCollectionExtensions.cs} (78%) rename src/OrchardCore/OrchardCore.DisplayManagement/{ => Extensions}/OrchardCoreBuilderExtensions.cs (100%) rename src/OrchardCore/OrchardCore.DisplayManagement/Extensions/{RazorHelperExtensions.cs => OrchardHelperExtensions.cs} (74%) rename src/OrchardCore/OrchardCore.DisplayManagement/{ => Extensions}/ShapeFactoryExtensions.cs (100%) rename src/OrchardCore/OrchardCore.DisplayManagement/Extensions/{ShapeTableProviderExtensions.cs => ShapeTableProviderServiceCollectionExtensions.cs} (93%) rename src/OrchardCore/OrchardCore.DisplayManagement/Extensions/{ServiceCollectionExtensions.cs => TagHelpersServiceCollectionExtensions.cs} (92%) diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs index d4d8f44ba38..b069427c2a9 100644 --- a/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs @@ -11,7 +11,7 @@ using OrchardCore.Admin.Drivers; using OrchardCore.Admin.Models; using OrchardCore.DisplayManagement; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.DisplayManagement.ModelBinding; using OrchardCore.DisplayManagement.Theming; using OrchardCore.Environment.Shell.Configuration; diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/Startup.cs index ac5587c2b82..6aacd729ccb 100644 --- a/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Alias/GraphQL/Startup.cs @@ -1,8 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using OrchardCore.Alias.Indexes; using OrchardCore.Alias.Models; -using OrchardCore.Apis; -using OrchardCore.ContentManagement.GraphQL; using OrchardCore.ContentManagement.GraphQL.Queries; using OrchardCore.Modules; diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs index 3ca6623e86c..0f39302ae57 100644 --- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs @@ -13,7 +13,7 @@ using OrchardCore.BackgroundTasks; using OrchardCore.Data; using OrchardCore.Data.Migration; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Navigation; using OrchardCore.Security.Permissions; diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/Startup.cs index dda9c0a6e70..f39b267977a 100644 --- a/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/GraphQL/Startup.cs @@ -1,8 +1,6 @@ using Microsoft.Extensions.DependencyInjection; -using OrchardCore.Apis; using OrchardCore.Autoroute.Core.Indexes; using OrchardCore.Autoroute.Models; -using OrchardCore.ContentManagement.GraphQL; using OrchardCore.ContentManagement.GraphQL.Queries; using OrchardCore.Modules; diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Startup.cs index 4cbb31e4766..71636c75af4 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Startup.cs @@ -1,9 +1,7 @@ using Microsoft.Extensions.DependencyInjection; -using OrchardCore.Apis; using OrchardCore.ContentFields.Fields; using OrchardCore.ContentFields.GraphQL.Fields; using OrchardCore.ContentFields.GraphQL.Types; -using OrchardCore.ContentManagement.GraphQL; using OrchardCore.ContentManagement.GraphQL.Queries.Types; using OrchardCore.Modules; diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/Startup.cs index 35dd01bf283..8fad2348e67 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/GraphQL/Startup.cs @@ -1,8 +1,6 @@ using Microsoft.Extensions.DependencyInjection; -using OrchardCore.Apis; using OrchardCore.ContentLocalization.Models; using OrchardCore.ContentLocalization.Records; -using OrchardCore.ContentManagement.GraphQL; using OrchardCore.ContentManagement.GraphQL.Queries; using OrchardCore.Modules; diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Startup.cs index 84f6a7b5bdd..201e627f669 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Startup.cs @@ -14,7 +14,7 @@ using OrchardCore.ContentLocalization.ViewModels; using OrchardCore.Contents.Services; using OrchardCore.Contents.ViewModels; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Environment.Shell.Configuration; using OrchardCore.Indexing; using OrchardCore.Liquid; diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Startup.cs index 80a93e803d7..cf01796a3f1 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Startup.cs @@ -12,7 +12,7 @@ using OrchardCore.Contents.AuditTrail.Services; using OrchardCore.ContentTypes.Editors; using OrchardCore.Data.Migration; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; namespace OrchardCore.Contents.AuditTrail; diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanStartup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanStartup.cs index b04076855db..90945ebca50 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanStartup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/AddToDeploymentPlan/AddToDeploymentPlanStartup.cs @@ -2,7 +2,7 @@ using OrchardCore.ContentManagement.Display.ContentDisplay; using OrchardCore.Contents.ViewModels; using OrchardCore.Deployment; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; namespace OrchardCore.Contents.Deployment.AddToDeploymentPlan; diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetStartup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetStartup.cs index 23cd1d5fd2a..78f9b9d5234 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetStartup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetStartup.cs @@ -3,7 +3,7 @@ using OrchardCore.Contents.ViewModels; using OrchardCore.Data.Migration; using OrchardCore.Deployment; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Navigation; using OrchardCore.Settings.Deployment; diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/GraphQL/Startup.cs index f34c7b904b0..b02c5a6a034 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/GraphQL/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Contents/GraphQL/Startup.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.DependencyInjection; -using OrchardCore.ContentManagement.GraphQL; using OrchardCore.Modules; namespace OrchardCore.Contents.GraphQL; diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs index a37bbf1aacc..d253b31ce4c 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs @@ -6,7 +6,6 @@ using Microsoft.Extensions.DependencyInjection; using OrchardCore.AdminMenu; using OrchardCore.ContentManagement; -using OrchardCore.ContentManagement.Display; using OrchardCore.ContentManagement.Display.ContentDisplay; using OrchardCore.ContentManagement.Handlers; using OrchardCore.ContentManagement.Metadata.Models; @@ -34,7 +33,7 @@ using OrchardCore.Data.Migration; using OrchardCore.Deployment; using OrchardCore.DisplayManagement; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.DisplayManagement.Liquid; using OrchardCore.DisplayManagement.Liquid.Tags; using OrchardCore.DisplayManagement.Views; diff --git a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Startup.cs b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Startup.cs index 3d534193221..847dabcbe22 100644 --- a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Startup.cs @@ -7,7 +7,7 @@ using OrchardCore.CustomSettings.Recipes; using OrchardCore.CustomSettings.Services; using OrchardCore.Deployment; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Navigation; using OrchardCore.Recipes; diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Demo/Startup.cs index 94a40f581f1..69f1492dd46 100644 --- a/src/OrchardCore.Modules/OrchardCore.Demo/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Demo/Startup.cs @@ -19,7 +19,7 @@ using OrchardCore.Demo.TagHelpers; using OrchardCore.DisplayManagement; using OrchardCore.DisplayManagement.Descriptors; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Environment.Commands; using OrchardCore.Modules; using OrchardCore.Mvc.Core.Utilities; diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Startup.cs index 7911c0cb69c..30c915b1034 100644 --- a/src/OrchardCore.Modules/OrchardCore.Deployment/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Startup.cs @@ -8,7 +8,7 @@ using OrchardCore.Deployment.Indexes; using OrchardCore.Deployment.Recipes; using OrchardCore.Deployment.Steps; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Navigation; using OrchardCore.Recipes; diff --git a/src/OrchardCore.Modules/OrchardCore.Email.Azure/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Email.Azure/Startup.cs index 4ecf3dca2fb..3e36c99f5ca 100644 --- a/src/OrchardCore.Modules/OrchardCore.Email.Azure/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Email.Azure/Startup.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using OrchardCore.Azure.Email.Drivers; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Email.Azure.Models; using OrchardCore.Email.Azure.Services; using OrchardCore.Email.Core; diff --git a/src/OrchardCore.Modules/OrchardCore.Email.Smtp/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Email.Smtp/Startup.cs index b57b9f3dd24..98fd1a3b9c8 100644 --- a/src/OrchardCore.Modules/OrchardCore.Email.Smtp/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Email.Smtp/Startup.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Email.Smtp.Drivers; using OrchardCore.Email.Smtp.Extensions; using OrchardCore.Email.Smtp.Services; diff --git a/src/OrchardCore.Modules/OrchardCore.Email/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Email/Startup.cs index 2eca8683011..1175c122be6 100644 --- a/src/OrchardCore.Modules/OrchardCore.Email/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Email/Startup.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using OrchardCore.Data.Migration; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Email.Core; using OrchardCore.Email.Drivers; using OrchardCore.Email.Migrations; diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Startup.cs index 9adc4d234c5..78ed1eff52c 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Startup.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Facebook.Drivers; using OrchardCore.Facebook.Endpoints; using OrchardCore.Facebook.Filters; diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/StartupLogin.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/StartupLogin.cs index 16a6c24c926..a2bc1a6be29 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/StartupLogin.cs +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/StartupLogin.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using OrchardCore.Deployment; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Facebook.Deployment; using OrchardCore.Facebook.Login.Configuration; using OrchardCore.Facebook.Login.Drivers; diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/StartupPixel.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/StartupPixel.cs index 694c64b80e7..60ffb74ca1d 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/StartupPixel.cs +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/StartupPixel.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Facebook.Drivers; using OrchardCore.Facebook.Filters; using OrchardCore.Modules; diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/Startup.cs index 2a206710b73..b6197cc3e53 100644 --- a/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Flows/GraphQL/Startup.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.DependencyInjection; -using OrchardCore.Apis; using OrchardCore.ContentManagement.GraphQL.Queries.Types; using OrchardCore.Flows.Models; using OrchardCore.Modules; diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/Startup.cs index 0d89f436dfe..222147b2e6e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Forms/GraphQL/Startup.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.DependencyInjection; -using OrchardCore.Apis; using OrchardCore.Forms.Models; using OrchardCore.Modules; diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/Startup.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/Startup.cs index cf7f715bba2..29ac3da6bba 100644 --- a/src/OrchardCore.Modules/OrchardCore.GitHub/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.GitHub/Startup.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.GitHub.Configuration; using OrchardCore.GitHub.Drivers; using OrchardCore.GitHub.Recipes; diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationStartup.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationStartup.cs index 13b6c07e580..5e9744071b3 100644 --- a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationStartup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationStartup.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Google.Analytics; using OrchardCore.Google.Analytics.Drivers; using OrchardCore.Google.Analytics.Services; diff --git a/src/OrchardCore.Modules/OrchardCore.Html/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Html/GraphQL/Startup.cs index c68de475b43..c71e3461bc9 100644 --- a/src/OrchardCore.Modules/OrchardCore.Html/GraphQL/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Html/GraphQL/Startup.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.DependencyInjection; -using OrchardCore.Apis; using OrchardCore.Html.Models; using OrchardCore.Modules; diff --git a/src/OrchardCore.Modules/OrchardCore.Https/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Https/Startup.cs index b7894083b28..81b2d1d42b7 100644 --- a/src/OrchardCore.Modules/OrchardCore.Https/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Https/Startup.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.HttpsPolicy; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Https.Drivers; using OrchardCore.Https.Services; using OrchardCore.Https.Settings; diff --git a/src/OrchardCore.Modules/OrchardCore.Indexing/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Indexing/Startup.cs index a831ad4de54..b93a9dbd1fc 100644 --- a/src/OrchardCore.Modules/OrchardCore.Indexing/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Indexing/Startup.cs @@ -5,7 +5,7 @@ using OrchardCore.Data; using OrchardCore.Data.Migration; using OrchardCore.Deployment; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Indexing.Core; using OrchardCore.Indexing.Core.Deployments; using OrchardCore.Indexing.Core.Handlers; diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Startup.cs index ad7b82b30fa..74f3f535ac4 100644 --- a/src/OrchardCore.Modules/OrchardCore.Layers/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Layers/Startup.cs @@ -7,7 +7,7 @@ using OrchardCore.Data; using OrchardCore.Data.Migration; using OrchardCore.Deployment; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Layers.Deployment; using OrchardCore.Layers.Drivers; using OrchardCore.Layers.Handlers; diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/Startup.cs index 747a613a80f..5daedbe1a29 100644 --- a/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/Startup.cs @@ -1,6 +1,4 @@ using Microsoft.Extensions.DependencyInjection; -using OrchardCore.Apis; -using OrchardCore.ContentManagement.GraphQL; using OrchardCore.ContentManagement.GraphQL.Queries; using OrchardCore.ContentManagement.GraphQL.Queries.Types; using OrchardCore.Lists.Indexes; diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Startup.cs index fe1e927860b..c43181b0dd2 100644 --- a/src/OrchardCore.Modules/OrchardCore.Lists/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Lists/Startup.cs @@ -13,7 +13,7 @@ using OrchardCore.ContentTypes.Editors; using OrchardCore.Data; using OrchardCore.Data.Migration; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Feeds; using OrchardCore.Indexing; using OrchardCore.Liquid; diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPartNavigationAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPartNavigationAdmin.cshtml index 104625769b6..89c206bb717 100644 --- a/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPartNavigationAdmin.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPartNavigationAdmin.cshtml @@ -1,8 +1,8 @@ +@using System.Security.Claims @using Microsoft.AspNetCore.Authorization @using OrchardCore.ContentManagement @using OrchardCore.Contents @using OrchardCore.Localization.Data -@using System.Security.Claims @model OrchardCore.Lists.ViewModels.ListPartNavigationAdminViewModel @inject IContentManager ContentManager @inject IAuthorizationService AuthorizationService diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Localization/Startup.cs index f9d2ea3639a..cfec88f28b7 100644 --- a/src/OrchardCore.Modules/OrchardCore.Localization/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Localization/Startup.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; using OrchardCore.Admin.Models; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Localization.Drivers; using OrchardCore.Localization.Models; using OrchardCore.Localization.Services; diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/GraphQL/Startup.cs index aaba84546b6..d91c5c23bc6 100644 --- a/src/OrchardCore.Modules/OrchardCore.Markdown/GraphQL/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Markdown/GraphQL/Startup.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.DependencyInjection; -using OrchardCore.Apis; using OrchardCore.Markdown.Fields; using OrchardCore.Markdown.Models; using OrchardCore.Modules; diff --git a/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/Startup.cs index 7519e3f41fa..1523b4d2840 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media/GraphQL/Startup.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.DependencyInjection; -using OrchardCore.Apis; using OrchardCore.Apis.GraphQL; using OrchardCore.Media.Fields; using OrchardCore.Modules; diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/Startup.cs index 9c4efb9e181..63c98082d86 100644 --- a/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Menu/GraphQL/Startup.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.DependencyInjection; -using OrchardCore.Apis; using OrchardCore.ContentManagement.GraphQL.Queries.Types; using OrchardCore.Menu.Models; using OrchardCore.Modules; diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AzureADStartup.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AzureADStartup.cs index a7f963ad9b9..9562d87989e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AzureADStartup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AzureADStartup.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Options; using Microsoft.Identity.Web; using OrchardCore.Deployment; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Microsoft.Authentication.Configuration; using OrchardCore.Microsoft.Authentication.Deployment; using OrchardCore.Microsoft.Authentication.Drivers; diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/MicrosoftAccountStartup.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/MicrosoftAccountStartup.cs index 9270d9ca2b9..7ac1837d257 100644 --- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/MicrosoftAccountStartup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/MicrosoftAccountStartup.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using OrchardCore.Deployment; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Microsoft.Authentication.Configuration; using OrchardCore.Microsoft.Authentication.Deployment; using OrchardCore.Microsoft.Authentication.Drivers; diff --git a/src/OrchardCore.Modules/OrchardCore.Notifications/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Notifications/Startup.cs index f373cb57173..508d1bceb2b 100644 --- a/src/OrchardCore.Modules/OrchardCore.Notifications/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Notifications/Startup.cs @@ -4,7 +4,7 @@ using OrchardCore.Admin.Models; using OrchardCore.Data; using OrchardCore.Data.Migration; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Environment.Shell.Configuration; using OrchardCore.Modules; using OrchardCore.Navigation.Core; diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs index 2e2b7e4b7ea..a03eb6e29a2 100644 --- a/src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs @@ -16,7 +16,7 @@ using OrchardCore.BackgroundTasks; using OrchardCore.Data.Migration; using OrchardCore.Deployment; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Environment.Shell.Builders; using OrchardCore.Modules; using OrchardCore.Navigation; diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/Startup.cs index ab322c936fd..3f852fb5b21 100644 --- a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/Startup.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using OrchardCore.Data.Migration; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Navigation; using OrchardCore.Queries.Core; diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Startup.cs index b65a93cd5ec..5e9b9e16b14 100644 --- a/src/OrchardCore.Modules/OrchardCore.Queries/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Queries/Startup.cs @@ -2,7 +2,7 @@ using Fluid.Values; using Microsoft.Extensions.DependencyInjection; using OrchardCore.Deployment; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Liquid; using OrchardCore.Modules; using OrchardCore.Navigation; diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Startup.cs index be04f91880a..65715bf68dd 100644 --- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Startup.cs @@ -1,5 +1,5 @@ using Microsoft.Extensions.DependencyInjection; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Navigation; using OrchardCore.ReCaptcha.Configuration; diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Startup.cs index bbf4da8dceb..6aa82ebd81f 100644 --- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Startup.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Navigation; using OrchardCore.ReverseProxy.Configuration; diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Startup.cs index bfc3767db3f..bc641502a6c 100644 --- a/src/OrchardCore.Modules/OrchardCore.Rules/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Rules/Startup.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using OrchardCore.ContentManagement.Display.ContentDisplay; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Rules.Drivers; using OrchardCore.Rules.Models; diff --git a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Startup.cs index c9a972fddc4..cfc7f6234da 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Startup.cs @@ -3,7 +3,7 @@ using OrchardCore.ContentTypes.Editors; using OrchardCore.Data.Migration; using OrchardCore.Deployment; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Indexing.Core; using OrchardCore.Indexing.Models; using OrchardCore.Modules; diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Startup.cs index 24d346d203f..03b77c3964e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Startup.cs @@ -6,7 +6,7 @@ using OrchardCore.Data.Migration; using OrchardCore.Deployment; using OrchardCore.DisplayManagement.Descriptors; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Environment.Shell.Configuration; using OrchardCore.Indexing.Core; using OrchardCore.Indexing.Models; diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Startup.cs index 058ec7d4d97..3a63cd5ffdf 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Startup.cs @@ -7,7 +7,7 @@ using OrchardCore.Data.Migration; using OrchardCore.Deployment; using OrchardCore.DisplayManagement.Descriptors; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Indexing.Core; using OrchardCore.Indexing.Models; using OrchardCore.Lucene.Core; diff --git a/src/OrchardCore.Modules/OrchardCore.Search/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Search/Startup.cs index f2cf8961947..dde25ec2fa9 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Search/Startup.cs @@ -4,7 +4,7 @@ using OrchardCore.ContentManagement.Display.ContentDisplay; using OrchardCore.Data.Migration; using OrchardCore.Deployment; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Navigation; using OrchardCore.Search.Deployment; diff --git a/src/OrchardCore.Modules/OrchardCore.Security/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Security/Startup.cs index 753cbabe759..614d42a6fee 100644 --- a/src/OrchardCore.Modules/OrchardCore.Security/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Security/Startup.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Navigation; using OrchardCore.Security.Drivers; diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Seo/GraphQL/Startup.cs index 703137750b0..e04e26a8fcf 100644 --- a/src/OrchardCore.Modules/OrchardCore.Seo/GraphQL/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Seo/GraphQL/Startup.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.DependencyInjection; -using OrchardCore.Apis; using OrchardCore.Modules; using OrchardCore.ResourceManagement; using OrchardCore.Seo.Models; diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Seo/Startup.cs index f501c4bb52f..ebc06c130fc 100644 --- a/src/OrchardCore.Modules/OrchardCore.Seo/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Seo/Startup.cs @@ -6,7 +6,7 @@ using OrchardCore.ContentManagement.Handlers; using OrchardCore.ContentTypes.Editors; using OrchardCore.Data.Migration; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Indexing; using OrchardCore.Modules; using OrchardCore.Navigation; diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Startup.cs index 7fe7d80916f..c3de8bf19f4 100644 --- a/src/OrchardCore.Modules/OrchardCore.Settings/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Settings/Startup.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using OrchardCore.Deployment; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Liquid; using OrchardCore.Modules; using OrchardCore.Navigation; diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Startup.cs index 57523d85251..29af2d186b2 100644 --- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Startup.cs @@ -2,7 +2,7 @@ using Fluid.Values; using Microsoft.Extensions.DependencyInjection; using OrchardCore.Deployment; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Navigation; using OrchardCore.Recipes; diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Startup.cs index 472b98bac4e..12126a044f5 100644 --- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Startup.cs @@ -7,7 +7,7 @@ using OrchardCore.ContentManagement.Display.ContentDisplay; using OrchardCore.Data.Migration; using OrchardCore.Deployment; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Navigation; using OrchardCore.Recipes; diff --git a/src/OrchardCore.Modules/OrchardCore.Sms.Azure/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Sms.Azure/Startup.cs index 8b899739ac3..1ee67ac8fd6 100644 --- a/src/OrchardCore.Modules/OrchardCore.Sms.Azure/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Sms.Azure/Startup.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Environment.Shell.Configuration; using OrchardCore.Modules; using OrchardCore.Sms.Azure.Drivers; diff --git a/src/OrchardCore.Modules/OrchardCore.Sms/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Sms/Startup.cs index 392e15841c1..dbe2f8d385b 100644 --- a/src/OrchardCore.Modules/OrchardCore.Sms/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Sms/Startup.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Navigation; using OrchardCore.Notifications; diff --git a/src/OrchardCore.Modules/OrchardCore.Spatial/GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Spatial/GraphQL/Startup.cs index 8fc5d5e1ebf..22f80a28b33 100644 --- a/src/OrchardCore.Modules/OrchardCore.Spatial/GraphQL/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Spatial/GraphQL/Startup.cs @@ -1,4 +1,3 @@ -using OrchardCore.Apis; using Microsoft.Extensions.DependencyInjection; using OrchardCore.ContentManagement.GraphQL.Queries.Types; using OrchardCore.Modules; diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Startup.cs index 012b230a9b4..abcfd861297 100644 --- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Startup.cs @@ -1,6 +1,5 @@ using Fluid; using Microsoft.Extensions.DependencyInjection; -using OrchardCore.Apis; using OrchardCore.ContentManagement; using OrchardCore.ContentManagement.Display.ContentDisplay; using OrchardCore.ContentManagement.Handlers; @@ -10,7 +9,7 @@ using OrchardCore.Data; using OrchardCore.Data.Migration; using OrchardCore.DisplayManagement; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Indexing; using OrchardCore.Liquid; using OrchardCore.Modules; diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Themes/Startup.cs index 8e1356b774b..13dc699f939 100644 --- a/src/OrchardCore.Modules/OrchardCore.Themes/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Themes/Startup.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using OrchardCore.Deployment; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.DisplayManagement.Theming; using OrchardCore.Modules; using OrchardCore.Navigation; diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs index a1a87996138..2e308c761f9 100644 --- a/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Http.Resilience; using Microsoft.Extensions.Options; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Navigation; using OrchardCore.Recipes; diff --git a/src/OrchardCore.Modules/OrchardCore.UrlRewriting/Startup.cs b/src/OrchardCore.Modules/OrchardCore.UrlRewriting/Startup.cs index c7dcb54c115..2b36991396e 100644 --- a/src/OrchardCore.Modules/OrchardCore.UrlRewriting/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.UrlRewriting/Startup.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Navigation; using OrchardCore.Recipes; diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Startup.cs index f093f23850d..4b69847d13b 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/AuditTrail/Startup.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.Options; using OrchardCore.AuditTrail.Models; using OrchardCore.AuditTrail.Services.Models; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Users.AuditTrail.Drivers; using OrchardCore.Users.AuditTrail.Handlers; diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Localization/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Users/Localization/Startup.cs index 66218f143d7..9a00991e24f 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/Localization/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/Localization/Startup.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Users.Localization.Drivers; using OrchardCore.Users.Localization.Providers; diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Users/Startup.cs index b8e79e94053..ec28dd9a248 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/Startup.cs @@ -18,7 +18,7 @@ using OrchardCore.Data.Migration; using OrchardCore.Deployment; using OrchardCore.DisplayManagement; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.DisplayManagement.Theming; using OrchardCore.Environment.Commands; using OrchardCore.Environment.Shell; diff --git a/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Startup.cs index 983456a04d4..0533d904b84 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/TimeZone/Startup.cs @@ -1,5 +1,5 @@ using Microsoft.Extensions.DependencyInjection; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Users.Handlers; using OrchardCore.Users.Models; diff --git a/src/OrchardCore.Modules/OrchardCore.Users/TwoFactorAuthenticationStartup.cs b/src/OrchardCore.Modules/OrchardCore.Users/TwoFactorAuthenticationStartup.cs index c30b119c4af..809b9672c2b 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/TwoFactorAuthenticationStartup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/TwoFactorAuthenticationStartup.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using OrchardCore.Mvc.Core.Utilities; using OrchardCore.Security.Permissions; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Startup.cs index d8adda2071c..eb4f1655f1e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Startup.cs @@ -3,7 +3,7 @@ using OrchardCore.Data; using OrchardCore.Data.Migration; using OrchardCore.Deployment; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Environment.Shell.Configuration; using OrchardCore.Liquid; using OrchardCore.Modules; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/Extensions/ServiceCollectionExtensions.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/Extensions/ServiceCollectionExtensions.cs index 1138795dcb1..98c1dc64d5e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/Extensions/ServiceCollectionExtensions.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/Extensions/ServiceCollectionExtensions.cs @@ -1,5 +1,5 @@ using OrchardCore.BackgroundTasks; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Environment.Shell.Configuration; using OrchardCore.Navigation; using OrchardCore.Workflows.Trimming; diff --git a/src/OrchardCore.Themes/TheAdmin/Startup.cs b/src/OrchardCore.Themes/TheAdmin/Startup.cs index ef496f3b4f5..23785fe1bec 100644 --- a/src/OrchardCore.Themes/TheAdmin/Startup.cs +++ b/src/OrchardCore.Themes/TheAdmin/Startup.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using OrchardCore.Admin.Models; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.DisplayManagement.Html; using OrchardCore.Environment.Shell.Configuration; using OrchardCore.Modules; diff --git a/src/OrchardCore.Themes/TheTheme/Startup.cs b/src/OrchardCore.Themes/TheTheme/Startup.cs index fa791be1c63..fb1e6b7b300 100644 --- a/src/OrchardCore.Themes/TheTheme/Startup.cs +++ b/src/OrchardCore.Themes/TheTheme/Startup.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using OrchardCore.Admin.Models; -using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.Modules; using TheTheme.Drivers; diff --git a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/AdminMenuExtensions.cs b/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/AdminMenuExtensions.cs index 4098f2492e8..44b52f6201b 100644 --- a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/AdminMenuExtensions.cs +++ b/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/AdminMenuExtensions.cs @@ -2,6 +2,7 @@ using Microsoft.Extensions.DependencyInjection; using OrchardCore.AdminMenu.Models; using OrchardCore.AdminMenu.Services; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.DisplayManagement.Handlers; using OrchardCore.Navigation; diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Extensions/ObjectGraphTypeServiceCollectionExtensions.cs similarity index 92% rename from src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/ServiceCollectionExtensions.cs rename to src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Extensions/ObjectGraphTypeServiceCollectionExtensions.cs index 3c13ea5e2c4..c476056a256 100644 --- a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/ServiceCollectionExtensions.cs +++ b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Extensions/ObjectGraphTypeServiceCollectionExtensions.cs @@ -1,10 +1,9 @@ using GraphQL.Types; -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -namespace OrchardCore.Apis; +namespace Microsoft.Extensions.DependencyInjection; -public static class ServiceCollectionExtensions +public static class ObjectGraphTypeServiceCollectionExtensions { /// /// Registers a type describing input arguments. diff --git a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/ContentLocalizationOrchardHelperExtensions.cs b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Extensions/ContentLocalizationOrchardHelperExtensions.cs similarity index 97% rename from src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/ContentLocalizationOrchardHelperExtensions.cs rename to src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Extensions/ContentLocalizationOrchardHelperExtensions.cs index eaebd7cad28..f25e1c69c12 100644 --- a/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/ContentLocalizationOrchardHelperExtensions.cs +++ b/src/OrchardCore/OrchardCore.ContentLocalization.Abstractions/Extensions/ContentLocalizationOrchardHelperExtensions.cs @@ -1,9 +1,10 @@ using System.Globalization; using Microsoft.Extensions.DependencyInjection; -using OrchardCore; using OrchardCore.ContentLocalization; using OrchardCore.ContentManagement; +namespace OrchardCore; + /// /// Provides an extension methods for . /// diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentDefinitionManagerExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Extensions/ContentDefinitionManagerExtensions.cs similarity index 100% rename from src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentDefinitionManagerExtensions.cs rename to src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Extensions/ContentDefinitionManagerExtensions.cs diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Extensions/ContentItemExtensions.cs similarity index 100% rename from src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemExtensions.cs rename to src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Extensions/ContentItemExtensions.cs diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentManagerExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Extensions/ContentManagerExtensions.cs similarity index 100% rename from src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentManagerExtensions.cs rename to src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Extensions/ContentManagerExtensions.cs diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentQueryExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Extensions/ContentQueryExtensions.cs similarity index 100% rename from src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentQueryExtensions.cs rename to src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Extensions/ContentQueryExtensions.cs diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentQueryOfTIndexExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Extensions/ContentQueryOfTIndexExtensions.cs similarity index 100% rename from src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentQueryOfTIndexExtensions.cs rename to src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Extensions/ContentQueryOfTIndexExtensions.cs diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/Extensions/ContentManagementDisplayServiceCollectionExtensions.cs similarity index 89% rename from src/OrchardCore/OrchardCore.ContentManagement.Display/ServiceCollectionExtensions.cs rename to src/OrchardCore/OrchardCore.ContentManagement.Display/Extensions/ContentManagementDisplayServiceCollectionExtensions.cs index 1b9231fbd97..b76b915c846 100644 --- a/src/OrchardCore/OrchardCore.ContentManagement.Display/ServiceCollectionExtensions.cs +++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/Extensions/ContentManagementDisplayServiceCollectionExtensions.cs @@ -1,6 +1,6 @@ using Fluid; -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; +using OrchardCore.ContentManagement.Display; using OrchardCore.ContentManagement.Display.ContentDisplay; using OrchardCore.ContentManagement.Display.Liquid; using OrchardCore.ContentManagement.Display.Placement; @@ -8,9 +8,9 @@ using OrchardCore.DisplayManagement.Descriptors.ShapePlacementStrategy; using OrchardCore.Liquid; -namespace OrchardCore.ContentManagement.Display; +namespace Microsoft.Extensions.DependencyInjection; -public static class ServiceCollectionExtensions +public static class ContentManagementDisplayServiceCollectionExtensions { public static IServiceCollection AddContentManagementDisplay(this IServiceCollection services) { diff --git a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Extensions/GraphQLServiceCollectionExtensions.cs similarity index 93% rename from src/OrchardCore/OrchardCore.ContentManagement.GraphQL/ServiceCollectionExtensions.cs rename to src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Extensions/GraphQLServiceCollectionExtensions.cs index 4fc240b6da7..34bc0947cce 100644 --- a/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/ServiceCollectionExtensions.cs +++ b/src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Extensions/GraphQLServiceCollectionExtensions.cs @@ -1,5 +1,6 @@ -using Microsoft.Extensions.DependencyInjection; using OrchardCore.Apis.GraphQL; +using OrchardCore.ContentManagement; +using OrchardCore.ContentManagement.GraphQL; using OrchardCore.ContentManagement.GraphQL.Options; using OrchardCore.ContentManagement.GraphQL.Queries; using OrchardCore.ContentManagement.GraphQL.Queries.Types; @@ -8,9 +9,9 @@ using OrchardCore.Security.Permissions; using YesSql.Indexes; -namespace OrchardCore.ContentManagement.GraphQL; +namespace Microsoft.Extensions.DependencyInjection; -public static class ServiceCollectionExtensions +public static class GraphQLServiceCollectionExtensions { public static IServiceCollection AddContentGraphQL(this IServiceCollection services) { diff --git a/src/OrchardCore/OrchardCore.ContentManagement/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement/Extensions/ContentManagementServiceCollectionExtensions.cs similarity index 92% rename from src/OrchardCore/OrchardCore.ContentManagement/ServiceCollectionExtensions.cs rename to src/OrchardCore/OrchardCore.ContentManagement/Extensions/ContentManagementServiceCollectionExtensions.cs index 2fe98175db5..eb6a89c2a8c 100644 --- a/src/OrchardCore/OrchardCore.ContentManagement/ServiceCollectionExtensions.cs +++ b/src/OrchardCore/OrchardCore.ContentManagement/Extensions/ContentManagementServiceCollectionExtensions.cs @@ -1,5 +1,5 @@ -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; +using OrchardCore.ContentManagement; using OrchardCore.ContentManagement.Cache; using OrchardCore.ContentManagement.Handlers; using OrchardCore.ContentManagement.Metadata; @@ -8,9 +8,9 @@ using OrchardCore.Data.Migration; using OrchardCore.Environment.Cache; -namespace OrchardCore.ContentManagement; +namespace Microsoft.Extensions.DependencyInjection; -public static class ServiceCollectionExtensions +public static class ContentManagementServiceCollectionExtensions { public static IServiceCollection AddContentManagement(this IServiceCollection services) { diff --git a/src/OrchardCore/OrchardCore.Contents.Core/AuthorizationServiceExtensions.cs b/src/OrchardCore/OrchardCore.Contents.Core/Extensions/AuthorizationServiceExtensions.cs similarity index 100% rename from src/OrchardCore/OrchardCore.Contents.Core/AuthorizationServiceExtensions.cs rename to src/OrchardCore/OrchardCore.Contents.Core/Extensions/AuthorizationServiceExtensions.cs diff --git a/src/OrchardCore/OrchardCore.Contents.Core/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Contents.Core/Extensions/ContentsServiceCollectionExtensions.cs similarity index 71% rename from src/OrchardCore/OrchardCore.Contents.Core/ServiceCollectionExtensions.cs rename to src/OrchardCore/OrchardCore.Contents.Core/Extensions/ContentsServiceCollectionExtensions.cs index f2a0305bab5..7dfed29b8a5 100644 --- a/src/OrchardCore/OrchardCore.Contents.Core/ServiceCollectionExtensions.cs +++ b/src/OrchardCore/OrchardCore.Contents.Core/Extensions/ContentsServiceCollectionExtensions.cs @@ -1,11 +1,10 @@ using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using OrchardCore.Contents.Core.Services; -namespace OrchardCore.Contents.Core; +namespace Microsoft.Extensions.DependencyInjection; -public static class ServiceCollectionExtensions +public static class ContentsServiceCollectionExtensions { public static IServiceCollection AddContentServices(this IServiceCollection services) { diff --git a/src/OrchardCore/OrchardCore.Contents.Core/SiteServiceExtensions.cs b/src/OrchardCore/OrchardCore.Contents.Core/Extensions/SiteServiceExtensions.cs similarity index 100% rename from src/OrchardCore/OrchardCore.Contents.Core/SiteServiceExtensions.cs rename to src/OrchardCore/OrchardCore.Contents.Core/Extensions/SiteServiceExtensions.cs diff --git a/src/OrchardCore/OrchardCore.Deployment.Abstractions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Deployment.Abstractions/ServiceCollectionExtensions.cs index 4d1efaf1af3..449130a64da 100644 --- a/src/OrchardCore/OrchardCore.Deployment.Abstractions/ServiceCollectionExtensions.cs +++ b/src/OrchardCore/OrchardCore.Deployment.Abstractions/ServiceCollectionExtensions.cs @@ -1,6 +1,7 @@ using System.Text.Json.Serialization; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.DisplayManagement.Handlers; namespace OrchardCore.Deployment; diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/DisplayDriverServiceCollectionExtensions.cs similarity index 78% rename from src/OrchardCore/OrchardCore.DisplayManagement/ServiceCollectionExtensions.cs rename to src/OrchardCore/OrchardCore.DisplayManagement/Extensions/DisplayDriverServiceCollectionExtensions.cs index 5d869e52043..92aa34fdccf 100644 --- a/src/OrchardCore/OrchardCore.DisplayManagement/ServiceCollectionExtensions.cs +++ b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/DisplayDriverServiceCollectionExtensions.cs @@ -1,10 +1,10 @@ -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; +using OrchardCore.DisplayManagement.Handlers; using OrchardCore.Settings; -namespace OrchardCore.DisplayManagement.Handlers; +namespace Microsoft.Extensions.DependencyInjection; -public static class ServiceCollectionExtensions +public static class DisplayDriverServiceCollectionExtensions { public static IServiceCollection AddSiteDisplayDriver(this IServiceCollection services) where TDriver : class, IDisplayDriver diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/OrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/OrchardCoreBuilderExtensions.cs similarity index 100% rename from src/OrchardCore/OrchardCore.DisplayManagement/OrchardCoreBuilderExtensions.cs rename to src/OrchardCore/OrchardCore.DisplayManagement/Extensions/OrchardCoreBuilderExtensions.cs diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/RazorHelperExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/OrchardHelperExtensions.cs similarity index 74% rename from src/OrchardCore/OrchardCore.DisplayManagement/Extensions/RazorHelperExtensions.cs rename to src/OrchardCore/OrchardCore.DisplayManagement/Extensions/OrchardHelperExtensions.cs index 2d856055e21..8630aca7d1c 100644 --- a/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/RazorHelperExtensions.cs +++ b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/OrchardHelperExtensions.cs @@ -3,31 +3,25 @@ using OrchardCore.Localization; #pragma warning disable CA1050 // Declare types in namespaces -public static class RazorHelperExtensions +public static class OrchardHelperExtensions { /// /// Returns the text writing directionality or the current request. /// /// "rtl" if the current culture is Left To Right, "ltr" otherwise. public static string CultureDir(this IOrchardHelper _) - { - return CultureInfo.CurrentUICulture.GetLanguageDirection(); - } + => CultureInfo.CurrentUICulture.GetLanguageDirection(); /// /// Gets whether the culture is RTL or not. /// public static bool IsRightToLeft(this IOrchardHelper _) - { - return CultureInfo.CurrentUICulture.IsRightToLeft(); - } + => CultureInfo.CurrentUICulture.IsRightToLeft(); /// /// Returns the current culture name. /// public static string CultureName(this IOrchardHelper _) - { - return CultureInfo.CurrentUICulture.Name; - } + => CultureInfo.CurrentUICulture.Name; } #pragma warning restore CA1050 // Declare types in namespaces diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/ShapeFactoryExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ShapeFactoryExtensions.cs similarity index 100% rename from src/OrchardCore/OrchardCore.DisplayManagement/ShapeFactoryExtensions.cs rename to src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ShapeFactoryExtensions.cs diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ShapeTableProviderExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ShapeTableProviderServiceCollectionExtensions.cs similarity index 93% rename from src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ShapeTableProviderExtensions.cs rename to src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ShapeTableProviderServiceCollectionExtensions.cs index e0eb7b62250..af72666201b 100644 --- a/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ShapeTableProviderExtensions.cs +++ b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ShapeTableProviderServiceCollectionExtensions.cs @@ -7,7 +7,7 @@ namespace OrchardCore.DisplayManagement; /// /// Provides an extension methods for . /// -public static class ShapeTableProviderExtensions +public static class ShapeTableProviderServiceCollectionExtensions { /// /// Registers required services for the specified . diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/TagHelpersServiceCollectionExtensions.cs similarity index 92% rename from src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ServiceCollectionExtensions.cs rename to src/OrchardCore/OrchardCore.DisplayManagement/Extensions/TagHelpersServiceCollectionExtensions.cs index b37734fe126..777f9729357 100644 --- a/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/ServiceCollectionExtensions.cs +++ b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/TagHelpersServiceCollectionExtensions.cs @@ -3,7 +3,7 @@ namespace Microsoft.Extensions.DependencyInjection; -public static class ServiceCollectionExtensions +public static class TagHelpersServiceCollectionExtensions { /// /// Adds tag helper services. diff --git a/src/OrchardCore/OrchardCore.Rules.Core/Extensions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Rules.Core/Extensions/ServiceCollectionExtensions.cs index df391982c47..19c0b518e9e 100644 --- a/src/OrchardCore/OrchardCore.Rules.Core/Extensions/ServiceCollectionExtensions.cs +++ b/src/OrchardCore/OrchardCore.Rules.Core/Extensions/ServiceCollectionExtensions.cs @@ -1,5 +1,6 @@ using System.Text.Json.Serialization; using Microsoft.Extensions.DependencyInjection; +using OrchardCore.DisplayManagement.Extensions; using OrchardCore.DisplayManagement.Handlers; using OrchardCore.Rules.Services; From 62428d5ee499f819ff4a8b9755d8721b2f9cd6c6 Mon Sep 17 00:00:00 2001 From: Hisham Bin Ateya Date: Sat, 7 Mar 2026 20:45:03 +0300 Subject: [PATCH 2/2] Update --- .../DataServiceCollectionExtensions.cs} | 6 +++--- .../{ => Extensions}/ShellSettingsExtensions.cs | 4 ++-- .../{ => Extensions}/DataMigrationExtensions.cs | 0 .../{ => Extensions}/IndexServiceCollectionExtensions.cs | 4 ++-- .../MigrationServiceCollectionExtensions.cs | 4 ++-- .../{ => Extensions}/OrchardCoreBuilderExtensions.cs | 2 +- .../DeploymentServiceCollectionExtensions.cs} | 7 +++---- .../DeploymentServiceCollectionExtensions.cs} | 5 ++--- .../{ => Extensions}/OrchardCoreBuilderExtensions.cs | 0 .../{ => Extensions}/MailMessageExtensions.cs | 0 .../EmailServiceCollectionExtensions.cs} | 6 +++--- .../{ => Extensions}/AmazonWebServiceResponseExtensions.cs | 0 12 files changed, 18 insertions(+), 20 deletions(-) rename src/OrchardCore/OrchardCore.Data.Abstractions/{ServiceCollectionExtensions.cs => Extensions/DataServiceCollectionExtensions.cs} (93%) rename src/OrchardCore/OrchardCore.Data.Abstractions/{ => Extensions}/ShellSettingsExtensions.cs (98%) rename src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/{ => Extensions}/DataMigrationExtensions.cs (100%) rename src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/{ => Extensions}/IndexServiceCollectionExtensions.cs (90%) rename src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/{ => Extensions}/MigrationServiceCollectionExtensions.cs (86%) rename src/OrchardCore/OrchardCore.Data.YesSql/{ => Extensions}/OrchardCoreBuilderExtensions.cs (99%) rename src/OrchardCore/OrchardCore.Deployment.Abstractions/{ServiceCollectionExtensions.cs => Extensions/DeploymentServiceCollectionExtensions.cs} (93%) rename src/OrchardCore/OrchardCore.Deployment.Core/{ServiceCollectionExtensions.cs => Extensions/DeploymentServiceCollectionExtensions.cs} (68%) rename src/OrchardCore/OrchardCore.DisplayManagement.Liquid/{ => Extensions}/OrchardCoreBuilderExtensions.cs (100%) rename src/OrchardCore/OrchardCore.Email.Abstractions/{ => Extensions}/MailMessageExtensions.cs (100%) rename src/OrchardCore/OrchardCore.Email.Core/{ServiceCollectionExtensions.cs => Extensions/EmailServiceCollectionExtensions.cs} (90%) rename src/OrchardCore/OrchardCore.FileStorage.AmazonS3/{ => Extensions}/AmazonWebServiceResponseExtensions.cs (100%) diff --git a/src/OrchardCore/OrchardCore.Data.Abstractions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Data.Abstractions/Extensions/DataServiceCollectionExtensions.cs similarity index 93% rename from src/OrchardCore/OrchardCore.Data.Abstractions/ServiceCollectionExtensions.cs rename to src/OrchardCore/OrchardCore.Data.Abstractions/Extensions/DataServiceCollectionExtensions.cs index 23f2045bce0..eca6f11dd4c 100644 --- a/src/OrchardCore/OrchardCore.Data.Abstractions/ServiceCollectionExtensions.cs +++ b/src/OrchardCore/OrchardCore.Data.Abstractions/Extensions/DataServiceCollectionExtensions.cs @@ -1,12 +1,12 @@ -using Microsoft.Extensions.DependencyInjection; +using OrchardCore.Data; using OrchardCore.Environment.Shell.Builders; -namespace OrchardCore.Data; +namespace Microsoft.Extensions.DependencyInjection; /// /// Provides extension methods for to add YesSQL s. /// -public static class ServiceCollectionExtensions +public static class DataServiceCollectionExtensions { /// /// diff --git a/src/OrchardCore/OrchardCore.Data.Abstractions/ShellSettingsExtensions.cs b/src/OrchardCore/OrchardCore.Data.Abstractions/Extensions/ShellSettingsExtensions.cs similarity index 98% rename from src/OrchardCore/OrchardCore.Data.Abstractions/ShellSettingsExtensions.cs rename to src/OrchardCore/OrchardCore.Data.Abstractions/Extensions/ShellSettingsExtensions.cs index e0cc40da6fc..ea9ba3ef2b4 100644 --- a/src/OrchardCore/OrchardCore.Data.Abstractions/ShellSettingsExtensions.cs +++ b/src/OrchardCore/OrchardCore.Data.Abstractions/Extensions/ShellSettingsExtensions.cs @@ -1,6 +1,6 @@ -using OrchardCore.Environment.Shell; +using OrchardCore.Data; -namespace OrchardCore.Data; +namespace OrchardCore.Environment.Shell; public static class ShellSettingsExtensions { diff --git a/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/DataMigrationExtensions.cs b/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/Extensions/DataMigrationExtensions.cs similarity index 100% rename from src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/DataMigrationExtensions.cs rename to src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/Extensions/DataMigrationExtensions.cs diff --git a/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/IndexServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/Extensions/IndexServiceCollectionExtensions.cs similarity index 90% rename from src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/IndexServiceCollectionExtensions.cs rename to src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/Extensions/IndexServiceCollectionExtensions.cs index 5cb3076fad7..1eb86bac9f5 100644 --- a/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/IndexServiceCollectionExtensions.cs +++ b/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/Extensions/IndexServiceCollectionExtensions.cs @@ -1,8 +1,8 @@ -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; +using OrchardCore.Data; using YesSql.Indexes; -namespace OrchardCore.Data; +namespace Microsoft.Extensions.DependencyInjection; public static class IndexServiceCollectionExtensions { diff --git a/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/MigrationServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/Extensions/MigrationServiceCollectionExtensions.cs similarity index 86% rename from src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/MigrationServiceCollectionExtensions.cs rename to src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/Extensions/MigrationServiceCollectionExtensions.cs index fbff7a55914..244135d5a82 100644 --- a/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/MigrationServiceCollectionExtensions.cs +++ b/src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/Extensions/MigrationServiceCollectionExtensions.cs @@ -1,7 +1,7 @@ -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; +using OrchardCore.Data.Migration; -namespace OrchardCore.Data.Migration; +namespace Microsoft.Extensions.DependencyInjection; /// /// Provides extension methods for to add YesSql migration . diff --git a/src/OrchardCore/OrchardCore.Data.YesSql/OrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Data.YesSql/Extensions/OrchardCoreBuilderExtensions.cs similarity index 99% rename from src/OrchardCore/OrchardCore.Data.YesSql/OrchardCoreBuilderExtensions.cs rename to src/OrchardCore/OrchardCore.Data.YesSql/Extensions/OrchardCoreBuilderExtensions.cs index cd7101697ee..6ee1e3742dd 100644 --- a/src/OrchardCore/OrchardCore.Data.YesSql/OrchardCoreBuilderExtensions.cs +++ b/src/OrchardCore/OrchardCore.Data.YesSql/Extensions/OrchardCoreBuilderExtensions.cs @@ -1,5 +1,5 @@ using System.Buffers; -using System.Data; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using OrchardCore.Data; diff --git a/src/OrchardCore/OrchardCore.Deployment.Abstractions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Deployment.Abstractions/Extensions/DeploymentServiceCollectionExtensions.cs similarity index 93% rename from src/OrchardCore/OrchardCore.Deployment.Abstractions/ServiceCollectionExtensions.cs rename to src/OrchardCore/OrchardCore.Deployment.Abstractions/Extensions/DeploymentServiceCollectionExtensions.cs index 449130a64da..ddeaecdd5ca 100644 --- a/src/OrchardCore/OrchardCore.Deployment.Abstractions/ServiceCollectionExtensions.cs +++ b/src/OrchardCore/OrchardCore.Deployment.Abstractions/Extensions/DeploymentServiceCollectionExtensions.cs @@ -1,12 +1,11 @@ using System.Text.Json.Serialization; -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -using OrchardCore.DisplayManagement.Extensions; +using OrchardCore.Deployment; using OrchardCore.DisplayManagement.Handlers; -namespace OrchardCore.Deployment; +namespace Microsoft.Extensions.DependencyInjection; -public static class ServiceCollectionExtensions +public static class DeploymentServiceCollectionExtensions { public static IServiceCollection AddDeploymentTargetHandler(this IServiceCollection services) where TImplementation : class, IDeploymentTargetHandler diff --git a/src/OrchardCore/OrchardCore.Deployment.Core/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Deployment.Core/Extensions/DeploymentServiceCollectionExtensions.cs similarity index 68% rename from src/OrchardCore/OrchardCore.Deployment.Core/ServiceCollectionExtensions.cs rename to src/OrchardCore/OrchardCore.Deployment.Core/Extensions/DeploymentServiceCollectionExtensions.cs index 33150df0906..d129bcd141f 100644 --- a/src/OrchardCore/OrchardCore.Deployment.Core/ServiceCollectionExtensions.cs +++ b/src/OrchardCore/OrchardCore.Deployment.Core/Extensions/DeploymentServiceCollectionExtensions.cs @@ -1,10 +1,9 @@ -using Microsoft.Extensions.DependencyInjection; using OrchardCore.Deployment.Core.Services; using OrchardCore.Deployment.Services; -namespace OrchardCore.Deployment.Core; +namespace Microsoft.Extensions.DependencyInjection; -public static class ServiceCollectionExtensions +public static class DeploymentServiceCollectionExtensions { public static IServiceCollection AddDeploymentServices(this IServiceCollection services) { diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/OrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Extensions/OrchardCoreBuilderExtensions.cs similarity index 100% rename from src/OrchardCore/OrchardCore.DisplayManagement.Liquid/OrchardCoreBuilderExtensions.cs rename to src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Extensions/OrchardCoreBuilderExtensions.cs diff --git a/src/OrchardCore/OrchardCore.Email.Abstractions/MailMessageExtensions.cs b/src/OrchardCore/OrchardCore.Email.Abstractions/Extensions/MailMessageExtensions.cs similarity index 100% rename from src/OrchardCore/OrchardCore.Email.Abstractions/MailMessageExtensions.cs rename to src/OrchardCore/OrchardCore.Email.Abstractions/Extensions/MailMessageExtensions.cs diff --git a/src/OrchardCore/OrchardCore.Email.Core/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Email.Core/Extensions/EmailServiceCollectionExtensions.cs similarity index 90% rename from src/OrchardCore/OrchardCore.Email.Core/ServiceCollectionExtensions.cs rename to src/OrchardCore/OrchardCore.Email.Core/Extensions/EmailServiceCollectionExtensions.cs index b12b6d9eb99..f3e6a3ab600 100644 --- a/src/OrchardCore/OrchardCore.Email.Core/ServiceCollectionExtensions.cs +++ b/src/OrchardCore/OrchardCore.Email.Core/Extensions/EmailServiceCollectionExtensions.cs @@ -1,10 +1,10 @@ -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; +using OrchardCore.Email; using OrchardCore.Email.Core.Services; -namespace OrchardCore.Email.Core; +namespace Microsoft.Extensions.DependencyInjection; -public static class ServiceCollectionExtensions +public static class EmailServiceCollectionExtensions { public static IServiceCollection AddEmailServices(this IServiceCollection services) { diff --git a/src/OrchardCore/OrchardCore.FileStorage.AmazonS3/AmazonWebServiceResponseExtensions.cs b/src/OrchardCore/OrchardCore.FileStorage.AmazonS3/Extensions/AmazonWebServiceResponseExtensions.cs similarity index 100% rename from src/OrchardCore/OrchardCore.FileStorage.AmazonS3/AmazonWebServiceResponseExtensions.cs rename to src/OrchardCore/OrchardCore.FileStorage.AmazonS3/Extensions/AmazonWebServiceResponseExtensions.cs