Browse Source

Use prerelease for testing.

pull/289/head
Sebastian 8 years ago
parent
commit
0b690daea4
  1. 1
      NuGet.Config
  2. 6
      src/Squidex.Domain.Apps.Entities/AppProvider.cs
  3. 4
      src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
  4. 6
      src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
  5. 1
      src/Squidex/Config/Orleans/ClientWrapper.cs
  6. 1
      src/Squidex/Config/Orleans/SiloWrapper.cs

1
NuGet.Config

@ -2,6 +2,7 @@
<configuration> <configuration>
<packageSources> <packageSources>
<add key="localfeed" value="libs" /> <add key="localfeed" value="libs" />
<add key="myget.org" value="https://dotnet.myget.org/F/orleans-ci/api/v3/index.json" protocolVersion="3" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources> </packageSources>
</configuration> </configuration>

6
src/Squidex.Domain.Apps.Entities/AppProvider.cs

@ -47,14 +47,14 @@ namespace Squidex.Domain.Apps.Entities
return (null, null); return (null, null);
} }
var schema = await grainFactory.GetGrain<ISchemaGrain>(id).GetStateAsync(); var schema = await GetSchemaAsync(appId, id, false);
if (!IsExisting(schema, false)) if (schema == null)
{ {
return (null, null); return (null, null);
} }
return (app.Value, schema.Value); return (app.Value, schema);
} }
}); });
} }

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" /> <PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator.Build" Version="2.0.3-ci.20180511.2" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.0.0" /> <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.0.3-ci.20180511.2" />
<PackageReference Include="NodaTime" Version="2.2.5" /> <PackageReference Include="NodaTime" Version="2.2.5" />
<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" />

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

@ -10,9 +10,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.0.1" /> <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.1" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.1" />
<PackageReference Include="Microsoft.Orleans.Core" Version="2.0.0" /> <PackageReference Include="Microsoft.Orleans.Core" Version="2.0.3-ci.20180511.2" />
<PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator.Build" Version="2.0.0" /> <PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator.Build" Version="2.0.3-ci.20180511.2" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.0.0" /> <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.0.3-ci.20180511.2" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="NodaTime" Version="2.2.5" /> <PackageReference Include="NodaTime" Version="2.2.5" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" />

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

@ -31,6 +31,7 @@ namespace Squidex.Config.Orleans
.Configure<ClusterOptions>(options => .Configure<ClusterOptions>(options =>
{ {
options.ClusterId = "squidex"; options.ClusterId = "squidex";
options.ServiceId = "squidex";
}) })
.ConfigureServices((context, services) => .ConfigureServices((context, services) =>
{ {

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

@ -68,6 +68,7 @@ namespace Squidex.Config.Orleans
.Configure<ClusterOptions>(options => .Configure<ClusterOptions>(options =>
{ {
options.ClusterId = "squidex"; options.ClusterId = "squidex";
options.ServiceId = "squidex";
}) })
.ConfigureLogging((hostingContext, builder) => .ConfigureLogging((hostingContext, builder) =>
{ {

Loading…
Cancel
Save