Browse Source

Packages updated.

pull/352/head
Sebastian Stehle 7 years ago
parent
commit
321fd64e5a
  1. 2
      extensions/Squidex.Extensions/Squidex.Extensions.csproj
  2. 2
      src/Squidex.Domain.Apps.Core.Model/Squidex.Domain.Apps.Core.Model.csproj
  3. 2
      src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
  4. 2
      src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
  5. 2
      src/Squidex.Domain.Apps.Events/Squidex.Domain.Apps.Events.csproj
  6. 2
      src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj
  7. 53
      src/Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs
  8. 4
      src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
  9. 12
      src/Squidex/Squidex.csproj
  10. 2
      tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj

2
extensions/Squidex.Extensions/Squidex.Extensions.csproj

@ -13,7 +13,7 @@
<PackageReference Include="Microsoft.Extensions.Http" Version="2.2.0" /> <PackageReference Include="Microsoft.Extensions.Http" Version="2.2.0" />
<PackageReference Include="Microsoft.OData.Core" Version="7.5.4" /> <PackageReference Include="Microsoft.OData.Core" Version="7.5.4" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="NodaTime" Version="2.4.4" /> <PackageReference Include="NodaTime" Version="2.4.5" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" /> <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />

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

@ -9,7 +9,7 @@
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Fody" Version="4.0.2"> <PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>

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

@ -17,7 +17,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Jint" Version="3.0.0-beta-1469" /> <PackageReference Include="Jint" Version="3.0.0-beta-1469" />
<PackageReference Include="Microsoft.OData.Core" Version="7.5.4" /> <PackageReference Include="Microsoft.OData.Core" Version="7.5.4" />
<PackageReference Include="NJsonSchema" Version="9.13.27" /> <PackageReference Include="NJsonSchema" Version="9.13.29" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" /> <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />

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

@ -25,7 +25,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Orleans.Core" Version="2.3.0" /> <PackageReference Include="Microsoft.Orleans.Core" Version="2.3.0" />
<PackageReference Include="NodaTime" Version="2.4.4" /> <PackageReference Include="NodaTime" Version="2.4.5" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" /> <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />

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

@ -13,7 +13,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.2.0" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.2.0" />
<PackageReference Include="NodaTime" Version="2.4.4" /> <PackageReference Include="NodaTime" Version="2.4.5" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" /> <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />

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

@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Azure.DocumentDB.ChangeFeedProcessor" Version="2.2.6" /> <PackageReference Include="Microsoft.Azure.DocumentDB.ChangeFeedProcessor" Version="2.2.6" />
<PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.2.3" /> <PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.3.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" /> <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />

53
src/Squidex.Infrastructure/DependencyInjection/DependencyInjectionExtensions.cs

@ -14,13 +14,29 @@ namespace Microsoft.Extensions.DependencyInjection
{ {
public static class DependencyInjectionExtensions public static class DependencyInjectionExtensions
{ {
public delegate void Registrator(Type serviceType, Func<IServiceProvider, object> implementationFactory);
public sealed class InterfaceRegistrator<T> public sealed class InterfaceRegistrator<T>
{ {
private readonly IServiceCollection services; private readonly Registrator register;
private readonly Registrator registerOptional;
public InterfaceRegistrator(IServiceCollection services) public InterfaceRegistrator(Registrator register, Registrator registerOptional)
{ {
this.services = services; this.register = register;
this.registerOptional = registerOptional;
var interfaces = typeof(T).GetInterfaces();
if (interfaces.Contains(typeof(IInitializable)))
{
register(typeof(IInitializable), c => c.GetRequiredService<T>());
}
if (interfaces.Contains(typeof(IBackgroundProcess)))
{
register(typeof(IBackgroundProcess), c => c.GetRequiredService<T>());
}
} }
public InterfaceRegistrator<T> AsSelf() public InterfaceRegistrator<T> AsSelf()
@ -32,7 +48,7 @@ namespace Microsoft.Extensions.DependencyInjection
{ {
if (typeof(TInterface) != typeof(T)) if (typeof(TInterface) != typeof(T))
{ {
services.TryAddSingleton(typeof(TInterface), c => c.GetRequiredService<T>()); registerOptional(typeof(TInterface), c => c.GetRequiredService<T>());
} }
return this; return this;
@ -42,7 +58,7 @@ namespace Microsoft.Extensions.DependencyInjection
{ {
if (typeof(TInterface) != typeof(T)) if (typeof(TInterface) != typeof(T))
{ {
services.AddSingleton(typeof(TInterface), c => c.GetRequiredService<T>()); register(typeof(TInterface), c => c.GetRequiredService<T>());
} }
return this; return this;
@ -53,47 +69,28 @@ namespace Microsoft.Extensions.DependencyInjection
{ {
services.AddTransient(typeof(T), factory); services.AddTransient(typeof(T), factory);
return new InterfaceRegistrator<T>(services); return new InterfaceRegistrator<T>((t, f) => services.AddTransient(t, f), (t, f) => services.TryAddTransient(t, f));
} }
public static InterfaceRegistrator<T> AddTransientAs<T>(this IServiceCollection services) where T : class public static InterfaceRegistrator<T> AddTransientAs<T>(this IServiceCollection services) where T : class
{ {
services.AddTransient<T, T>(); services.AddTransient<T, T>();
return new InterfaceRegistrator<T>(services); return new InterfaceRegistrator<T>((t, f) => services.AddTransient(t, f), (t, f) => services.TryAddTransient(t, f));
} }
public static InterfaceRegistrator<T> AddSingletonAs<T>(this IServiceCollection services, Func<IServiceProvider, T> factory) where T : class public static InterfaceRegistrator<T> AddSingletonAs<T>(this IServiceCollection services, Func<IServiceProvider, T> factory) where T : class
{ {
services.AddSingleton(typeof(T), factory); services.AddSingleton(typeof(T), factory);
RegisterDefaults<T>(services); return new InterfaceRegistrator<T>((t, f) => services.AddSingleton(t, f), (t, f) => services.TryAddSingleton(t, f));
return new InterfaceRegistrator<T>(services);
} }
public static InterfaceRegistrator<T> AddSingletonAs<T>(this IServiceCollection services) where T : class public static InterfaceRegistrator<T> AddSingletonAs<T>(this IServiceCollection services) where T : class
{ {
services.AddSingleton<T, T>(); services.AddSingleton<T, T>();
RegisterDefaults<T>(services); return new InterfaceRegistrator<T>((t, f) => services.AddSingleton(t, f), (t, f) => services.TryAddSingleton(t, f));
return new InterfaceRegistrator<T>(services);
}
private static void RegisterDefaults<T>(IServiceCollection services) where T : class
{
var interfaces = typeof(T).GetInterfaces();
if (interfaces.Contains(typeof(IInitializable)))
{
services.AddSingleton(typeof(IInitializable), c => c.GetRequiredService<T>());
}
if (interfaces.Contains(typeof(IBackgroundProcess)))
{
services.AddSingleton(typeof(IBackgroundProcess), c => c.GetRequiredService<T>());
}
} }
} }
} }

4
src/Squidex.Infrastructure/Squidex.Infrastructure.csproj

@ -20,14 +20,14 @@
<PackageReference Include="Microsoft.Orleans.Core" Version="2.3.0" /> <PackageReference Include="Microsoft.Orleans.Core" Version="2.3.0" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.3.0" /> <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.3.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="NodaTime" Version="2.4.4" /> <PackageReference Include="NodaTime" Version="2.4.5" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0004" /> <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0004" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" /> <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
<PackageReference Include="System.Linq" Version="4.3.0" /> <PackageReference Include="System.Linq" Version="4.3.0" />
<PackageReference Include="System.Reactive" Version="4.1.3" /> <PackageReference Include="System.Reactive" Version="4.1.5" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" /> <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
<PackageReference Include="System.Security.Claims" Version="4.3.0" /> <PackageReference Include="System.Security.Claims" Version="4.3.0" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" /> <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />

12
src/Squidex/Squidex.csproj

@ -68,15 +68,15 @@
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="2.3.0" /> <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="2.3.0" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.3.0" /> <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.3.0" />
<PackageReference Include="MongoDB.Driver" Version="2.8.0" /> <PackageReference Include="MongoDB.Driver" Version="2.8.0" />
<PackageReference Include="NJsonSchema" Version="9.13.27" /> <PackageReference Include="NJsonSchema" Version="9.13.29" />
<PackageReference Include="NSwag.AspNetCore" Version="12.0.17" /> <PackageReference Include="NSwag.AspNetCore" Version="12.1.0" />
<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.3.1" /> <PackageReference Include="Orleans.Providers.MongoDB" Version="2.3.1" />
<PackageReference Include="Orleans.WebHostCompatibilityLayer" Version="2.3.0" /> <PackageReference Include="Orleans.WebHostCompatibilityLayer" Version="2.3.1" />
<PackageReference Include="OrleansDashboard" Version="2.3.0" /> <PackageReference Include="OrleansDashboard" Version="2.3.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="ReportGenerator" Version="4.0.15" PrivateAssets="all" /> <PackageReference Include="ReportGenerator" Version="4.1.2" PrivateAssets="all" />
<PackageReference Include="Squidex.ClientLibrary" Version="2.8.0" /> <PackageReference Include="Squidex.ClientLibrary" Version="2.9.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
<PackageReference Include="System.Linq" Version="4.3.0" /> <PackageReference Include="System.Linq" Version="4.3.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" /> <PackageReference Include="System.ValueTuple" Version="4.5.0" />

2
tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj

@ -15,7 +15,7 @@
<PackageReference Include="IdentityServer4" Version="2.4.0" /> <PackageReference Include="IdentityServer4" Version="2.4.0" />
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.4.0" /> <PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
<PackageReference Include="NJsonSchema" Version="9.13.27" /> <PackageReference Include="NJsonSchema" Version="9.13.29" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
<PackageReference Include="xunit" Version="2.4.1" /> <PackageReference Include="xunit" Version="2.4.1" />

Loading…
Cancel
Save