Cleanup deps, update interface and test image

JimBobSquarePants · JimBobSquarePants · commit c937a44b5bee · 2022-03-17T00:38:43.000+11:00
diff --git a/samples/ImageSharp.Web.Sample/wwwroot/imagesharp-logo.png b/samples/ImageSharp.Web.Sample/wwwroot/imagesharp-logo.png
diff --git a/samples/ImageSharp.Web.Sample/wwwroot/index.html b/samples/ImageSharp.Web.Sample/wwwroot/index.html
diff --git a/samples/ImageSharp.Web.Sample/wwwroot/sixlabors.imagesharp.web.png b/samples/ImageSharp.Web.Sample/wwwroot/sixlabors.imagesharp.web.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e320603ed2376bf6c79180b0e611b08a1c11c4b68856327023ef4af323a55628
+size 18945
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -17,11 +17,7 @@
   <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.targets" />
 
   <ItemGroup>
-    <PackageReference Update="AWSSDK.S3" Version="3.7.7.16" />
-    <PackageReference Update="Azure.Storage.Blobs" Version="12.10.0" />
-    <PackageReference Update="Microsoft.IO.RecyclableMemoryStream" Version="2.2.0" />
     <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
-    <PackageReference Update="SixLabors.ImageSharp"  Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
diff --git a/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj b/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.S3" />
+    <PackageReference Include="AWSSDK.S3" Version="3.7.8.8" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj b/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj
@@ -31,7 +31,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Storage.Blobs" />
+    <!--Do not upgrade this. Last Version that supports .NET Core 2.1-->
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ImageSharp.Web/ImageSharp.Web.csproj b/src/ImageSharp.Web/ImageSharp.Web.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <AssemblyTitle>SixLabors.ImageSharp.Web</AssemblyTitle>
@@ -44,8 +44,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
-    <PackageReference Include="SixLabors.ImageSharp" />
+    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.2.0" />
+    <PackageReference Include="SixLabors.ImageSharp"  Version="2.1.0" />
   </ItemGroup>
 
   <Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />
diff --git a/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs b/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs
@@ -47,6 +47,6 @@ public FormattedImage Process(
         }
 
         /// <inheritdoc/>
-        public bool RequiresAlphaComponent(CommandCollection commands, CommandParser parser, CultureInfo culture) => true;
+        public bool RequiresAlphaAwarePixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => true;
     }
 }
diff --git a/src/ImageSharp.Web/Processors/FormatWebProcessor.cs b/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
@@ -66,6 +66,6 @@ public FormattedImage Process(
         }
 
         /// <inheritdoc/>
-        public bool RequiresAlphaComponent(CommandCollection commands, CommandParser parser, CultureInfo culture) => true;
+        public bool RequiresAlphaAwarePixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => true;
     }
 }
diff --git a/src/ImageSharp.Web/Processors/IImageWebProcessor.cs b/src/ImageSharp.Web/Processors/IImageWebProcessor.cs
@@ -37,15 +37,18 @@ FormattedImage Process(
             CultureInfo culture);
 
         /// <summary>
+        /// <para>
         /// Returns a value indicating whether the image to be processed should be decoded using a pixel format that supports
         /// an alpha component for correct processing.
+        /// </para>
+        /// <para>This method is used to determine whether optimizations can be enabled to reduce memory consumption during processing.</para>
         /// </summary>
         /// <param name="commands">The ordered collection containing the processing commands.</param>
         /// <param name="parser">The command parser use for parting commands.</param>
         /// <param name="culture">
         /// The <see cref="CultureInfo"/> to use as the current parsing culture.
         /// </param>
-        /// <returns>The <see cref="bool"/> indicating whether an alpha component is required.</returns>
-        bool RequiresAlphaComponent(CommandCollection commands, CommandParser parser, CultureInfo culture);
+        /// <returns>The <see cref="bool"/> indicating whether a pixel format containing an alpha component is required.</returns>
+        bool RequiresAlphaAwarePixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture);
     }
 }
diff --git a/src/ImageSharp.Web/Processors/QualityWebProcessor.cs b/src/ImageSharp.Web/Processors/QualityWebProcessor.cs
@@ -84,6 +84,6 @@ public FormattedImage Process(
         }
 
         /// <inheritdoc/>
-        public bool RequiresAlphaComponent(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
+        public bool RequiresAlphaAwarePixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
     }
 }
diff --git a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
@@ -47,6 +47,11 @@ public class ResizeWebProcessor : IImageWebProcessor
         /// </summary>
         public const string Anchor = "ranchor";
 
+        /// <summary>
+        /// The command constant for the resize padding background color.
+        /// </summary>
+        public const string Color = "rcolor";
+
         /// <summary>
         /// The command constant for the resize orientation handling mode.
         /// </summary>
@@ -67,7 +72,8 @@ private static readonly IEnumerable<string> ResizeCommands
                 Sampler,
                 Anchor,
                 Compand,
-                Orient
+                Orient,
+                Color
             };
 
         /// <inheritdoc/>
@@ -132,12 +138,13 @@ internal static ResizeOptions GetResizeOptions(
 
             // Defaults to Bicubic if not set.
             options.Sampler = GetSampler(commands);
+            options.PadColor = parser.ParseValue<Color>(commands.GetValueOrDefault(Color), culture);
 
             return options;
         }
 
         /// <inheritdoc/>
-        public bool RequiresAlphaComponent(CommandCollection commands, CommandParser parser, CultureInfo culture)
+        public bool RequiresAlphaAwarePixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture)
         {
             ResizeMode mode = parser.ParseValue<ResizeMode>(commands.GetValueOrDefault(Mode), culture);
             return mode is ResizeMode.Pad or ResizeMode.BoxPad;
diff --git a/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs b/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs
@@ -108,7 +108,7 @@ public static bool RequiresAlphaComponent(
             bool requiresAlpha = false;
             foreach ((int Index, IImageWebProcessor Processor) processor in processors)
             {
-                requiresAlpha |= processor.Processor.RequiresAlphaComponent(commands, parser, culture);
+                requiresAlpha |= processor.Processor.RequiresAlphaAwarePixelFormat(commands, parser, culture);
             }
 
             return requiresAlpha;
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
@@ -18,11 +18,7 @@
 
   <!-- Test Dependencies -->
   <ItemGroup>
-    <PackageReference Update="Azure.Storage.Blobs" Version="12.10.0" />
     <PackageReference Update="BenchmarkDotNet" Version="0.13.1" />
-    <PackageReference Update="Microsoft.AspNetCore.Http" Version="2.2.2" />
-    <PackageReference Update="Microsoft.Azure.KeyVault.Core" Version="3.0.4" />
-    <PackageReference Update="Microsoft.Azure.Storage.Blob" Version="11.1.2" />
 
     <!--
         Don't update these. We're getting AmbiguousMatchException for
diff --git a/tests/ImageSharp.Web.Tests/DependencyInjection/MockWebProcessor.cs b/tests/ImageSharp.Web.Tests/DependencyInjection/MockWebProcessor.cs
@@ -22,6 +22,6 @@ public FormattedImage Process(
             CultureInfo culture)
             => image;
 
-        public bool RequiresAlphaComponent(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
+        public bool RequiresAlphaAwarePixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/ImageSharp.Web.Tests.csproj b/tests/ImageSharp.Web.Tests/ImageSharp.Web.Tests.csproj
@@ -6,10 +6,6 @@
     <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Azure.Storage.Blobs" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
     <PackageReference Include="Microsoft.AspNetCore.TestHost" />
   </ItemGroup>
@@ -20,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="SubFolder\imagesharp-logo.png">
+    <None Update="SubFolder\sixlabors.imagesharp.web.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="xunit.runner.json">
diff --git a/tests/ImageSharp.Web.Tests/Processors/BackgroundColorWebProcessorTests.cs b/tests/ImageSharp.Web.Tests/Processors/BackgroundColorWebProcessorTests.cs
@@ -48,7 +48,7 @@ public void BackgroundColorWebProcessor_CanReportAlphaRequirements(string color)
                 { new(BackgroundColorWebProcessor.Color, color) }
             };
 
-            Assert.True(new BackgroundColorWebProcessor().RequiresAlphaComponent(commands, parser, culture));
+            Assert.True(new BackgroundColorWebProcessor().RequiresAlphaAwarePixelFormat(commands, parser, culture));
         }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processors/FormatWebProcessorTests.cs b/tests/ImageSharp.Web.Tests/Processors/FormatWebProcessorTests.cs
@@ -65,7 +65,7 @@ public void FormatWebProcessor_CanReportAlphaRequirements(string format)
             };
 
             FormatWebProcessor processor = new(Options.Create(new ImageSharpMiddlewareOptions()));
-            Assert.True(processor.RequiresAlphaComponent(commands, parser, culture));
+            Assert.True(processor.RequiresAlphaAwarePixelFormat(commands, parser, culture));
         }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processors/QualityWebProcessorTests.cs b/tests/ImageSharp.Web.Tests/Processors/QualityWebProcessorTests.cs
@@ -83,7 +83,7 @@ public void QualityWebProcessor_CanReportAlphaRequirements()
                 { new(QualityWebProcessor.Quality, this.random.Next(1, 100).ToString()) },
             };
 
-            Assert.False(new QualityWebProcessor().RequiresAlphaComponent(commands, parser, culture));
+            Assert.False(new QualityWebProcessor().RequiresAlphaAwarePixelFormat(commands, parser, culture));
         }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processors/ResizeWebProcessorTests.cs b/tests/ImageSharp.Web.Tests/Processors/ResizeWebProcessorTests.cs
@@ -284,7 +284,7 @@ public void ResizeWebProcessor_CanReportAlphaRequirements(ResizeMode resizeMode,
                 { new(ResizeWebProcessor.Mode, resizeMode.ToString()) },
             };
 
-            Assert.Equal(requiresAlpha, new ResizeWebProcessor().RequiresAlphaComponent(commands, parser, culture));
+            Assert.Equal(requiresAlpha, new ResizeWebProcessor().RequiresAlphaAwarePixelFormat(commands, parser, culture));
         }
 
         private static PointF GetExpectedCenter(ushort orientation, PointF center)
diff --git a/tests/ImageSharp.Web.Tests/SubFolder/imagesharp-logo.png b/tests/ImageSharp.Web.Tests/SubFolder/imagesharp-logo.png
diff --git a/tests/ImageSharp.Web.Tests/SubFolder/sixlabors.imagesharp.web.png b/tests/ImageSharp.Web.Tests/SubFolder/sixlabors.imagesharp.web.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e320603ed2376bf6c79180b0e611b08a1c11c4b68856327023ef4af323a55628
+size 18945
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/CacheBusterWebProcessor.cs b/tests/ImageSharp.Web.Tests/TestUtilities/CacheBusterWebProcessor.cs
@@ -23,6 +23,6 @@ public FormattedImage Process(
             CultureInfo culture)
             => image;
 
-        public bool RequiresAlphaComponent(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
+        public bool RequiresAlphaAwarePixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs b/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
@@ -14,7 +14,7 @@ public static class TestConstants
         public const string AWSCacheBucketName = "aws-cache";
         public const string AWSAccessKey = "";
         public const string AWSAccessSecret = "";
-        public const string ImagePath = "SubFolder/imagesharp-logo.png";
+        public const string ImagePath = "SubFolder/sixlabors.imagesharp.web.png";
         public const string PhysicalTestImage = "http://localhost/" + ImagePath;
         public const string AzureTestImage = "http://localhost/" + AzureContainerName + "/" + ImagePath;
         public const string AWSTestImage = "http://localhost/" + AWSBucketName + "/" + ImagePath;

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,6 @@ public FormattedImage Process(`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/// <inheritdoc/>`
`50`		`- public bool RequiresAlphaComponent(CommandCollection commands, CommandParser parser, CultureInfo culture) => true;`
	`50`	`+ public bool RequiresAlphaAwarePixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => true;`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,6 @@ public FormattedImage Process(`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`/// <inheritdoc/>`
`69`		`- public bool RequiresAlphaComponent(CommandCollection commands, CommandParser parser, CultureInfo culture) => true;`
	`69`	`+ public bool RequiresAlphaAwarePixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => true;`
`70`	`70`	`}`
`71`	`71`	`}`