Merge remote-tracking branch 'upstream/master'

src/Squidex/Config/Orleans/OrleansServices.cs

@@ -22,7 +22,7 @@ namespace Squidex.Config.Orleans
 {
     public static class OrleansServices
     {
-        public static IServiceProvider AddAndBuildOrleans(this IServiceCollection services, IConfiguration config)
+        public static IServiceProvider AddAndBuildOrleans(this IServiceCollection services, IConfiguration config, Action<IServiceCollection> afterServices)
         {
             services.Configure<ClusterOptions>(options =>
             {
@@ -105,6 +105,8 @@ namespace Squidex.Config.Orleans
                     siloServices.Add(descriptor);
                 }
 
+                afterServices(siloServices);
+
                 provider = siloServices.BuildServiceProvider();
 
                 return provider;

src/Squidex/WebStartup.cs

@@ -93,10 +93,11 @@ namespace Squidex
             services.Configure<MyUsageOptions>(
                 config.GetSection("usage"));
 
-            services.AddHostedService<InitializerHost>();
-            services.AddHostedService<MigratorHost>();
-
-            var provider = services.AddAndBuildOrleans(configuration);
+            var provider = services.AddAndBuildOrleans(configuration, afterServices =>
+            {
+                afterServices.AddHostedService<InitializerHost>();
+                afterServices.AddHostedService<MigratorHost>();
+            });
 
             return provider;
         }