Add AddNavigationProvider extension (#16618)

src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs

@@ -57,7 +57,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddScoped<IAdminThemeService, AdminThemeService>();
         services.AddScoped<IDisplayDriver<ISite>, AdminSiteSettingsDisplayDriver>();
         services.AddScoped<IPermissionProvider, PermissionsAdminSettings>();
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddSingleton<IPageRouteModelProvider, AdminPageRouteModelProvider>();
         services.AddScoped<IDisplayDriver<Navbar>, VisitSiteNavbarDisplayDriver>();
 

src/OrchardCore.Modules/OrchardCore.AdminMenu/Startup.cs

@@ -16,7 +16,7 @@ public sealed class Startup : StartupBase
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddScoped<IPermissionProvider, Permissions>();
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IAdminMenuPermissionService, AdminMenuPermissionService>();
 
         services.AddScoped<IAdminMenuService, AdminMenuService>();

src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Startup.cs

@@ -46,7 +46,7 @@ public override void ConfigureServices(IServiceCollection services)
         });
 
         services.AddScoped<IPermissionProvider, Permissions>();
-        services.AddTransient<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddSingleton<GraphQLMiddleware>();
 
         services.AddGraphQL(builder => builder.AddSystemTextJson((options, sp) =>

src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs

@@ -44,8 +44,8 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddSingleton<IBackgroundTask, AuditTrailBackgroundTask>();
 
         services.AddScoped<IPermissionProvider, Permissions>();
-        services.AddScoped<INavigationProvider, AuditTrailAdminMenu>();
-        services.AddScoped<INavigationProvider, AuditTrailSettingsAdminMenu>();
+        services.AddNavigationProvider<AuditTrailAdminMenu>();
+        services.AddNavigationProvider<AuditTrailSettingsAdminMenu>();
 
         services.AddScoped<IDisplayDriver<ISite>, AuditTrailSettingsDisplayDriver>();
         services.AddScoped<IDisplayDriver<ISite>, AuditTrailTrimmingSettingsDisplayDriver>();

src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Startup.cs

@@ -13,7 +13,7 @@ public override void ConfigureServices(IServiceCollection services)
         services
             .AddScoped<BackgroundTaskManager>()
             .AddScoped<IPermissionProvider, Permissions>()
-            .AddScoped<INavigationProvider, AdminMenu>()
+            .AddNavigationProvider<AdminMenu>()
             .AddScoped<IBackgroundTaskSettingsProvider, BackgroundTaskSettingsProvider>();
     }
 }

src/OrchardCore.Modules/OrchardCore.ContentLocalization/Startup.cs

@@ -62,7 +62,7 @@ public override void ConfigureServices(IServiceCollection services)
     {
         services.AddScoped<IDisplayDriver<Navbar>, ContentCulturePickerNavbarDisplayDriver>();
         services.AddLiquidFilter<SwitchCultureUrlFilter>("switch_culture_url");
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IContentCulturePickerService, ContentCulturePickerService>();
         services.AddScoped<IDisplayDriver<ISite>, ContentCulturePickerSettingsDriver>();
         services.AddScoped<IDisplayDriver<ISite>, ContentRequestCultureProviderSettingsDriver>();

src/OrchardCore.Modules/OrchardCore.ContentTypes/Startup.cs

@@ -20,7 +20,7 @@ public sealed class Startup : StartupBase
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddScoped<IPermissionProvider, Permissions>();
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IContentDefinitionService, ContentDefinitionService>();
         services.AddScoped<IStereotypeService, StereotypeService>();
         services.AddScoped<IContentDefinitionDisplayHandler, ContentDefinitionDisplayCoordinator>();

src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetStartup.cs

@@ -16,7 +16,7 @@ public sealed class ExportContentToDeploymentTargetStartup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<INavigationProvider, ExportContentToDeploymentTargetAdminMenu>();
+        services.AddNavigationProvider<ExportContentToDeploymentTargetAdminMenu>();
 
         services.AddScoped<IDisplayDriver<ISite>, ExportContentToDeploymentTargetSettingsDisplayDriver>();
 

src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs

@@ -143,7 +143,7 @@ static async Task<FluidValue> GetContentByHandleAsync(LiquidTemplateContext cont
         services.AddScoped<IPermissionProvider, ContentTypePermissions>();
         services.AddScoped<IAuthorizationHandler, ContentTypeAuthorizationHandler>();
         services.AddScoped<IShapeTableProvider, Shapes>();
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IContentDisplayDriver, ContentsDriver>();
         services.AddScoped<IContentHandler, ContentsHandler>();
         services.AddRecipeExecutionStep<ContentStep>();

src/OrchardCore.Modules/OrchardCore.Cors/Startup.cs

@@ -24,7 +24,7 @@ public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder ro
 
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IPermissionProvider, Permissions>();
         services.AddSingleton<CorsService>();
 

src/OrchardCore.Modules/OrchardCore.CustomSettings/Startup.cs

@@ -20,7 +20,7 @@ public sealed class Startup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IDisplayDriver<ISite>, CustomSettingsDisplayDriver>();
         services.AddScoped<CustomSettingsService>();
         services.AddScoped<IStereotypesProvider, CustomSettingsStereotypesProvider>();

src/OrchardCore.Modules/OrchardCore.Demo/Startup.cs

@@ -86,7 +86,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddSingleton<IBackgroundTask, TestBackgroundTask>();
         services.AddScoped<IShapeTableProvider, DemoShapeProvider>();
         services.AddShapeAttributes<DemoShapeProvider>();
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IContentDisplayDriver, TestContentElementDisplayDriver>();
         services.AddDataMigration<Migrations>();
         services.AddScoped<IPermissionProvider, Permissions>();

src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Startup.cs

@@ -13,7 +13,7 @@ public override void ConfigureServices(IServiceCollection services)
     {
         services.AddHttpClient();
 
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<RemoteInstanceService>();
         services.AddScoped<RemoteClientService>();
         services.AddScoped<IDeploymentTargetProvider, RemoteInstanceDeploymentTargetProvider>();

src/OrchardCore.Modules/OrchardCore.Deployment/Startup.cs

@@ -19,7 +19,7 @@ public override void ConfigureServices(IServiceCollection services)
     {
         services.AddDeploymentServices();
 
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IPermissionProvider, Permissions>();
 
         services.AddSingleton<IDeploymentTargetProvider, FileDownloadDeploymentTargetProvider>();

src/OrchardCore.Modules/OrchardCore.Email/Startup.cs

@@ -18,7 +18,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddEmailServices()
             .AddScoped<IDisplayDriver<ISite>, EmailSettingsDisplayDriver>()
             .AddScoped<IPermissionProvider, Permissions>()
-            .AddScoped<INavigationProvider, AdminMenu>();
+            .AddNavigationProvider<AdminMenu>();
 
         services.AddDataMigration<EmailMigrations>();
     }

src/OrchardCore.Modules/OrchardCore.Facebook/Startup.cs

@@ -28,7 +28,7 @@ public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilde
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddScoped<IPermissionProvider, Permissions>();
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
 
         services.AddSingleton<IFacebookService, FacebookService>();
         services.AddScoped<IDisplayDriver<ISite>, FacebookSettingsDisplayDriver>();

src/OrchardCore.Modules/OrchardCore.Facebook/StartupLogin.cs

@@ -22,7 +22,7 @@ public sealed class StartupLogin : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<INavigationProvider, AdminMenuLogin>();
+        services.AddNavigationProvider<AdminMenuLogin>();
 
         services.AddSingleton<IFacebookLoginService, FacebookLoginService>();
         services.AddScoped<IDisplayDriver<ISite>, FacebookLoginSettingsDisplayDriver>();

src/OrchardCore.Modules/OrchardCore.Facebook/StartupPixel.cs

@@ -17,7 +17,7 @@ public override void ConfigureServices(IServiceCollection services)
     {
         services.AddScoped<IDisplayDriver<ISite>, FacebookPixelSettingsDisplayDriver>();
         services.AddScoped<IPermissionProvider, PixelPermissionProvider>();
-        services.AddScoped<INavigationProvider, AdminMenuPixel>();
+        services.AddNavigationProvider<AdminMenuPixel>();
 
         services.Configure<MvcOptions>((options) =>
         {

src/OrchardCore.Modules/OrchardCore.Features/Startup.cs

@@ -20,7 +20,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddRecipeExecutionStep<FeatureStep>();
         services.AddScoped<IPermissionProvider, Permissions>();
         services.AddScoped<IModuleService, ModuleService>();
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
 
         services.AddDeployment<AllFeaturesDeploymentSource, AllFeaturesDeploymentStep, AllFeaturesDeploymentStepDriver>();
     }

src/OrchardCore.Modules/OrchardCore.GitHub/Startup.cs

@@ -31,7 +31,7 @@ public override void ConfigureServices(IServiceCollection services)
     {
         services.AddSingleton<IGitHubAuthenticationService, GitHubAuthenticationService>();
         services.AddScoped<IDisplayDriver<ISite>, GitHubAuthenticationSettingsDisplayDriver>();
-        services.AddScoped<INavigationProvider, AdminMenuGitHubLogin>();
+        services.AddNavigationProvider<AdminMenuGitHubLogin>();
         services.AddRecipeExecutionStep<GitHubAuthenticationSettingsStep>();
 
         services.AddTransient<IConfigureOptions<GitHubAuthenticationSettings>, GitHubAuthenticationSettingsConfiguration>();

src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationStartup.cs

@@ -33,7 +33,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddScoped<IPermissionProvider, GoogleAuthenticationPermissionProvider>();
         services.AddSingleton<GoogleAuthenticationService, GoogleAuthenticationService>();
         services.AddScoped<IDisplayDriver<ISite>, GoogleAuthenticationSettingsDisplayDriver>();
-        services.AddScoped<INavigationProvider, GoogleAuthenticationAdminMenu>();
+        services.AddNavigationProvider<GoogleAuthenticationAdminMenu>();
         // Register the options initializers required by the Google Handler.
         services.TryAddEnumerable(new[]
         {
@@ -57,7 +57,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddSingleton<IGoogleAnalyticsService, GoogleAnalyticsService>();
 
         services.AddScoped<IDisplayDriver<ISite>, GoogleAnalyticsSettingsDisplayDriver>();
-        services.AddScoped<INavigationProvider, GoogleAnalyticsAdminMenu>();
+        services.AddNavigationProvider<GoogleAnalyticsAdminMenu>();
         services.Configure<MvcOptions>((options) =>
         {
             options.Filters.Add<GoogleAnalyticsFilter>();
@@ -74,7 +74,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddSingleton<IGoogleTagManagerService, GoogleTagManagerService>();
 
         services.AddScoped<IDisplayDriver<ISite>, GoogleTagManagerSettingsDisplayDriver>();
-        services.AddScoped<INavigationProvider, GoogleTagManagerAdminMenu>();
+        services.AddNavigationProvider<GoogleTagManagerAdminMenu>();
         services.Configure<MvcOptions>((options) =>
         {
             options.Filters.Add<GoogleTagManagerFilter>();

src/OrchardCore.Modules/OrchardCore.Https/Startup.cs

@@ -34,7 +34,7 @@ public override async ValueTask ConfigureAsync(IApplicationBuilder app, IEndpoin
 
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IDisplayDriver<ISite>, HttpsSettingsDisplayDriver>();
         services.AddSingleton<IHttpsService, HttpsService>();
 

src/OrchardCore.Modules/OrchardCore.Layers/Startup.cs

@@ -42,7 +42,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddScoped<IDisplayDriver<ISite>, LayerSiteSettingsDisplayDriver>();
         services.AddContentPart<LayerMetadata>();
         services.AddScoped<IContentDisplayDriver, LayerMetadataWelder>();
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<ILayerService, LayerService>();
         services.AddScoped<IContentHandler, LayerMetadataHandler>();
         services.AddIndexProvider<LayerMetadataIndexProvider>();

src/OrchardCore.Modules/OrchardCore.Localization/Startup.cs

@@ -29,7 +29,7 @@ public sealed class Startup : StartupBase
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddScoped<IDisplayDriver<ISite>, LocalizationSettingsDisplayDriver>();
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IPermissionProvider, Permissions>();
         services.AddScoped<ILocalizationService, LocalizationService>();
 

src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/Startup.cs

@@ -35,7 +35,7 @@ public Startup(IShellConfiguration configuration,
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddScoped<IPermissionProvider, Permissions>();
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddTransient<IConfigureOptions<AwsStorageOptions>, AwsStorageOptionsConfiguration>();
 
         var storeOptions = new AwsStorageOptions().BindConfiguration(AmazonS3Constants.ConfigSections.AmazonS3, _configuration, _logger);

src/OrchardCore.Modules/OrchardCore.Media.Azure/Startup.cs

@@ -40,7 +40,7 @@ public override int Order
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddScoped<IPermissionProvider, Permissions>();
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddTransient<IConfigureOptions<MediaBlobStorageOptions>, MediaBlobStorageOptionsConfiguration>();
 
         // Only replace default implementation if options are valid.

src/OrchardCore.Modules/OrchardCore.Media/Startup.cs

@@ -137,7 +137,7 @@ public override void ConfigureServices(IServiceCollection services)
 
         services.AddScoped<IPermissionProvider, PermissionProvider>();
         services.AddScoped<IAuthorizationHandler, ManageMediaFolderAuthorizationHandler>();
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
 
         // ImageSharp
 
@@ -236,7 +236,7 @@ public sealed class MediaCacheStartup : StartupBase
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddScoped<IPermissionProvider, MediaCachePermissions>();
-        services.AddScoped<INavigationProvider, MediaCacheAdminMenu>();
+        services.AddNavigationProvider<MediaCacheAdminMenu>();
     }
 }
 

src/OrchardCore.Modules/OrchardCore.Menu/Startup.cs

@@ -24,7 +24,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddDataMigration<Migrations>();
         services.AddScoped<IShapeTableProvider, MenuShapes>();
         services.AddScoped<IPermissionProvider, Permissions>();
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
 
         services.AddScoped<IStereotypesProvider, MenuItemStereotypesProvider>();
 

src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/MicrosoftAccountStartup.cs

@@ -30,7 +30,7 @@ public override void ConfigureServices(IServiceCollection services)
 
         services.AddSingleton<IMicrosoftAccountService, MicrosoftAccountService>();
         services.AddScoped<IDisplayDriver<ISite>, MicrosoftAccountSettingsDisplayDriver>();
-        services.AddScoped<INavigationProvider, AdminMenuMicrosoftAccount>();
+        services.AddNavigationProvider<AdminMenuMicrosoftAccount>();
         services.AddRecipeExecutionStep<MicrosoftAccountSettingsStep>();
 
         services.AddTransient<IConfigureOptions<MicrosoftAccountSettings>, MicrosoftAccountSettingsConfiguration>();
@@ -58,7 +58,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddRecipeExecutionStep<AzureADSettingsStep>();
 
         services.AddScoped<IDisplayDriver<ISite>, AzureADSettingsDisplayDriver>();
-        services.AddScoped<INavigationProvider, AdminMenuAAD>();
+        services.AddNavigationProvider<AdminMenuAAD>();
 
         services.AddTransient<IConfigureOptions<AzureADSettings>, AzureADSettingsConfiguration>();
 

src/OrchardCore.Modules/OrchardCore.Placements/Startup.cs

@@ -19,7 +19,7 @@ public sealed class Startup : StartupBase
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddScoped<IPermissionProvider, Permissions>();
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
 
         services.TryAddScoped<IPlacementStore, DatabasePlacementsStore>();
         services.AddScoped<PlacementsManager>();

src/OrchardCore.Modules/OrchardCore.Queries/Sql/Startup.cs

@@ -22,7 +22,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddScoped<IDisplayDriver<Query>, SqlQueryDisplayDriver>();
         services.AddQuerySource<SqlQuerySource>(SqlQuerySource.SourceName);
 
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddDataMigration<SqlQueryMigrations>();
         services.AddScoped<IQueryHandler, SqlQueryHandler>();
     }

src/OrchardCore.Modules/OrchardCore.Queries/Startup.cs

@@ -24,7 +24,7 @@ public sealed class Startup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IDisplayDriver<Query>, QueryDisplayDriver>();
         services.AddScoped<IPermissionProvider, Permissions>();
     }

src/OrchardCore.Modules/OrchardCore.ReCaptcha/Startup.cs

@@ -23,7 +23,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddReCaptcha();
 
         services.AddScoped<IDisplayDriver<ISite>, ReCaptchaSettingsDisplayDriver>();
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IPermissionProvider, Permissions>();
     }
 }

src/OrchardCore.Modules/OrchardCore.Recipes/Startup.cs

@@ -14,7 +14,7 @@ public sealed class Startup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
 
         services.AddRecipeExecutionStep<CommandStep>();
         services.AddRecipeExecutionStep<RecipesStep>();

src/OrchardCore.Modules/OrchardCore.ReverseProxy/Startup.cs

@@ -27,7 +27,7 @@ public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder ro
 
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IPermissionProvider, Permissions>();
         services.AddScoped<IDisplayDriver<ISite>, ReverseProxySettingsDisplayDriver>();
 

src/OrchardCore.Modules/OrchardCore.Roles/Startup.cs

@@ -27,7 +27,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddRecipeExecutionStep<RolesStep>();
         services.AddScoped<IAuthorizationHandler, RolesPermissionsHandler>();
         services.AddScoped<IPermissionProvider, Permissions>();
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
     }
 }
 

src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Startup.cs

@@ -19,7 +19,7 @@ public sealed class Startup : StartupBase
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddAzureAISearchServices();
-        services.AddScoped<INavigationProvider, AdminMenu>();
+        services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IDisplayDriver<ISite>, AzureAISearchDefaultSettingsDisplayDriver>();
     }
 }