Startup Async Configure

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

@@ -1,6 +1,6 @@
 using System;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
@@ -41,12 +41,12 @@ public override void ConfigureServices(IServiceCollection services)
         }
 
         /// <inheritdocs />
-        public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
+        public override async ValueTask ConfigureAsync(IApplicationBuilder app, IServiceProvider serviceProvider)
         {
             var localizationService = serviceProvider.GetService<ILocalizationService>();
 
-            var defaultCulture = localizationService.GetDefaultCultureAsync().GetAwaiter().GetResult();
-            var supportedCultures = localizationService.GetSupportedCulturesAsync().GetAwaiter().GetResult();
+            var defaultCulture = await localizationService.GetDefaultCultureAsync();
+            var supportedCultures = await localizationService.GetSupportedCulturesAsync();
 
             var localizationOptions = serviceProvider.GetService<IOptions<RequestLocalizationOptions>>().Value;
             var ignoreSystemSettings = serviceProvider.GetService<IOptions<CultureOptions>>().Value.IgnoreSystemSettings;

src/OrchardCore/OrchardCore.Abstractions/Modules/IAsyncStartup.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+
+namespace OrchardCore.Modules
+{
+    /// <summary>
+    /// An implementation of this interface allows to configure asynchronously the tenant pipeline.
+    /// </summary>
+    public interface IAsyncStartup
+    {
+        /// <summary>
+        /// This method gets called before any <see cref="IStartup.Configure"/> and can collaborate to
+        /// build the tenant pipeline, but is not intended to configure the route/endpoint middleware.
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <param name="serviceProvider"></param>
+        ValueTask ConfigureAsync(IApplicationBuilder builder, IServiceProvider serviceProvider);
+    }
+}

src/OrchardCore/OrchardCore.Abstractions/Modules/StartupBase.cs

@@ -1,11 +1,12 @@
 using System;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace OrchardCore.Modules
 {
-    public abstract class StartupBase : IStartup
+    public abstract class StartupBase : IStartup, IAsyncStartup
     {
         /// <inheritdoc />
         public virtual int Order { get; } = 0;
@@ -22,5 +23,8 @@ public virtual void ConfigureServices(IServiceCollection services)
         public virtual void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
         {
         }
+
+        /// <inheritdoc />
+        public virtual ValueTask ConfigureAsync(IApplicationBuilder app, IServiceProvider serviceProvider) => default;
     }
 }

src/OrchardCore/OrchardCore/Modules/Extensions/ShellPipelineExtensions.cs

@@ -31,7 +31,7 @@ public static async Task BuildPipelineAsync(this ShellContext context)
         {
             if (!context.HasPipeline())
             {
-                context.Pipeline = context.BuildPipeline();
+                context.Pipeline = await context.BuildPipelineInternalAsync();
             }
         }
         finally
@@ -43,22 +43,20 @@ public static async Task BuildPipelineAsync(this ShellContext context)
     /// <summary>
     /// Builds the tenant pipeline.
     /// </summary>
-    private static IShellPipeline BuildPipeline(this ShellContext context)
+    private static async ValueTask<IShellPipeline> BuildPipelineInternalAsync(this ShellContext context)
     {
         var features = context.ServiceProvider.GetService<IServer>()?.Features;
         var builder = new ApplicationBuilder(context.ServiceProvider, features ?? new FeatureCollection());
         var startupFilters = builder.ApplicationServices.GetService<IEnumerable<IStartupFilter>>();
 
-        Action<IApplicationBuilder> configure = builder =>
-        {
-            ConfigurePipeline(builder);
-        };
-
+        Action<IApplicationBuilder> configure = builder => { };
         foreach (var filter in startupFilters.Reverse())
         {
             configure = filter.Configure(configure);
         }
 
+        await ConfigurePipelineAsync(builder);
+
         configure(builder);
 
         var shellPipeline = new ShellRequestPipeline
@@ -72,13 +70,21 @@ private static IShellPipeline BuildPipeline(this ShellContext context)
     /// <summary>
     /// Configures the tenant pipeline.
     /// </summary>
-    private static void ConfigurePipeline(IApplicationBuilder builder)
+    private static async ValueTask ConfigurePipelineAsync(IApplicationBuilder builder)
     {
         // 'IStartup' instances are ordered by module dependencies with a 'ConfigureOrder' of 0 by default.
         // 'OrderBy' performs a stable sort, so the order is preserved among equal 'ConfigureOrder' values.
         var startups = builder.ApplicationServices.GetServices<IStartup>().OrderBy(s => s.ConfigureOrder);
 
         var services = ShellScope.Services;
+        foreach (var startup in startups)
+        {
+            if (startup is IAsyncStartup asyncStartup)
+            {
+                await asyncStartup.ConfigureAsync(builder, services);
+            }
+        }
+
         builder.UseRouting().UseEndpoints(routes =>
         {
             foreach (var startup in startups)