From d824a47ba535734e85670b4d2501c3c6cd585683 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Fri, 1 Sep 2017 22:18:11 +0200 Subject: [PATCH] Packages bumped --- .../Squidex.Domain.Apps.Core.csproj | 8 ++++---- .../Squidex.Domain.Apps.Events.csproj | 3 +-- .../Squidex.Domain.Apps.Read.MongoDb.csproj | 4 ++-- .../Squidex.Domain.Apps.Read.csproj | 7 +++---- .../Squidex.Domain.Apps.Write.csproj | 3 +-- .../Squidex.Infrastructure.Azure.csproj | 2 +- .../Squidex.Infrastructure.GoogleCloud.csproj | 2 +- .../Squidex.Infrastructure.MongoDb.csproj | 2 +- .../Squidex.Infrastructure.RabbitMq.csproj | 2 +- .../Squidex.Infrastructure.Redis.csproj | 4 ++-- .../ImageSharpAssetThumbnailGenerator.cs | 18 ++++++------------ .../Squidex.Infrastructure.csproj | 6 +++--- src/Squidex/Squidex.csproj | 14 +++++++------- tests/Benchmarks/Benchmarks.csproj | 2 +- .../Squidex.Domain.Apps.Core.Tests.csproj | 7 +++---- .../Squidex.Domain.Apps.Read.Tests.csproj | 7 +++---- .../Squidex.Domain.Apps.Write.Tests.csproj | 7 +++---- .../Squidex.Domain.Users.Tests.csproj | 7 +++---- .../Squidex.Infrastructure.Tests.csproj | 6 +++--- 19 files changed, 49 insertions(+), 62 deletions(-) diff --git a/src/Squidex.Domain.Apps.Core/Squidex.Domain.Apps.Core.csproj b/src/Squidex.Domain.Apps.Core/Squidex.Domain.Apps.Core.csproj index 47cbd8afc..85c417268 100644 --- a/src/Squidex.Domain.Apps.Core/Squidex.Domain.Apps.Core.csproj +++ b/src/Squidex.Domain.Apps.Core/Squidex.Domain.Apps.Core.csproj @@ -10,10 +10,10 @@ - - + + - - + + diff --git a/src/Squidex.Domain.Apps.Events/Squidex.Domain.Apps.Events.csproj b/src/Squidex.Domain.Apps.Events/Squidex.Domain.Apps.Events.csproj index f90d9ea5b..24a773bd6 100644 --- a/src/Squidex.Domain.Apps.Events/Squidex.Domain.Apps.Events.csproj +++ b/src/Squidex.Domain.Apps.Events/Squidex.Domain.Apps.Events.csproj @@ -1,7 +1,6 @@  netstandard1.6 - $(PackageTargetFallback);dnxcore50 full @@ -13,6 +12,6 @@ - + diff --git a/src/Squidex.Domain.Apps.Read.MongoDb/Squidex.Domain.Apps.Read.MongoDb.csproj b/src/Squidex.Domain.Apps.Read.MongoDb/Squidex.Domain.Apps.Read.MongoDb.csproj index eda56115c..ffbf73909 100644 --- a/src/Squidex.Domain.Apps.Read.MongoDb/Squidex.Domain.Apps.Read.MongoDb.csproj +++ b/src/Squidex.Domain.Apps.Read.MongoDb/Squidex.Domain.Apps.Read.MongoDb.csproj @@ -14,8 +14,8 @@ - + - + diff --git a/src/Squidex.Domain.Apps.Read/Squidex.Domain.Apps.Read.csproj b/src/Squidex.Domain.Apps.Read/Squidex.Domain.Apps.Read.csproj index 516fe672b..ea90018ac 100644 --- a/src/Squidex.Domain.Apps.Read/Squidex.Domain.Apps.Read.csproj +++ b/src/Squidex.Domain.Apps.Read/Squidex.Domain.Apps.Read.csproj @@ -1,7 +1,6 @@  netstandard1.6 - $(PackageTargetFallback);dnxcore50 full @@ -13,10 +12,10 @@ - + - - + + diff --git a/src/Squidex.Domain.Apps.Write/Squidex.Domain.Apps.Write.csproj b/src/Squidex.Domain.Apps.Write/Squidex.Domain.Apps.Write.csproj index 0d8ec6df3..a8187f67f 100644 --- a/src/Squidex.Domain.Apps.Write/Squidex.Domain.Apps.Write.csproj +++ b/src/Squidex.Domain.Apps.Write/Squidex.Domain.Apps.Write.csproj @@ -1,7 +1,6 @@  netstandard1.6 - $(PackageTargetFallback);dnxcore50 full @@ -16,6 +15,6 @@ - + diff --git a/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj b/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj index a2d331b7d..89feea628 100644 --- a/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj +++ b/src/Squidex.Infrastructure.Azure/Squidex.Infrastructure.Azure.csproj @@ -4,7 +4,7 @@ Squidex.Infrastructure - + diff --git a/src/Squidex.Infrastructure.GoogleCloud/Squidex.Infrastructure.GoogleCloud.csproj b/src/Squidex.Infrastructure.GoogleCloud/Squidex.Infrastructure.GoogleCloud.csproj index a39c0faf1..535870790 100644 --- a/src/Squidex.Infrastructure.GoogleCloud/Squidex.Infrastructure.GoogleCloud.csproj +++ b/src/Squidex.Infrastructure.GoogleCloud/Squidex.Infrastructure.GoogleCloud.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj b/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj index 2995b1a9f..0e3eed9f1 100644 --- a/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj +++ b/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj @@ -12,6 +12,6 @@ - + diff --git a/src/Squidex.Infrastructure.RabbitMq/Squidex.Infrastructure.RabbitMq.csproj b/src/Squidex.Infrastructure.RabbitMq/Squidex.Infrastructure.RabbitMq.csproj index bea75db31..95e44795a 100644 --- a/src/Squidex.Infrastructure.RabbitMq/Squidex.Infrastructure.RabbitMq.csproj +++ b/src/Squidex.Infrastructure.RabbitMq/Squidex.Infrastructure.RabbitMq.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Squidex.Infrastructure.Redis/Squidex.Infrastructure.Redis.csproj b/src/Squidex.Infrastructure.Redis/Squidex.Infrastructure.Redis.csproj index f705fa01c..ab908563b 100644 --- a/src/Squidex.Infrastructure.Redis/Squidex.Infrastructure.Redis.csproj +++ b/src/Squidex.Infrastructure.Redis/Squidex.Infrastructure.Redis.csproj @@ -11,7 +11,7 @@ - - + + diff --git a/src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs b/src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs index 95677da6b..abc63035f 100644 --- a/src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs +++ b/src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs @@ -10,8 +10,8 @@ using System; using System.IO; using System.Threading.Tasks; using ImageSharp; -using ImageSharp.Formats; using ImageSharp.Processing; +using SixLabors.Primitives; namespace Squidex.Infrastructure.Assets.ImageSharp { @@ -19,8 +19,8 @@ namespace Squidex.Infrastructure.Assets.ImageSharp { public ImageSharpAssetThumbnailGenerator() { - Configuration.Default.AddImageFormat(new JpegFormat()); - Configuration.Default.AddImageFormat(new PngFormat()); + Configuration.Default.AddImageFormat(ImageFormats.Jpeg); + Configuration.Default.AddImageFormat(ImageFormats.Png); } public Task CreateThumbnailAsync(Stream source, Stream destination, int? width, int? height, string mode) @@ -42,22 +42,16 @@ namespace Squidex.Infrastructure.Assets.ImageSharp var w = width ?? int.MaxValue; var h = height ?? int.MaxValue; - using (var sourceImage = Image.Load(source)) + using (var sourceImage = Image.Load(source, out var format)) { if (w >= sourceImage.Width && h >= sourceImage.Height && resizeMode == ResizeMode.Crop) { resizeMode = ResizeMode.BoxPad; } - var options = - new ResizeOptions - { - Size = new Size(w, h), - Mode = resizeMode - }; + var options = new ResizeOptions { Size = new Size(w, h), Mode = resizeMode }; - sourceImage.MetaData.Quality = 0; - sourceImage.Resize(options).Save(destination); + sourceImage.Resize(options).Save(destination, format); } }); } diff --git a/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj b/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj index 5abba34f0..20a242cf9 100644 --- a/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj +++ b/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj @@ -8,15 +8,15 @@ True - + - + - + diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj index 8c7273200..818f9bac5 100644 --- a/src/Squidex/Squidex.csproj +++ b/src/Squidex/Squidex.csproj @@ -44,7 +44,7 @@ - + @@ -69,16 +69,16 @@ - + - + - + - - + + - + diff --git a/tests/Benchmarks/Benchmarks.csproj b/tests/Benchmarks/Benchmarks.csproj index e6995c8d6..a190125de 100644 --- a/tests/Benchmarks/Benchmarks.csproj +++ b/tests/Benchmarks/Benchmarks.csproj @@ -9,6 +9,6 @@ - + diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj b/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj index 603c7d575..ad20bb85c 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj +++ b/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj @@ -2,7 +2,6 @@ Exe netcoreapp1.1 - $(PackageTargetFallback);dnxcore50 Squidex.Domain.Apps.Core @@ -10,10 +9,10 @@ - - + + - + diff --git a/tests/Squidex.Domain.Apps.Read.Tests/Squidex.Domain.Apps.Read.Tests.csproj b/tests/Squidex.Domain.Apps.Read.Tests/Squidex.Domain.Apps.Read.Tests.csproj index 2efcd320b..977b30ad2 100644 --- a/tests/Squidex.Domain.Apps.Read.Tests/Squidex.Domain.Apps.Read.Tests.csproj +++ b/tests/Squidex.Domain.Apps.Read.Tests/Squidex.Domain.Apps.Read.Tests.csproj @@ -2,7 +2,6 @@ Exe netcoreapp1.1 - $(PackageTargetFallback);dnxcore50 Squidex.Domain.Apps.Read @@ -19,10 +18,10 @@ - - + + - + diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Squidex.Domain.Apps.Write.Tests.csproj b/tests/Squidex.Domain.Apps.Write.Tests/Squidex.Domain.Apps.Write.Tests.csproj index 011efc695..2c37cb292 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Squidex.Domain.Apps.Write.Tests.csproj +++ b/tests/Squidex.Domain.Apps.Write.Tests/Squidex.Domain.Apps.Write.Tests.csproj @@ -2,7 +2,6 @@ Exe netcoreapp1.1 - $(PackageTargetFallback);dnxcore50 Squidex.Domain.Apps.Write @@ -12,9 +11,9 @@ - - - + + + diff --git a/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj b/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj index ff2f9ef94..a9ac31d61 100644 --- a/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj +++ b/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj @@ -2,7 +2,6 @@ Exe netcoreapp1.1 - $(PackageTargetFallback);dnxcore50 Squidex.Domain.Users @@ -13,9 +12,9 @@ - - - + + + diff --git a/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj b/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj index 5da5979d1..100efb778 100644 --- a/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj +++ b/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj @@ -11,12 +11,12 @@ - + - - + +