Browse Source

RC1

pull/249/head
Sebastian Stehle 8 years ago
parent
commit
b36cc6bb15
  1. 2
      global.json
  2. BIN
      libs/orleansdashboard/2.0.0-rc1/orleansdashboard.2.0.0-rc1.nupkg
  3. 1
      libs/orleansdashboard/2.0.0-rc1/orleansdashboard.2.0.0-rc1.nupkg.sha512
  4. 25
      libs/orleansdashboard/2.0.0-rc1/orleansdashboard.nuspec
  5. 2
      src/Squidex.Domain.Apps.Core.Model/Squidex.Domain.Apps.Core.Model.csproj
  6. 12
      src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
  7. 2
      src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj
  8. 4
      src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
  9. 2
      src/Squidex.Domain.Apps.Events/Squidex.Domain.Apps.Events.csproj
  10. 2
      src/Squidex.Domain.Users.MongoDb/Squidex.Domain.Users.MongoDb.csproj
  11. 2
      src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj
  12. 2
      src/Squidex.Infrastructure.GetEventStore/Squidex.Infrastructure.GetEventStore.csproj
  13. 2
      src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj
  14. 10
      src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
  15. 25
      src/Squidex/Config/Orleans/ClientWrapper.cs
  16. 34
      src/Squidex/Config/Orleans/SiloExtensions.cs
  17. 32
      src/Squidex/Config/Orleans/SiloServices.cs
  18. 81
      src/Squidex/Config/Orleans/SiloWrapper.cs
  19. 1
      src/Squidex/Program.cs
  20. 28
      src/Squidex/Squidex.csproj
  21. 4
      tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj
  22. 4
      tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj
  23. 4
      tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj
  24. 4
      tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj

2
global.json

@ -1,5 +1,5 @@
{ {
"sdk": { "sdk": {
"version": "2.0.0" "version": "2.1.4"
} }
} }

BIN
libs/orleansdashboard/2.0.0-rc1/orleansdashboard.2.0.0-rc1.nupkg

Binary file not shown.

1
libs/orleansdashboard/2.0.0-rc1/orleansdashboard.2.0.0-rc1.nupkg.sha512

@ -0,0 +1 @@
uTfl6S7PJhuGfx75wJiQC5gTgaRh17T0kqLDgfXZtXqQuz1kk6ikRGTnaDEjWM9SKks/uBf7q27CE8yOkuctFw==

25
libs/orleansdashboard/2.0.0-rc1/orleansdashboard.nuspec

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>OrleansDashboard</id>
<version>2.0.0-rc1</version>
<authors>OrleansContrib</authors>
<owners>OrleansContrib</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<licenseUrl>https://opensource.org/licenses/MIT</licenseUrl>
<projectUrl>https://github.com/OrleansContrib/OrleansDashboard</projectUrl>
<iconUrl>http://dotnet.github.io/orleans/assets/logo.png</iconUrl>
<description>An admin dashboard for Microsoft Orleans</description>
<copyright>Copyright © 2017</copyright>
<tags>orleans dashboard metrics monitor</tags>
<repository url="https://github.com/OrleansContrib/OrleansDashboard" />
<dependencies>
<group targetFramework=".NETStandard2.0">
<dependency id="Microsoft.AspNetCore" version="2.0.1" exclude="Build,Analyzers" />
<dependency id="Microsoft.Orleans.Core" version="2.0.0-rc1" exclude="Build,Analyzers" />
<dependency id="Microsoft.Orleans.OrleansCodeGenerator.Build" version="2.0.0-rc1" exclude="Build,Analyzers" />
<dependency id="Microsoft.Orleans.OrleansRuntime" version="2.0.0-rc1" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
</package>

2
src/Squidex.Domain.Apps.Core.Model/Squidex.Domain.Apps.Core.Model.csproj

@ -8,7 +8,7 @@
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Fody" Version="2.3.24" /> <PackageReference Include="Fody" Version="2.4.4" />
<PackageReference Include="Freezable.Fody" Version="1.8.0" /> <PackageReference Include="Freezable.Fody" Version="1.8.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.4.0" /> <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" /> <PackageReference Include="System.ValueTuple" Version="4.4.0" />

12
src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj

@ -13,17 +13,17 @@
<ProjectReference Include="..\Squidex.Infrastructure\Squidex.Infrastructure.csproj" /> <ProjectReference Include="..\Squidex.Infrastructure\Squidex.Infrastructure.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Algolia.Search" Version="4.2.1" /> <PackageReference Include="Algolia.Search" Version="4.2.2" />
<PackageReference Include="Jint" Version="2.11.58" /> <PackageReference Include="Jint" Version="2.11.58" />
<PackageReference Include="Microsoft.OData.Core" Version="7.4.0" /> <PackageReference Include="Microsoft.OData.Core" Version="7.4.1" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
<PackageReference Include="NJsonSchema" Version="9.10.19" /> <PackageReference Include="NJsonSchema" Version="9.10.29" />
<PackageReference Include="NodaTime" Version="2.2.3" /> <PackageReference Include="NodaTime" Version="2.2.4" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
<PackageReference Include="System.Collections.Immutable" Version="1.4.0" /> <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" /> <PackageReference Include="System.ValueTuple" Version="4.4.0" />
<PackageReference Include="WindowsAzure.Storage" Version="8.7.0" /> <PackageReference Include="WindowsAzure.Storage" Version="9.1.0" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<CodeAnalysisRuleSet>..\..\Squidex.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>..\..\Squidex.ruleset</CodeAnalysisRuleSet>

2
src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj

@ -15,7 +15,7 @@
<ProjectReference Include="..\Squidex.Domain.Apps.Entities\Squidex.Domain.Apps.Entities.csproj" /> <ProjectReference Include="..\Squidex.Domain.Apps.Entities\Squidex.Domain.Apps.Entities.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.OData.Core" Version="7.4.0" /> <PackageReference Include="Microsoft.OData.Core" Version="7.4.1" />
<PackageReference Include="MongoDB.Driver" Version="2.5.0" /> <PackageReference Include="MongoDB.Driver" Version="2.5.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />

4
src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj

@ -14,8 +14,8 @@
<ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" /> <ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator.Build" Version="2.0.0-beta3" /> <PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator.Build" Version="2.0.0-rc1" />
<PackageReference Include="NodaTime" Version="2.2.3" /> <PackageReference Include="NodaTime" Version="2.2.4" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" /> <PackageReference Include="System.ValueTuple" Version="4.4.0" />

2
src/Squidex.Domain.Apps.Events/Squidex.Domain.Apps.Events.csproj

@ -13,7 +13,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="GraphQL" Version="0.17.3" /> <PackageReference Include="GraphQL" Version="0.17.3" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.0.0" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.0.0" />
<PackageReference Include="NodaTime" Version="2.2.3" /> <PackageReference Include="NodaTime" Version="2.2.4" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.8.0" /> <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.8.0" />

2
src/Squidex.Domain.Users.MongoDb/Squidex.Domain.Users.MongoDb.csproj

@ -13,7 +13,7 @@
<ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" /> <ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="IdentityServer4" Version="2.1.1" /> <PackageReference Include="IdentityServer4" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.0.1" /> <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.0.1" />
<PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" /> <PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
<PackageReference Include="MongoDB.Driver" Version="2.5.0" /> <PackageReference Include="MongoDB.Driver" Version="2.5.0" />

2
src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj

@ -6,7 +6,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="RefactoringEssentials" Version="5.6.0" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
<PackageReference Include="WindowsAzure.Storage" Version="8.7.0" /> <PackageReference Include="WindowsAzure.Storage" Version="9.1.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Squidex.Infrastructure\Squidex.Infrastructure.csproj" /> <ProjectReference Include="..\Squidex.Infrastructure\Squidex.Infrastructure.csproj" />

2
src/Squidex.Infrastructure.GetEventStore/Squidex.Infrastructure.GetEventStore.csproj

@ -8,7 +8,7 @@
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EventStore.ClientAPI.NetCore" Version="4.0.2-rc" /> <PackageReference Include="EventStore.ClientAPI.NetCore" Version="4.1.0.23" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
</ItemGroup> </ItemGroup>

2
src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj

@ -11,7 +11,7 @@
<ProjectReference Include="..\Squidex.Infrastructure\Squidex.Infrastructure.csproj" /> <ProjectReference Include="..\Squidex.Infrastructure\Squidex.Infrastructure.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.OData.Core" Version="7.4.0" /> <PackageReference Include="Microsoft.OData.Core" Version="7.4.1" />
<PackageReference Include="MongoDB.Driver" Version="2.5.0" /> <PackageReference Include="MongoDB.Driver" Version="2.5.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />

10
src/Squidex.Infrastructure/Squidex.Infrastructure.csproj

@ -10,11 +10,11 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.0.0" /> <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
<PackageReference Include="Microsoft.Orleans.Core" Version="2.0.0-beta3" /> <PackageReference Include="Microsoft.Orleans.Core" Version="2.0.0-rc1" />
<PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator.Build" Version="2.0.0-beta3" /> <PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator.Build" Version="2.0.0-rc1" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.0.0-beta3" /> <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.0.0-rc1" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
<PackageReference Include="NodaTime" Version="2.2.3" /> <PackageReference Include="NodaTime" Version="2.2.4" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0001" /> <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0001" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />

25
src/Squidex/Config/Orleans/ClientWrapper.cs

@ -6,14 +6,15 @@
// ========================================================================== // ==========================================================================
using System; using System;
using System.Net;
using Orleans; using Orleans;
using Orleans.Runtime.Configuration; using Orleans.Runtime;
using Squidex.Domain.Apps.Entities; using Squidex.Domain.Apps.Entities;
using Squidex.Infrastructure; using Squidex.Infrastructure;
namespace Squidex.Config.Orleans namespace Squidex.Config.Orleans
{ {
public sealed class ClientWrapper : IInitializable, IDisposable public sealed class ClientWrapper : DisposableObjectBase, IInitializable, IDisposable
{ {
private readonly IClusterClient client; private readonly IClusterClient client;
@ -25,17 +26,20 @@ namespace Squidex.Config.Orleans
public ClientWrapper() public ClientWrapper()
{ {
client = new ClientBuilder() client = new ClientBuilder()
.UseConfiguration(ClientConfiguration.LocalhostSilo())
.UseDashboard() .UseDashboard()
.UseStaticClustering(options =>
{
options.Gateways.Add(new IPEndPoint(IPAddress.Loopback, 40000).ToGatewayUri());
})
.ConfigureCluster(options =>
{
options.ClusterId = "squidex";
})
.ConfigureApplicationParts(builder => .ConfigureApplicationParts(builder =>
{ {
builder.AddApplicationPart(SquidexEntities.Assembly); builder.AddApplicationPart(SquidexEntities.Assembly);
builder.AddApplicationPart(SquidexInfrastructure.Assembly); builder.AddApplicationPart(SquidexInfrastructure.Assembly);
}) })
.UseStaticGatewayListProvider(options =>
{
options.Gateways.Add(new Uri("gwy.tcp://127.0.0.1:40000/0"));
})
.Build(); .Build();
} }
@ -44,9 +48,12 @@ namespace Squidex.Config.Orleans
client.Connect().Wait(); client.Connect().Wait();
} }
public void Dispose() protected override void DisposeObject(bool disposing)
{ {
client.Close().Wait(); if (disposing)
{
client.Close().Wait();
}
} }
} }
} }

34
src/Squidex/Config/Orleans/SiloExtensions.cs

@ -1,34 +0,0 @@
// ==========================================================================
// Squidex Headless CMS
// ==========================================================================
// Copyright (c) Squidex UG (haftungsbeschränkt)
// All rights reserved. Licensed under the MIT license.
// ==========================================================================
using Microsoft.Extensions.Configuration;
using Orleans;
using Orleans.Hosting;
using Orleans.Runtime.Configuration;
namespace Squidex.Config.Orleans
{
public static class SiloExtensions
{
public static ISiloHostBuilder UseContentRoot(this ISiloHostBuilder builder, string path)
{
builder.ConfigureAppConfiguration(config =>
{
config.SetBasePath(path);
});
return builder;
}
public static ClusterConfiguration WithDashboard(this ClusterConfiguration config)
{
config.RegisterDashboard();
return config;
}
}
}

32
src/Squidex/Config/Orleans/SiloServices.cs

@ -5,13 +5,9 @@
// All rights reserved. Licensed under the MIT license. // All rights reserved. Licensed under the MIT license.
// ========================================================================== // ==========================================================================
using System;
using System.Linq;
using System.Net;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Orleans; using Orleans.Hosting;
using Orleans.Runtime.Configuration;
namespace Squidex.Config.Orleans namespace Squidex.Config.Orleans
{ {
@ -19,32 +15,6 @@ namespace Squidex.Config.Orleans
{ {
public static void AddAppSiloServices(this IServiceCollection services, IConfiguration config) public static void AddAppSiloServices(this IServiceCollection services, IConfiguration config)
{ {
var clusterConfiguration =
services.Where(x => x.ServiceType == typeof(ClusterConfiguration))
.Select(x => x.ImplementationInstance)
.Select(x => (ClusterConfiguration)x)
.FirstOrDefault();
if (clusterConfiguration != null)
{
var ipConfig = config.GetRequiredValue("orleans:hostNameOrIPAddress");
if (ipConfig.Equals("Host", StringComparison.OrdinalIgnoreCase))
{
ipConfig = Dns.GetHostName();
}
else if (ipConfig.Equals("FirstIPAddressOfHost"))
{
var ips = Dns.GetHostAddressesAsync(Dns.GetHostName()).Result;
ipConfig = ips.FirstOrDefault()?.ToString();
}
clusterConfiguration.Defaults.PropagateActivityId = true;
clusterConfiguration.Defaults.ProxyGatewayEndpoint = new IPEndPoint(IPAddress.Any, 40000);
clusterConfiguration.Defaults.HostNameOrIPAddress = ipConfig;
}
config.ConfigureByOption("store:type", new Options config.ConfigureByOption("store:type", new Options
{ {
["MongoDB"] = () => ["MongoDB"] = () =>

81
src/Squidex/Config/Orleans/SiloWrapper.cs

@ -6,11 +6,13 @@
// ========================================================================== // ==========================================================================
using System; using System;
using System.IO; using System.Net;
using System.Threading.Tasks;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Orleans; using Orleans;
using Orleans.Configuration;
using Orleans.Hosting; using Orleans.Hosting;
using Orleans.Runtime.Configuration;
using Squidex.Config.Domain; using Squidex.Config.Domain;
using Squidex.Domain.Apps.Entities; using Squidex.Domain.Apps.Entities;
using Squidex.Infrastructure; using Squidex.Infrastructure;
@ -19,7 +21,7 @@ using Squidex.Infrastructure.Orleans;
namespace Squidex.Config.Orleans namespace Squidex.Config.Orleans
{ {
public class SiloWrapper : IInitializable, IDisposable public class SiloWrapper : DisposableObjectBase, IInitializable, IDisposable
{ {
private readonly ISiloHost silo; private readonly ISiloHost silo;
@ -42,38 +44,40 @@ namespace Squidex.Config.Orleans
{ {
J.Serializer = SerializationServices.DefaultJsonSerializer; J.Serializer = SerializationServices.DefaultJsonSerializer;
silo = SiloHostBuilder.CreateDefault() silo = new SiloHostBuilder()
.UseConfiguration(ClusterConfiguration.LocalhostPrimarySilo(33333).WithDashboard()) .UseDashboard(options => options.HostSelf = true)
.UseContentRoot(Directory.GetCurrentDirectory()) .ConfigureEndpoints(Dns.GetHostName(), 11111, 40000, listenOnAllHostAddresses: true)
.UseDashboard(options => .Configure(options =>
{ {
options.HostSelf = false; options.ClusterId = "squidex";
}) })
.ConfigureLogging(builder => .ConfigureLogging(builder =>
{ {
builder.AddSemanticLog(); builder.AddSemanticLog();
}) })
.ConfigureApplicationParts(builder => .ConfigureApplicationParts(builder =>
{ {
builder.AddApplicationPart(SquidexEntities.Assembly); builder.AddApplicationPart(SquidexEntities.Assembly);
builder.AddApplicationPart(SquidexInfrastructure.Assembly); builder.AddApplicationPart(SquidexInfrastructure.Assembly);
}) })
.ConfigureServices((context, services) => .ConfigureServices((context, services) =>
{ {
services.AddAppSiloServices(context.Configuration); services.AddAppSiloServices(context.Configuration);
services.AddAppServices(context.Configuration); services.AddAppServices(context.Configuration);
})
.ConfigureAppConfiguration((hostContext, builder) => services.Configure<ProcessExitHandlingOptions>(options => options.FastKillOnProcessExit = false);
{ })
if (configuration is IConfigurationRoot root) .ConfigureAppConfiguration((hostContext, builder) =>
{ {
foreach (var provider in root.Providers) if (configuration is IConfigurationRoot root)
{ {
builder.Add(new Source(provider)); foreach (var provider in root.Providers)
} {
} builder.Add(new Source(provider));
}) }
.Build(); }
})
.Build();
} }
public void Initialize() public void Initialize()
@ -81,9 +85,12 @@ namespace Squidex.Config.Orleans
silo.StartAsync().Wait(); silo.StartAsync().Wait();
} }
public void Dispose() protected override void DisposeObject(bool disposing)
{ {
silo.StopAsync().Wait(); if (disposing)
{
Task.Run(() => silo.StopAsync()).Wait();
}
} }
} }
} }

1
src/Squidex/Program.cs

@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Orleans; using Orleans;
using Orleans.Hosting; using Orleans.Hosting;
using Squidex.Config.Orleans;
using Squidex.Infrastructure.Log.Adapter; using Squidex.Infrastructure.Log.Adapter;
namespace Squidex namespace Squidex

28
src/Squidex/Squidex.csproj

@ -48,11 +48,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Algolia.Search" Version="4.2.1" /> <PackageReference Include="Algolia.Search" Version="4.2.2" />
<PackageReference Include="Ben.BlockingDetector" Version="0.0.2" /> <PackageReference Include="Ben.BlockingDetector" Version="0.0.3" />
<PackageReference Include="EventStore.ClientAPI.NetCore" Version="4.0.2-rc" /> <PackageReference Include="EventStore.ClientAPI.NetCore" Version="4.1.0.23" />
<PackageReference Include="IdentityServer4" Version="2.1.1" /> <PackageReference Include="IdentityServer4" Version="2.1.2" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.3.0" /> <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.4.0" />
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.1.0" /> <PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.1" /> <PackageReference Include="Microsoft.AspNetCore" Version="2.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.1" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.1" />
@ -69,20 +69,20 @@
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.4" /> <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.4" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" /> <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
<PackageReference Include="Microsoft.Data.Edm" Version="5.8.3" /> <PackageReference Include="Microsoft.Data.Edm" Version="5.8.3" />
<PackageReference Include="Microsoft.OData.Core" Version="7.4.0" /> <PackageReference Include="Microsoft.OData.Core" Version="7.4.1" />
<PackageReference Include="Microsoft.Orleans.Client" Version="2.0.0-beta3" /> <PackageReference Include="Microsoft.Orleans.Client" Version="2.0.0-rc1" />
<PackageReference Include="Microsoft.Orleans.Server " Version="2.0.0-beta3" /> <PackageReference Include="Microsoft.Orleans.Server " Version="2.0.0-beta3" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.1" /> <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.2" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.2" />
<PackageReference Include="MongoDB.Driver" Version="2.5.0" /> <PackageReference Include="MongoDB.Driver" Version="2.5.0" />
<PackageReference Include="NJsonSchema" Version="9.10.19" /> <PackageReference Include="NJsonSchema" Version="9.10.29" />
<PackageReference Include="NodaTime.Serialization.JsonNet" Version="2.0.0" /> <PackageReference Include="NodaTime.Serialization.JsonNet" Version="2.0.0" />
<PackageReference Include="NSwag.AspNetCore" Version="11.12.16" /> <PackageReference Include="NSwag.AspNetCore" Version="11.15.3" />
<PackageReference Include="OpenCover" Version="4.6.519" /> <PackageReference Include="OpenCover" Version="4.6.519" />
<PackageReference Include="Orleans.Providers.MongoDB" Version="2.0.0-preview2" /> <PackageReference Include="Orleans.Providers.MongoDB" Version="2.0.0-rc1" />
<PackageReference Include="OrleansDashboard" Version="2.0.0-beta4" /> <PackageReference Include="OrleansDashboard" Version="2.0.0-rc1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
<PackageReference Include="ReportGenerator" Version="3.1.1" /> <PackageReference Include="ReportGenerator" Version="3.1.2" />
<PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.6" /> <PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.6" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
<PackageReference Include="System.Linq" Version="4.3.0" /> <PackageReference Include="System.Linq" Version="4.3.0" />
@ -104,4 +104,8 @@
<AdditionalFiles Include="..\..\stylecop.json" Link="stylecop.json" /> <AdditionalFiles Include="..\..\stylecop.json" Link="stylecop.json" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Update="Microsoft.Orleans.Server" Version="2.0.0-rc1" />
</ItemGroup>
</Project> </Project>

4
tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj

@ -10,9 +10,9 @@
<ProjectReference Include="..\..\src\Squidex.Infrastructure\Squidex.Infrastructure.csproj" /> <ProjectReference Include="..\..\src\Squidex.Infrastructure\Squidex.Infrastructure.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="FakeItEasy" Version="4.3.0" /> <PackageReference Include="FakeItEasy" Version="4.5.1" />
<PackageReference Include="FluentAssertions" Version="4.19.4" /> <PackageReference Include="FluentAssertions" Version="4.19.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" /> <PackageReference Include="System.ValueTuple" Version="4.4.0" />

4
tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj

@ -19,9 +19,9 @@
<ProjectReference Include="..\..\src\Squidex.Domain.Apps.Entities\Squidex.Domain.Apps.Entities.csproj" /> <ProjectReference Include="..\..\src\Squidex.Domain.Apps.Entities\Squidex.Domain.Apps.Entities.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="FakeItEasy" Version="4.3.0" /> <PackageReference Include="FakeItEasy" Version="4.5.1" />
<PackageReference Include="FluentAssertions" Version="4.19.4" /> <PackageReference Include="FluentAssertions" Version="4.19.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
<PackageReference Include="MongoDB.Driver" Version="2.5.0" /> <PackageReference Include="MongoDB.Driver" Version="2.5.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />

4
tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj

@ -11,9 +11,9 @@
<ProjectReference Include="..\..\src\Squidex.Shared\Squidex.Shared.csproj" /> <ProjectReference Include="..\..\src\Squidex.Shared\Squidex.Shared.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="FakeItEasy" Version="4.3.0" /> <PackageReference Include="FakeItEasy" Version="4.5.1" />
<PackageReference Include="FluentAssertions" Version="4.19.4" /> <PackageReference Include="FluentAssertions" Version="4.19.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" /> <PackageReference Include="System.ValueTuple" Version="4.4.0" />

4
tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj

@ -11,12 +11,12 @@
<ProjectReference Include="..\..\src\Squidex.Infrastructure\Squidex.Infrastructure.csproj" /> <ProjectReference Include="..\..\src\Squidex.Infrastructure\Squidex.Infrastructure.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="FakeItEasy" Version="4.3.0" /> <PackageReference Include="FakeItEasy" Version="4.5.1" />
<PackageReference Include="FluentAssertions" Version="4.19.4" /> <PackageReference Include="FluentAssertions" Version="4.19.4" />
<PackageReference Include="Google.Cloud.Storage.V1" Version="2.1.0" /> <PackageReference Include="Google.Cloud.Storage.V1" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.0.0" /> <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.0.0" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" /> <PackageReference Include="System.ValueTuple" Version="4.4.0" />

Loading…
Cancel
Save