Browse Source

Downgraded to 3.6.0

pull/400/head
Sebastian Stehle 6 years ago
parent
commit
766d23a12b
  1. 4
      src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
  2. 6
      src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
  3. 14
      src/Squidex/Config/Orleans/OrleansServices.cs
  4. 12
      src/Squidex/Squidex.csproj

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

@ -20,11 +20,11 @@
<PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00005" /> <PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00005" />
<PackageReference Include="Lucene.Net.Queries" Version="4.8.0-beta00005" /> <PackageReference Include="Lucene.Net.Queries" Version="4.8.0-beta00005" />
<PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00005" /> <PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00005" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="2.4.0"> <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="2.3.6">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Orleans.Core" Version="2.4.0" /> <PackageReference Include="Microsoft.Orleans.Core" Version="2.3.6" />
<PackageReference Include="NodaTime" Version="2.4.6" /> <PackageReference Include="NodaTime" Version="2.4.6" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />

6
src/Squidex.Infrastructure/Squidex.Infrastructure.csproj

@ -14,12 +14,12 @@
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="2.2.0" /> <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
<PackageReference Include="Microsoft.OData.Core" Version="7.6.0" /> <PackageReference Include="Microsoft.OData.Core" Version="7.6.0" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="2.4.0"> <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="2.3.6">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Orleans.Core" Version="2.4.0" /> <PackageReference Include="Microsoft.Orleans.Core" Version="2.3.6" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.4.0" /> <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.3.6" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="NJsonSchema" Version="10.0.21" /> <PackageReference Include="NJsonSchema" Version="10.0.21" />
<PackageReference Include="NodaTime" Version="2.4.6" /> <PackageReference Include="NodaTime" Version="2.4.6" />

14
src/Squidex/Config/Orleans/OrleansServices.cs

@ -7,14 +7,12 @@
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.Runtime.InteropServices;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Orleans; using Orleans;
using Orleans.Configuration; using Orleans.Configuration;
using Orleans.Hosting; using Orleans.Hosting;
using Orleans.Providers.MongoDB.Configuration; using Orleans.Providers.MongoDB.Configuration;
using Orleans.Statistics;
using OrleansDashboard; using OrleansDashboard;
using Squidex.Domain.Apps.Entities; using Squidex.Domain.Apps.Entities;
using Squidex.Infrastructure; using Squidex.Infrastructure;
@ -62,18 +60,6 @@ namespace Squidex.Config.Orleans
options.HostSelf = false; options.HostSelf = false;
}); });
if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
builder.UseLinuxEnvironmentStatistics();
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
builder.UsePerfCounterEnvironmentStatistics();
}
}
var orleansPortSilo = config.GetOptionalValue("orleans:siloPort", 11111); var orleansPortSilo = config.GetOptionalValue("orleans:siloPort", 11111);
var orleansPortGateway = config.GetOptionalValue("orleans:gatewayPort", 40000); var orleansPortGateway = config.GetOptionalValue("orleans:gatewayPort", 40000);

12
src/Squidex/Squidex.csproj

@ -63,12 +63,10 @@
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" /> <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
<PackageReference Include="Microsoft.Data.Edm" Version="5.8.4" /> <PackageReference Include="Microsoft.Data.Edm" Version="5.8.4" />
<PackageReference Include="Microsoft.OData.Core" Version="7.6.0" /> <PackageReference Include="Microsoft.OData.Core" Version="7.6.0" />
<PackageReference Include="Microsoft.Orleans.Client" Version="2.4.0" /> <PackageReference Include="Microsoft.Orleans.Client" Version="2.3.6" />
<PackageReference Include="Microsoft.Orleans.Core" Version="2.4.0" /> <PackageReference Include="Microsoft.Orleans.Core" Version="2.3.6" />
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="2.4.0" /> <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="2.3.6" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.4.0" /> <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.3.6" />
<PackageReference Include="Microsoft.Orleans.OrleansTelemetryConsumers.Counters" Version="2.4.0" />
<PackageReference Include="Microsoft.Orleans.OrleansTelemetryConsumers.Linux" Version="2.4.0" />
<PackageReference Include="MongoDB.Driver" Version="2.8.1" /> <PackageReference Include="MongoDB.Driver" Version="2.8.1" />
<PackageReference Include="Namotion.Reflection" Version="1.0.6" /> <PackageReference Include="Namotion.Reflection" Version="1.0.6" />
<PackageReference Include="NJsonSchema" Version="10.0.21" /> <PackageReference Include="NJsonSchema" Version="10.0.21" />
@ -76,7 +74,7 @@
<PackageReference Include="OpenCover" Version="4.7.922" PrivateAssets="all" /> <PackageReference Include="OpenCover" Version="4.7.922" PrivateAssets="all" />
<PackageReference Include="Orleans.Providers.MongoDB" Version="2.5.0" /> <PackageReference Include="Orleans.Providers.MongoDB" Version="2.5.0" />
<PackageReference Include="Orleans.WebHostCompatibilityLayer" Version="2.3.1" /> <PackageReference Include="Orleans.WebHostCompatibilityLayer" Version="2.3.1" />
<PackageReference Include="OrleansDashboard" Version="2.4.0" /> <PackageReference Include="OrleansDashboard" Version="2.3.6" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="ReportGenerator" Version="4.2.15" PrivateAssets="all" /> <PackageReference Include="ReportGenerator" Version="4.2.15" PrivateAssets="all" />
<PackageReference Include="Squidex.ClientLibrary" Version="3.7.0" /> <PackageReference Include="Squidex.ClientLibrary" Version="3.7.0" />

Loading…
Cancel
Save