Merge pull request #341 from mdupras/mdupras/web-3.1-fixes

3.1 release compatibility
SixLabors · Nov 6, 2023 · 2ac2e3c · 2ac2e3c
2 parents 60d19fb + 7c49794
commit 2ac2e3c
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 6 deletions.
diff --git a/src/ImageSharp.Web/ExifOrientationUtilities.cs b/src/ImageSharp.Web/ExifOrientationUtilities.cs
@@ -4,6 +4,7 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.Metadata.Profiles.Exif;
+using SixLabors.ImageSharp.Processing;
 
 namespace SixLabors.ImageSharp.Web;
 

diff --git a/src/ImageSharp.Web/FormattedImage.cs b/src/ImageSharp.Web/FormattedImage.cs
@@ -2,9 +2,9 @@
 // Licensed under the Six Labors Split License.
 
 using System.Diagnostics.CodeAnalysis;
-using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Metadata.Profiles.Exif;
+using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Web;
 
@@ -38,7 +38,7 @@ public FormattedImage(Image image, IImageFormat format)
     private FormattedImage(Image image, IImageFormat format, bool keepOpen)
     {
         this.Image = image;
-        this.imageFormatsManager = image.GetConfiguration().ImageFormatsManager;
+        this.imageFormatsManager = image.Configuration.ImageFormatsManager;
         this.format = format;
         this.encoder = this.imageFormatsManager.GetEncoder(format);
         this.keepOpen = keepOpen;

diff --git a/src/ImageSharp.Web/ImageSharp.Web.csproj b/src/ImageSharp.Web/ImageSharp.Web.csproj
@@ -46,7 +46,7 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.0-alpha.0.43" />
   </ItemGroup>
 
   <Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />

diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
@@ -9,6 +9,7 @@
 using Microsoft.Extensions.Options;
 using Microsoft.IO;
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Processors;

diff --git a/src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs b/src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs
@@ -3,6 +3,7 @@
 
 using System.Globalization;
 using Microsoft.Extensions.Logging;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Web.Commands;
 
 namespace SixLabors.ImageSharp.Web.Processors;

diff --git a/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs b/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs
@@ -3,6 +3,7 @@
 
 using System.Globalization;
 using Microsoft.Extensions.Logging;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Web.Commands;
 
 namespace SixLabors.ImageSharp.Web.Processors;

diff --git a/src/ImageSharp.Web/Processors/QualityWebProcessor.cs b/src/ImageSharp.Web/Processors/QualityWebProcessor.cs
@@ -3,7 +3,6 @@
 
 using System.Globalization;
 using Microsoft.Extensions.Logging;
-using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Formats.Webp;
 using SixLabors.ImageSharp.Web.Commands;
@@ -46,7 +45,7 @@ public FormattedImage Process(
             {
                 JpegEncoder reference =
                     (JpegEncoder)image.Image
-                    .GetConfiguration()
+                    .Configuration
                     .ImageFormatsManager
                     .GetEncoder(image.Format);
 
@@ -65,7 +64,7 @@ public FormattedImage Process(
             {
                 WebpEncoder reference =
                     (WebpEncoder)image.Image
-                    .GetConfiguration()
+                    .Configuration
                     .ImageFormatsManager
                     .GetEncoder(image.Format);
 

diff --git a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
@@ -5,6 +5,7 @@
 using System.Numerics;
 using Microsoft.Extensions.Logging;
 using SixLabors.ImageSharp.Metadata.Profiles.Exif;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using SixLabors.ImageSharp.Web.Commands;
 

diff --git a/src/ImageSharp.Web/Resampler.cs b/src/ImageSharp.Web/Resampler.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using SixLabors.ImageSharp.Processing;
+
 namespace SixLabors.ImageSharp.Web;
 
 /// <summary>

diff --git a/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
@@ -9,6 +9,7 @@
 using Microsoft.AspNetCore.Mvc.TagHelpers;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Options;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Middleware;
 using SixLabors.ImageSharp.Web.Processors;