Browse Source

Correct prerelease package

pull/294/head
Sebastian 8 years ago
parent
commit
91ffe68422
  1. 4
      src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
  2. 6
      src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
  3. 2
      src/Squidex/Config/Orleans/ClientWrapper.cs
  4. 1
      src/Squidex/Pipeline/ApiCostsFilter.cs
  5. 3
      src/Squidex/Pipeline/RequestLogPerformanceMiddleware.cs
  6. 7
      src/Squidex/Squidex.csproj
  7. 56
      tests/Squidex.Infrastructure.Tests/Orleans/JsonExternalSerializerTests.cs
  8. 1
      tests/Squidex.Tests/Squidex.Tests.csproj

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

@ -14,8 +14,8 @@
<ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator.Build" Version="2.0.3-ci.20180511.2" />
<PackageReference Include="Microsoft.Orleans.Core" Version="2.0.3-ci.20180511.2" />
<PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator.Build" Version="2.0.0-ci.20180515.5" />
<PackageReference Include="Microsoft.Orleans.Core" Version="2.0.0-ci.20180515.5" />
<PackageReference Include="NodaTime" Version="2.2.5" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />

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

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

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

@ -6,10 +6,8 @@
// ==========================================================================
using System;
using System.Net;
using Orleans;
using Orleans.Configuration;
using Orleans.Runtime;
using Squidex.Config.Domain;
using Squidex.Domain.Apps.Entities;
using Squidex.Infrastructure;

1
src/Squidex/Pipeline/ApiCostsFilter.cs

@ -6,7 +6,6 @@
// ==========================================================================
using System;
using System.Diagnostics;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;

3
src/Squidex/Pipeline/RequestLogPerformanceMiddleware.cs

@ -5,6 +5,8 @@
// All rights reserved. Licensed under the MIT license.
// ==========================================================================
using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Squidex.Infrastructure;
@ -14,6 +16,7 @@ namespace Squidex.Pipeline
{
public sealed class RequestLogPerformanceMiddleware : IMiddleware
{
private const int LongOperationsMs = 1000;
private readonly ISemanticLog log;
public RequestLogPerformanceMiddleware(ISemanticLog log)

7
src/Squidex/Squidex.csproj

@ -3,7 +3,7 @@
<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
<NoWarn>$(NoWarn);CS1591;1591;1573;1572</NoWarn>
<NoWarn>$(NoWarn);CS1591;1591;1573;1572;NU1605</NoWarn>
<PackageId>Squidex</PackageId>
<PreserveCompilationContext>true</PreserveCompilationContext>
<TargetFramework>netcoreapp2.0</TargetFramework>
@ -76,7 +76,9 @@
<PackageReference Include="Microsoft.Data.Edm" Version="5.8.3" />
<PackageReference Include="Microsoft.OData.Core" Version="7.4.4" />
<PackageReference Include="Microsoft.Orleans.Client" Version="2.0.0-ci.20180515.5" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.0.3-ci.20180511.2" />
<PackageReference Include="Microsoft.Orleans.Core" Version="2.0.0-ci.20180515.5" />
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="2.0.0-ci.20180515.5" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.0.0-ci.20180515.5" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.2" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.3" />
<PackageReference Include="MongoDB.Driver" Version="2.5.1" />
@ -112,5 +114,4 @@
<ItemGroup>
<PackageReference Update="Microsoft.Orleans.Server" Version="2.0.0" />
</ItemGroup>
</Project>

56
tests/Squidex.Infrastructure.Tests/Orleans/JsonExternalSerializerTests.cs

@ -47,24 +47,33 @@ namespace Squidex.Infrastructure.Orleans
[Fact]
public void Should_serialize_and_deserialize_value()
{
var value = new J<List<int>>(new List<int> { 1, 2, 3 });
SerializeAndDeserialize(ArrayOfLength(100), Assert.Equal);
}
[Fact]
public void Should_serialize_and_deserialize_large_value()
{
SerializeAndDeserialize(ArrayOfLength(8000), Assert.Equal);
}
private void SerializeAndDeserialize<T>(T value, Action<T, T> equals) where T : class
{
var buffer = new MemoryStream();
var writer = A.Fake<IBinaryTokenStreamWriter>();
var writerContext = new SerializationContext(null) { StreamWriter = writer };
J<object>.Serialize(J.Of(value), CreateWriter(buffer), typeof(T));
A.CallTo(() => writer.Write(A<byte[]>.Ignored, A<int>.Ignored, A<int>.Ignored))
.Invokes(new Action<byte[], int, int>(buffer.Write));
A.CallTo(() => writer.CurrentOffset)
.ReturnsLazily(x => (int)buffer.Position);
buffer.Position = 0;
J<object>.Serialize(value, writerContext, value.GetType());
var copy = (J<T>)J<object>.Deserialize(typeof(J<T>), CreateReader(buffer));
buffer.Position = 0;
equals(copy.Value, value);
Assert.NotSame(value, copy.Value);
}
private static DeserializationContext CreateReader(MemoryStream buffer)
{
var reader = A.Fake<IBinaryTokenStreamReader>();
var readerContext = new DeserializationContext(null) { StreamReader = reader };
A.CallTo(() => reader.ReadByteArray(A<byte[]>.Ignored, A<int>.Ignored, A<int>.Ignored))
.Invokes(new Action<byte[], int, int>((b, o, l) => buffer.Read(b, o, l)));
@ -73,10 +82,31 @@ namespace Squidex.Infrastructure.Orleans
A.CallTo(() => reader.Length)
.ReturnsLazily(x => (int)buffer.Length);
var copy = (J<List<int>>)J<object>.Deserialize(value.GetType(), readerContext);
return new DeserializationContext(null) { StreamReader = reader };
}
private static SerializationContext CreateWriter(MemoryStream buffer)
{
var writer = A.Fake<IBinaryTokenStreamWriter>();
A.CallTo(() => writer.Write(A<byte[]>.Ignored, A<int>.Ignored, A<int>.Ignored))
.Invokes(new Action<byte[], int, int>(buffer.Write));
A.CallTo(() => writer.CurrentOffset)
.ReturnsLazily(x => (int)buffer.Position);
return new SerializationContext(null) { StreamWriter = writer };
}
private List<int> ArrayOfLength(int length)
{
var result = new List<int>();
for (var i = 0; i < length; i++)
{
result.Add(i);
}
Assert.Equal(value.Value, copy.Value);
Assert.NotSame(value.Value, copy.Value);
return result;
}
}
}

1
tests/Squidex.Tests/Squidex.Tests.csproj

@ -3,6 +3,7 @@
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<RootNamespace>Squidex</RootNamespace>
<NoWarn>$(NoWarn);NU1605</NoWarn>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Squidex.Domain.Users\Squidex.Domain.Users.csproj" />

Loading…
Cancel
Save