Merge pull request #11349 from umbraco/v9/feature/update-imagesharp-web

Update to SixLabors.ImageSharp.Web 1.0.4 and remove processing order workarounds

Author: Zeegaan

src/Umbraco.Infrastructure/Media/ImageSharpImageUrlGenerator.cs

@@ -56,14 +56,14 @@ void AppendQueryString(string value)
             void AddQueryString(string key, params IConvertible[] values)
                 => AppendQueryString(key + '=' + string.Join(",", values.Select(x => x.ToString(CultureInfo.InvariantCulture))));
 
-            if (options.FocalPoint != null)
+            if (options.Crop != null)
             {
-                AddQueryString("rxy", options.FocalPoint.Left, options.FocalPoint.Top);
+                AddQueryString("cc", options.Crop.Left, options.Crop.Top, options.Crop.Right, options.Crop.Bottom);
             }
 
-            if (options.Crop != null)
+            if (options.FocalPoint != null)
             {
-                AddQueryString("cc", options.Crop.Left, options.Crop.Top, options.Crop.Right, options.Crop.Bottom);
+                AddQueryString("rxy", options.FocalPoint.Left, options.FocalPoint.Top);
             }
 
             if (options.ImageCropMode.HasValue)

src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilder.ImageSharp.cs

@@ -27,7 +27,7 @@ public static IServiceCollection AddUmbracoImageSharp(this IUmbracoBuilder build
 
             builder.Services.AddImageSharp(options =>
             {
-                // The configuration is set using ImageSharpConfigurationOptions
+                // options.Configuration is set using ImageSharpConfigurationOptions below
                 options.BrowserMaxAge = imagingSettings.Cache.BrowserMaxAge;
                 options.CacheMaxAge = imagingSettings.Cache.CacheMaxAge;
                 options.CachedNameLength = imagingSettings.Cache.CachedNameLength;
@@ -52,16 +52,7 @@ public static IServiceCollection AddUmbracoImageSharp(this IUmbracoBuilder build
                 };
             })
                 .Configure<PhysicalFileSystemCacheOptions>(options => options.CacheFolder = builder.BuilderHostingEnvironment.MapPathContentRoot(imagingSettings.Cache.CacheFolder))
-                // We need to add CropWebProcessor before ResizeWebProcessor (until https://github.com/SixLabors/ImageSharp.Web/issues/182 is fixed)
-                .RemoveProcessor<ResizeWebProcessor>()
-                .RemoveProcessor<FormatWebProcessor>()
-                .RemoveProcessor<BackgroundColorWebProcessor>()
-                .RemoveProcessor<JpegQualityWebProcessor>()
-                .AddProcessor<CropWebProcessor>()
-                .AddProcessor<ResizeWebProcessor>()
-                .AddProcessor<FormatWebProcessor>()
-                .AddProcessor<BackgroundColorWebProcessor>()
-                .AddProcessor<JpegQualityWebProcessor>();
+                .AddProcessor<CropWebProcessor>();
 
             builder.Services.AddTransient<IConfigureOptions<ImageSharpMiddlewareOptions>, ImageSharpConfigurationOptions>();
 

tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs

@@ -358,13 +358,14 @@ void AppendQueryString(string value)
                 void AddQueryString(string key, params IConvertible[] values)
                     => AppendQueryString(key + '=' + string.Join(",", values.Select(x => x.ToString(CultureInfo.InvariantCulture))));
 
-                if (options.FocalPoint != null)
+                if (options.Crop != null)
                 {
-                    AddQueryString("f", options.FocalPoint.Top, options.FocalPoint.Left);
+                    AddQueryString("c", options.Crop.Left, options.Crop.Top, options.Crop.Right, options.Crop.Bottom);
                 }
-                else if (options.Crop != null)
+
+                if (options.FocalPoint != null)
                 {
-                    AddQueryString("c", options.Crop.Left, options.Crop.Top, options.Crop.Right, options.Crop.Bottom);
+                    AddQueryString("f", options.FocalPoint.Top, options.FocalPoint.Left);
                 }
 
                 if (options.ImageCropMode.HasValue)
@@ -399,7 +400,7 @@ void AddQueryString(string key, params IConvertible[] values)
 
                 if (options.CacheBusterValue != null)
                 {
-                    AddQueryString("r", options.CacheBusterValue);
+                    AddQueryString("v", options.CacheBusterValue);
                 }
 
                 return imageUrl.ToString();