Use AddPermissionProvider & AddNavigationProvider in OpenID

src/OrchardCore.Modules/OrchardCore.ContentPreview/Startup.cs

@@ -28,6 +28,6 @@ public override void ConfigureServices(IServiceCollection services)
 
         services.AddDataMigration<Migrations>();
         services.AddScoped<IContentTypePartDefinitionDisplayDriver, PreviewPartSettingsDisplayDriver>();
-        services.TryAddEnumerable(ServiceDescriptor.Singleton<IStartupFilter, PreviewStartupFilter>());
+        services.AddSingleton<IStartupFilter, PreviewStartupFilter>();
     }
 }

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

@@ -28,7 +28,6 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddPermissionProvider<Permissions>();
         services.AddSingleton<CorsService>();
 
-        services.TryAddEnumerable(ServiceDescriptor
-            .Transient<IConfigureOptions<CorsOptions>, CorsOptionsConfiguration>());
+        services.AddTransient<IConfigureOptions<CorsOptions>, CorsOptionsConfiguration>();
     }
 }

src/OrchardCore.Modules/OrchardCore.Diagnostics/Startup.cs

@@ -10,7 +10,7 @@ public sealed class Startup : Modules.StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.TryAddEnumerable(ServiceDescriptor.Singleton<IStartupFilter, DiagnosticsStartupFilter>());
+        services.AddSingleton<IStartupFilter, DiagnosticsStartupFilter>();
     }
 
     public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)

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

@@ -28,17 +28,12 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddRecipeExecutionStep<FacebookLoginSettingsStep>();
 
         // Register the options initializers required by the Facebook handler.
-        services.TryAddEnumerable(new[]
-        {
-            // Orchard-specific initializers:
-            ServiceDescriptor.Transient<IConfigureOptions<AuthenticationOptions>, FacebookLoginConfiguration>(),
-            ServiceDescriptor.Transient<IConfigureOptions<FacebookOptions>, FacebookLoginConfiguration>(),
+        // Orchard-specific initializers:
+        services.AddTransient<IConfigureOptions<AuthenticationOptions>, FacebookLoginConfiguration>();
+        services.AddTransient<IConfigureOptions<FacebookOptions>, FacebookLoginConfiguration>();
 
-            // Deployment
-
-            // Built-in initializers:
-            ServiceDescriptor.Transient<IPostConfigureOptions<FacebookOptions>, OAuthPostConfigureOptions<FacebookOptions, FacebookHandler>>()
-        });
+        // Built-in initializers:
+        services.AddTransient<IPostConfigureOptions<FacebookOptions>, OAuthPostConfigureOptions<FacebookOptions, FacebookHandler>>();
     }
 }
 

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

@@ -36,13 +36,10 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddTransient<IConfigureOptions<GitHubAuthenticationSettings>, GitHubAuthenticationSettingsConfiguration>();
 
         // Register the options initializers required by the GitHub Handler.
-        services.TryAddEnumerable(new[]
-        {
-            // Orchard-specific initializers:
-            ServiceDescriptor.Transient<IConfigureOptions<AuthenticationOptions>, GitHubOptionsConfiguration>(),
-            ServiceDescriptor.Transient<IConfigureOptions<GitHubOptions>, GitHubOptionsConfiguration>(),
-            // Built-in initializers:
-            ServiceDescriptor.Transient<IPostConfigureOptions<GitHubOptions>, OAuthPostConfigureOptions<GitHubOptions, GitHubHandler>>()
-        });
+        // Orchard-specific initializers:
+        services.AddTransient<IConfigureOptions<AuthenticationOptions>, GitHubOptionsConfiguration>();
+        services.AddTransient<IConfigureOptions<GitHubOptions>, GitHubOptionsConfiguration>();
+        // Built-in initializers:
+        services.AddTransient<IPostConfigureOptions<GitHubOptions>, OAuthPostConfigureOptions<GitHubOptions, GitHubHandler>>();
     }
 }

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

@@ -35,14 +35,12 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddNavigationProvider<GoogleAuthenticationAdminMenu>();
 
         // Register the options initializers required by the Google Handler.
-        services.TryAddEnumerable(new[]
-        {
-            // Orchard-specific initializers:
-            ServiceDescriptor.Transient<IConfigureOptions<AuthenticationOptions>, GoogleOptionsConfiguration>(),
-            ServiceDescriptor.Transient<IConfigureOptions<GoogleOptions>, GoogleOptionsConfiguration>(),
-            // Built-in initializers:
-            ServiceDescriptor.Transient<IPostConfigureOptions<GoogleOptions>, OAuthPostConfigureOptions<GoogleOptions, GoogleHandler>>()
-        });
+        // Orchard-specific initializers:
+        services.AddTransient<IConfigureOptions<AuthenticationOptions>, GoogleOptionsConfiguration>();
+        services.AddTransient<IConfigureOptions<GoogleOptions>, GoogleOptionsConfiguration>();
+
+        // Built-in initializers:
+        services.AddTransient<IPostConfigureOptions<GoogleOptions>, OAuthPostConfigureOptions<GoogleOptions, GoogleHandler>>();
 
         services.AddTransient<IConfigureOptions<GoogleAuthenticationSettings>, GoogleAuthenticationSettingsConfiguration>();
     }

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

@@ -23,7 +23,7 @@ public sealed class MicrosoftAccountStartup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.TryAddEnumerable(new ServiceDescriptor(typeof(IPermissionProvider), typeof(Permissions), ServiceLifetime.Scoped));
+        services.AddPermissionProvider<Permissions>();
 
         services.AddSingleton<IMicrosoftAccountService, MicrosoftAccountService>();
         services.AddSiteDisplayDriver<MicrosoftAccountSettingsDisplayDriver>();

src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs

@@ -30,7 +30,6 @@
 using OrchardCore.OpenId.Settings;
 using OrchardCore.OpenId.Tasks;
 using OrchardCore.Recipes;
-using OrchardCore.Recipes.Services;
 using OrchardCore.Security;
 using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
@@ -52,12 +51,8 @@ public override void ConfigureServices(IServiceCollection services)
                        .UseYesSql();
             });
 
-        // Note: the following services are registered using TryAddEnumerable to prevent duplicate registrations.
-        services.TryAddEnumerable(new[]
-        {
-            ServiceDescriptor.Scoped<IPermissionProvider, Permissions>(),
-            ServiceDescriptor.Scoped<INavigationProvider, AdminMenu>(),
-        });
+        services.AddPermissionProvider<Permissions>();
+        services.AddNavigationProvider<AdminMenu>();
     }
 }
 

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

@@ -32,8 +32,7 @@ public override void ConfigureServices(IServiceCollection services)
 
         services.AddSingleton<ReverseProxyService>();
 
-        services.TryAddEnumerable(ServiceDescriptor
-            .Transient<IConfigureOptions<ForwardedHeadersOptions>, ForwardedHeadersOptionsConfiguration>());
+        services.AddTransient<IConfigureOptions<ForwardedHeadersOptions>, ForwardedHeadersOptionsConfiguration>();
     }
 }
 

src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs

@@ -68,14 +68,12 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddNavigationProvider<AdminMenuSignin>();
         services.AddSingleton<ITwitterSigninService, TwitterSigninService>();
         services.AddSiteDisplayDriver<TwitterSigninSettingsDisplayDriver>();
+
         // Register the options initializers required by the Twitter Handler.
-        services.TryAddEnumerable(new[]
-        {
-            // Orchard-specific initializers:
-            ServiceDescriptor.Transient<IConfigureOptions<AuthenticationOptions>, TwitterOptionsConfiguration>(),
-            ServiceDescriptor.Transient<IConfigureOptions<TwitterOptions>, TwitterOptionsConfiguration>(),
-            // Built-in initializers:
-            ServiceDescriptor.Transient<IPostConfigureOptions<TwitterOptions>, TwitterPostConfigureOptions>()
-        });
+        // Orchard-specific initializers:
+        services.AddTransient<IConfigureOptions<AuthenticationOptions>, TwitterOptionsConfiguration>();
+        services.AddTransient<IConfigureOptions<TwitterOptions>, TwitterOptionsConfiguration>();
+        // Built-in initializers:
+        services.AddTransient<IPostConfigureOptions<TwitterOptions>, TwitterPostConfigureOptions>();
     }
 }

src/OrchardCore/OrchardCore.ContentManagement.Display/ServiceCollectionExtensions.cs

@@ -21,7 +21,8 @@ public static IServiceCollection AddContentManagementDisplay(this IServiceCollec
         });
 
         services.TryAddTransient<IContentItemDisplayManager, ContentItemDisplayManager>();
-        services.TryAddEnumerable(new ServiceDescriptor(typeof(IContentDisplayHandler), typeof(ContentItemDisplayCoordinator), ServiceLifetime.Scoped));
+
+        services.AddScoped<IContentDisplayHandler, ContentItemDisplayCoordinator>();
 
         services.AddScoped<IPlacementNodeFilterProvider, ContentTypePlacementNodeFilterProvider>();
         services.AddScoped<IPlacementNodeFilterProvider, ContentPartPlacementNodeFilterProvider>();

src/OrchardCore/OrchardCore.DisplayManagement.Liquid/OrchardCoreBuilderExtensions.cs

@@ -35,13 +35,9 @@ public static OrchardCoreBuilder AddLiquidViews(this OrchardCoreBuilder builder)
 
             services.AddTransient<IConfigureOptions<TemplateOptions>, TemplateOptionsFileProviderSetup>();
 
-            services.TryAddEnumerable(
-                ServiceDescriptor.Transient<IConfigureOptions<LiquidViewOptions>,
-                LiquidViewOptionsSetup>());
+            services.AddTransient<IConfigureOptions<LiquidViewOptions>, LiquidViewOptionsSetup>();
 
-            services.TryAddEnumerable(
-                ServiceDescriptor.Transient<IConfigureOptions<ShapeTemplateOptions>,
-                LiquidShapeTemplateOptionsSetup>());
+            services.AddTransient<IConfigureOptions<ShapeTemplateOptions>, LiquidShapeTemplateOptionsSetup>();
 
             services.AddSingleton<IApplicationFeatureProvider<ViewsFeature>, LiquidViewsFeatureProvider>();
             services.AddScoped<IRazorViewExtensionProvider, LiquidViewExtensionProvider>();

src/OrchardCore/OrchardCore.DisplayManagement/OrchardCoreBuilderExtensions.cs

@@ -71,8 +71,7 @@ public static OrchardCoreBuilder AddTheming(this OrchardCoreBuilder builder)
 
                 services.AddScoped<IShapePlacementProvider, ShapeTablePlacementProvider>();
 
-                services.TryAddEnumerable(
-                    ServiceDescriptor.Transient<IConfigureOptions<ShapeTemplateOptions>, ShapeTemplateOptionsSetup>());
+                services.AddTransient<IConfigureOptions<ShapeTemplateOptions>, ShapeTemplateOptionsSetup>();
                 services.TryAddSingleton<IShapeTemplateFileProviderAccessor, ShapeTemplateFileProviderAccessor>();
 
                 services.AddShapeAttributes<CoreShapes>();

src/OrchardCore/OrchardCore.Infrastructure/Documents/OrchardCoreBuilderExtensions.cs

@@ -18,9 +18,7 @@ public static OrchardCoreBuilder AddDocumentManagement(this OrchardCoreBuilder b
             services.AddSingleton(typeof(IDocumentManager<>), typeof(DocumentManager<>));
             services.AddSingleton(typeof(IVolatileDocumentManager<>), typeof(VolatileDocumentManager<>));
             services.AddSingleton(typeof(IDocumentManager<,>), typeof(DocumentManager<,>));
-
-            services.TryAddEnumerable(ServiceDescriptor.Singleton<IConfigureOptions<DocumentOptions>, DocumentOptionsSetup>());
-
+            services.AddSingleton<IConfigureOptions<DocumentOptions>, DocumentOptionsSetup>();
             services.AddSingleton(typeof(IDocumentEntityManager<>), typeof(DocumentEntityManager<>));
             services.AddSingleton(typeof(IVolatileDocumentEntityManager<>), typeof(VolatileDocumentEntityManager<>));
             services.AddSingleton(typeof(IDocumentEntityManager<,>), typeof(DocumentEntityManager<,>));

src/OrchardCore/OrchardCore.Infrastructure/Entities/ServiceCollectionExtensions.cs

@@ -10,7 +10,8 @@ public static class ServiceCollectionExtensions
     public static IServiceCollection AddIdGeneration(this IServiceCollection services)
     {
         services.TryAddSingleton<IIdGenerator, DefaultIdGenerator>();
-        services.TryAddEnumerable(ServiceDescriptor.Singleton<IGlobalMethodProvider, IdGeneratorMethod>());
+        services.TryAddSingleton<IGlobalMethodProvider, IdGeneratorMethod>();
+
         return services;
     }
 }

src/OrchardCore/OrchardCore.Mvc.Core/RazorPages/ModularPageMvcCoreBuilderExtensions.cs

@@ -18,13 +18,11 @@ public static IMvcCoreBuilder AddModularRazorPages(this IMvcCoreBuilder builder)
 
     internal static IServiceCollection AddModularRazorPages(this IServiceCollection services)
     {
-        services.TryAddEnumerable(ServiceDescriptor.Singleton<MatcherPolicy, PageEndpointComparerPolicy>());
+        services.AddSingleton<MatcherPolicy, PageEndpointComparerPolicy>();
 
-        services.TryAddEnumerable(
-            ServiceDescriptor.Transient<IConfigureOptions<RazorPagesOptions>, ModularPageRazorPagesOptionsSetup>());
+        services.AddTransient<IConfigureOptions<RazorPagesOptions>, ModularPageRazorPagesOptionsSetup>();
 
-        services.TryAddEnumerable(
-            ServiceDescriptor.Singleton<IPageApplicationModelProvider, ModularPageApplicationModelProvider>());
+        services.AddSingleton<IPageApplicationModelProvider, ModularPageApplicationModelProvider>();
 
         return services;
     }

src/OrchardCore/OrchardCore.Mvc.Core/Startup.cs

@@ -93,8 +93,7 @@ public override void ConfigureServices(IServiceCollection services)
         builder.AddViewLocalization();
         builder.AddDataAnnotationsLocalization();
 
-        services.TryAddEnumerable(
-            ServiceDescriptor.Transient<IConfigureOptions<RazorViewEngineOptions>, ModularRazorViewEngineOptionsSetup>());
+        services.AddTransient<IConfigureOptions<RazorViewEngineOptions>, ModularRazorViewEngineOptionsSetup>();
 
         if (_hostingEnvironment.IsDevelopment())
         {
@@ -114,8 +113,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddSingleton<IViewCompilerProvider, SharedViewCompilerProvider>();
         }
 
-        services.TryAddEnumerable(
-            ServiceDescriptor.Transient<IConfigureOptions<MvcRazorRuntimeCompilationOptions>, RazorCompilationOptionsSetup>());
+        services.AddTransient<IConfigureOptions<MvcRazorRuntimeCompilationOptions>, RazorCompilationOptionsSetup>();
 
         services.AddSingleton<RazorCompilationFileProviderAccessor>();
 
@@ -141,7 +139,6 @@ internal static void AddMvcModuleCoreServices(IServiceCollection services)
         services.AddScoped<IViewLocationExpanderProvider, ComponentViewLocationExpanderProvider>();
         services.AddScoped<IViewLocationExpanderProvider, SharedViewLocationExpanderProvider>();
 
-        services.TryAddEnumerable(
-            ServiceDescriptor.Singleton<IApplicationModelProvider, ModularApplicationModelProvider>());
+        services.AddSingleton<IApplicationModelProvider, ModularApplicationModelProvider>();
     }
 }

src/OrchardCore/OrchardCore.OpenId.Core/Extensions/OpenIdExtensions.cs

@@ -19,8 +19,7 @@ public static OpenIddictCoreBuilder AddOrchardMigrations(this OpenIddictCoreBuil
     {
         ArgumentNullException.ThrowIfNull(builder);
 
-        builder.Services.TryAddEnumerable(
-            ServiceDescriptor.Scoped<IDataMigration, OpenIdMigrations>());
+        builder.Services.AddDataMigration<OpenIdMigrations>();
 
         // Configure support for an OpenId collection.
         builder.Services.Configure<StoreCollectionOptions>(o => o.Collections.Add("OpenId"));