From e7535559e5e17b624c67d63ae4563e1fa7bde30e Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Wed, 13 Sep 2017 22:25:48 +0100 Subject: [PATCH 1/6] upgrade api usage to imagesharp beta code --- samples/ImageSharp.Web.Sample/Startup.cs | 10 +++++----- src/ImageSharp.Web/Caching/CacheHash.cs | 2 +- src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs | 2 +- .../Commands/Converters/Rgba32Converter.cs | 3 +-- src/ImageSharp.Web/Commands/TypeConstants.cs | 2 +- .../DependencyInjection/ImageSharpConfiguration.cs | 2 +- src/ImageSharp.Web/FormattedImage.cs | 6 +++--- src/ImageSharp.Web/Helpers/FormatHelpers.cs | 4 ++-- src/ImageSharp.Web/ImageSharp.Web.csproj | 2 +- src/ImageSharp.Web/Memory/BufferDataPool.cs | 2 +- src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs | 4 ++-- .../Middleware/ImageSharpMiddlewareOptions.cs | 2 +- .../Processors/BackgroundColorWebProcessor.cs | 4 ++-- src/ImageSharp.Web/Processors/FormatWebProcessor.cs | 6 +++--- src/ImageSharp.Web/Processors/IImageWebProcessor.cs | 2 +- src/ImageSharp.Web/Processors/ResizeWebProcessor.cs | 6 +++--- .../Processors/WebProcessingExtensions.cs | 2 +- .../Resolvers/PhysicalFileSystemResolver.cs | 2 +- tests/ImageSharp.Web.Tests/Caching/CacheHashTests.cs | 2 +- .../Commands/CommandParserTests.cs | 4 ++-- 20 files changed, 34 insertions(+), 35 deletions(-) diff --git a/samples/ImageSharp.Web.Sample/Startup.cs b/samples/ImageSharp.Web.Sample/Startup.cs index 0c4972d3..4f90c90a 100644 --- a/samples/ImageSharp.Web.Sample/Startup.cs +++ b/samples/ImageSharp.Web.Sample/Startup.cs @@ -10,11 +10,11 @@ namespace SixLabors.ImageSharp.Web.Sample { - using ImageSharp.Web.Caching; - using ImageSharp.Web.Commands; - using ImageSharp.Web.DependencyInjection; - using ImageSharp.Web.Processors; - using ImageSharp.Web.Resolvers; + using SixLabors.ImageSharp.Web.Caching; + using SixLabors.ImageSharp.Web.Commands; + using SixLabors.ImageSharp.Web.DependencyInjection; + using SixLabors.ImageSharp.Web.Processors; + using SixLabors.ImageSharp.Web.Resolvers; public class Startup { diff --git a/src/ImageSharp.Web/Caching/CacheHash.cs b/src/ImageSharp.Web/Caching/CacheHash.cs index 60e7ef0a..f6879193 100644 --- a/src/ImageSharp.Web/Caching/CacheHash.cs +++ b/src/ImageSharp.Web/Caching/CacheHash.cs @@ -3,7 +3,7 @@ using System.Security.Cryptography; using System.Text; -using ImageSharp; +using SixLabors.ImageSharp; using SixLabors.ImageSharp.Web.Helpers; namespace SixLabors.ImageSharp.Web.Caching diff --git a/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs b/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs index 1f91d3f2..1fcade6d 100644 --- a/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs +++ b/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; -using ImageSharp.Memory; +using SixLabors.ImageSharp.Memory; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.FileProviders; diff --git a/src/ImageSharp.Web/Commands/Converters/Rgba32Converter.cs b/src/ImageSharp.Web/Commands/Converters/Rgba32Converter.cs index 97c035fa..c6d034d5 100644 --- a/src/ImageSharp.Web/Commands/Converters/Rgba32Converter.cs +++ b/src/ImageSharp.Web/Commands/Converters/Rgba32Converter.cs @@ -6,8 +6,7 @@ using System.Globalization; using System.Reflection; using System.Text.RegularExpressions; -using ImageSharp; -using ImageSharp.PixelFormats; +using SixLabors.ImageSharp.PixelFormats; namespace SixLabors.ImageSharp.Web.Commands.Converters { diff --git a/src/ImageSharp.Web/Commands/TypeConstants.cs b/src/ImageSharp.Web/Commands/TypeConstants.cs index 36f3d6ad..7414f76c 100644 --- a/src/ImageSharp.Web/Commands/TypeConstants.cs +++ b/src/ImageSharp.Web/Commands/TypeConstants.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. using System; -using ImageSharp; +using SixLabors.ImageSharp; namespace SixLabors.ImageSharp.Web.Commands { diff --git a/src/ImageSharp.Web/DependencyInjection/ImageSharpConfiguration.cs b/src/ImageSharp.Web/DependencyInjection/ImageSharpConfiguration.cs index f987b17a..75e5170b 100644 --- a/src/ImageSharp.Web/DependencyInjection/ImageSharpConfiguration.cs +++ b/src/ImageSharp.Web/DependencyInjection/ImageSharpConfiguration.cs @@ -1,7 +1,7 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -using ImageSharp; +using SixLabors.ImageSharp; using Microsoft.Extensions.Options; using SixLabors.ImageSharp.Web.Middleware; diff --git a/src/ImageSharp.Web/FormattedImage.cs b/src/ImageSharp.Web/FormattedImage.cs index c5a9e800..dbd57e43 100644 --- a/src/ImageSharp.Web/FormattedImage.cs +++ b/src/ImageSharp.Web/FormattedImage.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.IO; using System.Text; -using ImageSharp; -using ImageSharp.Formats; -using ImageSharp.PixelFormats; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.Formats; +using SixLabors.ImageSharp.PixelFormats; using ISImage = ImageSharp.Image; namespace SixLabors.ImageSharp.Web diff --git a/src/ImageSharp.Web/Helpers/FormatHelpers.cs b/src/ImageSharp.Web/Helpers/FormatHelpers.cs index c1f13693..66dc836a 100644 --- a/src/ImageSharp.Web/Helpers/FormatHelpers.cs +++ b/src/ImageSharp.Web/Helpers/FormatHelpers.cs @@ -4,8 +4,8 @@ using System; using System.IO; using System.Linq; -using ImageSharp; -using ImageSharp.Formats; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.Formats; namespace SixLabors.ImageSharp.Web.Helpers { diff --git a/src/ImageSharp.Web/ImageSharp.Web.csproj b/src/ImageSharp.Web/ImageSharp.Web.csproj index 5b57a729..274e7a99 100644 --- a/src/ImageSharp.Web/ImageSharp.Web.csproj +++ b/src/ImageSharp.Web/ImageSharp.Web.csproj @@ -32,13 +32,13 @@ - + All diff --git a/src/ImageSharp.Web/Memory/BufferDataPool.cs b/src/ImageSharp.Web/Memory/BufferDataPool.cs index 8d1dca78..50fcd9a6 100644 --- a/src/ImageSharp.Web/Memory/BufferDataPool.cs +++ b/src/ImageSharp.Web/Memory/BufferDataPool.cs @@ -3,7 +3,7 @@ using System.Buffers; -namespace ImageSharp.Memory +namespace SixLabors.ImageSharp.Memory { /// /// Provides a resource pool that enables reusing instances of value type arrays for image data . diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs index 0df899f4..ed5e1e48 100644 --- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs +++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs @@ -7,8 +7,8 @@ using System.IO; using System.Linq; using System.Threading.Tasks; -using ImageSharp; -using ImageSharp.Memory; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.Memory; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs index b87e66ee..56d7bcc6 100644 --- a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs +++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. using System; -using ImageSharp; +using SixLabors.ImageSharp; using Microsoft.AspNetCore.Http; using SixLabors.ImageSharp.Web.Commands; using SixLabors.ImageSharp.Web.Processors; diff --git a/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs b/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs index 4b7a7bab..215cacad 100644 --- a/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs +++ b/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. using System.Collections.Generic; -using ImageSharp; +using SixLabors.ImageSharp; using Microsoft.Extensions.Logging; using SixLabors.ImageSharp.Web.Commands; @@ -34,7 +34,7 @@ public FormattedImage Process(FormattedImage image, ILogger logger, IDictionary< if (background != default(Rgba32)) { - image.Image.BackgroundColor(background); + image.Image.Mutate(x => x.BackgroundColor(background)); } return image; diff --git a/src/ImageSharp.Web/Processors/FormatWebProcessor.cs b/src/ImageSharp.Web/Processors/FormatWebProcessor.cs index 0e538074..0c616545 100644 --- a/src/ImageSharp.Web/Processors/FormatWebProcessor.cs +++ b/src/ImageSharp.Web/Processors/FormatWebProcessor.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Linq; -using ImageSharp; -using ImageSharp.Formats; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.Formats; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using SixLabors.ImageSharp.Web.Commands; @@ -52,7 +52,7 @@ public FormattedImage Process(FormattedImage image, ILogger logger, IDictionary< if (!string.IsNullOrWhiteSpace(extension)) { - IImageFormat format = this.options.Configuration.FindFormatByFileExtensions(extension); + IImageFormat format = this.options.Configuration.FindFormatByFileExtension(extension); if (format != null) { diff --git a/src/ImageSharp.Web/Processors/IImageWebProcessor.cs b/src/ImageSharp.Web/Processors/IImageWebProcessor.cs index a7cc712a..18c0fb68 100644 --- a/src/ImageSharp.Web/Processors/IImageWebProcessor.cs +++ b/src/ImageSharp.Web/Processors/IImageWebProcessor.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. using System.Collections.Generic; -using ImageSharp; +using SixLabors.ImageSharp; using Microsoft.Extensions.Logging; namespace SixLabors.ImageSharp.Web.Processors diff --git a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs index af82d88c..19e28cbc 100644 --- a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs +++ b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. using System.Collections.Generic; -using ImageSharp; -using ImageSharp.Processing; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.Processing; using Microsoft.Extensions.Logging; using SixLabors.ImageSharp.Web.Commands; using SixLabors.Primitives; @@ -72,7 +72,7 @@ public FormattedImage Process(FormattedImage image, ILogger logger, IDictionary< if (options != null) { - image.Image.Resize(options); + image.Image.Mutate(x => x.Resize(options)); } return image; diff --git a/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs b/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs index 17955de7..4d182f5a 100644 --- a/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs +++ b/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. using System.Collections.Generic; -using ImageSharp; +using SixLabors.ImageSharp; using Microsoft.Extensions.Logging; namespace SixLabors.ImageSharp.Web.Processors diff --git a/src/ImageSharp.Web/Resolvers/PhysicalFileSystemResolver.cs b/src/ImageSharp.Web/Resolvers/PhysicalFileSystemResolver.cs index 4195cb0f..f54b3812 100644 --- a/src/ImageSharp.Web/Resolvers/PhysicalFileSystemResolver.cs +++ b/src/ImageSharp.Web/Resolvers/PhysicalFileSystemResolver.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; -using ImageSharp.Memory; +using SixLabors.ImageSharp.Memory; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Extensions; diff --git a/tests/ImageSharp.Web.Tests/Caching/CacheHashTests.cs b/tests/ImageSharp.Web.Tests/Caching/CacheHashTests.cs index 97220652..51f87bd1 100644 --- a/tests/ImageSharp.Web.Tests/Caching/CacheHashTests.cs +++ b/tests/ImageSharp.Web.Tests/Caching/CacheHashTests.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. using System.IO; -using global::ImageSharp; +using global::SixLabors.ImageSharp; using SixLabors.ImageSharp.Web.Caching; using Xunit; diff --git a/tests/ImageSharp.Web.Tests/Commands/CommandParserTests.cs b/tests/ImageSharp.Web.Tests/Commands/CommandParserTests.cs index 7ace15fb..136302a8 100644 --- a/tests/ImageSharp.Web.Tests/Commands/CommandParserTests.cs +++ b/tests/ImageSharp.Web.Tests/Commands/CommandParserTests.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; using System.Globalization; -using global::ImageSharp; -using global::ImageSharp.Processing; +using global::SixLabors.ImageSharp; +using global::SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Web.Commands; using Xunit; From 8b4c892401796012feb6c9408ef60bb025d27518 Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Thu, 14 Sep 2017 18:31:13 +0100 Subject: [PATCH 2/6] update to ci pacakge --- NuGet.config | 2 +- src/ImageSharp.Web/ImageSharp.Web.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 45841bf3..64d884e0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,7 +1,7 @@  - + diff --git a/src/ImageSharp.Web/ImageSharp.Web.csproj b/src/ImageSharp.Web/ImageSharp.Web.csproj index 274e7a99..50da7211 100644 --- a/src/ImageSharp.Web/ImageSharp.Web.csproj +++ b/src/ImageSharp.Web/ImageSharp.Web.csproj @@ -38,7 +38,7 @@ - + All From 4067165e84ad7576a9457fbeb1bc79d22f85b6f1 Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Thu, 14 Sep 2017 18:35:25 +0100 Subject: [PATCH 3/6] fixed using statement --- src/ImageSharp.Web/FormattedImage.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ImageSharp.Web/FormattedImage.cs b/src/ImageSharp.Web/FormattedImage.cs index dbd57e43..e5942bd2 100644 --- a/src/ImageSharp.Web/FormattedImage.cs +++ b/src/ImageSharp.Web/FormattedImage.cs @@ -5,7 +5,6 @@ using SixLabors.ImageSharp; using SixLabors.ImageSharp.Formats; using SixLabors.ImageSharp.PixelFormats; -using ISImage = ImageSharp.Image; namespace SixLabors.ImageSharp.Web { @@ -69,7 +68,7 @@ public void Dispose() /// A formatted image public static FormattedImage Load(Configuration configuation, byte[] source) { - var image = ISImage.Load(configuation, source, out IImageFormat format); + var image = ImageSharp.Image.Load(configuation, source, out IImageFormat format); return new FormattedImage(image, format); } } From e9ae1b7796cf24e7e3bc752759da5b6c237e3179 Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Thu, 14 Sep 2017 18:48:42 +0100 Subject: [PATCH 4/6] fix stylecop issues --- src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs | 2 +- src/ImageSharp.Web/Commands/TypeConstants.cs | 2 +- .../DependencyInjection/ImageSharpConfiguration.cs | 2 +- src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs | 4 ++-- src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs | 2 +- src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs | 2 +- src/ImageSharp.Web/Processors/FormatWebProcessor.cs | 4 ++-- src/ImageSharp.Web/Processors/IImageWebProcessor.cs | 2 +- src/ImageSharp.Web/Processors/ResizeWebProcessor.cs | 2 +- src/ImageSharp.Web/Processors/WebProcessingExtensions.cs | 2 +- src/ImageSharp.Web/Resolvers/PhysicalFileSystemResolver.cs | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs b/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs index 1fcade6d..3fdd6fb6 100644 --- a/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs +++ b/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs @@ -5,9 +5,9 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; -using SixLabors.ImageSharp.Memory; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.FileProviders; +using SixLabors.ImageSharp.Memory; namespace SixLabors.ImageSharp.Web.Caching { diff --git a/src/ImageSharp.Web/Commands/TypeConstants.cs b/src/ImageSharp.Web/Commands/TypeConstants.cs index 7414f76c..b82d5eb4 100644 --- a/src/ImageSharp.Web/Commands/TypeConstants.cs +++ b/src/ImageSharp.Web/Commands/TypeConstants.cs @@ -67,7 +67,7 @@ internal static class TypeConstants }; /// - /// The type + /// The type /// public static readonly Type Rgba32 = typeof(Rgba32); } diff --git a/src/ImageSharp.Web/DependencyInjection/ImageSharpConfiguration.cs b/src/ImageSharp.Web/DependencyInjection/ImageSharpConfiguration.cs index 75e5170b..5e2c2959 100644 --- a/src/ImageSharp.Web/DependencyInjection/ImageSharpConfiguration.cs +++ b/src/ImageSharp.Web/DependencyInjection/ImageSharpConfiguration.cs @@ -1,8 +1,8 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -using SixLabors.ImageSharp; using Microsoft.Extensions.Options; +using SixLabors.ImageSharp; using SixLabors.ImageSharp.Web.Middleware; namespace SixLabors.ImageSharp.Web.DependencyInjection diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs index ed5e1e48..1b0f0da1 100644 --- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs +++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs @@ -7,11 +7,11 @@ using System.IO; using System.Linq; using System.Threading.Tasks; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.Memory; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.Web.Caching; using SixLabors.ImageSharp.Web.Commands; using SixLabors.ImageSharp.Web.Helpers; diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs index 56d7bcc6..4d440e48 100644 --- a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs +++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. using System; -using SixLabors.ImageSharp; using Microsoft.AspNetCore.Http; +using SixLabors.ImageSharp; using SixLabors.ImageSharp.Web.Commands; using SixLabors.ImageSharp.Web.Processors; using SixLabors.ImageSharp.Web.Resolvers; diff --git a/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs b/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs index 215cacad..3cf924cd 100644 --- a/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs +++ b/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. using System.Collections.Generic; -using SixLabors.ImageSharp; using Microsoft.Extensions.Logging; +using SixLabors.ImageSharp; using SixLabors.ImageSharp.Web.Commands; namespace SixLabors.ImageSharp.Web.Processors diff --git a/src/ImageSharp.Web/Processors/FormatWebProcessor.cs b/src/ImageSharp.Web/Processors/FormatWebProcessor.cs index 0c616545..1a162bad 100644 --- a/src/ImageSharp.Web/Processors/FormatWebProcessor.cs +++ b/src/ImageSharp.Web/Processors/FormatWebProcessor.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.Formats; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.Formats; using SixLabors.ImageSharp.Web.Commands; using SixLabors.ImageSharp.Web.Middleware; diff --git a/src/ImageSharp.Web/Processors/IImageWebProcessor.cs b/src/ImageSharp.Web/Processors/IImageWebProcessor.cs index 18c0fb68..aee9501d 100644 --- a/src/ImageSharp.Web/Processors/IImageWebProcessor.cs +++ b/src/ImageSharp.Web/Processors/IImageWebProcessor.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. using System.Collections.Generic; -using SixLabors.ImageSharp; using Microsoft.Extensions.Logging; +using SixLabors.ImageSharp; namespace SixLabors.ImageSharp.Web.Processors { diff --git a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs index 19e28cbc..ab2fd199 100644 --- a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs +++ b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. using System.Collections.Generic; +using Microsoft.Extensions.Logging; using SixLabors.ImageSharp; using SixLabors.ImageSharp.Processing; -using Microsoft.Extensions.Logging; using SixLabors.ImageSharp.Web.Commands; using SixLabors.Primitives; diff --git a/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs b/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs index 4d182f5a..f4e53ce2 100644 --- a/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs +++ b/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. using System.Collections.Generic; -using SixLabors.ImageSharp; using Microsoft.Extensions.Logging; +using SixLabors.ImageSharp; namespace SixLabors.ImageSharp.Web.Processors { diff --git a/src/ImageSharp.Web/Resolvers/PhysicalFileSystemResolver.cs b/src/ImageSharp.Web/Resolvers/PhysicalFileSystemResolver.cs index f54b3812..c09b0b77 100644 --- a/src/ImageSharp.Web/Resolvers/PhysicalFileSystemResolver.cs +++ b/src/ImageSharp.Web/Resolvers/PhysicalFileSystemResolver.cs @@ -5,13 +5,13 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; -using SixLabors.ImageSharp.Memory; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Extensions; using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; +using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.Web.Helpers; using SixLabors.ImageSharp.Web.Middleware; From 449a018749e7c6c00c075a6c61cd1e08b86c49dc Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Thu, 14 Sep 2017 18:50:36 +0100 Subject: [PATCH 5/6] publish on master to myget --- appveyor.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 66a30b96..1cd68018 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,13 +21,13 @@ test_script: after_test: - cmd: appveyor PushArtifact "artifacts\SixLabors.ImageSharp.Web.%GitVersion_NuGetVersion%.nupkg" -#deploy: -# # MyGet Deployment for builds & releases -# - provider: NuGet -# server: https://www.myget.org/F/imagesharp/api/v2/package -# symbol_server: https://www.myget.org/F/imagesharp/symbols/api/v2/package -# api_key: -# secure: fz0rUrt3B1HczUC1ZehwVsrFSWX9WZGDQoueDztLte9/+yQG+BBU7UrO+coE8lUf -# artifact: /.*\.nupkg/ -# on: -# branch: master +deploy: + # MyGet Deployment for builds & releases + - provider: NuGet + server: https://www.myget.org/F/sixlabors/api/v2/package + symbol_server: https://www.myget.org/F/sixlabors/symbols/api/v2/package + api_key: + secure: V/lEHP0UeMWIpWd0fiNlY2IgbCnJKQlGdRksECdJbOBdaE20Fl0RNL7WyqHe02o4 + artifact: /.*\.nupkg/ + on: + branch: master From d4db478a7e037fa50d3f3b376b090bcba02f308d Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Thu, 14 Sep 2017 18:56:44 +0100 Subject: [PATCH 6/6] update imagesharp to beta version --- src/ImageSharp.Web/ImageSharp.Web.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ImageSharp.Web/ImageSharp.Web.csproj b/src/ImageSharp.Web/ImageSharp.Web.csproj index 50da7211..329ee540 100644 --- a/src/ImageSharp.Web/ImageSharp.Web.csproj +++ b/src/ImageSharp.Web/ImageSharp.Web.csproj @@ -38,7 +38,7 @@ - + All