Configuration improved.

src/Squidex/Config/Orleans/ClientWrapper.cs

@@ -9,7 +9,6 @@ using System;
 using Orleans;
 using Orleans.Configuration;
 using Squidex.Config.Domain;
-using Squidex.Domain.Apps.Entities;
 using Squidex.Infrastructure;
 
 namespace Squidex.Config.Orleans
@@ -25,8 +24,7 @@ namespace Squidex.Config.Orleans
                 .UseLocalhostClustering(40000)
                 .Configure<ClusterOptions>(options =>
                 {
-                    options.ClusterId = Constants.OrleansClusterId;
+                    options.Configure();
-                    options.ServiceId = Constants.OrleansClusterId;
                 })
                 .ConfigureServices((context, services) =>
                 {
@@ -34,8 +32,7 @@ namespace Squidex.Config.Orleans
                 })
                 .ConfigureApplicationParts(builder =>
                 {
-                    builder.AddApplicationPart(SquidexEntities.Assembly);
+                    builder.AddMyParts();
-                    builder.AddApplicationPart(SquidexInfrastructure.Assembly);
                 })
                 .Build();
         }

src/Squidex/Config/Orleans/Extensions.cs

@@ -0,0 +1,30 @@
+// ==========================================================================
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex UG (haftungsbeschraenkt)
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using Orleans;
+using Orleans.ApplicationParts;
+using Orleans.Configuration;
+using Squidex.Domain.Apps.Entities;
+using Squidex.Infrastructure;
+
+namespace Squidex.Config.Orleans
+{
+    public static class Extensions
+    {
+        public static void AddMyParts(this IApplicationPartManager builder)
+        {
+            builder.AddApplicationPart(SquidexEntities.Assembly);
+            builder.AddApplicationPart(SquidexInfrastructure.Assembly);
+        }
+
+        public static void Configure(this ClusterOptions options)
+        {
+            options.ClusterId = Constants.OrleansClusterId;
+            options.ServiceId = Constants.OrleansClusterId;
+        }
+    }
+}

src/Squidex/Config/Orleans/SiloWrapper.cs

@@ -15,7 +15,6 @@ using Orleans;
 using Orleans.Configuration;
 using Orleans.Hosting;
 using Squidex.Config.Domain;
-using Squidex.Domain.Apps.Entities;
 using Squidex.Domain.Apps.Entities.Contents;
 using Squidex.Domain.Apps.Entities.Rules;
 using Squidex.Infrastructure;
@@ -27,7 +26,7 @@ using Squidex.Infrastructure.Tasks;
 
 namespace Squidex.Config.Orleans
 {
-    public class SiloWrapper : DisposableObjectBase, IInitializable, IDisposable
+    public sealed class SiloWrapper : DisposableObjectBase, IInitializable, IDisposable
     {
         private readonly Lazy<ISiloHost> silo;
         private readonly ISemanticLog log;
@@ -67,8 +66,11 @@ namespace Squidex.Config.Orleans
                     })
                     .Configure<ClusterOptions>(options =>
                     {
-                        options.ClusterId = Constants.OrleansClusterId;
+                        options.Configure();
-                        options.ServiceId = Constants.OrleansClusterId;
+                    })
+                    .ConfigureApplicationParts(builder =>
+                    {
+                        builder.AddMyParts();
                     })
                     .ConfigureLogging((hostingContext, builder) =>
                     {
@@ -76,11 +78,6 @@ namespace Squidex.Config.Orleans
                         builder.AddSemanticLog();
                         builder.AddFilter();
                     })
-                    .ConfigureApplicationParts(builder =>
-                    {
-                        builder.AddApplicationPart(SquidexEntities.Assembly);
-                        builder.AddApplicationPart(SquidexInfrastructure.Assembly);
-                    })
                     .ConfigureServices((context, services) =>
                     {
                         services.AddAppSiloServices(context.Configuration);

src/Squidex/Squidex.csproj

@@ -81,7 +81,7 @@
     <PackageReference Include="NSwag.AspNetCore" Version="11.15.4" />
     <PackageReference Include="OpenCover" Version="4.6.519" />
     <PackageReference Include="Orleans.Providers.MongoDB" Version="2.0.0" />
-    <PackageReference Include="OrleansDashboard" Version="2.0.1" />
+    <PackageReference Include="OrleansDashboard" Version="2.0.4" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
     <PackageReference Include="ReportGenerator" Version="3.1.2" />
     <PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.6" />