Merge pull request #1 from SixLabors/beta-1

[WIP] beta1 release
SixLabors · Sep 14, 2017 · a06fddb · a06fddb
2 parents 9edd7eb + d4db478
commit a06fddb
Show file tree

Hide file tree

Showing 22 changed files with 47 additions and 49 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>  
-    <add key="myget.org imagesharp" value="https://www.myget.org/F/imagesharp/api/v3/index.json" />
+    <add key="myget.org sixlabors" value="https://www.myget.org/F/sixlabors/api/v3/index.json" />
     <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="nuget.org" value="https://www.nuget.org/api/v2/" />

diff --git 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
diff --git 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
@@ -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
@@ -5,9 +5,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-using 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/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
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using ImageSharp;
+using SixLabors.ImageSharp;
 
 namespace SixLabors.ImageSharp.Web.Commands
 {
@@ -67,7 +67,7 @@ internal static class TypeConstants
         };
 
         /// <summary>
-        /// The <see cref="global::ImageSharp.Rgba32"/> type
+        /// The <see cref="global::SixLabors.ImageSharp.Rgba32"/> type
         /// </summary>
         public static readonly Type Rgba32 = typeof(Rgba32);
     }

diff --git 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 ImageSharp;
 using Microsoft.Extensions.Options;
+using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Web.Middleware;
 
 namespace SixLabors.ImageSharp.Web.DependencyInjection

diff --git a/src/ImageSharp.Web/FormattedImage.cs b/src/ImageSharp.Web/FormattedImage.cs
@@ -2,10 +2,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using ImageSharp;
-using ImageSharp.Formats;
-using ImageSharp.PixelFormats;
-using ISImage = ImageSharp.Image;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Web
 {
@@ -69,7 +68,7 @@ public void Dispose()
         /// <returns>A formatted image</returns>
         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);
         }
     }

diff --git 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
@@ -32,13 +32,13 @@
     <AdditionalFiles Include="..\..\stylecop.json" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ImageSharp" Version="1.0.0-alpha9-00194" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="1.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="1.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="1.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0001" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>

diff --git 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
 {
     /// <summary>
     /// Provides a resource pool that enables reusing instances of value type arrays for image data <see cref="T:Byte[]"/>.

diff --git 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 ImageSharp;
-using 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
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using 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
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Collections.Generic;
-using ImageSharp;
 using Microsoft.Extensions.Logging;
+using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Web.Commands;
 
 namespace SixLabors.ImageSharp.Web.Processors
@@ -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
@@ -3,10 +3,10 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using ImageSharp;
-using 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;
 
@@ -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
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Collections.Generic;
-using 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
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Collections.Generic;
-using ImageSharp;
-using ImageSharp.Processing;
 using Microsoft.Extensions.Logging;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Processing;
 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
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Collections.Generic;
-using 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
@@ -5,13 +5,13 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-using 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;
 

diff --git 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
@@ -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;