OrchardCMS · MikeAlhayek · Aug 26, 2024 · Aug 26, 2024 · Aug 26, 2024 · Aug 26, 2024
diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs
@@ -22,7 +22,6 @@
 using OrchardCore.Mvc.Routing;
 using OrchardCore.Navigation;
 using OrchardCore.Security.Permissions;
-using OrchardCore.Settings;
 using OrchardCore.Settings.Deployment;
 
 namespace OrchardCore.Admin;
@@ -55,7 +54,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddScoped<IPermissionProvider, Permissions>();
         services.AddScoped<IThemeSelector, AdminThemeSelector>();
         services.AddScoped<IAdminThemeService, AdminThemeService>();
-        services.AddScoped<IDisplayDriver<ISite>, AdminSiteSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<AdminSiteSettingsDisplayDriver>();
         services.AddScoped<IPermissionProvider, PermissionsAdminSettings>();
         services.AddScoped<INavigationProvider, AdminMenu>();
         services.AddSingleton<IPageRouteModelProvider, AdminPageRouteModelProvider>();

diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs
@@ -17,7 +17,6 @@
 using OrchardCore.Modules;
 using OrchardCore.Navigation;
 using OrchardCore.Security.Permissions;
-using OrchardCore.Settings;
 using OrchardCore.Settings.Deployment;
 using YesSql.Filters.Query;
 
@@ -47,8 +46,8 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddScoped<INavigationProvider, AuditTrailAdminMenu>();
         services.AddScoped<INavigationProvider, AuditTrailSettingsAdminMenu>();
 
-        services.AddScoped<IDisplayDriver<ISite>, AuditTrailSettingsDisplayDriver>();
-        services.AddScoped<IDisplayDriver<ISite>, AuditTrailTrimmingSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<AuditTrailSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<AuditTrailTrimmingSettingsDisplayDriver>();
 
         services.AddScoped<IDisplayDriver<AuditTrailIndexOptions>, AuditTrailOptionsDisplayDriver>();
 

diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Startup.cs
@@ -21,7 +21,6 @@
 using OrchardCore.Modules;
 using OrchardCore.Navigation;
 using OrchardCore.Security.Permissions;
-using OrchardCore.Settings;
 using OrchardCore.Sitemaps.Builders;
 
 namespace OrchardCore.ContentLocalization;
@@ -64,8 +63,8 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddLiquidFilter<SwitchCultureUrlFilter>("switch_culture_url");
         services.AddScoped<INavigationProvider, AdminMenu>();
         services.AddScoped<IContentCulturePickerService, ContentCulturePickerService>();
-        services.AddScoped<IDisplayDriver<ISite>, ContentCulturePickerSettingsDriver>();
-        services.AddScoped<IDisplayDriver<ISite>, ContentRequestCultureProviderSettingsDriver>();
+        services.AddSiteDisplayDriver<ContentCulturePickerSettingsDriver>();
+        services.AddSiteDisplayDriver<ContentRequestCultureProviderSettingsDriver>();
         services.Configure<RequestLocalizationOptions>(options => options.AddInitialRequestCultureProvider(new ContentRequestCultureProvider()));
         services.Configure<CulturePickerOptions>(_shellConfiguration.GetSection("OrchardCore_ContentLocalization_CulturePickerOptions"));
     }

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Startup.cs
@@ -14,7 +14,6 @@
 using OrchardCore.Data.Migration;
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.Modules;
-using OrchardCore.Settings;
 
 namespace OrchardCore.Contents.AuditTrail;
 
@@ -32,7 +31,7 @@ public override void ConfigureServices(IServiceCollection services)
 
         services.AddTransient<IConfigureOptions<AuditTrailOptions>, ContentAuditTrailEventConfiguration>();
         services.AddScoped<IAuditTrailEventHandler, ContentAuditTrailEventHandler>();
-        services.AddScoped<IDisplayDriver<ISite>, ContentAuditTrailSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<ContentAuditTrailSettingsDisplayDriver>();
 
         services.AddScoped<IDisplayDriver<AuditTrailEvent>, AuditTrailContentEventDisplayDriver>();
 

diff --git a/...ents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetStartup.cs b/...ents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetStartup.cs
@@ -6,7 +6,6 @@
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.Modules;
 using OrchardCore.Navigation;
-using OrchardCore.Settings;
 using OrchardCore.Settings.Deployment;
 
 namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget;
@@ -18,7 +17,7 @@ public override void ConfigureServices(IServiceCollection services)
     {
         services.AddScoped<INavigationProvider, ExportContentToDeploymentTargetAdminMenu>();
 
-        services.AddScoped<IDisplayDriver<ISite>, ExportContentToDeploymentTargetSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<ExportContentToDeploymentTargetSettingsDisplayDriver>();
 
         services.AddDeployment<ExportContentToDeploymentTargetDeploymentSource, ExportContentToDeploymentTargetDeploymentStep, ExportContentToDeploymentTargetDeploymentStepDriver>();
 

diff --git a/src/OrchardCore.Modules/OrchardCore.CustomSettings/Startup.cs b/src/OrchardCore.Modules/OrchardCore.CustomSettings/Startup.cs
@@ -12,7 +12,6 @@
 using OrchardCore.Navigation;
 using OrchardCore.Recipes;
 using OrchardCore.Security.Permissions;
-using OrchardCore.Settings;
 
 namespace OrchardCore.CustomSettings;
 
@@ -21,7 +20,7 @@ public sealed class Startup : StartupBase
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddScoped<INavigationProvider, AdminMenu>();
-        services.AddScoped<IDisplayDriver<ISite>, CustomSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<CustomSettingsDisplayDriver>();
         services.AddScoped<CustomSettingsService>();
         services.AddScoped<IStereotypesProvider, CustomSettingsStereotypesProvider>();
         // Permissions

diff --git a/src/OrchardCore.Modules/OrchardCore.Email.Azure/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Email.Azure/Startup.cs
@@ -8,7 +8,6 @@
 using OrchardCore.Email.Core;
 using OrchardCore.Email.Services;
 using OrchardCore.Environment.Shell.Configuration;
-using OrchardCore.Settings;
 
 namespace OrchardCore.Email.Azure;
 
@@ -26,7 +25,7 @@ public void ConfigureServices(IServiceCollection services)
         services.AddTransient<IConfigureOptions<AzureEmailOptions>, AzureEmailOptionsConfiguration>();
 
         services.AddEmailProviderOptionsConfiguration<AzureEmailProviderOptionsConfigurations>()
-            .AddScoped<IDisplayDriver<ISite>, AzureEmailSettingsDisplayDriver>();
+            .AddSiteDisplayDriver<AzureEmailSettingsDisplayDriver>();
 
         services.Configure<DefaultAzureEmailOptions>(options =>
         {

diff --git a/src/OrchardCore.Modules/OrchardCore.Email.Smtp/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Email.Smtp/Startup.cs
@@ -6,7 +6,6 @@
 using OrchardCore.Email.Smtp.Extensions;
 using OrchardCore.Email.Smtp.Services;
 using OrchardCore.Environment.Shell.Configuration;
-using OrchardCore.Settings;
 
 namespace OrchardCore.Email.Smtp;
 
@@ -22,7 +21,7 @@ public Startup(IShellConfiguration shellConfiguration)
     public void ConfigureServices(IServiceCollection services)
     {
         services.AddSmtpEmailProvider()
-            .AddScoped<IDisplayDriver<ISite>, SmtpSettingsDisplayDriver>()
+            .AddSiteDisplayDriver<SmtpSettingsDisplayDriver>()
             .AddTransient<IConfigureOptions<SmtpOptions>, SmtpOptionsConfiguration>();
 
         services.Configure<DefaultSmtpOptions>(options =>

diff --git a/src/OrchardCore.Modules/OrchardCore.Email/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Email/Startup.cs
@@ -7,7 +7,6 @@
 using OrchardCore.Modules;
 using OrchardCore.Navigation;
 using OrchardCore.Security.Permissions;
-using OrchardCore.Settings;
 
 namespace OrchardCore.Email;
 
@@ -16,7 +15,7 @@ public sealed class Startup : StartupBase
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddEmailServices()
-            .AddScoped<IDisplayDriver<ISite>, EmailSettingsDisplayDriver>()
+            .AddSiteDisplayDriver<EmailSettingsDisplayDriver>()
             .AddScoped<IPermissionProvider, Permissions>()
             .AddScoped<INavigationProvider, AdminMenu>();
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Startup.cs
@@ -14,7 +14,6 @@
 using OrchardCore.Recipes;
 using OrchardCore.ResourceManagement;
 using OrchardCore.Security.Permissions;
-using OrchardCore.Settings;
 
 namespace OrchardCore.Facebook;
 
@@ -31,7 +30,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddScoped<INavigationProvider, AdminMenu>();
 
         services.AddSingleton<IFacebookService, FacebookService>();
-        services.AddScoped<IDisplayDriver<ISite>, FacebookSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<FacebookSettingsDisplayDriver>();
         services.AddRecipeExecutionStep<FacebookSettingsStep>();
 
         services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();

diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/StartupLogin.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/StartupLogin.cs
@@ -13,7 +13,6 @@
 using OrchardCore.Modules;
 using OrchardCore.Navigation;
 using OrchardCore.Recipes;
-using OrchardCore.Settings;
 
 namespace OrchardCore.Facebook;
 
@@ -25,7 +24,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddScoped<INavigationProvider, AdminMenuLogin>();
 
         services.AddSingleton<IFacebookLoginService, FacebookLoginService>();
-        services.AddScoped<IDisplayDriver<ISite>, FacebookLoginSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<FacebookLoginSettingsDisplayDriver>();
         services.AddRecipeExecutionStep<FacebookLoginSettingsStep>();
 
         // Register the options initializers required by the Facebook handler.

diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/StartupPixel.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/StartupPixel.cs
@@ -6,7 +6,6 @@
 using OrchardCore.Modules;
 using OrchardCore.Navigation;
 using OrchardCore.Security.Permissions;
-using OrchardCore.Settings;
 
 namespace OrchardCore.Facebook;
 
@@ -15,7 +14,7 @@ public sealed class StartupPixel : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IDisplayDriver<ISite>, FacebookPixelSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<FacebookPixelSettingsDisplayDriver>();
         services.AddScoped<IPermissionProvider, PixelPermissionProvider>();
         services.AddScoped<INavigationProvider, AdminMenuPixel>();
 

diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/Startup.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/Startup.cs
@@ -12,7 +12,6 @@
 using OrchardCore.Navigation;
 using OrchardCore.Recipes;
 using OrchardCore.Security.Permissions;
-using OrchardCore.Settings;
 
 namespace OrchardCore.GitHub;
 
@@ -30,7 +29,7 @@ public sealed class GitHubLoginStartup : StartupBase
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddSingleton<IGitHubAuthenticationService, GitHubAuthenticationService>();
-        services.AddScoped<IDisplayDriver<ISite>, GitHubAuthenticationSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<GitHubAuthenticationSettingsDisplayDriver>();
         services.AddScoped<INavigationProvider, AdminMenuGitHubLogin>();
         services.AddRecipeExecutionStep<GitHubAuthenticationSettingsStep>();
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationStartup.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationStartup.cs
@@ -20,7 +20,6 @@
 using OrchardCore.Modules;
 using OrchardCore.Navigation;
 using OrchardCore.Security.Permissions;
-using OrchardCore.Settings;
 using OrchardCore.Settings.Deployment;
 
 namespace OrchardCore.Google;
@@ -32,7 +31,7 @@ public override void ConfigureServices(IServiceCollection services)
     {
         services.AddScoped<IPermissionProvider, GoogleAuthenticationPermissionProvider>();
         services.AddSingleton<GoogleAuthenticationService, GoogleAuthenticationService>();
-        services.AddScoped<IDisplayDriver<ISite>, GoogleAuthenticationSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<GoogleAuthenticationSettingsDisplayDriver>();
         services.AddScoped<INavigationProvider, GoogleAuthenticationAdminMenu>();
         // Register the options initializers required by the Google Handler.
         services.TryAddEnumerable(new[]
@@ -56,7 +55,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddScoped<IPermissionProvider, GoogleAnalyticsPermissionsProvider>();
         services.AddSingleton<IGoogleAnalyticsService, GoogleAnalyticsService>();
 
-        services.AddScoped<IDisplayDriver<ISite>, GoogleAnalyticsSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<GoogleAnalyticsSettingsDisplayDriver>();
         services.AddScoped<INavigationProvider, GoogleAnalyticsAdminMenu>();
         services.Configure<MvcOptions>((options) =>
         {
@@ -73,7 +72,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddScoped<IPermissionProvider, GoogleTagManagerPermissionProvider>();
         services.AddSingleton<IGoogleTagManagerService, GoogleTagManagerService>();
 
-        services.AddScoped<IDisplayDriver<ISite>, GoogleTagManagerSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<GoogleTagManagerSettingsDisplayDriver>();
         services.AddScoped<INavigationProvider, GoogleTagManagerAdminMenu>();
         services.Configure<MvcOptions>((options) =>
         {

diff --git a/src/OrchardCore.Modules/OrchardCore.Https/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Https/Startup.cs
@@ -10,7 +10,6 @@
 using OrchardCore.Modules;
 using OrchardCore.Navigation;
 using OrchardCore.Security.Permissions;
-using OrchardCore.Settings;
 using OrchardCore.Settings.Deployment;
 
 namespace OrchardCore.Https;
@@ -35,7 +34,7 @@ public override async ValueTask ConfigureAsync(IApplicationBuilder app, IEndpoin
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddScoped<INavigationProvider, AdminMenu>();
-        services.AddScoped<IDisplayDriver<ISite>, HttpsSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<HttpsSettingsDisplayDriver>();
         services.AddSingleton<IHttpsService, HttpsService>();
 
         services.AddScoped<IPermissionProvider, Permissions>();

diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Layers/Startup.cs
@@ -21,7 +21,6 @@
 using OrchardCore.Recipes;
 using OrchardCore.Scripting;
 using OrchardCore.Security.Permissions;
-using OrchardCore.Settings;
 
 namespace OrchardCore.Layers;
 
@@ -39,7 +38,7 @@ public override void ConfigureServices(IServiceCollection services)
             options.Filters.Add<LayerFilter>();
         });
 
-        services.AddScoped<IDisplayDriver<ISite>, LayerSiteSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<LayerSiteSettingsDisplayDriver>();
         services.AddContentPart<LayerMetadata>();
         services.AddScoped<IContentDisplayDriver, LayerMetadataWelder>();
         services.AddScoped<INavigationProvider, AdminMenu>();

diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Localization/Startup.cs
@@ -13,7 +13,6 @@
 using OrchardCore.Modules;
 using OrchardCore.Navigation;
 using OrchardCore.Security.Permissions;
-using OrchardCore.Settings;
 using OrchardCore.Settings.Deployment;
 
 namespace OrchardCore.Localization;
@@ -28,7 +27,7 @@ public sealed class Startup : StartupBase
     /// <inheritdocs />
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IDisplayDriver<ISite>, LocalizationSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<LocalizationSettingsDisplayDriver>();
         services.AddScoped<INavigationProvider, AdminMenu>();
         services.AddScoped<IPermissionProvider, Permissions>();
         services.AddScoped<ILocalizationService, LocalizationService>();

diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/MicrosoftAccountStartup.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/MicrosoftAccountStartup.cs
@@ -17,7 +17,6 @@
 using OrchardCore.Navigation;
 using OrchardCore.Recipes;
 using OrchardCore.Security.Permissions;
-using OrchardCore.Settings;
 
 namespace OrchardCore.Microsoft.Authentication;
 
@@ -29,7 +28,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.TryAddEnumerable(new ServiceDescriptor(typeof(IPermissionProvider), typeof(Permissions), ServiceLifetime.Scoped));
 
         services.AddSingleton<IMicrosoftAccountService, MicrosoftAccountService>();
-        services.AddScoped<IDisplayDriver<ISite>, MicrosoftAccountSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<MicrosoftAccountSettingsDisplayDriver>();
         services.AddScoped<INavigationProvider, AdminMenuMicrosoftAccount>();
         services.AddRecipeExecutionStep<MicrosoftAccountSettingsStep>();
 
@@ -57,7 +56,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddSingleton<IAzureADService, AzureADService>();
         services.AddRecipeExecutionStep<AzureADSettingsStep>();
 
-        services.AddScoped<IDisplayDriver<ISite>, AzureADSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<AzureADSettingsDisplayDriver>();
         services.AddScoped<INavigationProvider, AdminMenuAAD>();
 
         services.AddTransient<IConfigureOptions<AzureADSettings>, AzureADSettingsConfiguration>();

diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/Startup.cs
@@ -7,7 +7,6 @@
 using OrchardCore.ReCaptcha.Drivers;
 using OrchardCore.ReCaptcha.Users.Handlers;
 using OrchardCore.Security.Permissions;
-using OrchardCore.Settings;
 using OrchardCore.Settings.Deployment;
 using OrchardCore.Users;
 using OrchardCore.Users.Events;
@@ -22,7 +21,7 @@ public override void ConfigureServices(IServiceCollection services)
     {
         services.AddReCaptcha();
 
-        services.AddScoped<IDisplayDriver<ISite>, ReCaptchaSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<ReCaptchaSettingsDisplayDriver>();
         services.AddScoped<INavigationProvider, AdminMenu>();
         services.AddScoped<IPermissionProvider, Permissions>();
     }

diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Startup.cs
@@ -10,7 +10,6 @@
 using OrchardCore.ReverseProxy.Services;
 using OrchardCore.ReverseProxy.Settings;
 using OrchardCore.Security.Permissions;
-using OrchardCore.Settings;
 using OrchardCore.Settings.Deployment;
 
 namespace OrchardCore.ReverseProxy;
@@ -29,7 +28,7 @@ public override void ConfigureServices(IServiceCollection services)
     {
         services.AddScoped<INavigationProvider, AdminMenu>();
         services.AddScoped<IPermissionProvider, Permissions>();
-        services.AddScoped<IDisplayDriver<ISite>, ReverseProxySettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<ReverseProxySettingsDisplayDriver>();
 
         services.AddSingleton<ReverseProxyService>();
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Startup.cs
@@ -10,7 +10,6 @@
 using OrchardCore.Search.AzureAI.Drivers;
 using OrchardCore.Search.AzureAI.Handlers;
 using OrchardCore.Search.AzureAI.Services;
-using OrchardCore.Settings;
 
 namespace OrchardCore.Search.AzureAI;
 
@@ -20,7 +19,7 @@ public override void ConfigureServices(IServiceCollection services)
     {
         services.AddAzureAISearchServices();
         services.AddScoped<INavigationProvider, AdminMenu>();
-        services.AddScoped<IDisplayDriver<ISite>, AzureAISearchDefaultSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<AzureAISearchDefaultSettingsDisplayDriver>();
     }
 }
 
@@ -29,7 +28,7 @@ public sealed class SearchStartup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IDisplayDriver<ISite>, AzureAISearchSettingsDisplayDriver>();
+        services.AddSiteDisplayDriver<AzureAISearchSettingsDisplayDriver>();
         services.AddScoped<ISearchService, AzureAISearchService>();
         services.AddScoped<IAuthorizationHandler, AzureAISearchAuthorizationHandler>();
     }