From 06f99a44b3d4fd4c33afdddce5cc42408d15f977 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Wed, 6 Jul 2022 00:36:42 +1000
Subject: [PATCH 001/102] Sketch out auth utils class

---
 .../AsyncHelper.cs                            |  11 +-
 src/ImageSharp.Web/CaseHandlingUriBuilder.cs  |  13 +-
 .../Commands/QueryCollectionRequestParser.cs  |   6 +-
 src/ImageSharp.Web/FormatUtilities.cs         |   5 +-
 src/ImageSharp.Web/ImageSharp.Web.csproj      |   1 +
 ...ImageSharpRequestAuthorizationUtilities.cs | 180 ++++++++++++++++++
 src/ImageSharp.Web/PathUtilities.cs           |  12 --
 7 files changed, 195 insertions(+), 33 deletions(-)
 rename src/{ImageSharp.Web.Providers.AWS => ImageSharp.Web}/AsyncHelper.cs (89%)
 create mode 100644 src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs

diff --git a/src/ImageSharp.Web.Providers.AWS/AsyncHelper.cs b/src/ImageSharp.Web/AsyncHelper.cs
similarity index 89%
rename from src/ImageSharp.Web.Providers.AWS/AsyncHelper.cs
rename to src/ImageSharp.Web/AsyncHelper.cs
index 058ebcd5..342880c7 100644
--- a/src/ImageSharp.Web.Providers.AWS/AsyncHelper.cs
+++ b/src/ImageSharp.Web/AsyncHelper.cs
@@ -13,11 +13,12 @@ namespace SixLabors.ImageSharp.Web
     /// </summary>
     internal static class AsyncHelper
     {
-        private static readonly TaskFactory TaskFactory = new
-            (CancellationToken.None,
-            TaskCreationOptions.None,
-            TaskContinuationOptions.None,
-            TaskScheduler.Default);
+        private static readonly TaskFactory TaskFactory
+            = new(
+                CancellationToken.None,
+                TaskCreationOptions.None,
+                TaskContinuationOptions.None,
+                TaskScheduler.Default);
 
         /// <summary>
         /// Executes an async <see cref="Task"/> method synchronously.
diff --git a/src/ImageSharp.Web/CaseHandlingUriBuilder.cs b/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
index e3a0555a..f648a61f 100644
--- a/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
+++ b/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
@@ -14,6 +14,7 @@ namespace SixLabors.ImageSharp.Web
     /// </summary>
     public static class CaseHandlingUriBuilder
     {
+        private static readonly Uri FallbackBaseUri = new("http://localhost/");
         private static readonly SpanAction<char, (bool LowerInvariant, string Host, string PathBase, string Path, string Query)> InitializeAbsoluteUriStringSpanAction = new(InitializeAbsoluteUriString);
 
         /// <summary>
@@ -127,13 +128,11 @@ public static string Encode(CaseHandling handling, Uri uri)
             }
             else
             {
-                string components = uri.GetComponents(UriComponents.SerializationInfoString, UriFormat.UriEscaped);
-                if (handling == CaseHandling.LowerInvariant)
-                {
-                    return components.ToLowerInvariant();
-                }
-
-                return components;
+                Uri faux = new(FallbackBaseUri, uri);
+                return BuildRelative(
+                    handling,
+                    pathBase: PathString.FromUriComponent(faux),
+                    query: QueryString.FromUriComponent(faux));
             }
         }
 
diff --git a/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs b/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs
index cf31b149..dde943e9 100644
--- a/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs
+++ b/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Primitives;
 
 namespace SixLabors.ImageSharp.Web.Commands
@@ -22,11 +21,8 @@ public CommandCollection ParseRequestCommands(HttpContext context)
                 return new();
             }
 
-            // TODO: Investigate skipping the double allocation here.
-            // In .NET 6 we can directly use the QueryStringEnumerable type and enumerate stright to our command collection
-            Dictionary<string, StringValues> parsed = QueryHelpers.ParseQuery(context.Request.QueryString.ToUriComponent());
             CommandCollection transformed = new();
-            foreach (KeyValuePair<string, StringValues> pair in parsed)
+            foreach (KeyValuePair<string, StringValues> pair in context.Request.Query)
             {
                 // Use the indexer for both set and query. This replaces any previously parsed values.
                 transformed[pair.Key] = pair.Value[pair.Value.Count - 1];
diff --git a/src/ImageSharp.Web/FormatUtilities.cs b/src/ImageSharp.Web/FormatUtilities.cs
index a111c51d..2def7f71 100644
--- a/src/ImageSharp.Web/FormatUtilities.cs
+++ b/src/ImageSharp.Web/FormatUtilities.cs
@@ -34,10 +34,7 @@ public FormatUtilities(IOptions<ImageSharpMiddlewareOptions> options)
             {
                 string[] extensions = imageFormat.FileExtensions.ToArray();
 
-                foreach (string extension in extensions)
-                {
-                    this.extensions.Add(extension);
-                }
+                this.extensions.AddRange(extensions);
 
                 this.extensionsByMimeType[imageFormat.DefaultMimeType] = extensions[0];
             }
diff --git a/src/ImageSharp.Web/ImageSharp.Web.csproj b/src/ImageSharp.Web/ImageSharp.Web.csproj
index b3943393..21429278 100644
--- a/src/ImageSharp.Web/ImageSharp.Web.csproj
+++ b/src/ImageSharp.Web/ImageSharp.Web.csproj
@@ -36,6 +36,7 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" />
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" />
diff --git a/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs b/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
new file mode 100644
index 00000000..c3a4e882
--- /dev/null
+++ b/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
@@ -0,0 +1,180 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+
+#if !NETCOREAPP3_0_OR_GREATER
+using Microsoft.AspNetCore.Http.Internal;
+#endif
+
+using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Extensions.Options;
+using SixLabors.ImageSharp.Web.Commands;
+using SixLabors.ImageSharp.Web.Middleware;
+using SixLabors.ImageSharp.Web.Processors;
+
+namespace SixLabors.ImageSharp.Web
+{
+    /// <summary>
+    /// Contains various helper methods for authorizing image requests.
+    /// </summary>
+    public sealed class ImageSharpRequestAuthorizationUtilities
+    {
+        /// <summary>
+        /// The command used by image requests for transporting Hash-based Message Authentication Code (HMAC) tokens.
+        /// </summary>
+        public const string TokenCommand = HMACUtilities.TokenCommand;
+
+        private static readonly Uri FallbackBaseUri = new("http://localhost/");
+        private readonly HashSet<string> knownCommands;
+        private readonly ImageSharpMiddlewareOptions options;
+        private readonly IRequestParser requestParser;
+        private readonly IServiceProvider serviceProvider;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImageSharpRequestAuthorizationUtilities"/> class.
+        /// </summary>
+        /// <param name="options">The middleware configuration options.</param>
+        /// <param name="requestParser">An <see cref="IRequestParser"/> instance used to parse image requests for commands.</param>
+        /// <param name="processors">A collection of <see cref="IImageWebProcessor"/> instances used to process images.</param>
+        /// <param name="serviceProvider">The service provider.</param>
+        public ImageSharpRequestAuthorizationUtilities(
+            IOptions<ImageSharpMiddlewareOptions> options,
+            IRequestParser requestParser,
+            IEnumerable<IImageWebProcessor> processors,
+            IServiceProvider serviceProvider)
+        {
+            Guard.NotNull(options, nameof(options));
+            Guard.NotNull(requestParser, nameof(requestParser));
+            Guard.NotNull(processors, nameof(processors));
+            Guard.NotNull(serviceProvider, nameof(serviceProvider));
+
+            HashSet<string> commands = new(StringComparer.OrdinalIgnoreCase);
+            foreach (IImageWebProcessor processor in processors)
+            {
+                foreach (string command in processor.Commands)
+                {
+                    commands.Add(command);
+                }
+            }
+
+            this.knownCommands = commands;
+            this.options = options.Value;
+        }
+
+        /// <summary>
+        /// Strips any unknown commands from the command collection.
+        /// </summary>
+        /// <param name="commands">The unsanitized command collection.</param>
+        public void StripUnknownCommands(CommandCollection commands)
+        {
+            if (commands?.Count > 0)
+            {
+                // Strip out any unknown commands, if needed.
+                var keys = new List<string>(commands.Keys);
+                for (int i = keys.Count - 1; i >= 0; i--)
+                {
+                    if (!this.knownCommands.Contains(keys[i]))
+                    {
+                        commands.RemoveAt(i);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+        /// </summary>
+        /// <param name="uri">The uri to compute the code from.</param>
+        /// <returns>The computed HMAC.</returns>
+        public string ComputeHMAC(string uri)
+            => this.ComputeHMAC(new Uri(uri));
+
+        /// <summary>
+        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+        /// </summary>
+        /// <param name="uri">The uri to compute the code from.</param>
+        /// <returns>The computed HMAC.</returns>
+        public string ComputeHMAC(Uri uri)
+            => AsyncHelper.RunSync(() => this.ComputeHMACAsync(uri));
+
+        /// <summary>
+        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+        /// </summary>
+        /// <param name="uri">The uri to compute the code from.</param>
+        /// <returns>The computed HMAC.</returns>
+        public Task<string> ComputeHMACAsync(string uri)
+            => this.ComputeHMACAsync(new Uri(uri));
+
+        /// <summary>
+        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+        /// </summary>
+        /// <param name="uri">The uri to compute the code from.</param>
+        /// <returns>The computed HMAC.</returns>
+        public async Task<string> ComputeHMACAsync(Uri uri)
+        {
+            byte[] secret = this.options.HMACSecretKey;
+            if (secret is null || secret.Length == 0)
+            {
+                return null;
+            }
+
+            // We need to generate a HttpRequest to use the rest of the services.
+            DefaultHttpContext context = new() { RequestServices = this.serviceProvider };
+            HttpRequest request = context.Request;
+
+            ToComponents(
+                uri,
+                out HostString host,
+                out PathString path,
+                out QueryString queryString,
+                out QueryCollection query);
+
+            request.Host = host;
+            request.Path = path;
+            request.QueryString = queryString;
+            request.Query = query;
+
+            CommandCollection commands = this.requestParser.ParseRequestCommands(context);
+
+            // The provided URI should not contain invalid commands since image URI geneneration
+            // should be tightly controlled by the running application but we will strip any out anyway.
+            this.StripUnknownCommands(commands);
+
+            ImageCommandContext imageCommandContext = new(context, commands, null, null);
+            return await this.options.OnComputeHMACAsync(imageCommandContext, secret);
+        }
+
+        private static void ToComponents(
+            Uri uri,
+            out HostString host,
+            out PathString path,
+            out QueryString queryString,
+            out QueryCollection query)
+        {
+            if (uri.IsAbsoluteUri)
+            {
+                host = HostString.FromUriComponent(uri);
+                path = PathString.FromUriComponent(uri);
+                queryString = QueryString.FromUriComponent(uri);
+                query = GetQueryComponent(queryString);
+            }
+            else
+            {
+                Uri faux = new(FallbackBaseUri, uri);
+                host = default;
+                path = PathString.FromUriComponent(faux);
+                queryString = QueryString.FromUriComponent(faux);
+                query = GetQueryComponent(queryString);
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static QueryCollection GetQueryComponent(QueryString query)
+            => new(QueryHelpers.ParseQuery(query.Value));
+    }
+}
diff --git a/src/ImageSharp.Web/PathUtilities.cs b/src/ImageSharp.Web/PathUtilities.cs
index d6a3579a..717c423a 100644
--- a/src/ImageSharp.Web/PathUtilities.cs
+++ b/src/ImageSharp.Web/PathUtilities.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
 using System.IO;
 
 namespace SixLabors.ImageSharp.Web
@@ -25,16 +24,5 @@ internal static string EnsureTrailingSlash(string path)
 
             return path;
         }
-
-        /// <summary>
-        /// Determines whether the <paramref name="path" /> is located underneath the specified <paramref name="rootPath" />.
-        /// </summary>
-        /// <param name="path">The fully qualified path to test.</param>
-        /// <param name="rootPath">The root path (needs to end with a directory separator).</param>
-        /// <returns>
-        ///   <c>true</c> if the path is located underneath the specified root path; otherwise, <c>false</c>.
-        /// </returns>
-        internal static bool IsUnderneathRoot(string path, string rootPath)
-            => path.StartsWith(rootPath, StringComparison.OrdinalIgnoreCase);
     }
 }

From 879f990ba880bc4cdde151d15197b16a54ff69c0 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Wed, 6 Jul 2022 13:03:56 +1000
Subject: [PATCH 002/102] Add overloads and cleanup

---
 .../Caching/AWSS3StorageCache.cs              |  51 ++++++
 src/ImageSharp.Web/CommandHandling.cs         |  24 +++
 ...ImageSharpRequestAuthorizationUtilities.cs | 158 +++++++++++++-----
 .../Middleware/ImageSharpMiddleware.cs        |   2 +-
 4 files changed, 196 insertions(+), 39 deletions(-)
 create mode 100644 src/ImageSharp.Web/CommandHandling.cs

diff --git a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs
index 42d47de0..326df6b0 100644
--- a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs
@@ -1,8 +1,11 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Amazon.S3;
 using Amazon.S3.Model;
@@ -119,5 +122,53 @@ private static async Task<PutBucketResponse> CreateIfNotExistsAsync(
 
             return null;
         }
+
+        /// <summary>
+        /// <see href="https://github.com/aspnet/AspNetIdentity/blob/b7826741279450c58b230ece98bd04b4815beabf/src/Microsoft.AspNet.Identity.Core/AsyncHelper.cs"/>
+        /// </summary>
+        internal static class AsyncHelper
+        {
+            private static readonly TaskFactory TaskFactory
+                = new(
+                    CancellationToken.None,
+                    TaskCreationOptions.None,
+                    TaskContinuationOptions.None,
+                    TaskScheduler.Default);
+
+            /// <summary>
+            /// Executes an async <see cref="Task"/> method synchronously.
+            /// </summary>
+            /// <param name="task">The task to excecute.</param>
+            public static void RunSync(Func<Task> task)
+            {
+                CultureInfo cultureUi = CultureInfo.CurrentUICulture;
+                CultureInfo culture = CultureInfo.CurrentCulture;
+                TaskFactory.StartNew(() =>
+                {
+                    Thread.CurrentThread.CurrentCulture = culture;
+                    Thread.CurrentThread.CurrentUICulture = cultureUi;
+                    return task();
+                }).Unwrap().GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Executes an async <see cref="Task{TResult}"/> method which has
+            /// a <paramref name="task"/> return type synchronously.
+            /// </summary>
+            /// <typeparam name="TResult">The type of result to return.</typeparam>
+            /// <param name="task">The task to excecute.</param>
+            /// <returns>The <typeparamref name="TResult"/>.</returns>
+            public static TResult RunSync<TResult>(Func<Task<TResult>> task)
+            {
+                CultureInfo cultureUi = CultureInfo.CurrentUICulture;
+                CultureInfo culture = CultureInfo.CurrentCulture;
+                return TaskFactory.StartNew(() =>
+                {
+                    Thread.CurrentThread.CurrentCulture = culture;
+                    Thread.CurrentThread.CurrentUICulture = cultureUi;
+                    return task();
+                }).Unwrap().GetAwaiter().GetResult();
+            }
+        }
     }
 }
diff --git a/src/ImageSharp.Web/CommandHandling.cs b/src/ImageSharp.Web/CommandHandling.cs
new file mode 100644
index 00000000..5722c3f3
--- /dev/null
+++ b/src/ImageSharp.Web/CommandHandling.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+using SixLabors.ImageSharp.Web.Commands;
+
+namespace SixLabors.ImageSharp.Web
+{
+    /// <summary>
+    /// Provides enumeration for handling <see cref="CommandCollection"/> instances
+    /// when processing a request.
+    /// </summary>
+    public enum CommandHandling
+    {
+        /// <summary>
+        /// The command collection will be stripped of any unknown commands.
+        /// </summary>
+        Sanitize,
+
+        /// <summary>
+        /// The command collection will be processed unaltered.
+        /// </summary>
+        None
+    }
+}
diff --git a/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs b/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
index c3a4e882..847ae812 100644
--- a/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
+++ b/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Runtime.CompilerServices;
+using System.Globalization;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
@@ -28,10 +28,11 @@ public sealed class ImageSharpRequestAuthorizationUtilities
         /// The command used by image requests for transporting Hash-based Message Authentication Code (HMAC) tokens.
         /// </summary>
         public const string TokenCommand = HMACUtilities.TokenCommand;
-
         private static readonly Uri FallbackBaseUri = new("http://localhost/");
         private readonly HashSet<string> knownCommands;
         private readonly ImageSharpMiddlewareOptions options;
+        private readonly CommandParser commandParser;
+        private readonly CultureInfo parserCulture;
         private readonly IRequestParser requestParser;
         private readonly IServiceProvider serviceProvider;
 
@@ -41,11 +42,13 @@ public sealed class ImageSharpRequestAuthorizationUtilities
         /// <param name="options">The middleware configuration options.</param>
         /// <param name="requestParser">An <see cref="IRequestParser"/> instance used to parse image requests for commands.</param>
         /// <param name="processors">A collection of <see cref="IImageWebProcessor"/> instances used to process images.</param>
+        /// <param name="commandParser">The command parser.</param>
         /// <param name="serviceProvider">The service provider.</param>
         public ImageSharpRequestAuthorizationUtilities(
             IOptions<ImageSharpMiddlewareOptions> options,
             IRequestParser requestParser,
             IEnumerable<IImageWebProcessor> processors,
+            CommandParser commandParser,
             IServiceProvider serviceProvider)
         {
             Guard.NotNull(options, nameof(options));
@@ -53,6 +56,12 @@ public ImageSharpRequestAuthorizationUtilities(
             Guard.NotNull(processors, nameof(processors));
             Guard.NotNull(serviceProvider, nameof(serviceProvider));
 
+            this.options = options.Value;
+            this.commandParser = commandParser;
+            this.parserCulture = this.options.UseInvariantParsingCulture
+                ? CultureInfo.InvariantCulture
+                : CultureInfo.CurrentCulture;
+
             HashSet<string> commands = new(StringComparer.OrdinalIgnoreCase);
             foreach (IImageWebProcessor processor in processors)
             {
@@ -63,7 +72,6 @@ public ImageSharpRequestAuthorizationUtilities(
             }
 
             this.knownCommands = commands;
-            this.options = options.Value;
         }
 
         /// <summary>
@@ -90,62 +98,130 @@ public void StripUnknownCommands(CommandCollection commands)
         /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
         /// </summary>
         /// <param name="uri">The uri to compute the code from.</param>
+        /// <param name="handling">The command collection handling.</param>
         /// <returns>The computed HMAC.</returns>
-        public string ComputeHMAC(string uri)
-            => this.ComputeHMAC(new Uri(uri));
+        public string ComputeHMAC(string uri, CommandHandling handling)
+            => this.ComputeHMAC(new Uri(uri), handling);
 
         /// <summary>
         /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
         /// </summary>
         /// <param name="uri">The uri to compute the code from.</param>
+        /// <param name="handling">The command collection handling.</param>
         /// <returns>The computed HMAC.</returns>
-        public string ComputeHMAC(Uri uri)
-            => AsyncHelper.RunSync(() => this.ComputeHMACAsync(uri));
+        public Task<string> ComputeHMACAsync(string uri, CommandHandling handling)
+            => this.ComputeHMACAsync(new Uri(uri), handling);
 
         /// <summary>
         /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
         /// </summary>
         /// <param name="uri">The uri to compute the code from.</param>
+        /// <param name="handling">The command collection handling.</param>
         /// <returns>The computed HMAC.</returns>
-        public Task<string> ComputeHMACAsync(string uri)
-            => this.ComputeHMACAsync(new Uri(uri));
+        public string ComputeHMAC(Uri uri, CommandHandling handling)
+        {
+            ToComponents(
+                uri,
+                out HostString host,
+                out PathString path,
+                out QueryString queryString);
+
+            return this.ComputeHMAC(host, path, queryString, handling);
+        }
 
         /// <summary>
         /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
         /// </summary>
         /// <param name="uri">The uri to compute the code from.</param>
+        /// <param name="handling">The command collection handling.</param>
         /// <returns>The computed HMAC.</returns>
-        public async Task<string> ComputeHMACAsync(Uri uri)
+        public Task<string> ComputeHMACAsync(Uri uri, CommandHandling handling)
         {
-            byte[] secret = this.options.HMACSecretKey;
-            if (secret is null || secret.Length == 0)
-            {
-                return null;
-            }
-
-            // We need to generate a HttpRequest to use the rest of the services.
-            DefaultHttpContext context = new() { RequestServices = this.serviceProvider };
-            HttpRequest request = context.Request;
-
             ToComponents(
                 uri,
                 out HostString host,
                 out PathString path,
-                out QueryString queryString,
-                out QueryCollection query);
+                out QueryString queryString);
 
-            request.Host = host;
-            request.Path = path;
-            request.QueryString = queryString;
-            request.Query = query;
+            return this.ComputeHMACAsync(host, path, queryString, handling);
+        }
 
-            CommandCollection commands = this.requestParser.ParseRequestCommands(context);
+        /// <summary>
+        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+        /// </summary>
+        /// <param name="host">The host header.</param>
+        /// <param name="path">The path or pathbase.</param>
+        /// <param name="queryString">The querystring.</param>
+        /// <param name="handling">The command collection handling.</param>
+        /// <returns>The computed HMAC.</returns>
+        public string ComputeHMAC(HostString host, PathString path, QueryString queryString, CommandHandling handling)
+            => this.ComputeHMAC(host, path, queryString, handling);
 
-            // The provided URI should not contain invalid commands since image URI geneneration
-            // should be tightly controlled by the running application but we will strip any out anyway.
-            this.StripUnknownCommands(commands);
+        /// <summary>
+        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+        /// </summary>
+        /// <param name="host">The host header.</param>
+        /// <param name="path">The path or pathbase.</param>
+        /// <param name="queryString">The querystring.</param>
+        /// <param name="handling">The command collection handling.</param>
+        /// <returns>The computed HMAC.</returns>
+        public Task<string> ComputeHMACAsync(HostString host, PathString path, QueryString queryString, CommandHandling handling)
+            => this.ComputeHMACAsync(host, path, queryString, new(QueryHelpers.ParseQuery(queryString.Value)), handling);
 
-            ImageCommandContext imageCommandContext = new(context, commands, null, null);
+        /// <summary>
+        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+        /// </summary>
+        /// <param name="host">The host header.</param>
+        /// <param name="path">The path or pathbase.</param>
+        /// <param name="queryString">The querystring.</param>
+        /// <param name="query">The query collection.</param>
+        /// <param name="handling">The command collection handling.</param>
+        /// <returns>The computed HMAC.</returns>
+        public string ComputeHMAC(HostString host, PathString path, QueryString queryString, QueryCollection query, CommandHandling handling)
+            => this.ComputeHMAC(this.ToHttpContext(host, path, queryString, query), handling);
+
+        /// <summary>
+        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+        /// </summary>
+        /// <param name="host">The host header.</param>
+        /// <param name="path">The path or pathbase.</param>
+        /// <param name="queryString">The querystring.</param>
+        /// <param name="query">The query collection.</param>
+        /// <param name="handling">The command collection handling.</param>
+        /// <returns>The computed HMAC.</returns>
+        public Task<string> ComputeHMACAsync(HostString host, PathString path, QueryString queryString, QueryCollection query, CommandHandling handling)
+            => this.ComputeHMACAsync(this.ToHttpContext(host, path, queryString, query), handling);
+
+        /// <summary>
+        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+        /// </summary>
+        /// <param name="context">The request HTTP context.</param>
+        /// <param name="handling">The command collection handling.</param>
+        /// <returns>The computed HMAC.</returns>
+        public string ComputeHMAC(HttpContext context, CommandHandling handling)
+            => AsyncHelper.RunSync(() => this.ComputeHMACAsync(context, handling));
+
+        /// <summary>
+        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+        /// </summary>
+        /// <param name="context">The request HTTP context.</param>
+        /// <param name="handling">The command collection handling.</param>
+        /// <returns>The computed HMAC.</returns>
+        public async Task<string> ComputeHMACAsync(HttpContext context, CommandHandling handling)
+        {
+            byte[] secret = this.options.HMACSecretKey;
+            if (secret is null || secret.Length == 0)
+            {
+                return null;
+            }
+
+            CommandCollection commands = this.requestParser.ParseRequestCommands(context);
+            if (handling == CommandHandling.Sanitize)
+            {
+                this.StripUnknownCommands(commands);
+            }
+
+            ImageCommandContext imageCommandContext = new(context, commands, this.commandParser, this.parserCulture);
             return await this.options.OnComputeHMACAsync(imageCommandContext, secret);
         }
 
@@ -153,15 +229,13 @@ private static void ToComponents(
             Uri uri,
             out HostString host,
             out PathString path,
-            out QueryString queryString,
-            out QueryCollection query)
+            out QueryString queryString)
         {
             if (uri.IsAbsoluteUri)
             {
                 host = HostString.FromUriComponent(uri);
                 path = PathString.FromUriComponent(uri);
                 queryString = QueryString.FromUriComponent(uri);
-                query = GetQueryComponent(queryString);
             }
             else
             {
@@ -169,12 +243,20 @@ private static void ToComponents(
                 host = default;
                 path = PathString.FromUriComponent(faux);
                 queryString = QueryString.FromUriComponent(faux);
-                query = GetQueryComponent(queryString);
             }
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static QueryCollection GetQueryComponent(QueryString query)
-            => new(QueryHelpers.ParseQuery(query.Value));
+        private HttpContext ToHttpContext(HostString host, PathString path, QueryString queryString, QueryCollection query)
+        {
+            DefaultHttpContext context = new() { RequestServices = this.serviceProvider };
+            HttpRequest request = context.Request;
+            request.Method = HttpMethods.Get;
+            request.Host = host;
+            request.Path = path;
+            request.QueryString = queryString;
+            request.Query = query;
+
+            return context;
+        }
     }
 }
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
index f22d34f7..d3e95325 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
@@ -129,7 +129,7 @@ private static readonly ConcurrentTLruCache<string, string> HMACTokenLru
         /// <param name="cache">An <see cref="IImageCache"/> instance used for caching images.</param>
         /// <param name="cacheKey">An <see cref="ICacheKey"/> instance used for creating cache keys.</param>
         /// <param name="cacheHash">An <see cref="ICacheHash"/>instance used for calculating cached file names.</param>
-        /// <param name="commandParser">The command parser</param>
+        /// <param name="commandParser">The command parser.</param>
         /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
         /// <param name="asyncKeyLock">The async key lock</param>
         public ImageSharpMiddleware(

From e42ef8ecf12ebdecd1db319361165cdec9612405 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 8 Jul 2022 00:41:36 +1000
Subject: [PATCH 003/102] Wire up utils

---
 .../PresetOnlyQueryCollectionRequestParser.cs |  7 +-
 .../Commands/QueryCollectionRequestParser.cs  |  3 +-
 .../ServiceCollectionExtensions.cs            |  2 +
 ...ImageSharpRequestAuthorizationUtilities.cs | 32 ++++++++-
 .../Middleware/ImageSharpMiddleware.cs        | 71 +++++++------------
 .../AuthenticatedServerTestBase.cs            | 18 +++--
 6 files changed, 76 insertions(+), 57 deletions(-)

diff --git a/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs b/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs
index 7f6c5f45..21545848 100644
--- a/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs
+++ b/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs
@@ -33,13 +33,16 @@ public PresetOnlyQueryCollectionRequestParser(IOptions<PresetOnlyQueryCollection
         /// <inheritdoc/>
         public CommandCollection ParseRequestCommands(HttpContext context)
         {
-            if (context.Request.Query.Count == 0 || !context.Request.Query.ContainsKey(QueryKey))
+            IQueryCollection queryCollection = context.Request.Query;
+            if (queryCollection is null
+                || queryCollection.Count == 0
+                || !queryCollection.ContainsKey(QueryKey))
             {
                 // We return new here and below to ensure the collection is still mutable via events.
                 return new();
             }
 
-            StringValues query = context.Request.Query[QueryKey];
+            StringValues query = queryCollection[QueryKey];
             string requestedPreset = query[query.Count - 1];
             if (this.presets.TryGetValue(requestedPreset, out CommandCollection collection))
             {
diff --git a/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs b/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs
index dde943e9..6f89db16 100644
--- a/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs
+++ b/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs
@@ -15,7 +15,8 @@ public sealed class QueryCollectionRequestParser : IRequestParser
         /// <inheritdoc/>
         public CommandCollection ParseRequestCommands(HttpContext context)
         {
-            if (context.Request.Query.Count == 0)
+            IQueryCollection query = context.Request.Query;
+            if (query is null || query.Count == 0)
             {
                 // We return new to ensure the collection is still mutable via events.
                 return new();
diff --git a/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs b/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs
index 63786683..2d42ee52 100644
--- a/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs
+++ b/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs
@@ -60,6 +60,8 @@ private static void AddDefaultServices(
 
             builder.SetRequestParser<QueryCollectionRequestParser>();
 
+            builder.Services.AddSingleton<ImageSharpRequestAuthorizationUtilities>();
+
             builder.SetCache<PhysicalFileSystemCache>();
 
             builder.SetCacheKey<UriRelativeLowerInvariantCacheKey>();
diff --git a/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs b/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
index 847ae812..babc0f66 100644
--- a/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
+++ b/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
@@ -54,13 +54,16 @@ public ImageSharpRequestAuthorizationUtilities(
             Guard.NotNull(options, nameof(options));
             Guard.NotNull(requestParser, nameof(requestParser));
             Guard.NotNull(processors, nameof(processors));
+            Guard.NotNull(commandParser, nameof(commandParser));
             Guard.NotNull(serviceProvider, nameof(serviceProvider));
 
             this.options = options.Value;
+            this.requestParser = requestParser;
             this.commandParser = commandParser;
             this.parserCulture = this.options.UseInvariantParsingCulture
                 ? CultureInfo.InvariantCulture
                 : CultureInfo.CurrentCulture;
+            this.serviceProvider = serviceProvider;
 
             HashSet<string> commands = new(StringComparer.OrdinalIgnoreCase);
             foreach (IImageWebProcessor processor in processors)
@@ -101,7 +104,7 @@ public void StripUnknownCommands(CommandCollection commands)
         /// <param name="handling">The command collection handling.</param>
         /// <returns>The computed HMAC.</returns>
         public string ComputeHMAC(string uri, CommandHandling handling)
-            => this.ComputeHMAC(new Uri(uri), handling);
+            => this.ComputeHMAC(new Uri(uri, UriKind.RelativeOrAbsolute), handling);
 
         /// <summary>
         /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
@@ -110,7 +113,7 @@ public string ComputeHMAC(string uri, CommandHandling handling)
         /// <param name="handling">The command collection handling.</param>
         /// <returns>The computed HMAC.</returns>
         public Task<string> ComputeHMACAsync(string uri, CommandHandling handling)
-            => this.ComputeHMACAsync(new Uri(uri), handling);
+            => this.ComputeHMACAsync(new Uri(uri, UriKind.RelativeOrAbsolute), handling);
 
         /// <summary>
         /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
@@ -155,7 +158,7 @@ public Task<string> ComputeHMACAsync(Uri uri, CommandHandling handling)
         /// <param name="handling">The command collection handling.</param>
         /// <returns>The computed HMAC.</returns>
         public string ComputeHMAC(HostString host, PathString path, QueryString queryString, CommandHandling handling)
-            => this.ComputeHMAC(host, path, queryString, handling);
+            => this.ComputeHMAC(host, path, queryString, new(QueryHelpers.ParseQuery(queryString.Value)), handling);
 
         /// <summary>
         /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
@@ -225,6 +228,29 @@ public async Task<string> ComputeHMACAsync(HttpContext context, CommandHandling
             return await this.options.OnComputeHMACAsync(imageCommandContext, secret);
         }
 
+        /// <summary>
+        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+        /// </summary>
+        /// <param name="context">Contains information about the current image request and parsed commands.</param>
+        /// <param name="handling">The command collection handling.</param>
+        /// <returns>The computed HMAC.</returns>
+        internal async Task<string> ComputeHMACAsync(ImageCommandContext context, CommandHandling handling)
+        {
+            byte[] secret = this.options.HMACSecretKey;
+            if (secret is null || secret.Length == 0)
+            {
+                return null;
+            }
+
+            CommandCollection commands = this.requestParser.ParseRequestCommands(context.Context);
+            if (handling == CommandHandling.Sanitize)
+            {
+                this.StripUnknownCommands(commands);
+            }
+
+            return await this.options.OnComputeHMACAsync(context, secret);
+        }
+
         private static void ToComponents(
             Uri uri,
             out HostString host,
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
index d3e95325..55c84e74 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
@@ -92,11 +92,6 @@ private static readonly ConcurrentTLruCache<string, string> HMACTokenLru
         /// </summary>
         private readonly ICacheHash cacheHash;
 
-        /// <summary>
-        /// The collection of known commands gathered from the processors.
-        /// </summary>
-        private readonly HashSet<string> knownCommands;
-
         /// <summary>
         /// Contains various helper methods based on the current configuration.
         /// </summary>
@@ -117,6 +112,11 @@ private static readonly ConcurrentTLruCache<string, string> HMACTokenLru
         /// </summary>
         private readonly AsyncKeyReaderWriterLock<string> asyncKeyLock;
 
+        /// <summary>
+        /// Contains helpers that allow authorization of image requests.
+        /// </summary>
+        private readonly ImageSharpRequestAuthorizationUtilities authorizationUtilities;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageSharpMiddleware"/> class.
         /// </summary>
@@ -131,7 +131,8 @@ private static readonly ConcurrentTLruCache<string, string> HMACTokenLru
         /// <param name="cacheHash">An <see cref="ICacheHash"/>instance used for calculating cached file names.</param>
         /// <param name="commandParser">The command parser.</param>
         /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
-        /// <param name="asyncKeyLock">The async key lock</param>
+        /// <param name="asyncKeyLock">The async key lock.</param>
+        /// <param name="requestAuthorizationUtilities">Contains helpers that allow authorization of image requests.</param>
         public ImageSharpMiddleware(
             RequestDelegate next,
             IOptions<ImageSharpMiddlewareOptions> options,
@@ -144,7 +145,8 @@ public ImageSharpMiddleware(
             ICacheHash cacheHash,
             CommandParser commandParser,
             FormatUtilities formatUtilities,
-            AsyncKeyReaderWriterLock<string> asyncKeyLock)
+            AsyncKeyReaderWriterLock<string> asyncKeyLock,
+            ImageSharpRequestAuthorizationUtilities requestAuthorizationUtilities)
         {
             Guard.NotNull(next, nameof(next));
             Guard.NotNull(options, nameof(options));
@@ -158,6 +160,7 @@ public ImageSharpMiddleware(
             Guard.NotNull(commandParser, nameof(commandParser));
             Guard.NotNull(formatUtilities, nameof(formatUtilities));
             Guard.NotNull(asyncKeyLock, nameof(asyncKeyLock));
+            Guard.NotNull(requestAuthorizationUtilities, nameof(requestAuthorizationUtilities));
 
             this.next = next;
             this.options = options.Value;
@@ -172,20 +175,10 @@ public ImageSharpMiddleware(
                 ? CultureInfo.InvariantCulture
                 : CultureInfo.CurrentCulture;
 
-            var commands = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-            foreach (IImageWebProcessor processor in this.processors)
-            {
-                foreach (string command in processor.Commands)
-                {
-                    commands.Add(command);
-                }
-            }
-
-            this.knownCommands = commands;
-
             this.logger = loggerFactory.CreateLogger<ImageSharpMiddleware>();
             this.formatUtilities = formatUtilities;
             this.asyncKeyLock = asyncKeyLock;
+            this.authorizationUtilities = requestAuthorizationUtilities;
         }
 
         /// <summary>
@@ -197,31 +190,6 @@ public ImageSharpMiddleware(
 
         private async Task Invoke(HttpContext httpContext, bool retry)
         {
-            CommandCollection commands = this.requestParser.ParseRequestCommands(httpContext);
-
-            // First check for a HMAC token and capture before the command is stripped out.
-            byte[] secret = this.options.HMACSecretKey;
-            bool checkHMAC = false;
-            string token = null;
-            if (secret?.Length > 0)
-            {
-                checkHMAC = true;
-                token = commands.GetValueOrDefault(HMACUtilities.TokenCommand);
-            }
-
-            if (commands.Count > 0)
-            {
-                // Strip out any unknown commands, if needed.
-                var keys = new List<string>(commands.Keys);
-                for (int i = keys.Count - 1; i >= 0; i--)
-                {
-                    if (!this.knownCommands.Contains(keys[i]))
-                    {
-                        commands.RemoveAt(i);
-                    }
-                }
-            }
-
             // Get the correct provider for the request
             IImageProvider provider = null;
             foreach (IImageProvider resolver in this.providers)
@@ -240,6 +208,19 @@ private async Task Invoke(HttpContext httpContext, bool retry)
                 return;
             }
 
+            CommandCollection commands = this.requestParser.ParseRequestCommands(httpContext);
+
+            // First check for a HMAC token and capture before the command is stripped out.
+            byte[] secret = this.options.HMACSecretKey;
+            bool checkHMAC = false;
+            string token = null;
+            if (secret?.Length > 0)
+            {
+                checkHMAC = true;
+                token = commands.GetValueOrDefault(ImageSharpRequestAuthorizationUtilities.TokenCommand);
+            }
+
+            this.authorizationUtilities.StripUnknownCommands(commands);
             ImageCommandContext imageCommandContext = new(httpContext, commands, this.commandParser, this.parserCulture);
 
             // At this point we know that this is an image request so should attempt to compute a validating HMAC.
@@ -253,7 +234,9 @@ private async Task Invoke(HttpContext httpContext, bool retry)
                 //
                 // As a rule all image requests should contain valid commands only.
                 // Key generation uses string.Create under the hood with very low allocation so should be good enough as a cache key.
-                hmac = await HMACTokenLru.GetOrAddAsync(httpContext.Request.GetEncodedUrl(), _ => this.options.OnComputeHMACAsync(imageCommandContext, secret));
+                hmac = await HMACTokenLru.GetOrAddAsync(
+                    httpContext.Request.GetEncodedUrl(),
+                    _ => this.authorizationUtilities.ComputeHMACAsync(imageCommandContext, CommandHandling.None));
             }
 
             await this.options.OnParseCommandsAsync.Invoke(imageCommandContext);
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs
index 68c75edf..c9fe6bd6 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs
@@ -1,10 +1,10 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -13,9 +13,16 @@ namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
     public abstract class AuthenticatedServerTestBase<TFixture> : ServerTestBase<TFixture>
          where TFixture : AuthenticatedTestServerFixture
     {
+        private readonly ImageSharpRequestAuthorizationUtilities authorizationUtilities;
+        private readonly string relativeImageSouce;
+
         protected AuthenticatedServerTestBase(TFixture fixture, ITestOutputHelper outputHelper, string imageSource)
             : base(fixture, outputHelper, imageSource)
         {
+            this.authorizationUtilities =
+                       this.Fixture.Services.GetRequiredService<ImageSharpRequestAuthorizationUtilities>();
+
+            this.relativeImageSouce = this.ImageSource.Replace("http://localhost", string.Empty);
         }
 
         [Fact]
@@ -38,12 +45,9 @@ public async Task CanRejectUnauthorizedRequestAsync()
 
         protected override string AugmentCommand(string command)
         {
-            // Mimic the lowecase relative url format used by the token and default options.
-            string uri = (this.ImageSource + command).Replace("http://localhost", string.Empty);
-            uri = CaseHandlingUriBuilder.Encode(CaseHandlingUriBuilder.CaseHandling.LowerInvariant, uri);
-
-            string token = HMACUtilities.ComputeHMACSHA256(uri, AuthenticatedTestServerFixture.HMACSecretKey);
-            return command + "&" + HMACUtilities.TokenCommand + "=" + token;
+            string uri = this.relativeImageSouce + command;
+            string token = this.authorizationUtilities.ComputeHMAC(uri, CommandHandling.Sanitize);
+            return command + "&" + ImageSharpRequestAuthorizationUtilities.TokenCommand + "=" + token;
         }
     }
 }

From 2ad2da1355f03001196a48cb574c4f4782e1db09 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 8 Jul 2022 00:59:37 +1000
Subject: [PATCH 004/102] Update Directory.Build.targets

---
 src/Directory.Build.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 048116fe..f5811d15 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -26,6 +26,7 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
     <PackageReference Update="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
+    <PackageReference Update="Microsoft.AspNetCore.Http" Version="2.2.0"/>
     <PackageReference Update="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Update="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
     <PackageReference Update="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />

From 5aaff202036cef8daffa2777b4b0b8d0eaa1be23 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sat, 9 Jul 2022 00:18:59 +1000
Subject: [PATCH 005/102] Add encoding tests

---
 .../Caching/UriAbsoluteCacheKey.cs            |  7 +++-
 .../UriAbsoluteLowerInvariantCacheKey.cs      |  7 +++-
 src/ImageSharp.Web/CaseHandlingUriBuilder.cs  | 40 +++++++++++++++++--
 .../Helpers/CaseHandlingUriBuilderTests.cs    | 30 ++++++++++++++
 4 files changed, 79 insertions(+), 5 deletions(-)
 create mode 100644 tests/ImageSharp.Web.Tests/Helpers/CaseHandlingUriBuilderTests.cs

diff --git a/src/ImageSharp.Web/Caching/UriAbsoluteCacheKey.cs b/src/ImageSharp.Web/Caching/UriAbsoluteCacheKey.cs
index b10178c9..941ffcfe 100644
--- a/src/ImageSharp.Web/Caching/UriAbsoluteCacheKey.cs
+++ b/src/ImageSharp.Web/Caching/UriAbsoluteCacheKey.cs
@@ -13,6 +13,11 @@ public class UriAbsoluteCacheKey : ICacheKey
     {
         /// <inheritdoc/>
         public string Create(HttpContext context, CommandCollection commands)
-            => CaseHandlingUriBuilder.BuildAbsolute(CaseHandlingUriBuilder.CaseHandling.None, context.Request.Host, context.Request.PathBase, context.Request.Path, QueryString.Create(commands));
+            => CaseHandlingUriBuilder.BuildAbsolute(
+                CaseHandlingUriBuilder.CaseHandling.None,
+                context.Request.Host,
+                context.Request.PathBase,
+                context.Request.Path,
+                QueryString.Create(commands));
     }
 }
diff --git a/src/ImageSharp.Web/Caching/UriAbsoluteLowerInvariantCacheKey.cs b/src/ImageSharp.Web/Caching/UriAbsoluteLowerInvariantCacheKey.cs
index cf90a401..333acbc8 100644
--- a/src/ImageSharp.Web/Caching/UriAbsoluteLowerInvariantCacheKey.cs
+++ b/src/ImageSharp.Web/Caching/UriAbsoluteLowerInvariantCacheKey.cs
@@ -13,6 +13,11 @@ public class UriAbsoluteLowerInvariantCacheKey : ICacheKey
     {
         /// <inheritdoc/>
         public string Create(HttpContext context, CommandCollection commands)
-            => CaseHandlingUriBuilder.BuildAbsolute(CaseHandlingUriBuilder.CaseHandling.LowerInvariant, context.Request.Host, context.Request.PathBase, context.Request.Path, QueryString.Create(commands));
+            => CaseHandlingUriBuilder.BuildAbsolute(
+                CaseHandlingUriBuilder.CaseHandling.LowerInvariant,
+                context.Request.Host,
+                context.Request.PathBase,
+                context.Request.Path,
+                QueryString.Create(commands));
     }
 }
diff --git a/src/ImageSharp.Web/CaseHandlingUriBuilder.cs b/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
index f648a61f..f615f409 100644
--- a/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
+++ b/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
@@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp.Web
     public static class CaseHandlingUriBuilder
     {
         private static readonly Uri FallbackBaseUri = new("http://localhost/");
-        private static readonly SpanAction<char, (bool LowerInvariant, string Host, string PathBase, string Path, string Query)> InitializeAbsoluteUriStringSpanAction = new(InitializeAbsoluteUriString);
+        private static readonly SpanAction<char, (bool LowerInvariant, string Scheme, string Host, string PathBase, string Path, string Query)> InitializeAbsoluteUriStringSpanAction = new(InitializeAbsoluteUriString);
 
         /// <summary>
         /// Provides Uri case handling options.
@@ -50,11 +50,31 @@ public static string BuildRelative(
             // Take any potential performance hit vs concatination for code reading sanity.
             => BuildAbsolute(handling, default, pathBase, path, query);
 
+        /// <summary>
+        /// Combines the given URI components into a string that is properly encoded for use in HTTP headers.
+        /// Note that unicode in the HostString will be encoded as punycode and the scheme is not included
+        /// in the result.
+        /// </summary>
+        /// <param name="handling">Determines case handling for the result. <paramref name="query"/> is always converted to invariant lowercase.</param>
+        /// <param name="host">The host portion of the uri normally included in the Host header. This may include the port.</param>
+        /// <param name="pathBase">The first portion of the request path associated with application root.</param>
+        /// <param name="path">The portion of the request path that identifies the requested resource.</param>
+        /// <param name="query">The query, if any.</param>
+        /// <returns>The combined URI components, properly encoded for use in HTTP headers.</returns>
+        public static string BuildAbsolute(
+            CaseHandling handling,
+            HostString host,
+            PathString pathBase = default,
+            PathString path = default,
+            QueryString query = default)
+            => BuildAbsolute(handling, string.Empty, host, pathBase, path, query);
+
         /// <summary>
         /// Combines the given URI components into a string that is properly encoded for use in HTTP headers.
         /// Note that unicode in the HostString will be encoded as punycode.
         /// </summary>
         /// <param name="handling">Determines case handling for the result. <paramref name="query"/> is always converted to invariant lowercase.</param>
+        /// <param name="scheme">http, https, etc.</param>
         /// <param name="host">The host portion of the uri normally included in the Host header. This may include the port.</param>
         /// <param name="pathBase">The first portion of the request path associated with application root.</param>
         /// <param name="path">The portion of the request path that identifies the requested resource.</param>
@@ -62,11 +82,14 @@ public static string BuildRelative(
         /// <returns>The combined URI components, properly encoded for use in HTTP headers.</returns>
         public static string BuildAbsolute(
             CaseHandling handling,
+            string scheme,
             HostString host,
             PathString pathBase = default,
             PathString path = default,
             QueryString query = default)
         {
+            Guard.NotNull(scheme, nameof(scheme));
+
             string hostText = host.ToUriComponent();
             string pathBaseText = pathBase.ToUriComponent();
             string pathText = path.ToUriComponent();
@@ -74,6 +97,7 @@ public static string BuildAbsolute(
 
             // PERF: Calculate string length to allocate correct buffer size for string.Create.
             int length =
+                (scheme.Length > 0 ? scheme.Length + Uri.SchemeDelimiter.Length : 0) +
                 hostText.Length +
                 pathBaseText.Length +
                 pathText.Length +
@@ -95,7 +119,10 @@ public static string BuildAbsolute(
                 length--;
             }
 
-            return string.Create(length, (handling == CaseHandling.LowerInvariant, hostText, pathBaseText, pathText, queryText), InitializeAbsoluteUriStringSpanAction);
+            return string.Create(
+                length,
+                (handling == CaseHandling.LowerInvariant, scheme, hostText, pathBaseText, pathText, queryText),
+                InitializeAbsoluteUriStringSpanAction);
         }
 
         /// <summary>
@@ -122,6 +149,7 @@ public static string Encode(CaseHandling handling, Uri uri)
             {
                 return BuildAbsolute(
                     handling,
+                    scheme: uri.Scheme,
                     host: HostString.FromUriComponent(uri),
                     pathBase: PathString.FromUriComponent(uri),
                     query: QueryString.FromUriComponent(uri));
@@ -167,7 +195,7 @@ private static int CopyTextToBufferLowerInvariant(Span<char> buffer, int index,
         /// </summary>
         /// <param name="buffer">The URI <see cref="string"/>'s <see cref="char"/> buffer.</param>
         /// <param name="uriParts">The URI parts.</param>
-        private static void InitializeAbsoluteUriString(Span<char> buffer, (bool Lower, string Host, string PathBase, string Path, string Query) uriParts)
+        private static void InitializeAbsoluteUriString(Span<char> buffer, (bool Lower, string Scheme, string Host, string PathBase, string Path, string Query) uriParts)
         {
             int index = 0;
             ReadOnlySpan<char> pathBaseSpan = uriParts.PathBase.AsSpan();
@@ -180,6 +208,12 @@ private static void InitializeAbsoluteUriString(Span<char> buffer, (bool Lower,
                 pathBaseSpan = pathBaseSpan.Slice(0, pathBaseSpan.Length - 1);
             }
 
+            if (uriParts.Scheme.Length > 0)
+            {
+                index = CopyTextToBuffer(buffer, index, uriParts.Scheme.AsSpan());
+                index = CopyTextToBuffer(buffer, index, Uri.SchemeDelimiter.AsSpan());
+            }
+
             if (uriParts.Lower)
             {
                 index = CopyTextToBufferLowerInvariant(buffer, index, uriParts.Host.AsSpan());
diff --git a/tests/ImageSharp.Web.Tests/Helpers/CaseHandlingUriBuilderTests.cs b/tests/ImageSharp.Web.Tests/Helpers/CaseHandlingUriBuilderTests.cs
new file mode 100644
index 00000000..0e13a7e6
--- /dev/null
+++ b/tests/ImageSharp.Web.Tests/Helpers/CaseHandlingUriBuilderTests.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+using Xunit;
+
+namespace SixLabors.ImageSharp.Web.Tests.Helpers
+{
+    public class CaseHandlingUriBuilderTests
+    {
+        [Theory]
+        [InlineData(CaseHandlingUriBuilder.CaseHandling.None, "https://sixlabors.com:443/Path/?query=1")]
+        [InlineData(CaseHandlingUriBuilder.CaseHandling.LowerInvariant, "https://sixlabors.com:443/path/?query=1")]
+        public void CanEncodeAbsoluteUri(CaseHandlingUriBuilder.CaseHandling value, string expected)
+        {
+            const string input = "https://sixlabors.com/Path/?Query=1";
+            string actual = CaseHandlingUriBuilder.Encode(value, input);
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(CaseHandlingUriBuilder.CaseHandling.None, "/Path/?query=1")]
+        [InlineData(CaseHandlingUriBuilder.CaseHandling.LowerInvariant, "/path/?query=1")]
+        public void CanEncodeRelativeUri(CaseHandlingUriBuilder.CaseHandling value, string expected)
+        {
+            const string input = "/Path/?Query=1";
+            string actual = CaseHandlingUriBuilder.Encode(value, input);
+            Assert.Equal(expected, actual);
+        }
+    }
+}

From 4f3dcbc6c38cbff12a44264dd8789e1ce7619735 Mon Sep 17 00:00:00 2001
From: Maxime Dupras <maxime.dupras@getmaintainx.com>
Date: Fri, 8 Jul 2022 10:19:07 -0400
Subject: [PATCH 006/102] Added a check when forbidden is returned when
 validating if a key exists in a S3 Bucket.

---
 .../Providers/AWSS3StorageImageProvider.cs                  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs
index 05f6883f..a32389cd 100644
--- a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs
@@ -161,6 +161,12 @@ private async Task<bool> KeyExists(IAmazonS3 s3Client, string bucketName, string
                     return false;
                 }
 
+                // If the object exists but the client is not authorized to access it, then a "Forbidden" will be thrown.
+                if (string.Equals(e.ErrorCode, "Forbidden"))
+                {
+                    return false;
+                }
+
                 throw;
             }
         }

From a6bdd95ec72acc47235efd7d82c1506d1d9c26ff Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sat, 9 Jul 2022 00:27:34 +1000
Subject: [PATCH 007/102] Cover the new authorization token methods

---
 .../TestUtilities/AuthenticatedServerTestBase.cs   | 13 +++++++++++--
 .../TestUtilities/ServerTestBase.cs                | 14 +++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs
index c9fe6bd6..116a9f9e 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs
@@ -43,11 +43,20 @@ public async Task CanRejectUnauthorizedRequestAsync()
             Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
         }
 
-        protected override string AugmentCommand(string command)
+        protected override async Task<string> AugmentCommandAsync(string command)
         {
             string uri = this.relativeImageSouce + command;
-            string token = this.authorizationUtilities.ComputeHMAC(uri, CommandHandling.Sanitize);
+            string token = await this.GetTokenAsync(uri);
             return command + "&" + ImageSharpRequestAuthorizationUtilities.TokenCommand + "=" + token;
         }
+
+        private async Task<string> GetTokenAsync(string uri)
+        {
+            string tokenSync = this.authorizationUtilities.ComputeHMAC(uri, CommandHandling.Sanitize);
+            string tokenAsync = await this.authorizationUtilities.ComputeHMACAsync(uri, CommandHandling.Sanitize);
+
+            Assert.Equal(tokenSync, tokenAsync);
+            return tokenSync;
+        }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs b/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs
index 40c3a3b7..7545304f 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs
@@ -51,7 +51,7 @@ public async Task CanProcessAndResolveImageAsync()
             IImageFormat format = Configuration.Default.ImageFormatsManager.FindFormatByFileExtension(ext);
 
             // First response
-            HttpResponseMessage response = await this.HttpClient.GetAsync(url + this.AugmentCommand(this.Fixture.Commands[0]));
+            HttpResponseMessage response = await this.HttpClient.GetAsync(url + await this.AugmentCommandAsync(this.Fixture.Commands[0]));
 
             Assert.NotNull(response);
             Assert.True(response.IsSuccessStatusCode);
@@ -67,7 +67,7 @@ public async Task CanProcessAndResolveImageAsync()
             response.Dispose();
 
             // Cached Response
-            response = await this.HttpClient.GetAsync(url + this.AugmentCommand(this.Fixture.Commands[0]));
+            response = await this.HttpClient.GetAsync(url + await this.AugmentCommandAsync(this.Fixture.Commands[0]));
 
             Assert.NotNull(response);
             Assert.True(response.IsSuccessStatusCode);
@@ -85,7 +85,7 @@ public async Task CanProcessAndResolveImageAsync()
             // 304 response
             var request = new HttpRequestMessage
             {
-                RequestUri = new Uri(url + this.AugmentCommand(this.Fixture.Commands[0])),
+                RequestUri = new Uri(url + await this.AugmentCommandAsync(this.Fixture.Commands[0])),
                 Method = HttpMethod.Get,
             };
 
@@ -108,7 +108,7 @@ public async Task CanProcessAndResolveImageAsync()
             // 412 response
             request = new HttpRequestMessage
             {
-                RequestUri = new Uri(url + this.AugmentCommand(this.Fixture.Commands[0])),
+                RequestUri = new Uri(url + await this.AugmentCommandAsync(this.Fixture.Commands[0])),
                 Method = HttpMethod.Get,
             };
 
@@ -127,8 +127,8 @@ public async Task CanProcessAndResolveImageAsync()
         public async Task CanProcessMultipleIdenticalQueriesAsync()
         {
             string url = this.ImageSource;
-            string command1 = this.AugmentCommand(this.Fixture.Commands[0]);
-            string command2 = this.AugmentCommand(this.Fixture.Commands[1]);
+            string command1 = await this.AugmentCommandAsync(this.Fixture.Commands[0]);
+            string command2 = await this.AugmentCommandAsync(this.Fixture.Commands[1]);
 
             Task[] tasks = Enumerable.Range(0, 100).Select(i => Task.Run(async () =>
             {
@@ -144,6 +144,6 @@ public async Task CanProcessMultipleIdenticalQueriesAsync()
             Assert.True(all.IsCompletedSuccessfully);
         }
 
-        protected virtual string AugmentCommand(string command) => command;
+        protected virtual Task<string> AugmentCommandAsync(string command) => Task.FromResult(command);
     }
 }

From ae90cdf986e4ff172118a1ed2026d0715ac93cbd Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sat, 9 Jul 2022 23:42:28 +1000
Subject: [PATCH 008/102] Address feedback

---
 .../Caching/AWSS3StorageCache.cs              |  2 +-
 src/ImageSharp.Web/CaseHandlingUriBuilder.cs  |  4 ++--
 .../Commands/QueryCollectionRequestParser.cs  |  2 +-
 ...ImageSharpRequestAuthorizationUtilities.cs | 23 +++++--------------
 .../Middleware/ImageSharpMiddleware.cs        |  2 +-
 5 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs
index 326df6b0..b904c86d 100644
--- a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs
@@ -126,7 +126,7 @@ private static async Task<PutBucketResponse> CreateIfNotExistsAsync(
         /// <summary>
         /// <see href="https://github.com/aspnet/AspNetIdentity/blob/b7826741279450c58b230ece98bd04b4815beabf/src/Microsoft.AspNet.Identity.Core/AsyncHelper.cs"/>
         /// </summary>
-        internal static class AsyncHelper
+        private static class AsyncHelper
         {
             private static readonly TaskFactory TaskFactory
                 = new(
diff --git a/src/ImageSharp.Web/CaseHandlingUriBuilder.cs b/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
index f615f409..d7ceed92 100644
--- a/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
+++ b/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
@@ -159,7 +159,7 @@ public static string Encode(CaseHandling handling, Uri uri)
                 Uri faux = new(FallbackBaseUri, uri);
                 return BuildRelative(
                     handling,
-                    pathBase: PathString.FromUriComponent(faux),
+                    path: PathString.FromUriComponent(faux),
                     query: QueryString.FromUriComponent(faux));
             }
         }
@@ -210,7 +210,7 @@ private static void InitializeAbsoluteUriString(Span<char> buffer, (bool Lower,
 
             if (uriParts.Scheme.Length > 0)
             {
-                index = CopyTextToBuffer(buffer, index, uriParts.Scheme.AsSpan());
+                index = CopyTextToBufferLowerInvariant(buffer, index, uriParts.Scheme.AsSpan());
                 index = CopyTextToBuffer(buffer, index, Uri.SchemeDelimiter.AsSpan());
             }
 
diff --git a/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs b/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs
index 6f89db16..d54ba8d7 100644
--- a/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs
+++ b/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs
@@ -23,7 +23,7 @@ public CommandCollection ParseRequestCommands(HttpContext context)
             }
 
             CommandCollection transformed = new();
-            foreach (KeyValuePair<string, StringValues> pair in context.Request.Query)
+            foreach (KeyValuePair<string, StringValues> pair in query)
             {
                 // Use the indexer for both set and query. This replaces any previously parsed values.
                 transformed[pair.Key] = pair.Value[pair.Value.Count - 1];
diff --git a/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs b/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
index babc0f66..4e3940af 100644
--- a/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
+++ b/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
@@ -231,25 +231,14 @@ public async Task<string> ComputeHMACAsync(HttpContext context, CommandHandling
         /// <summary>
         /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
         /// </summary>
+        /// <remarks>
+        /// This method is only called by the middleware and only if required.
+        /// As such, standard checks are avoided.
+        /// </remarks>
         /// <param name="context">Contains information about the current image request and parsed commands.</param>
-        /// <param name="handling">The command collection handling.</param>
         /// <returns>The computed HMAC.</returns>
-        internal async Task<string> ComputeHMACAsync(ImageCommandContext context, CommandHandling handling)
-        {
-            byte[] secret = this.options.HMACSecretKey;
-            if (secret is null || secret.Length == 0)
-            {
-                return null;
-            }
-
-            CommandCollection commands = this.requestParser.ParseRequestCommands(context.Context);
-            if (handling == CommandHandling.Sanitize)
-            {
-                this.StripUnknownCommands(commands);
-            }
-
-            return await this.options.OnComputeHMACAsync(context, secret);
-        }
+        internal Task<string> ComputeHMACAsync(ImageCommandContext context)
+            => this.options.OnComputeHMACAsync(context, this.options.HMACSecretKey);
 
         private static void ToComponents(
             Uri uri,
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
index 55c84e74..eee45855 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
@@ -236,7 +236,7 @@ private async Task Invoke(HttpContext httpContext, bool retry)
                 // Key generation uses string.Create under the hood with very low allocation so should be good enough as a cache key.
                 hmac = await HMACTokenLru.GetOrAddAsync(
                     httpContext.Request.GetEncodedUrl(),
-                    _ => this.authorizationUtilities.ComputeHMACAsync(imageCommandContext, CommandHandling.None));
+                    _ => this.authorizationUtilities.ComputeHMACAsync(imageCommandContext));
             }
 
             await this.options.OnParseCommandsAsync.Invoke(imageCommandContext);

From b87573140ef6543a94844af4d58aaa6e6eaa8ceb Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 18 Jul 2022 22:46:31 +1000
Subject: [PATCH 009/102] Minor cleanup.

---
 src/ImageSharp.Web/CaseHandlingUriBuilder.cs                 | 5 ++++-
 .../TestUtilities/AuthenticatedServerTestBase.cs             | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/ImageSharp.Web/CaseHandlingUriBuilder.cs b/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
index d7ceed92..ca09a4f6 100644
--- a/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
+++ b/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
@@ -133,7 +133,10 @@ public static string BuildAbsolute(
         /// <param name="uri">The Uri to encode.</param>
         /// <returns>The encoded string version of <paramref name="uri"/>.</returns>
         public static string Encode(CaseHandling handling, string uri)
-            => Encode(handling, new Uri(uri, UriKind.RelativeOrAbsolute));
+        {
+            Guard.NotNull(uri, nameof(uri));
+            return Encode(handling, new Uri(uri, UriKind.RelativeOrAbsolute));
+        }
 
         /// <summary>
         /// Generates a string from the given absolute or relative Uri that is appropriately encoded for use in
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs
index 116a9f9e..2759aa94 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs
@@ -37,7 +37,7 @@ public async Task CanRejectUnauthorizedRequestAsync()
             Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
 
             // Now send an invalid token
-            response = await this.HttpClient.GetAsync(url + this.Fixture.Commands[0] + "&" + HMACUtilities.TokenCommand + "=INVALID");
+            response = await this.HttpClient.GetAsync(url + this.Fixture.Commands[0] + "&" + ImageSharpRequestAuthorizationUtilities.TokenCommand + "=INVALID");
             Assert.NotNull(response);
             Assert.False(response.IsSuccessStatusCode);
             Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);

From 67f2a67f9ba34708c8cdf80a0b9d60a55011fe52 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Thu, 11 Aug 2022 23:39:04 +1000
Subject: [PATCH 010/102] Drop .NET Core 2.1 to fix Azure dependency security
 issue

---
 .github/workflows/build-and-test.yml          | 18 -----------------
 .../ImageSharp.Web.Providers.AWS.csproj       |  4 ++--
 .../ImageSharp.Web.Providers.Azure.csproj     |  7 +++----
 .../Caching/PhysicalFileSystemCache.cs        |  4 ----
 src/ImageSharp.Web/ImageSharp.Web.csproj      | 20 +++----------------
 ...ImageSharpRequestAuthorizationUtilities.cs |  5 -----
 .../Middleware/ImageSharpMiddleware.cs        | 12 -----------
 .../Providers/PhysicalFileSystemProvider.cs   |  8 --------
 .../Providers/WebRootImageProvider.cs         |  4 ----
 .../RefCountedConcurrentDictionary.cs         |  4 +---
 .../ImageSharp.Web.Benchmarks.csproj          |  6 +-----
 .../ImageSharp.Web.Tests.csproj               |  9 ++-------
 .../AWSS3StorageImageProviderFactory.cs       |  4 ----
 .../AzureBlobStorageImageProviderFactory.cs   |  4 ----
 14 files changed, 12 insertions(+), 97 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index a9ab565b..33cf815e 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -27,18 +27,6 @@ jobs:
             framework: net6.0
             runtime: -x64
             codecov: true
-          - os: ubuntu-latest
-            framework: net5.0
-            runtime: -x64
-            codecov: false
-          - os: macos-latest
-            framework: net5.0
-            runtime: -x64
-            codecov: false
-          - os: windows-latest
-            framework: net5.0
-            runtime: -x64
-            codecov: false
           - os: ubuntu-latest
             framework: netcoreapp3.1
             runtime: -x64
@@ -51,10 +39,6 @@ jobs:
             framework: netcoreapp3.1
             runtime: -x64
             codecov: false
-          - os: windows-latest
-            framework: netcoreapp2.1
-            runtime: -x64
-            codecov: false
 
     runs-on: ${{matrix.options.os}}
 
@@ -129,9 +113,7 @@ jobs:
         with:
           dotnet-version: |
             6.0.x
-            5.0.x
             3.1.x
-            2.1.x
 
       - name: DotNet Build
         shell: pwsh
diff --git a/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj b/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj
index 74af6b95..1e1a6f11 100644
--- a/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj
+++ b/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj
@@ -16,12 +16,12 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING) == true">
       <PropertyGroup>
-        <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
+        <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
diff --git a/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj b/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj
index 6c746c25..f4ae2f6d 100644
--- a/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj
+++ b/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj
@@ -16,12 +16,12 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING) == true">
       <PropertyGroup>
-        <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
+        <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
@@ -31,8 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!--TODO: Do not upgrade this. Last Version that supports .NET Core 2.1-->
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.13.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs b/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs
index d07230b5..5f3d660f 100644
--- a/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs
+++ b/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs
@@ -40,11 +40,7 @@ public class PhysicalFileSystemCache : IImageCache
         /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
         public PhysicalFileSystemCache(
             IOptions<PhysicalFileSystemCacheOptions> options,
-#if NETCOREAPP2_1
-            IHostingEnvironment environment,
-#else
             IWebHostEnvironment environment,
-#endif
             FormatUtilities formatUtilities)
         {
             Guard.NotNull(options, nameof(options));
diff --git a/src/ImageSharp.Web/ImageSharp.Web.csproj b/src/ImageSharp.Web/ImageSharp.Web.csproj
index 21429278..e7122cab 100644
--- a/src/ImageSharp.Web/ImageSharp.Web.csproj
+++ b/src/ImageSharp.Web/ImageSharp.Web.csproj
@@ -16,12 +16,12 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING) == true">
       <PropertyGroup>
-        <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
+        <TargetFrameworks>net6.0;netcoreapp3.1;</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
@@ -30,22 +30,8 @@
     <None Include="..\..\shared-infrastructure\branding\icons\imagesharp.web\sixlabors.imagesharp.web.128.png" Pack="true" PackagePath="" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" />
-    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" />
-  </ItemGroup>
-
   <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.2.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
   </ItemGroup>
diff --git a/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs b/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
index 4e3940af..c56ff988 100644
--- a/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
+++ b/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
@@ -6,11 +6,6 @@
 using System.Globalization;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-
-#if !NETCOREAPP3_0_OR_GREATER
-using Microsoft.AspNetCore.Http.Internal;
-#endif
-
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Options;
 using SixLabors.ImageSharp.Web.Commands;
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
index eee45855..4b4eea7b 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
@@ -449,19 +449,7 @@ private ValueTask StreamDisposeAsync(Stream stream)
                 return default;
             }
 
-#if NETCOREAPP2_1
-            try
-            {
-                stream.Dispose();
-                return default;
-            }
-            catch (Exception ex)
-            {
-                return new ValueTask(Task.FromException(ex));
-            }
-#else
             return stream.DisposeAsync();
-#endif
         }
 
         private async Task<ImageWorkerResult> IsNewOrUpdatedAsync(
diff --git a/src/ImageSharp.Web/Providers/PhysicalFileSystemProvider.cs b/src/ImageSharp.Web/Providers/PhysicalFileSystemProvider.cs
index 092bc3b8..9b09fa88 100644
--- a/src/ImageSharp.Web/Providers/PhysicalFileSystemProvider.cs
+++ b/src/ImageSharp.Web/Providers/PhysicalFileSystemProvider.cs
@@ -22,11 +22,7 @@ public sealed class PhysicalFileSystemProvider : FileProviderImageProvider
         /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
         public PhysicalFileSystemProvider(
             IOptions<PhysicalFileSystemProviderOptions> options,
-#if NETCOREAPP2_1
-            IHostingEnvironment environment,
-#else
             IWebHostEnvironment environment,
-#endif
             FormatUtilities formatUtilities)
             : base(GetProvider(options, environment), options.Value.ProcessingBehavior, formatUtilities)
         {
@@ -58,11 +54,7 @@ internal static string GetProviderRoot(PhysicalFileSystemProviderOptions options
 
         private static PhysicalFileProvider GetProvider(
             IOptions<PhysicalFileSystemProviderOptions> options,
-#if NETCOREAPP2_1
-            IHostingEnvironment environment)
-#else
             IWebHostEnvironment environment)
-#endif
         {
             Guard.NotNull(options, nameof(options));
             Guard.NotNull(environment, nameof(environment));
diff --git a/src/ImageSharp.Web/Providers/WebRootImageProvider.cs b/src/ImageSharp.Web/Providers/WebRootImageProvider.cs
index c7e41c6b..ea598c88 100644
--- a/src/ImageSharp.Web/Providers/WebRootImageProvider.cs
+++ b/src/ImageSharp.Web/Providers/WebRootImageProvider.cs
@@ -16,11 +16,7 @@ public sealed class WebRootImageProvider : FileProviderImageProvider
         /// <param name="environment">The web hosting environment.</param>
         /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
         public WebRootImageProvider(
-#if NETCOREAPP2_1
-            IHostingEnvironment environment,
-#else
             IWebHostEnvironment environment,
-#endif
             FormatUtilities formatUtilities)
             : base(environment.WebRootFileProvider, ProcessingBehavior.CommandOnly, formatUtilities)
         {
diff --git a/src/ImageSharp.Web/Synchronization/RefCountedConcurrentDictionary.cs b/src/ImageSharp.Web/Synchronization/RefCountedConcurrentDictionary.cs
index 49aaf48f..b4b8bded 100644
--- a/src/ImageSharp.Web/Synchronization/RefCountedConcurrentDictionary.cs
+++ b/src/ImageSharp.Web/Synchronization/RefCountedConcurrentDictionary.cs
@@ -229,10 +229,8 @@ public RefCountedValue(TValue value, int refCount)
             public bool Equals(
 #if NET5_0_OR_GREATER
                 RefCountedValue? other)
-#elif NETCOREAPP3_1_OR_GREATER
-                [System.Diagnostics.CodeAnalysis.AllowNull] RefCountedValue other)
 #else
-                RefCountedValue other)
+                [System.Diagnostics.CodeAnalysis.AllowNull] RefCountedValue other)
 #endif
                 => (other != null) && (this.RefCount == other.RefCount) && EqualityComparer<TValue>.Default.Equals(this.Value, other.Value);
 
diff --git a/tests/ImageSharp.Web.Benchmarks/ImageSharp.Web.Benchmarks.csproj b/tests/ImageSharp.Web.Benchmarks/ImageSharp.Web.Benchmarks.csproj
index bebb71f6..fb27e45a 100644
--- a/tests/ImageSharp.Web.Benchmarks/ImageSharp.Web.Benchmarks.csproj
+++ b/tests/ImageSharp.Web.Benchmarks/ImageSharp.Web.Benchmarks.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>ImageSharp.Web.Benchmarks</AssemblyName>
     <RootNamespace>SixLabors.ImageSharp.Web.Benchmarks</RootNamespace>
     <GenerateProgramFile>false</GenerateProgramFile>
@@ -14,8 +14,4 @@
     <PackageReference Include="BenchmarkDotNet"/>
   </ItemGroup>
   
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <PackageReference Include="Microsoft.AspNetCore.Http"/>
-  </ItemGroup>
-
 </Project>
diff --git a/tests/ImageSharp.Web.Tests/ImageSharp.Web.Tests.csproj b/tests/ImageSharp.Web.Tests/ImageSharp.Web.Tests.csproj
index f8179f75..ea578a88 100644
--- a/tests/ImageSharp.Web.Tests/ImageSharp.Web.Tests.csproj
+++ b/tests/ImageSharp.Web.Tests/ImageSharp.Web.Tests.csproj
@@ -3,15 +3,10 @@
   <PropertyGroup>
     <RootNamespace>SixLabors.ImageSharp.Web.Tests</RootNamespace>
     <AssemblyName>SixLabors.ImageSharp.Web.Tests</AssemblyName>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <PackageReference Include="Microsoft.AspNetCore.Http" />
+  <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.TestHost" />
   </ItemGroup>
 
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageImageProviderFactory.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageImageProviderFactory.cs
index 736b9fcd..8571afb8 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageImageProviderFactory.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageImageProviderFactory.cs
@@ -70,11 +70,7 @@ private static async Task InitializeAWSStorageAsync(IServiceProvider services, A
                 }
             }
 
-#if NETCOREAPP2_1
-            IHostingEnvironment environment = services.GetRequiredService<IHostingEnvironment>();
-#else
             IWebHostEnvironment environment = services.GetRequiredService<IWebHostEnvironment>();
-#endif
 
             try
             {
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AzureBlobStorageImageProviderFactory.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AzureBlobStorageImageProviderFactory.cs
index 52ee99cc..8d1adc7d 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AzureBlobStorageImageProviderFactory.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AzureBlobStorageImageProviderFactory.cs
@@ -33,11 +33,7 @@ private static void InitializeAzureStorage(IServiceProvider services, AzureBlobS
             var container = new BlobContainerClient(containerOptions.ConnectionString, containerOptions.ContainerName);
             container.CreateIfNotExists(PublicAccessType.Blob);
 
-#if NETCOREAPP2_1
-            IHostingEnvironment environment = services.GetRequiredService<IHostingEnvironment>();
-#else
             IWebHostEnvironment environment = services.GetRequiredService<IWebHostEnvironment>();
-#endif
 
             BlobClient blob = container.GetBlobClient(TestConstants.ImagePath);
 

From 985f9d5ae97b889039ba9dcdba95f67cf163b07f Mon Sep 17 00:00:00 2001
From: Maxime Dupras <maxime.dupras@getmaintainx.com>
Date: Mon, 26 Sep 2022 12:59:04 -0400
Subject: [PATCH 011/102] Add timeout support to AmazonS3Client

---
 .../AmazonS3ClientFactory.cs                        | 13 +++++++++++++
 .../Caching/AWSS3StorageCacheOptions.cs             |  3 +++
 .../IAWSS3BucketClientOptions.cs                    |  6 ++++++
 .../Providers/AWSS3StorageImageProviderOptions.cs   |  3 +++
 4 files changed, 25 insertions(+)

diff --git a/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs b/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs
index 62f094ef..98a683dc 100644
--- a/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs
+++ b/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Amazon;
+using Amazon.Runtime;
 using Amazon.S3;
 
 namespace SixLabors.ImageSharp.Web
@@ -25,6 +26,7 @@ public static AmazonS3Client CreateClient(IAWSS3BucketClientOptions options)
                 // AccessSecret can be empty.
                 // PathStyle endpoint doesn't support AccelerateEndpoint.
                 AmazonS3Config config = new() { ServiceURL = options.Endpoint, ForcePathStyle = true, AuthenticationRegion = options.Region };
+                SetTimeout(config, options.Timeout);
                 return new AmazonS3Client(options.AccessKey, options.AccessSecret, config);
             }
             else if (!string.IsNullOrWhiteSpace(options.AccessKey))
@@ -33,12 +35,14 @@ public static AmazonS3Client CreateClient(IAWSS3BucketClientOptions options)
                 Guard.NotNullOrWhiteSpace(options.Region, nameof(options.Region));
                 var region = RegionEndpoint.GetBySystemName(options.Region);
                 AmazonS3Config config = new() { RegionEndpoint = region, UseAccelerateEndpoint = options.UseAccelerateEndpoint };
+                SetTimeout(config, options.Timeout);
                 return new AmazonS3Client(options.AccessKey, options.AccessSecret, config);
             }
             else if (!string.IsNullOrWhiteSpace(options.Region))
             {
                 var region = RegionEndpoint.GetBySystemName(options.Region);
                 AmazonS3Config config = new() { RegionEndpoint = region, UseAccelerateEndpoint = options.UseAccelerateEndpoint };
+                SetTimeout(config, options.Timeout);
                 return new AmazonS3Client(config);
             }
             else
@@ -46,5 +50,14 @@ public static AmazonS3Client CreateClient(IAWSS3BucketClientOptions options)
                 throw new ArgumentException("Invalid configuration.", nameof(options));
             }
         }
+
+        private static void SetTimeout(ClientConfig config, TimeSpan? timeout)
+        {
+            // We don't want to override the default timeout if it's not set.
+            if (timeout.HasValue)
+            {
+                config.Timeout = timeout.Value;
+            }
+        }
     }
 }
diff --git a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs
index 692d9af1..24a384cd 100644
--- a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs
@@ -25,5 +25,8 @@ public class AWSS3StorageCacheOptions : IAWSS3BucketClientOptions
 
         /// <inheritdoc/>
         public bool UseAccelerateEndpoint { get; set; }
+
+        /// <inheritdoc/>
+        public TimeSpan? Timeout { get; set; }
     }
 }
diff --git a/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs b/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs
index e28560b8..71b8d40d 100644
--- a/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs
+++ b/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs
@@ -43,5 +43,11 @@ internal interface IAWSS3BucketClientOptions
         /// The feature must be enabled on the bucket. Follow AWS instruction on <see href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/transfer-acceleration.html"/>.
         /// </summary>
         bool UseAccelerateEndpoint { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating the timeout for the S3 client.
+        /// If the value is set, the value is assigned to the Timeout property of the HttpWebRequest/HttpClient object used to send requests.
+        /// </summary>
+        TimeSpan? Timeout { get; set; }
     }
 }
diff --git a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs
index 57f09fe6..0e654ca1 100644
--- a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs
@@ -38,5 +38,8 @@ public class AWSS3BucketClientOptions : IAWSS3BucketClientOptions
 
         /// <inheritdoc/>
         public bool UseAccelerateEndpoint { get; set; }
+
+        /// <inheritdoc/>
+        public TimeSpan? Timeout { get; set; }
     }
 }

From 34c46c5523b2afa437201601dd658f1ba320cb62 Mon Sep 17 00:00:00 2001
From: Maxime Dupras <maxime.dupras@getmaintainx.com>
Date: Mon, 26 Sep 2022 13:04:28 -0400
Subject: [PATCH 012/102] Added test coverage

---
 .../TestUtilities/AWSS3StorageCacheTestServerFixture.cs       | 4 +++-
 tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs     | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs
index b6c4adf8..ab95d5bd 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs
@@ -21,7 +21,8 @@ protected override void ConfigureCustomServices(IServiceCollection services, IIm
                     BucketName = TestConstants.AWSBucketName,
                     AccessKey = TestConstants.AWSAccessKey,
                     AccessSecret = TestConstants.AWSAccessSecret,
-                    Region = TestConstants.AWSRegion
+                    Region = TestConstants.AWSRegion,
+                    Timeout = TestConstants.AWSTimeout,
                 }))
             .AddProvider(AWSS3StorageImageProviderFactory.Create)
             .Configure<AWSS3StorageCacheOptions>(o =>
@@ -31,6 +32,7 @@ protected override void ConfigureCustomServices(IServiceCollection services, IIm
                 o.AccessKey = TestConstants.AWSAccessKey;
                 o.AccessSecret = TestConstants.AWSAccessSecret;
                 o.Region = TestConstants.AWSRegion;
+                o.Timeout = TestConstants.AWSTimeout;
 
                 AWSS3StorageCache.CreateIfNotExists(o, S3CannedACL.Private);
             })
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs b/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
index b43ba8cc..984c0940 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
@@ -18,5 +18,6 @@ public static class TestConstants
         public const string PhysicalTestImage = "http://localhost/" + ImagePath;
         public const string AzureTestImage = "http://localhost/" + AzureContainerName + "/" + ImagePath;
         public const string AWSTestImage = "http://localhost/" + AWSBucketName + "/" + ImagePath;
+        public static readonly TimeSpan AWSTimeout = TimeSpan.FromSeconds(10);
     }
 }

From 0823d899eca5709be738eb40156c32537b29dd1b Mon Sep 17 00:00:00 2001
From: Maxime Dupras <maxime.dupras@getmaintainx.com>
Date: Mon, 26 Sep 2022 13:41:50 -0400
Subject: [PATCH 013/102] Fixing CI issues

---
 .../Caching/AWSS3StorageCacheOptions.cs                         | 1 +
 src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs   | 2 ++
 .../Providers/AWSS3StorageImageProviderOptions.cs               | 1 +
 tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs       | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs
index 24a384cd..865f4c00 100644
--- a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
+using System;
 
 namespace SixLabors.ImageSharp.Web.Caching.AWS
 {
diff --git a/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs b/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs
index 71b8d40d..6ef40a40 100644
--- a/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs
+++ b/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
+
 namespace SixLabors.ImageSharp.Web
 {
     /// <summary>
diff --git a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs
index 0e654ca1..6fcf4f06 100644
--- a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
 using System.Collections.Generic;
 
 namespace SixLabors.ImageSharp.Web.Providers.AWS
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs b/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
index 984c0940..9c764d7e 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
+
 namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
 {
     public static class TestConstants

From 369c9d5b73c90442fbe20799c7fcfb7fd8fd8031 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 13:28:30 +0000
Subject: [PATCH 014/102] Bump actions/setup-dotnet from 2 to 3

Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 2 to 3.
- [Release notes](https://github.com/actions/setup-dotnet/releases)
- [Commits](https://github.com/actions/setup-dotnet/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/setup-dotnet
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build-and-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 33cf815e..d9cf46dd 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -109,7 +109,7 @@ jobs:
           s3rver -d . &
 
       - name: DotNet Setup
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
             6.0.x

From bbd77bf9f4bf09b8bb348cc1630f3d002f872b84 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Wed, 5 Oct 2022 22:20:06 +1000
Subject: [PATCH 015/102] Add taghelper

---
 .../ImageSharp.Web.Sample.csproj              |    6 +-
 .../ImageSharp.Web.Sample/Pages/Index.cshtml  | 1001 ++++++++++++++++
 .../ImageSharp.Web.Sample/Pages/IndexModel.cs |   14 +
 .../Pages/Shared/_Layout.cshtml               |   16 +
 .../Pages/Shared/_Layout.cshtml.css           |   48 +
 .../Pages/_ViewImports.cshtml                 |    7 +
 .../Pages/_ViewStart.cshtml                   |    3 +
 samples/ImageSharp.Web.Sample/Program.cs      |   74 +-
 .../Properties/launchSettings.json            |   17 +-
 samples/ImageSharp.Web.Sample/Startup.cs      |  150 ---
 .../appsettings.Development.json              |    6 +-
 .../ImageSharp.Web.Sample/appsettings.json    |    4 +-
 .../ImageSharp.Web.Sample/wwwroot/favicon.ico |  Bin 0 -> 5430 bytes
 .../ImageSharp.Web.Sample/wwwroot/index.html  | 1004 -----------------
 .../wwwroot/sixlabors.imagesharp.web.svg      |    1 +
 src/ImageSharp.Web/Format.cs                  |   41 +
 ...ImageSharpRequestAuthorizationUtilities.cs |   14 +
 src/ImageSharp.Web/ImageSharpTagHelper.cs     |  363 ++++++
 src/ImageSharp.Web/Resampler.cs               |   96 ++
 19 files changed, 1683 insertions(+), 1182 deletions(-)
 create mode 100644 samples/ImageSharp.Web.Sample/Pages/Index.cshtml
 create mode 100644 samples/ImageSharp.Web.Sample/Pages/IndexModel.cs
 create mode 100644 samples/ImageSharp.Web.Sample/Pages/Shared/_Layout.cshtml
 create mode 100644 samples/ImageSharp.Web.Sample/Pages/Shared/_Layout.cshtml.css
 create mode 100644 samples/ImageSharp.Web.Sample/Pages/_ViewImports.cshtml
 create mode 100644 samples/ImageSharp.Web.Sample/Pages/_ViewStart.cshtml
 delete mode 100644 samples/ImageSharp.Web.Sample/Startup.cs
 create mode 100644 samples/ImageSharp.Web.Sample/wwwroot/favicon.ico
 delete mode 100644 samples/ImageSharp.Web.Sample/wwwroot/index.html
 create mode 100644 samples/ImageSharp.Web.Sample/wwwroot/sixlabors.imagesharp.web.svg
 create mode 100644 src/ImageSharp.Web/Format.cs
 create mode 100644 src/ImageSharp.Web/ImageSharpTagHelper.cs
 create mode 100644 src/ImageSharp.Web/Resampler.cs

diff --git a/samples/ImageSharp.Web.Sample/ImageSharp.Web.Sample.csproj b/samples/ImageSharp.Web.Sample/ImageSharp.Web.Sample.csproj
index 744de963..237520c0 100644
--- a/samples/ImageSharp.Web.Sample/ImageSharp.Web.Sample.csproj
+++ b/samples/ImageSharp.Web.Sample/ImageSharp.Web.Sample.csproj
@@ -1,10 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <LangVersion>10</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\ImageSharp.Web\ImageSharp.Web.csproj" />
   </ItemGroup>
+
 </Project>
diff --git a/samples/ImageSharp.Web.Sample/Pages/Index.cshtml b/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
new file mode 100644
index 00000000..bfce153d
--- /dev/null
+++ b/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
@@ -0,0 +1,1001 @@
+@page
+@model IndexModel
+@{
+    ViewData["Title"] = "ImageSharp URI API Samples";
+}
+
+@section Css {
+    <style>
+        body {
+            text-align: center;
+            font-family: BlinkMacSystemFont, -apple-system, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
+        }
+
+        h1, h2, h3 {
+            width: 100%;
+        }
+
+        code {
+            background-color: #1e1e1e;
+            color: #c8c8c8;
+            padding: .2rem;
+            box-shadow: 0 2px 1px -1px rgba(0, 0, 0, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.07), 0 1px 3px 0 rgba(0, 0, 0, 0.06);
+        }
+
+        section {
+            display: flex;
+            flex-wrap: wrap;
+        }
+
+            section > p {
+                flex: 0 0 100%;
+            }
+
+            section > div {
+                flex: 0 0 50%;
+            }
+
+        img {
+            border: 1px solid #e3e3e3;
+        }
+    </style>
+}
+    <section>
+        <h2>Unmodified</h2>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.svg?width=300</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.svg" width="300" />
+            </p>
+        </div>
+    </section>
+    <section>
+        <h2>Resize</h2>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" />
+            </p>
+        </div>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&height=200</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" height="200" />
+            </p>
+        </div>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&height=200&rmode=stretch</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" height="200" asp-rmode="ResizeMode.Stretch" />
+            </p>
+        </div>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&height=200&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" height="200" asp-rmode="ResizeMode.Pad" asp-rcolor="Color.LimeGreen" />
+            </p>
+        </div>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&rsampler=lanczos3</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" asp-rsampler="Resampler.Lanczos3" />
+            </p>
+        </div>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&rsampler=nearestneighbor</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" asp-rsampler="Resampler.NearestNeighbor" />
+            </p>
+        </div>
+    </section>
+    <hr />
+    <section>
+        <h2>Format</h2>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&format=jpg</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" asp-format="Format.Jpg" />
+            </p>
+        </div>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&format=bmp</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" asp-format="Format.Bmp" />
+            </p>
+        </div>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&format=gif</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" asp-format="Format.Gif" />
+            </p>
+        </div>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&format=webp</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" asp-format="Format.WebP" />
+            </p>
+        </div>
+    </section>
+    <hr />
+    <section>
+        <h2>Jpeg Quality</h2>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&format=jpg&quality=100</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" asp-quality="100" />
+            </p>
+        </div>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&format=jpg&quality=50</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" asp-quality="50" />
+            </p>
+        </div>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&format=jpg&quality=1</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" asp-quality="1" />
+            </p>
+        </div>
+    </section>
+    <hr />
+    <section>
+        <h2>Webp Quality</h2>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&format=webp&quality=100</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" asp-format="Format.WebP" asp-quality="100" />
+            </p>
+        </div>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&format=webp&quality=50</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" asp-format="Format.WebP" asp-quality="50" />
+            </p>
+        </div>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&format=webp&quality=1</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" asp-format="Format.WebP" asp-quality="1" />
+            </p>
+        </div>
+    </section>
+    <hr />
+    <section>
+        <h2>Background Color</h2>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&bgcolor=red</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" asp-bgcolor="Color.Red" />
+            </p>
+        </div>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&bgcolor=FFFF00</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" asp-bgcolor='Color.ParseHex("FFFF00")' />
+            </p>
+        </div>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&bgcolor=128,28,32</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" asp-bgcolor="Color.FromRgb(128, 28, 32)" />
+            </p>
+        </div>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&bgcolor=C1FF0080</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" asp-bgcolor='Color.ParseHex("C1FF0080")' />
+            </p>
+        </div>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=300&bgcolor=128,28,32,128</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" asp-bgcolor="Color.FromRgba(128, 28, 32, 128)" />
+            </p>
+        </div>
+    </section>
+    <hr />
+    <section>
+        <h2>Identical Queries</h2>
+        <p>Demonstrates that the middleware handles identical queries without file contention.</p>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=123</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="123" />
+            </p>
+        </div>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=123</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="123" />
+            </p>
+        </div>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?width=123</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width=123" />
+            </p>
+        </div>
+    </section>
+        @*TODO: Convert the rest of these queries to use the tag helper.*@
+    <section>
+        <h2>EXIF Handling Portrait</h2>
+        <p>Demonstrates that the middleware handles EXIF orientation correctly for portrait images.</p>
+        <div>
+            <p>
+                <code>Portrait_0.jpg?width=60&height=50&rxy=0.69,0.37</code>
+            </p>
+            <p><img src="Portrait_0.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_1.jpg?width=60&height=50&rxy=0.69,0.37</code>
+            </p>
+            <p><img src="Portrait_1.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_2.jpg?width=60&height=50&rxy=0.69,0.37</code>
+            </p>
+            <p><img src="Portrait_2.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Portrait_3.jpg?width=60&height=50&rxy=0.69,0.37</code>
+            </p>
+            <p><img src="Portrait_3.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_4.jpg?width=60&height=50&rxy=0.69,0.37</code>
+            </p>
+            <p><img src="Portrait_4.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_5.jpg?width=60&height=50&rxy=0.69,0.37</code>
+            </p>
+            <p><img src="Portrait_5.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Portrait_6.jpg?width=60&height=50&rxy=0.69,0.37</code>
+            </p>
+            <p><img src="Portrait_6.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_7.jpg?width=60&height=50&rxy=0.69,0.37</code>
+            </p>
+            <p><img src="Portrait_7.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_8.jpg?width=60&height=50&rxy=0.69,0.37</code>
+            </p>
+            <p><img src="Portrait_8.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+        </div>
+    </section>
+
+    <section>
+        <h2>EXIF Handling Portrait</h2>
+        <p>Demonstrates that the middleware handles EXIF orientation correctly for portrait images.</p>
+        <div>
+            <p>
+                <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomleft</code>
+            </p>
+            <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=bottomleft" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomleft</code>
+            </p>
+            <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=bottomleft" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomleft</code>
+            </p>
+            <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=bottomleft" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomleft</code>
+            </p>
+            <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=bottomleft" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomleft</code>
+            </p>
+            <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=bottomleft" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomleft</code>
+            </p>
+            <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=bottomleft" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomleft</code>
+            </p>
+            <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=bottomleft" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomleft</code>
+            </p>
+            <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=bottomleft" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomleft</code>
+            </p>
+            <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=bottomleft" /></p>
+        </div>
+    </section>
+
+    <section>
+        <h2>EXIF Handling Portrait</h2>
+        <p>Demonstrates that the middleware handles EXIF orientation correctly for portrait images.</p>
+        <div>
+            <p>
+                <code>Portrait_0.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_1.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_2.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Portrait_3.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_4.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_5.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Portrait_6.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_7.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_8.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+    </section>
+
+    <section>
+        <h2>EXIF Handling Portrait</h2>
+        <p>Demonstrates that the middleware handles EXIF orientation correctly for portrait images.</p>
+        <div>
+            <p>
+                <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+    </section>
+
+    <section>
+        <h2>EXIF Handling Portrait</h2>
+        <p>Demonstrates that the middleware handles EXIF orientation correctly for portrait images.</p>
+        <div>
+            <p>
+                <code>Portrait_0.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_1.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_2.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Portrait_3.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_4.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_5.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Portrait_6.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_7.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_8.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+    </section>
+
+    <section>
+        <h2>EXIF Handling Portrait</h2>
+        <p>Demonstrates that the middleware handles EXIF orientation correctly for portrait images.</p>
+        <div>
+            <p>
+                <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+    </section>
+
+    <section>
+        <h2>EXIF Handling : Landscape</h2>
+        <p>Demonstrates that the middleware handles EXIF orientation correctly for landscape images.</p>
+        <div>
+            <p>
+                <code>Landscape_0.jpg?width=60&height=50&rxy=0.69,0.37</code>
+            </p>
+            <p><img src="Landscape_0.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_1.jpg?width=60&height=50&rxy=0.69,0.37</code>
+            </p>
+            <p><img src="Landscape_1.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_2.jpg?width=60&height=50&rxy=0.69,0.37</code>
+            </p>
+            <p><img src="Landscape_2.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Landscape_3.jpg?width=60&height=50&rxy=0.69,0.37</code>
+            </p>
+            <p><img src="Landscape_3.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_4.jpg?width=60&height=50&rxy=0.69,0.37</code>
+            </p>
+            <p><img src="Landscape_4.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_5.jpg?width=60&height=50&rxy=0.69,0.37</code>
+            </p>
+            <p><img src="Landscape_5.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Landscape_6.jpg?width=60&height=50&rxy=0.69,0.37</code>
+            </p>
+            <p><img src="Landscape_6.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_7.jpg?width=60&height=50&rxy=0.69,0.37</code>
+            </p>
+            <p><img src="Landscape_7.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_8.jpg?width=60&height=50&rxy=0.69,0.37</code>
+            </p>
+            <p><img src="Landscape_8.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+        </div>
+    </section>
+
+    <section>
+        <h2>EXIF Handling : Landscape</h2>
+        <p>Demonstrates that the middleware handles EXIF orientation correctly for landscape images.</p>
+        <div>
+            <p>
+                <code>Landscape_0.jpg?width=60&height=50&ranchor=topright</code>
+            </p>
+            <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=topright" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_1.jpg?width=60&height=50&ranchor=topright</code>
+            </p>
+            <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=topright" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_2.jpg?width=60&height=50&ranchor=topright</code>
+            </p>
+            <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=topright" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Landscape_3.jpg?width=60&height=50&ranchor=topright</code>
+            </p>
+            <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=topright" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_4.jpg?width=60&height=50&ranchor=topright</code>
+            </p>
+            <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=topright" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_5.jpg?width=60&height=50&ranchor=topright</code>
+            </p>
+            <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=topright" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Landscape_6.jpg?width=60&height=50&ranchor=topright</code>
+            </p>
+            <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=topright" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_7.jpg?width=60&height=50&ranchor=topright</code>
+            </p>
+            <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=topright" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_8.jpg?width=60&height=50&ranchor=topright</code>
+            </p>
+            <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=topright" /></p>
+        </div>
+    </section>
+
+    <section>
+        <h2>EXIF Handling : Landscape</h2>
+        <p>Demonstrates that the middleware handles EXIF orientation correctly for landscape images.</p>
+        <div>
+            <p>
+                <code>Landscape_0.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_1.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_2.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Landscape_3.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_4.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_5.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Landscape_6.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_7.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_8.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+    </section>
+
+    <section>
+        <h2>EXIF Handling : Landscape</h2>
+        <p>Demonstrates that the middleware handles EXIF orientation correctly for landscape images.</p>
+        <div>
+            <p>
+                <code>Landscape_0.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_1.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_2.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Landscape_3.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_4.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_5.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Landscape_6.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_7.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_8.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+    </section>
+
+    <section>
+        <h2>EXIF Handling : Landscape</h2>
+        <p>Demonstrates that the middleware handles EXIF orientation correctly for landscape images.</p>
+        <div>
+            <p>
+                <code>Landscape_0.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_1.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_2.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Landscape_3.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_4.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_5.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Landscape_6.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_7.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_8.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+    </section>
+
+    <section>
+        <h2>EXIF Handling : Landscape</h2>
+        <p>Demonstrates that the middleware handles EXIF orientation correctly for landscape images.</p>
+        <div>
+            <p>
+                <code>Landscape_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Landscape_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+
+        <div>
+            <p>
+                <code>Landscape_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+        <div>
+            <p>
+                <code>Landscape_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
+            </p>
+            <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+        </div>
+    </section>
diff --git a/samples/ImageSharp.Web.Sample/Pages/IndexModel.cs b/samples/ImageSharp.Web.Sample/Pages/IndexModel.cs
new file mode 100644
index 00000000..fd22ab50
--- /dev/null
+++ b/samples/ImageSharp.Web.Sample/Pages/IndexModel.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace ImageSharp.Web.Sample.Pages
+{
+    /// <summary>
+    /// Defines the index page view model.
+    /// </summary>
+    public class IndexModel : PageModel
+    {
+    }
+}
diff --git a/samples/ImageSharp.Web.Sample/Pages/Shared/_Layout.cshtml b/samples/ImageSharp.Web.Sample/Pages/Shared/_Layout.cshtml
new file mode 100644
index 00000000..ccf41dbb
--- /dev/null
+++ b/samples/ImageSharp.Web.Sample/Pages/Shared/_Layout.cshtml
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - ImageSharp.Web.Sample</title>
+    @await RenderSectionAsync("Css", required: false)
+</head>
+<body>
+
+    <main role="main">
+        @RenderBody()
+    </main>
+    
+</body>
+</html>
diff --git a/samples/ImageSharp.Web.Sample/Pages/Shared/_Layout.cshtml.css b/samples/ImageSharp.Web.Sample/Pages/Shared/_Layout.cshtml.css
new file mode 100644
index 00000000..a72cbeaf
--- /dev/null
+++ b/samples/ImageSharp.Web.Sample/Pages/Shared/_Layout.cshtml.css
@@ -0,0 +1,48 @@
+/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
+for details on configuring this project to bundle and minify static web assets. */
+
+a.navbar-brand {
+  white-space: normal;
+  text-align: center;
+  word-break: break-all;
+}
+
+a {
+  color: #0077cc;
+}
+
+.btn-primary {
+  color: #fff;
+  background-color: #1b6ec2;
+  border-color: #1861ac;
+}
+
+.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
+  color: #fff;
+  background-color: #1b6ec2;
+  border-color: #1861ac;
+}
+
+.border-top {
+  border-top: 1px solid #e5e5e5;
+}
+.border-bottom {
+  border-bottom: 1px solid #e5e5e5;
+}
+
+.box-shadow {
+  box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
+}
+
+button.accept-policy {
+  font-size: 1rem;
+  line-height: inherit;
+}
+
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  white-space: nowrap;
+  line-height: 60px;
+}
diff --git a/samples/ImageSharp.Web.Sample/Pages/_ViewImports.cshtml b/samples/ImageSharp.Web.Sample/Pages/_ViewImports.cshtml
new file mode 100644
index 00000000..cd1556e4
--- /dev/null
+++ b/samples/ImageSharp.Web.Sample/Pages/_ViewImports.cshtml
@@ -0,0 +1,7 @@
+@using ImageSharp.Web.Sample
+@using SixLabors.ImageSharp
+@using SixLabors.ImageSharp.Processing
+@using SixLabors.ImageSharp.Web
+@namespace ImageSharp.Web.Sample.Pages
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, SixLabors.ImageSharp.Web
diff --git a/samples/ImageSharp.Web.Sample/Pages/_ViewStart.cshtml b/samples/ImageSharp.Web.Sample/Pages/_ViewStart.cshtml
new file mode 100644
index 00000000..a5f10045
--- /dev/null
+++ b/samples/ImageSharp.Web.Sample/Pages/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}
diff --git a/samples/ImageSharp.Web.Sample/Program.cs b/samples/ImageSharp.Web.Sample/Program.cs
index 9c4bb394..5850e688 100644
--- a/samples/ImageSharp.Web.Sample/Program.cs
+++ b/samples/ImageSharp.Web.Sample/Program.cs
@@ -1,10 +1,13 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
+using SixLabors.ImageSharp.Web.Caching;
+using SixLabors.ImageSharp.Web.Commands;
+using SixLabors.ImageSharp.Web.DependencyInjection;
+using SixLabors.ImageSharp.Web.Processors;
+using SixLabors.ImageSharp.Web.Providers;
 
-namespace SixLabors.ImageSharp.Web.Sample
+namespace ImageSharp.Web.Sample
 {
     /// <summary>
     /// The running application.
@@ -12,18 +15,61 @@ namespace SixLabors.ImageSharp.Web.Sample
     public static class Program
     {
         /// <summary>
-        /// The main entry point to the running application.
+        /// The main application entry point.
         /// </summary>
-        /// <param name="args">Any arguments to pass to the application.</param>
-        public static void Main(string[] args) => CreateHostBuilder(args).Build().Run();
+        /// <param name="args">Argument paramateres.</param>
+        public static void Main(string[] args)
+        {
+            WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
-        /// <summary>
-        /// Creates an <see cref="IHostBuilder"/> instance used to create a configured <see cref="IHost"/>.
-        /// </summary>
-        /// <param name="args">Any arguments to pass to the application.</param>
-        /// <returns>The <see cref="IHostBuilder"/>.</returns>
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());
+            // Add services to the container.
+            IServiceCollection services = builder.Services;
+            services.AddRazorPages();
+
+            // TODO: Enable HMAC
+            services.AddImageSharp(options => options.HMACSecretKey = null) // new byte[] { 1, 2, 3, 4, 5 })
+                .SetRequestParser<QueryCollectionRequestParser>()
+                .Configure<PhysicalFileSystemCacheOptions>(options =>
+                {
+                    options.CacheRootPath = null;
+                    options.CacheFolder = "is-cache";
+                    options.CacheFolderDepth = 8;
+                })
+                .SetCache<PhysicalFileSystemCache>()
+                .SetCacheKey<UriRelativeLowerInvariantCacheKey>()
+                .SetCacheHash<SHA256CacheHash>()
+                .Configure<PhysicalFileSystemProviderOptions>(options => options.ProviderRootPath = null)
+                .AddProvider<PhysicalFileSystemProvider>()
+                .AddProcessor<ResizeWebProcessor>()
+                .AddProcessor<FormatWebProcessor>()
+                .AddProcessor<BackgroundColorWebProcessor>()
+                .AddProcessor<QualityWebProcessor>()
+                .AddProcessor<AutoOrientWebProcessor>();
+
+            WebApplication app = builder.Build();
+
+            // Configure the HTTP request pipeline.
+            if (!app.Environment.IsDevelopment())
+            {
+                app.UseExceptionHandler("/Error");
+
+                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+                app.UseHsts();
+            }
+
+            app.UseHttpsRedirection();
+
+            app.UseImageSharp();
+
+            app.UseStaticFiles();
+
+            app.UseRouting();
+
+            app.UseAuthorization();
+
+            app.MapRazorPages();
+
+            app.Run();
+        }
     }
 }
diff --git a/samples/ImageSharp.Web.Sample/Properties/launchSettings.json b/samples/ImageSharp.Web.Sample/Properties/launchSettings.json
index f4f5915d..a8c03df5 100644
--- a/samples/ImageSharp.Web.Sample/Properties/launchSettings.json
+++ b/samples/ImageSharp.Web.Sample/Properties/launchSettings.json
@@ -3,25 +3,26 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:2645/",
-      "sslPort": 0
+      "applicationUrl": "http://localhost:58534",
+      "sslPort": 44388
     }
   },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
+    "ImageSharp.Web.Sample": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
+      "applicationUrl": "https://localhost:7267;http://localhost:5267",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "ImageSharp.Web.Sample": {
-      "commandName": "Project",
+    "IIS Express": {
+      "commandName": "IISExpress",
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "http://localhost:2646"
+      }
     }
   }
 }
diff --git a/samples/ImageSharp.Web.Sample/Startup.cs b/samples/ImageSharp.Web.Sample/Startup.cs
deleted file mode 100644
index 26bca69c..00000000
--- a/samples/ImageSharp.Web.Sample/Startup.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using SixLabors.ImageSharp.Web.Caching;
-using SixLabors.ImageSharp.Web.Commands;
-using SixLabors.ImageSharp.Web.DependencyInjection;
-using SixLabors.ImageSharp.Web.Processors;
-using SixLabors.ImageSharp.Web.Providers;
-
-namespace SixLabors.ImageSharp.Web.Sample
-{
-    /// <summary>
-    /// Contains application configuration allowing the addition of services to the container.
-    /// </summary>
-    public class Startup
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Startup"/> class.
-        /// </summary>
-        /// <param name="configuration">The configuration properties.</param>
-        public Startup(IConfiguration configuration) => this.AppConfiguration = configuration;
-
-        /// <summary>
-        /// Gets the configuration properties.
-        /// </summary>
-        public IConfiguration AppConfiguration { get; }
-
-        /// <summary>
-        /// This method gets called by the runtime. Use this method to add services to the container.
-        /// </summary>
-        /// <param name="services">The collection of service descriptors.</param>
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddImageSharp()
-                .SetRequestParser<QueryCollectionRequestParser>()
-                .Configure<PhysicalFileSystemCacheOptions>(options =>
-                {
-                    options.CacheRootPath = null;
-                    options.CacheFolder = "is-cache";
-                    options.CacheFolderDepth = 8;
-                })
-                .SetCache<PhysicalFileSystemCache>()
-                .SetCacheKey<UriRelativeLowerInvariantCacheKey>()
-                .SetCacheHash<SHA256CacheHash>()
-                .Configure<PhysicalFileSystemProviderOptions>(options =>
-                {
-                    options.ProviderRootPath = null;
-                })
-                .AddProvider<PhysicalFileSystemProvider>()
-                .AddProcessor<ResizeWebProcessor>()
-                .AddProcessor<FormatWebProcessor>()
-                .AddProcessor<BackgroundColorWebProcessor>()
-                .AddProcessor<QualityWebProcessor>()
-                .AddProcessor<AutoOrientWebProcessor>();
-
-            // Add the default service and options.
-            //
-            // services.AddImageSharp();
-
-            // Or add the default service and custom options.
-            //
-            // this.ConfigureDefaultServicesAndCustomOptions(services);
-
-            // Or we can fine-grain control adding the default options and configure all other services.
-            //
-            // this.ConfigureCustomServicesAndDefaultOptions(services);
-
-            // Or we can fine-grain control adding custom options and configure all other services
-            // There are also factory methods for each builder that will allow building from configuration files.
-            //
-            // this.ConfigureCustomServicesAndCustomOptions(services);
-        }
-
-        private void ConfigureDefaultServicesAndCustomOptions(IServiceCollection services)
-        {
-            services.AddImageSharp(options =>
-            {
-                options.Configuration = Configuration.Default;
-                options.BrowserMaxAge = TimeSpan.FromDays(7);
-                options.CacheMaxAge = TimeSpan.FromDays(365);
-                options.CacheHashLength = 8;
-                options.OnParseCommandsAsync = _ => Task.CompletedTask;
-                options.OnBeforeSaveAsync = _ => Task.CompletedTask;
-                options.OnProcessedAsync = _ => Task.CompletedTask;
-                options.OnPrepareResponseAsync = _ => Task.CompletedTask;
-            });
-        }
-
-        private void ConfigureCustomServicesAndDefaultOptions(IServiceCollection services)
-        {
-            services.AddImageSharp()
-                    .RemoveProcessor<FormatWebProcessor>()
-                    .RemoveProcessor<BackgroundColorWebProcessor>();
-        }
-
-        private void ConfigureCustomServicesAndCustomOptions(IServiceCollection services)
-        {
-            services.AddImageSharp(options =>
-            {
-                options.Configuration = Configuration.Default;
-                options.BrowserMaxAge = TimeSpan.FromDays(7);
-                options.CacheMaxAge = TimeSpan.FromDays(365);
-                options.CacheHashLength = 8;
-                options.OnParseCommandsAsync = _ => Task.CompletedTask;
-                options.OnBeforeSaveAsync = _ => Task.CompletedTask;
-                options.OnProcessedAsync = _ => Task.CompletedTask;
-                options.OnPrepareResponseAsync = _ => Task.CompletedTask;
-            })
-                .SetRequestParser<QueryCollectionRequestParser>()
-                .Configure<PhysicalFileSystemCacheOptions>(options =>
-                {
-                    options.CacheFolder = "different-cache";
-                })
-                .SetCache<PhysicalFileSystemCache>()
-                .SetCacheKey<UriRelativeLowerInvariantCacheKey>()
-                .SetCacheHash<SHA256CacheHash>()
-                .ClearProviders()
-                .AddProvider<PhysicalFileSystemProvider>()
-                .ClearProcessors()
-                .AddProcessor<ResizeWebProcessor>()
-                .AddProcessor<FormatWebProcessor>()
-                .AddProcessor<BackgroundColorWebProcessor>()
-                .AddProcessor<QualityWebProcessor>();
-        }
-
-        /// <summary>
-        /// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        /// </summary>
-        /// <param name="app">The application builder.</param>
-        /// <param name="env">The hosting environment the application is running in.</param>
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-
-            app.UseDefaultFiles();
-            app.UseImageSharp();
-            app.UseStaticFiles();
-        }
-    }
-}
diff --git a/samples/ImageSharp.Web.Sample/appsettings.Development.json b/samples/ImageSharp.Web.Sample/appsettings.Development.json
index e203e940..770d3e93 100644
--- a/samples/ImageSharp.Web.Sample/appsettings.Development.json
+++ b/samples/ImageSharp.Web.Sample/appsettings.Development.json
@@ -1,9 +1,9 @@
 {
+  "DetailedErrors": true,
   "Logging": {
     "LogLevel": {
-      "Default": "Debug",
-      "System": "Information",
-      "Microsoft": "Information"
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
     }
   }
 }
diff --git a/samples/ImageSharp.Web.Sample/appsettings.json b/samples/ImageSharp.Web.Sample/appsettings.json
index 7cb5ac81..10f68b8c 100644
--- a/samples/ImageSharp.Web.Sample/appsettings.json
+++ b/samples/ImageSharp.Web.Sample/appsettings.json
@@ -1,8 +1,8 @@
 {
   "Logging": {
     "LogLevel": {
-      "Default": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
     }
   },
   "AllowedHosts": "*"
diff --git a/samples/ImageSharp.Web.Sample/wwwroot/favicon.ico b/samples/ImageSharp.Web.Sample/wwwroot/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..63e859b476eff5055e0e557aaa151ca8223fbeef
GIT binary patch
literal 5430
zcmc&&Yj2xp8Fqnv;>&(QB_ve7>^E#o2mu=cO~A%R>DU-_hfbSRv1t;m7zJ_AMrntN
zy0+^f&8be>q&YYzH%(88lQ?#KwiCzaCO*ZEo%j&v;<}&Lj_stKTKK>#U3nin@AF>w
zb3ONSAFR{u(S1d?cdw53y}Gt1b-Hirbh;;bm(Rcbnoc*%@jiaXM|4jU^1WO~`TYZ~
zC-~jh9~b-f?fX`DmwvcguQzn*uV}c^Vd&~?H|RUs4Epv~gTAfR(B0lT&?RWQOtduM
z^1vUD9{HQs<A&Q|hfBf6J7KS3o@2r`52u2acMYRM21G(Zg>W!{a9|0crA34m7Z6<V
z5*`G-ZUj9p1Uyaz+z!ItgpQVr#%MT%N?{$F3VCd92y!T|6ZthFt5C{iP|B@pSWClW
zvtVnpj7qtLN~wrSv7o&}=E}TW7Ns>lpG^}f6f?<P81Cy;{F}uMWP&q@PJMx>={zD+
zXAzk^i^aKN_}s2$eX81wjSMONE#WVdzf|MT)Ap*}Vsn!XbvsI#6o&ij{87^d%$|A{
z=F{KB%)g%@z76yBzbb7seW**Ju8r4e*Z3PWNX3_tTDgzZatz7)Q6ytwB%@&@A|XT;
zecM`Snxx5po$C)%yCP!KEtos~eOS)@2=kX-RIm)4glMCoagTEFxrBeSX%Euz734Fk
z%7)x(k~T!@Hbg_37NSQL!vlTBXoURSzt~I**Zw`&F24fH*&kx=%nvZv|49SC*daD(
zIw<~%#=lk8{2-l(BcIjy^Q$Q&m#KlWL9?UG{b<C<V86!C{kuQg3d@=2U~k>8@qhlD
z;umc+6p%|NsAT~0@DgV4-NKgQuWPWrmPI<Tg6(~1+zal9=Fj3A8b$^OjL~QWmCX|F
zo7)txz3qV7gSj)$V{YJ6&9}wBiCj8K{vhJC!901J{FSN=<)(d5XF>K&&XhV&n%`{l
zOl^bbWYjQN<u8-Jo$G%djz<1|@{4aP|0X~8G!YFd4Q40rU}Jr~iaa**Ic((Cur8nu
z>uVXTXESO)@|iUKVmErPUDfz2Wh`4dF@OFiaCW|d`3paV^@|r^8T_ZxM)Z+$p5qx#
z#K=z@%;aBPO=C4JNNGqVv6@UGolIz;KZsAro``Rz8X%vq_gpi^qEV&evgHb_=Y9-l
z`)imdx0UC>GWZYj)3+3aKh?zVb}=@%oNzg7a8%<c<Eh;a=QeB{??%hTi`)Dw)-KpD
zz67`aP1sw04%@{SVdeR&P#Xo>kfVl)SV-Amp1Okw&+hEZ3|v(k8vRjXW9?ih`&FFM
zV$~{j3IzhtcXk?Mu_!12;=+I7XK-IR2>Yd%VB^?oI9c^E&Chb&&je$NV0P-R;ujkP
z;cbLCCPEF6|22NDj=S`F^2e~XwT1ZnRX8ra0#DaFa9-X|8(xNW_+JhD75WnSd7cxo
z2>I_J5{c|WPfrgl7E2R)^c}F7ry()Z>$Jhk9CzZxiPKL#_0%`&{MX>P_%b~Dx0D^S
z7xP1(DQ!d_Icpk!RN3I1w@~|O1ru#CO==h#9M~S4Chx*@?=EKUPGBv$tmU+7Zs_al
z`!jR?6T&Z7(%uVq>#yLu`abWk!FBlnY{RFNHlj~6zh*;@u}+}viRKsD`IIxN#R-X3
z@vxu#EA_m}I503U(8Qmx^}u;)KfGP<!qsws<6m(7)L*!($n#7m7{_W5J(MO@pQ!n!
zvO&cOEmlap%BA8>`O9E1H1Q|xeeksX8jC%@!{YT1)!lWgO=+Y3*<x(Ts+hiuU-^XQ
zmk+Zcm#*?xbLjBMa5KN{I^36E#X>jr=iSxvOW1}^HSy=y){tOMQJ@an>sOl4FYniE
z;GOxd7AqxZNbYFNqobpv&HVO$c-w!Y*6r;$2oJ~h(a#(Bp<-)dg*mNigX~9rPqcHv
z^;c*|Md?tD)$y?6FO$DWl$jUGV`F1G_^E&E>sY*YnA~ruv3=z9F8&&~Xpm<<75?N3
z>x~`I&M9q)O1=zWZHN9hZWx>RQ}zLP+iL57Q)%&_^$Sme^^G7;e-P~CR?kqU#Io#(
z(nH1Wn*Ig)|M>WLGrxoU?FZrS`4GO&w;+39A3f8w{{Q7eg|$+dIlNFPAe+tN=FOYU
z{A&Fg|H73+w1IK(W=j*L<kknR^+Dgs{=|7Mmg$EpJfB(Sjv{NBHTrNo9>>JQgz$g0
z7JpKXLHIh}#$wm|N`s}o-@|L_`>*(gTQ~)wr3Eap7g%PVNisKw82im;Gdv#85x#s+
zoqqtnwu4ycd>cOQgRh-=aEJbnvVK`}ja%+FZx}&ehtX)n(9n<?d%a$xa5wU=$9)hV
z6dh9Z1-bj@Z}E}(^+^28O~M=JU2tP;RK?GYjSU2XK?H+ABj2dF<z8EVouxkdvj5ee
zY94LU&uS=@O1ORdHr83EEiEnW;^xdfv<InF>Vfe4{mn0bgijUbNr7<Z^Lg<z;gvjX
z<n--zKgxJ+Zte)5d#p=xRhj*OaErf9O-)H{V&qF6i(8(z*=$GBtS=v?&x5`f&XtuF
zL|In`SY!EozAxqG8T`Lq@;in6EU}lU{Z8>Tf5X^$*{qh2%`?--%+sbSrjE^;1e3>%
zqa%jdY16{Y)a1hSy*mr0JGU05Z%=qlx5vGvTjSpTt6k%nR06q}1DU`SQh_<FurFO^
zU%DKoZv>ZAeJ}A@`hL~xvv05U?0%=spP`R>dk?cOWM9^KNb7B?xjex>OZo%JMQQ1Q
zB|q@}8RiP<b^UIKKf`{|*Y^Re>@DWn-(fB;phPaIOP2Yp)XN3-Fsn)S3w($4&+<R{
z{b9-L_GcJBef=L{o^|<L$05~^71+l~Z4(aoQIhu+Hc(v8qsaFZn3oi2(}LUS&t@`M
z96Z9>p8f5W_f%gac}QvmkHfCj$2=!t`b<dumf~mZ)WF)(pJlDJH1si?ZLea!>oCvQ
zCW;&Dto=f8v##}dy^wg3VNaBy&kCe3N;1|@n@pUaMPT?(aJ9b<TlWX5o-8sZNiFT*
zZ#r5Z<G{`F8>*(gJ28$}(2qFt$H~u5z94xcIQkcOI++)*exzbrk?WOOOf*|%k5#KV
zL=&ky3)Eirv$wbRJ2F2s_ILQY--D~~7>^f}W|Aw^e7<A5j;+=$1=bhR@AnV%tNG!v
zPvFzP3un*K>inXr#WLI{@h`0|jHud2Y~cI~Yn{r_kU^Vo{1gja<nR51nlEuO&zxG|
zo)y?9tKOBLRb9b-E3to;|BZ}{sQD4&aV&NphHv=zHvi7tTg!bBYA3y^^hMLt)6c5B
zYt|!j<2d}c&Oda1Eq9sCvtayz)oMM*hxbTakvJ}p@xv}zljM09dsD_;HCN_0g718$
Y_O6}xTrQ{Lm(%HNn!7U|JnrZJ0OMGa@Bjb+

literal 0
HcmV?d00001

diff --git a/samples/ImageSharp.Web.Sample/wwwroot/index.html b/samples/ImageSharp.Web.Sample/wwwroot/index.html
deleted file mode 100644
index e247c7f7..00000000
--- a/samples/ImageSharp.Web.Sample/wwwroot/index.html
+++ /dev/null
@@ -1,1004 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8" />
-  <title></title>
-  <style>
-    body {
-      text-align: center;
-      font-family: BlinkMacSystemFont, -apple-system, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
-    }
-
-    h1, h2, h3 {
-      width: 100%;
-    }
-
-    code {
-      background-color: #1e1e1e;
-      color: #c8c8c8;
-      padding: .2rem;
-      box-shadow: 0 2px 1px -1px rgba(0, 0, 0, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.07), 0 1px 3px 0 rgba(0, 0, 0, 0.06);
-    }
-
-    section {
-      display: flex;
-      flex-wrap: wrap;
-    }
-      section > p {
-        flex: 0 0 100%;
-      }
-
-      section > div {
-        flex: 0 0 50%;
-      }
-
-    img {
-      border: 1px solid #e3e3e3;
-    }
-  </style>
-</head>
-<body>
-  <h1>ImageSharp URI API Samples</h1>
-  <main>
-    <section>
-      <h2>Unmodified</h2>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png" />
-        </p>
-      </div>
-    </section>
-    <section>
-      <h2>Resize</h2>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300" />
-        </p>
-      </div>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&height=200</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&height=200" />
-        </p>
-      </div>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&height=200&rmode=stretch</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&height=200&rmode=stretch" />
-        </p>
-      </div>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&height=200&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&height=200&rmode=pad&rcolor=limegreen" />
-        </p>
-      </div>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&rsampler=lanczos3</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&rsampler=lanczos3" />
-        </p>
-      </div>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&rsampler=nearest</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&rsampler=nearest" />
-        </p>
-      </div>
-    </section>
-    <hr />
-    <section>
-      <h2>Format</h2>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&format=jpg</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&format=jpg" />
-        </p>
-      </div>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&format=bmp</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&format=bmp" />
-        </p>
-      </div>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&format=gif</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&format=gif" />
-        </p>
-      </div>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&format=webp</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&format=webp" />
-        </p>
-      </div>
-    </section>
-    <hr />
-    <section>
-      <h2>Jpeg Quality</h2>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&format=jpg&quality=100</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&format=jpg&quality=100" />
-        </p>
-      </div>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&format=jpg&quality=50</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&format=jpg&quality=50" />
-        </p>
-      </div>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&format=jpg&quality=1</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&format=jpg&quality=1" />
-        </p>
-      </div>
-    </section>
-    <hr />
-    <section>
-      <h2>Webp Quality</h2>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&format=webp&quality=100</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&format=webp&quality=100" />
-        </p>
-      </div>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&format=webp&quality=50</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&format=webp&quality=50" />
-        </p>
-      </div>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&format=webp&quality=1</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&format=webp&quality=1" />
-        </p>
-      </div>
-    </section>
-    <hr />
-    <section>
-      <h2>Background Color</h2>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&bgcolor=red</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&bgcolor=red" />
-        </p>
-      </div>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&bgcolor=FFFF00</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&bgcolor=FFFF00" />
-        </p>
-      </div>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&bgcolor=128,28,32</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&bgcolor=128,28,32" />
-        </p>
-      </div>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&bgcolor=C1FF0080</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&bgcolor=C1FF0080" />
-        </p>
-      </div>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=300&bgcolor=128,28,32,128</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=300&bgcolor=128,28,32,128" />
-        </p>
-      </div>
-    </section>
-    <hr />
-    <section>
-      <h2>Identical Queries</h2>
-      <p>Demonstrates that the middleware handles identical queries without file contention.</p>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=123</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=123" />
-        </p>
-      </div>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=123</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=123" />
-        </p>
-      </div>
-      <div>
-        <p>
-          <code>sixlabors.imagesharp.web.png?width=123</code>
-        </p>
-        <p>
-          <img src="sixlabors.imagesharp.web.png?width=123" />
-        </p>
-      </div>
-    </section>
-    <section>
-      <h2>EXIF Handling Portrait</h2>
-      <p>Demonstrates that the middleware handles EXIF orientation correctly for portrait images.</p>
-      <div>
-        <p>
-          <code>Portrait_0.jpg?width=60&height=50&rxy=0.69,0.37</code>
-        </p>
-        <p><img src="Portrait_0.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_1.jpg?width=60&height=50&rxy=0.69,0.37</code>
-        </p>
-        <p><img src="Portrait_1.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_2.jpg?width=60&height=50&rxy=0.69,0.37</code>
-        </p>
-        <p><img src="Portrait_2.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Portrait_3.jpg?width=60&height=50&rxy=0.69,0.37</code>
-        </p>
-        <p><img src="Portrait_3.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_4.jpg?width=60&height=50&rxy=0.69,0.37</code>
-        </p>
-        <p><img src="Portrait_4.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_5.jpg?width=60&height=50&rxy=0.69,0.37</code>
-        </p>
-        <p><img src="Portrait_5.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Portrait_6.jpg?width=60&height=50&rxy=0.69,0.37</code>
-        </p>
-        <p><img src="Portrait_6.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_7.jpg?width=60&height=50&rxy=0.69,0.37</code>
-        </p>
-        <p><img src="Portrait_7.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_8.jpg?width=60&height=50&rxy=0.69,0.37</code>
-        </p>
-        <p><img src="Portrait_8.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
-      </div>
-    </section>
-
-    <section>
-      <h2>EXIF Handling Portrait</h2>
-      <p>Demonstrates that the middleware handles EXIF orientation correctly for portrait images.</p>
-      <div>
-        <p>
-          <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomleft</code>
-        </p>
-        <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=bottomleft" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomleft</code>
-        </p>
-        <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=bottomleft" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomleft</code>
-        </p>
-        <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=bottomleft" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomleft</code>
-        </p>
-        <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=bottomleft" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomleft</code>
-        </p>
-        <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=bottomleft" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomleft</code>
-        </p>
-        <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=bottomleft" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomleft</code>
-        </p>
-        <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=bottomleft" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomleft</code>
-        </p>
-        <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=bottomleft" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomleft</code>
-        </p>
-        <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=bottomleft" /></p>
-      </div>
-    </section>
-
-    <section>
-      <h2>EXIF Handling Portrait</h2>
-      <p>Demonstrates that the middleware handles EXIF orientation correctly for portrait images.</p>
-      <div>
-        <p>
-          <code>Portrait_0.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_1.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_2.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Portrait_3.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_4.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_5.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Portrait_6.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_7.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_8.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-    </section>
-
-    <section>
-      <h2>EXIF Handling Portrait</h2>
-      <p>Demonstrates that the middleware handles EXIF orientation correctly for portrait images.</p>
-      <div>
-        <p>
-          <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-    </section>
-
-    <section>
-      <h2>EXIF Handling Portrait</h2>
-      <p>Demonstrates that the middleware handles EXIF orientation correctly for portrait images.</p>
-      <div>
-        <p>
-          <code>Portrait_0.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_1.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_2.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Portrait_3.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_4.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_5.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Portrait_6.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_7.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_8.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-    </section>
-
-
-    <section>
-      <h2>EXIF Handling Portrait</h2>
-      <p>Demonstrates that the middleware handles EXIF orientation correctly for portrait images.</p>
-      <div>
-        <p>
-          <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-    </section>
-
-    <section>
-      <h2>EXIF Handling : Landscape</h2>
-      <p>Demonstrates that the middleware handles EXIF orientation correctly for landscape images.</p>
-      <div>
-        <p>
-          <code>Landscape_0.jpg?width=60&height=50&rxy=0.69,0.37</code>
-        </p>
-        <p><img src="Landscape_0.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_1.jpg?width=60&height=50&rxy=0.69,0.37</code>
-        </p>
-        <p><img src="Landscape_1.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_2.jpg?width=60&height=50&rxy=0.69,0.37</code>
-        </p>
-        <p><img src="Landscape_2.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Landscape_3.jpg?width=60&height=50&rxy=0.69,0.37</code>
-        </p>
-        <p><img src="Landscape_3.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_4.jpg?width=60&height=50&rxy=0.69,0.37</code>
-        </p>
-        <p><img src="Landscape_4.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_5.jpg?width=60&height=50&rxy=0.69,0.37</code>
-        </p>
-        <p><img src="Landscape_5.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Landscape_6.jpg?width=60&height=50&rxy=0.69,0.37</code>
-        </p>
-        <p><img src="Landscape_6.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_7.jpg?width=60&height=50&rxy=0.69,0.37</code>
-        </p>
-        <p><img src="Landscape_7.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_8.jpg?width=60&height=50&rxy=0.69,0.37</code>
-        </p>
-        <p><img src="Landscape_8.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
-      </div>
-    </section>
-
-    <section>
-      <h2>EXIF Handling : Landscape</h2>
-      <p>Demonstrates that the middleware handles EXIF orientation correctly for landscape images.</p>
-      <div>
-        <p>
-          <code>Landscape_0.jpg?width=60&height=50&ranchor=topright</code>
-        </p>
-        <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=topright" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_1.jpg?width=60&height=50&ranchor=topright</code>
-        </p>
-        <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=topright" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_2.jpg?width=60&height=50&ranchor=topright</code>
-        </p>
-        <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=topright" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Landscape_3.jpg?width=60&height=50&ranchor=topright</code>
-        </p>
-        <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=topright" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_4.jpg?width=60&height=50&ranchor=topright</code>
-        </p>
-        <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=topright" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_5.jpg?width=60&height=50&ranchor=topright</code>
-        </p>
-        <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=topright" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Landscape_6.jpg?width=60&height=50&ranchor=topright</code>
-        </p>
-        <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=topright" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_7.jpg?width=60&height=50&ranchor=topright</code>
-        </p>
-        <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=topright" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_8.jpg?width=60&height=50&ranchor=topright</code>
-        </p>
-        <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=topright" /></p>
-      </div>
-    </section>
-
-    <section>
-      <h2>EXIF Handling : Landscape</h2>
-      <p>Demonstrates that the middleware handles EXIF orientation correctly for landscape images.</p>
-      <div>
-        <p>
-          <code>Landscape_0.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_1.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_2.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Landscape_3.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_4.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_5.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Landscape_6.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_7.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_8.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-    </section>
-
-    <section>
-      <h2>EXIF Handling : Landscape</h2>
-      <p>Demonstrates that the middleware handles EXIF orientation correctly for landscape images.</p>
-      <div>
-        <p>
-          <code>Landscape_0.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_1.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_2.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Landscape_3.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_4.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_5.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Landscape_6.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_7.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_8.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-    </section>
-
-    <section>
-      <h2>EXIF Handling : Landscape</h2>
-      <p>Demonstrates that the middleware handles EXIF orientation correctly for landscape images.</p>
-      <div>
-        <p>
-          <code>Landscape_0.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_1.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_2.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Landscape_3.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_4.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_5.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Landscape_6.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_7.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_8.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-    </section>
-
-    <section>
-      <h2>EXIF Handling : Landscape</h2>
-      <p>Demonstrates that the middleware handles EXIF orientation correctly for landscape images.</p>
-      <div>
-        <p>
-          <code>Landscape_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Landscape_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-
-      <div>
-        <p>
-          <code>Landscape_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-      <div>
-        <p>
-          <code>Landscape_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
-        </p>
-        <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
-      </div>
-    </section>
-  </main>
-</body>
-</html>
diff --git a/samples/ImageSharp.Web.Sample/wwwroot/sixlabors.imagesharp.web.svg b/samples/ImageSharp.Web.Sample/wwwroot/sixlabors.imagesharp.web.svg
new file mode 100644
index 00000000..b1ff27a5
--- /dev/null
+++ b/samples/ImageSharp.Web.Sample/wwwroot/sixlabors.imagesharp.web.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2"><path d="M983.821 294.744c0-122.757-104.165-222.421-232.467-222.421H286.422c-128.302 0-232.467 99.664-232.467 222.421v444.843c0 122.758 104.165 222.422 232.467 222.422h464.932c128.302 0 232.467-99.664 232.467-222.422V294.744z" fill="url(#_Linear1)" transform="matrix(1.07542 0 0 1.12399 -46.025 -69.29)"/><path d="M434.62 262c-62.46 0-113.096 54.533-113.096 121.796 0 6.27.452 12.417 1.303 18.43-32.636 18.044-54.875 54.59-54.875 96.942 0 60.384 45.131 108.974 101.19 108.974h130.953v92.564c-6.81 3.205-12.256 9.103-15.256 16.41H318.917c-4.607-11.282-14.976-19.23-27.155-19.23-16.435 0-29.762 14.359-29.762 32.051s13.327 32.051 29.762 32.051c12.179 0 22.548-7.948 27.155-19.23h165.922c4.613 11.282 14.982 19.23 27.161 19.23 12.179 0 22.548-7.948 27.155-19.23h165.928c4.607 11.282 14.976 19.23 27.155 19.23 16.435 0 29.762-14.359 29.762-32.05 0-17.693-13.327-32.052-29.762-32.052-12.179 0-22.548 7.948-27.155 19.23H539.155c-2.994-7.307-8.44-13.205-15.25-16.41v-92.564h136.904c52.602 0 95.239-45.897 95.239-102.564 0-52.539-36.774-95.763-84.078-101.75-5.458-43.872-40.357-77.725-82.59-77.725-18.076 0-34.707 6.302-48.362 16.827C525.41 295.783 483.756 262 434.619 262z" fill="#fff" fill-rule="nonzero"/><defs><linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(955.549 -911.039 952.182 914.26 40.777 968.819)"><stop offset="0" stop-color="#1ecbe1"/><stop offset="1" stop-color="#e30183"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/src/ImageSharp.Web/Format.cs b/src/ImageSharp.Web/Format.cs
new file mode 100644
index 00000000..0ecd9a21
--- /dev/null
+++ b/src/ImageSharp.Web/Format.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+namespace SixLabors.ImageSharp.Web
+{
+    /// <summary>
+    /// Provides enumeration of possible image formats.
+    /// </summary>
+    public enum Format
+    {
+        /// <summary>
+        /// Bmp.
+        /// </summary>
+        Bmp,
+
+        /// <summary>
+        /// Gif.
+        /// </summary>
+        Gif,
+
+        /// <summary>
+        /// Jpg.
+        /// </summary>
+        Jpg,
+
+        /// <summary>
+        /// Png.
+        /// </summary>
+        Png,
+
+        /// <summary>
+        /// Tga.
+        /// </summary>
+        Tga,
+
+        /// <summary>
+        /// WebP.
+        /// </summary>
+        WebP
+    }
+}
diff --git a/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs b/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
index c56ff988..6cf89846 100644
--- a/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
+++ b/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
@@ -223,6 +223,20 @@ public async Task<string> ComputeHMACAsync(HttpContext context, CommandHandling
             return await this.options.OnComputeHMACAsync(imageCommandContext, secret);
         }
 
+        internal string ComputeHMAC(string uri, CommandCollection commands, byte[] secret)
+        {
+            ToComponents(
+                new Uri(uri, UriKind.RelativeOrAbsolute),
+                out HostString host,
+                out PathString path,
+                out QueryString queryString);
+
+            var context = this.ToHttpContext(host, path, queryString, new(QueryHelpers.ParseQuery(queryString.Value)));
+            ImageCommandContext imageCommandContext = new(context, commands, this.commandParser, this.parserCulture);
+
+            return AsyncHelper.RunSync(() => this.options.OnComputeHMACAsync(imageCommandContext, secret));
+        }
+
         /// <summary>
         /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
         /// </summary>
diff --git a/src/ImageSharp.Web/ImageSharpTagHelper.cs b/src/ImageSharp.Web/ImageSharpTagHelper.cs
new file mode 100644
index 00000000..368fd4b0
--- /dev/null
+++ b/src/ImageSharp.Web/ImageSharpTagHelper.cs
@@ -0,0 +1,363 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
+using Microsoft.AspNetCore.Mvc.Routing;
+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;
+
+namespace SixLabors.ImageSharp.Web
+{
+    /// <summary>
+    /// A TagHelper implementation targeting &lt;img&gt; element that allows the automatic generation of HMAC protected processing commands.
+    /// </summary>
+    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + WidthAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + HeightAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + AnchorAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + RModeAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + XyAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + RColorAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + CompandAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + OrientAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + AutoOrientAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + FormatAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + BgColorAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + QualityAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    public class ImageSharpTagHelper : UrlResolutionTagHelper
+    {
+        private const string SrcAttributeName = "src";
+        private const string WidthAttributeName = ResizeWebProcessor.Width;
+        private const string HeightAttributeName = ResizeWebProcessor.Height;
+        private const string AttributePrefix = "asp-";
+        private const string AnchorAttributeName = AttributePrefix + ResizeWebProcessor.Anchor;
+        private const string RModeAttributeName = AttributePrefix + ResizeWebProcessor.Mode;
+        private const string XyAttributeName = AttributePrefix + ResizeWebProcessor.Xy;
+        private const string RColorAttributeName = AttributePrefix + ResizeWebProcessor.Color;
+        private const string CompandAttributeName = AttributePrefix + ResizeWebProcessor.Compand;
+        private const string OrientAttributeName = AttributePrefix + ResizeWebProcessor.Orient;
+        private const string SamplerAttributeName = AttributePrefix + ResizeWebProcessor.Sampler;
+        private const string AutoOrientAttributeName = AttributePrefix + AutoOrientWebProcessor.AutoOrient;
+        private const string FormatAttributeName = AttributePrefix + FormatWebProcessor.Format;
+        private const string BgColorAttributeName = AttributePrefix + BackgroundColorWebProcessor.Color;
+        private const string QualityAttributeName = AttributePrefix + QualityWebProcessor.Quality;
+
+        private readonly ImageSharpMiddlewareOptions options;
+        private readonly CultureInfo parserCulture;
+        private readonly char separator;
+        private readonly ImageSharpRequestAuthorizationUtilities authorizationUtilities;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImageSharpTagHelper"/> class.
+        /// </summary>
+        /// <param name="options">The middleware configuration options.</param>
+        /// <param name="authorizationUtilities">Contains helpers that allow authorization of image requests.</param>
+        /// <param name="urlHelperFactory">The URL helper factory.</param>
+        /// <param name="htmlEncoder">The HTML encorder.</param>
+        public ImageSharpTagHelper(
+            IOptions<ImageSharpMiddlewareOptions> options,
+            ImageSharpRequestAuthorizationUtilities authorizationUtilities,
+            IUrlHelperFactory urlHelperFactory,
+            HtmlEncoder htmlEncoder)
+            : base(urlHelperFactory, htmlEncoder)
+        {
+            Guard.NotNull(options, nameof(options));
+            Guard.NotNull(authorizationUtilities, nameof(authorizationUtilities));
+
+            this.options = options.Value;
+            this.parserCulture = this.options.UseInvariantParsingCulture
+                ? CultureInfo.InvariantCulture
+                : CultureInfo.CurrentCulture;
+            this.separator = this.parserCulture.TextInfo.ListSeparator[0];
+
+            this.authorizationUtilities = authorizationUtilities;
+        }
+
+        /// <summary>
+        /// Gets or sets the src.
+        /// </summary>
+        /// <remarks>
+        /// Passed through to the generated HTML in all cases.
+        /// </remarks>
+        [HtmlAttributeName(SrcAttributeName)]
+        public string Src { get; set; }
+
+        /// <summary>
+        /// Gets or sets the width in pixel units.
+        /// </summary>
+        /// <remarks>
+        /// Passed through to the generated HTML in all cases.
+        /// </remarks>
+        [HtmlAttributeName(WidthAttributeName)]
+        public int? Width { get; set; }
+
+        /// <summary>
+        /// Gets or sets the height in pixel units.
+        /// </summary>
+        /// <remarks>
+        /// Passed through to the generated HTML in all cases.
+        /// </remarks>
+        [HtmlAttributeName(HeightAttributeName)]
+        public int? Height { get; set; }
+
+        /// <summary>
+        /// Gets or sets the resize mode.
+        /// </summary>
+        [HtmlAttributeName(RModeAttributeName)]
+        public ResizeMode? ResizeMode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the anchor position.
+        /// </summary>
+        [HtmlAttributeName(AnchorAttributeName)]
+        public AnchorPositionMode? Position { get; set; }
+
+        /// <summary>
+        /// Gets or sets the center coordinates.
+        /// </summary>
+        [HtmlAttributeName(XyAttributeName)]
+        public PointF? Center { get; set; }
+
+        /// <summary>
+        /// Gets or sets the color to use as a background when padding an image.
+        /// </summary>
+        [HtmlAttributeName(RColorAttributeName)]
+        public Color? PadColor { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to compress
+        /// or expand individual pixel colors values on processing.
+        /// </summary>
+        [HtmlAttributeName(CompandAttributeName)]
+        public bool? Compand { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to factor embedded
+        /// EXIF orientation property values during processing.
+        /// </summary>
+        /// <remarks>Defaults to <see langword="true"/>.</remarks>
+        [HtmlAttributeName(OrientAttributeName)]
+        public bool? Orient { get; set; }
+
+        /// <summary>
+        /// Gets or sets the sampling algorithm to use when resizing images.
+        /// </summary>
+        [HtmlAttributeName(SamplerAttributeName)]
+        public Resampler? Sampler { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to automatically
+        /// rotate/flip the iput image based on embedded EXIF orientation property values
+        /// before processing.
+        /// </summary>
+        [HtmlAttributeName(AutoOrientAttributeName)]
+        public bool? AutoOrient { get; set; }
+
+        /// <summary>
+        /// Gets or sets the image format to convert to.
+        /// </summary>
+        [HtmlAttributeName(FormatAttributeName)]
+        public Format? Format { get; set; }
+
+        /// <summary>
+        /// Gets or sets the background color of the image.
+        /// </summary>
+        [HtmlAttributeName(BgColorAttributeName)]
+        public Color? BackgroundColor { get; set; }
+
+        /// <summary>
+        /// Gets or sets the quality, that will be used to encode the image. Quality
+        /// index must be between 0 and 100 (compression from max to min).
+        /// </summary>
+        [HtmlAttributeName(QualityAttributeName)]
+        public int? Quality { get; set; }
+
+        /// <inheritdoc />
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            Guard.NotNull(context, nameof(context));
+            Guard.NotNull(output, nameof(output));
+
+            string src = output.Attributes[SrcAttributeName]?.Value as string ?? this.Src;
+            if (string.IsNullOrWhiteSpace(src))
+            {
+                return;
+            }
+
+            output.CopyHtmlAttribute(SrcAttributeName, context);
+            this.ProcessUrlAttribute(SrcAttributeName, output);
+
+            CommandCollection commands = new();
+            this.AddProcessingCommands(context, output, commands, this.parserCulture);
+
+            if (commands.Count > 0)
+            {
+                // Retrieve the TagHelperOutput variation of the "src" attribute in case other TagHelpers in the
+                // pipeline have touched the value. If the value is already encoded this helper may
+                // not function properly.
+                src = output.Attributes[SrcAttributeName].Value as string;
+                byte[] secret = this.options.HMACSecretKey;
+                if (secret?.Length > 0)
+                {
+                    string hash = this.authorizationUtilities.ComputeHMAC(src, commands, secret);
+                    commands.Add(ImageSharpRequestAuthorizationUtilities.TokenCommand, hash);
+                }
+
+                src = AddQueryString(src, commands);
+            }
+
+            this.Src = src;
+            output.Attributes.SetAttribute(SrcAttributeName, src);
+        }
+
+        /// <summary>
+        /// Allows the addition of processing commands by inheriting classes.
+        /// </summary>
+        /// <param name="context">Contains information associated with the current HTML tag.</param>
+        /// <param name="output">A stateful HTML element used to generate an HTML tag.</param>
+        /// <param name="commands">The command collection.</param>
+        /// <param name="commandCulture">The culture to use when generating and processing commands.</param>
+        protected virtual void AddProcessingCommands(
+            TagHelperContext context,
+            TagHelperOutput output,
+            CommandCollection commands,
+            CultureInfo commandCulture)
+        {
+            this.AddResizeCommands(output, commands);
+            this.AddAutoOrientCommands(commands);
+            this.AddFormatCommands(commands);
+            this.AddBackgroundColorCommands(commands);
+            this.AddQualityCommands(commands);
+        }
+
+        private void AddResizeCommands(TagHelperOutput output, CommandCollection commands)
+        {
+            if (this.Width.HasValue)
+            {
+                commands.Add(ResizeWebProcessor.Width, this.Width.Value.ToString(this.parserCulture));
+                output.Attributes.SetAttribute(WidthAttributeName, this.Width);
+            }
+
+            if (this.Height.HasValue)
+            {
+                commands.Add(ResizeWebProcessor.Height, this.Height.Value.ToString(this.parserCulture));
+                output.Attributes.SetAttribute(HeightAttributeName, this.Height);
+            }
+
+            if (this.ResizeMode.HasValue)
+            {
+                commands.Add(ResizeWebProcessor.Mode, this.ResizeMode.Value.ToString());
+            }
+
+            if (this.Position.HasValue)
+            {
+                commands.Add(ResizeWebProcessor.Anchor, this.Position.Value.ToString());
+            }
+
+            if (this.Center.HasValue)
+            {
+                string xy = $"{this.Center.Value.Y.ToString(this.parserCulture)}{this.separator}{this.Center.Value.Y.ToString(this.parserCulture)}";
+                commands.Add(ResizeWebProcessor.Xy, xy);
+            }
+
+            if (this.PadColor.HasValue)
+            {
+                commands.Add(ResizeWebProcessor.Color, this.PadColor.Value.ToHex());
+            }
+
+            if (this.Compand.HasValue)
+            {
+                commands.Add(ResizeWebProcessor.Compand, this.Compand.Value.ToString(this.parserCulture));
+            }
+
+            if (this.Orient.HasValue)
+            {
+                commands.Add(ResizeWebProcessor.Orient, this.Orient.Value.ToString(this.parserCulture));
+            }
+
+            if (this.Sampler.HasValue)
+            {
+                commands.Add(ResizeWebProcessor.Sampler, this.Sampler.Value.ToString());
+            }
+        }
+
+        private void AddAutoOrientCommands(CommandCollection commands)
+        {
+            if (this.AutoOrient.HasValue)
+            {
+                commands.Add(AutoOrientWebProcessor.AutoOrient, this.AutoOrient.Value.ToString());
+            }
+        }
+
+        private void AddFormatCommands(CommandCollection commands)
+        {
+            if (this.Format.HasValue)
+            {
+                commands.Add(FormatWebProcessor.Format, this.Format.Value.ToString());
+            }
+        }
+
+        private void AddBackgroundColorCommands(CommandCollection commands)
+        {
+            if (this.BackgroundColor.HasValue)
+            {
+                commands.Add(BackgroundColorWebProcessor.Color, this.BackgroundColor.Value.ToHex());
+            }
+        }
+
+        private void AddQualityCommands(CommandCollection commands)
+        {
+            if (this.Quality.HasValue)
+            {
+                commands.Add(QualityWebProcessor.Quality, this.Quality.Value.ToString(this.parserCulture));
+            }
+        }
+
+        private static string AddQueryString(
+            string uri,
+            CommandCollection commands)
+        {
+            int anchorIndex = uri.IndexOf('#');
+            string uriToBeAppended = uri;
+            string anchorText = string.Empty;
+
+            // If there is an anchor, then the query string must be inserted before its first occurrence.
+            if (anchorIndex != -1)
+            {
+                anchorText = uri.Substring(anchorIndex);
+                uriToBeAppended = uri.Substring(0, anchorIndex);
+            }
+
+            int queryIndex = uriToBeAppended.IndexOf('?');
+            bool hasQuery = queryIndex != -1;
+
+            StringBuilder sb = new();
+            sb.Append(uriToBeAppended);
+
+            foreach (KeyValuePair<string, string> parameter in commands)
+            {
+                if (parameter.Value == null)
+                {
+                    continue;
+                }
+
+                sb.Append(hasQuery ? '&' : '?');
+                sb.Append(UrlEncoder.Default.Encode(parameter.Key));
+                sb.Append('=');
+                sb.Append(UrlEncoder.Default.Encode(parameter.Value));
+                hasQuery = true;
+            }
+
+            sb.Append(anchorText);
+            return sb.ToString();
+        }
+    }
+}
diff --git a/src/ImageSharp.Web/Resampler.cs b/src/ImageSharp.Web/Resampler.cs
new file mode 100644
index 00000000..78d3530a
--- /dev/null
+++ b/src/ImageSharp.Web/Resampler.cs
@@ -0,0 +1,96 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+namespace SixLabors.ImageSharp.Web
+{
+    /// <summary>
+    /// Provides enumeration of known resampler algorithms.
+    /// </summary>
+    public enum Resampler
+    {
+        /// <summary>
+        /// Bicubic sampler that implements the bicubic kernel algorithm W(x).
+        /// </summary>
+        Bicubic,
+
+        /// <summary>
+        /// Similar to nearest neighbor when upscaling.
+        /// When downscaling the pixels will average, merging pixels together.
+        /// </summary>
+        Box,
+
+        /// <summary>
+        /// A well known standard Cubic Filter often used as a interpolation function
+        /// </summary>
+        CatmullRom,
+
+        /// <summary>
+        /// A type of smoothed triangular interpolation filter that rounds off strong edges while
+        /// preserving flat 'color levels' in the original image.
+        /// </summary>
+        Hermite,
+
+        /// <summary>
+        /// Lanczos kernel sampler that implements smooth interpolation with a radius of 2 pixels.
+        /// This algorithm provides sharpened results when compared to others when downsampling.
+        /// </summary>
+        Lanczos2,
+
+        /// <summary>
+        /// Lanczos kernel sampler that implements smooth interpolation with a radius of 3 pixels.
+        /// This algorithm provides sharpened results when compared to others when downsampling.
+        /// </summary>
+        Lanczos3,
+
+        /// <summary>
+        /// Lanczos kernel sampler that implements smooth interpolation with a radius of 5 pixels.
+        /// This algorithm provides sharpened results when compared to others when downsampling.
+        /// </summary>
+        Lanczos5,
+
+        /// <summary>
+        /// Lanczos kernel sampler that implements smooth interpolation with a radius of 8 pixels.
+        /// This algorithm provides sharpened results when compared to others when downsampling.
+        /// </summary>
+        Lanczos8,
+
+        /// <summary>
+        /// This seperable cubic algorithm yields a very good equilibrium between
+        /// detail preservation (sharpness) and smoothness.
+        /// </summary>
+        MitchellNetravali,
+
+        /// <summary>
+        /// This uses a very fast, unscaled filter
+        /// which will select the closest pixel to the new pixels position.
+        /// </summary>
+        NearestNeighbor,
+
+        /// <summary>
+        /// This algorithm developed by Nicolas Robidoux providing a very good equilibrium between
+        /// detail preservation (sharpness) and smoothness comparable to <see cref="MitchellNetravali"/>.
+        /// </summary>
+        Robidoux,
+
+        /// <summary>
+        /// A sharpened form of the <see cref="Robidoux"/> sampler.
+        /// </summary>
+        RobidouxSharp,
+
+        /// <summary>
+        /// A separable cubic algorithm similar to <see cref="MitchellNetravali"/> but yielding smoother results.
+        /// </summary>
+        Spline,
+
+        /// <summary>
+        /// This interpolation algorithm can be used where perfect image transformation
+        /// with pixel matching is impossible, so that one can calculate and assign appropriate intensity values to pixels.
+        /// </summary>
+        Triangle,
+
+        /// <summary>
+        /// A high speed algorithm that delivers very sharpened results.
+        /// </summary>
+        Welch,
+    }
+}

From 18948671cab26d2e4bbd316a43e89c18ae6896c8 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sun, 23 Oct 2022 11:52:22 +1000
Subject: [PATCH 016/102] Finish translating sample

---
 .../ImageSharp.Web.Sample/Pages/Index.cshtml  | 475 +++++++++++++-----
 src/ImageSharp.Web/ImageSharpTagHelper.cs     |   4 +-
 2 files changed, 348 insertions(+), 131 deletions(-)

diff --git a/samples/ImageSharp.Web.Sample/Pages/Index.cshtml b/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
index bfce153d..728bf8c1 100644
--- a/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
+++ b/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
@@ -74,7 +74,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&height=200&rmode=stretch</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" height="200" asp-rmode="ResizeMode.Stretch" />
+                <img src="sixlabors.imagesharp.web.png" width="300" height="200" is-rmode="ResizeMode.Stretch" />
             </p>
         </div>
         <div>
@@ -82,7 +82,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&height=200&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" height="200" asp-rmode="ResizeMode.Pad" asp-rcolor="Color.LimeGreen" />
+                <img src="sixlabors.imagesharp.web.png" width="300" height="200" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -90,7 +90,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&rsampler=lanczos3</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" asp-rsampler="Resampler.Lanczos3" />
+                <img src="sixlabors.imagesharp.web.png" width="300" is-rsampler="Resampler.Lanczos3" />
             </p>
         </div>
         <div>
@@ -98,7 +98,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&rsampler=nearestneighbor</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" asp-rsampler="Resampler.NearestNeighbor" />
+                <img src="sixlabors.imagesharp.web.png" width="300" is-rsampler="Resampler.NearestNeighbor" />
             </p>
         </div>
     </section>
@@ -110,7 +110,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=jpg</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" asp-format="Format.Jpg" />
+                <img src="sixlabors.imagesharp.web.png" width="300" is-format="Format.Jpg" />
             </p>
         </div>
         <div>
@@ -118,7 +118,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=bmp</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" asp-format="Format.Bmp" />
+                <img src="sixlabors.imagesharp.web.png" width="300" is-format="Format.Bmp" />
             </p>
         </div>
         <div>
@@ -126,7 +126,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=gif</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" asp-format="Format.Gif" />
+                <img src="sixlabors.imagesharp.web.png" width="300" is-format="Format.Gif" />
             </p>
         </div>
         <div>
@@ -134,7 +134,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=webp</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" asp-format="Format.WebP" />
+                <img src="sixlabors.imagesharp.web.png" width="300" is-format="Format.WebP" />
             </p>
         </div>
     </section>
@@ -146,7 +146,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=jpg&quality=100</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" asp-quality="100" />
+                <img src="sixlabors.imagesharp.web.png" width="300" is-quality="100" />
             </p>
         </div>
         <div>
@@ -154,7 +154,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=jpg&quality=50</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" asp-quality="50" />
+                <img src="sixlabors.imagesharp.web.png" width="300" is-quality="50" />
             </p>
         </div>
         <div>
@@ -162,7 +162,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=jpg&quality=1</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" asp-quality="1" />
+                <img src="sixlabors.imagesharp.web.png" width="300" is-quality="1" />
             </p>
         </div>
     </section>
@@ -174,7 +174,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=webp&quality=100</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" asp-format="Format.WebP" asp-quality="100" />
+                <img src="sixlabors.imagesharp.web.png" width="300" is-format="Format.WebP" is-quality="100" />
             </p>
         </div>
         <div>
@@ -182,7 +182,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=webp&quality=50</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" asp-format="Format.WebP" asp-quality="50" />
+                <img src="sixlabors.imagesharp.web.png" width="300" is-format="Format.WebP" is-quality="50" />
             </p>
         </div>
         <div>
@@ -190,7 +190,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=webp&quality=1</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" asp-format="Format.WebP" asp-quality="1" />
+                <img src="sixlabors.imagesharp.web.png" width="300" is-format="Format.WebP" is-quality="1" />
             </p>
         </div>
     </section>
@@ -202,7 +202,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&bgcolor=red</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" asp-bgcolor="Color.Red" />
+                <img src="sixlabors.imagesharp.web.png" width="300" is-bgcolor="Color.Red" />
             </p>
         </div>
         <div>
@@ -210,7 +210,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&bgcolor=FFFF00</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" asp-bgcolor='Color.ParseHex("FFFF00")' />
+                <img src="sixlabors.imagesharp.web.png" width="300" is-bgcolor='Color.ParseHex("FFFF00")' />
             </p>
         </div>
         <div>
@@ -218,7 +218,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&bgcolor=128,28,32</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" asp-bgcolor="Color.FromRgb(128, 28, 32)" />
+                <img src="sixlabors.imagesharp.web.png" width="300" is-bgcolor="Color.FromRgb(128, 28, 32)" />
             </p>
         </div>
         <div>
@@ -226,7 +226,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&bgcolor=C1FF0080</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" asp-bgcolor='Color.ParseHex("C1FF0080")' />
+                <img src="sixlabors.imagesharp.web.png" width="300" is-bgcolor='Color.ParseHex("C1FF0080")' />
             </p>
         </div>
         <div>
@@ -234,7 +234,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&bgcolor=128,28,32,128</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" asp-bgcolor="Color.FromRgba(128, 28, 32, 128)" />
+                <img src="sixlabors.imagesharp.web.png" width="300" is-bgcolor="Color.FromRgba(128, 28, 32, 128)" />
             </p>
         </div>
     </section>
@@ -263,11 +263,11 @@
                 <code>sixlabors.imagesharp.web.png?width=123</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width=123" />
+                <img src="sixlabors.imagesharp.web.png" width="123" />
             </p>
         </div>
     </section>
-        @*TODO: Convert the rest of these queries to use the tag helper.*@
+    @*TODO: Convert the rest of these queries to use the tag helper.*@
     <section>
         <h2>EXIF Handling Portrait</h2>
         <p>Demonstrates that the middleware handles EXIF orientation correctly for portrait images.</p>
@@ -275,57 +275,75 @@
             <p>
                 <code>Portrait_0.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
-            <p><img src="Portrait_0.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+            <p>
+                <img src="Portrait_0.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_1.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
-            <p><img src="Portrait_1.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+            <p>
+                <img src="Portrait_1.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_2.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
-            <p><img src="Portrait_2.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+            <p>
+                <img src="Portrait_2.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Portrait_3.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
-            <p><img src="Portrait_3.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+            <p>
+                <img src="Portrait_3.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_4.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
-            <p><img src="Portrait_4.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+            <p>
+                <img src="Portrait_4.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_5.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
-            <p><img src="Portrait_5.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+            <p>
+                <img src="Portrait_5.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Portrait_6.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
-            <p><img src="Portrait_6.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+            <p>
+                <img src="Portrait_6.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_7.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
-            <p><img src="Portrait_7.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+            <p>
+                <img src="Portrait_7.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_8.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
-            <p><img src="Portrait_8.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+            <p>
+                <img src="Portrait_8.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+            </p>
         </div>
     </section>
 
@@ -336,57 +354,75 @@
             <p>
                 <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
-            <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=bottomleft" /></p>
+            <p>
+                <img src="Portrait_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
-            <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=bottomleft" /></p>
+            <p>
+                <img src="Portrait_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
-            <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=bottomleft" /></p>
+            <p>
+                <img src="Portrait_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
-            <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=bottomleft" /></p>
+            <p>
+                <img src="Portrait_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
-            <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=bottomleft" /></p>
+            <p>
+                <img src="Portrait_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
-            <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=bottomleft" /></p>
+            <p>
+                <img src="Portrait_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
-            <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=bottomleft" /></p>
+            <p>
+                <img src="Portrait_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
-            <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=bottomleft" /></p>
+            <p>
+                <img src="Portrait_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
-            <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=bottomleft" /></p>
+            <p>
+                <img src="Portrait_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" />
+            </p>
         </div>
     </section>
 
@@ -397,57 +433,75 @@
             <p>
                 <code>Portrait_0.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Left" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_1.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Left" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_2.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Left" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Portrait_3.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Left" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_4.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Left" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_5.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Left" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Portrait_6.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Left" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_7.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Left" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_8.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Left" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
     </section>
 
@@ -458,57 +512,75 @@
             <p>
                 <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
     </section>
 
@@ -519,57 +591,75 @@
             <p>
                 <code>Portrait_0.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Right" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_1.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Right" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_2.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Right" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Portrait_3.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Right" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_4.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Right" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_5.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Right" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Portrait_6.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Right" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_7.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Right" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_8.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Right" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
     </section>
 
@@ -580,57 +670,75 @@
             <p>
                 <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Portrait_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
     </section>
 
@@ -641,60 +749,79 @@
             <p>
                 <code>Landscape_0.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
-            <p><img src="Landscape_0.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+            <p>
+                <img src="Landscape_0.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_1.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
-            <p><img src="Landscape_1.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+            <p>
+                <img src="Landscape_1.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_2.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
-            <p><img src="Landscape_2.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+            <p>
+                <img src="Landscape_2.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Landscape_3.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
-            <p><img src="Landscape_3.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+            <p>
+                <img src="Landscape_3.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_4.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
-            <p><img src="Landscape_4.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+            <p>
+                <img src="Landscape_4.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_5.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
-            <p><img src="Landscape_5.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+            <p>
+                <img src="Landscape_5.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Landscape_6.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
-            <p><img src="Landscape_6.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+            <p>
+                <img src="Landscape_6.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_7.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
-            <p><img src="Landscape_7.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+            <p>
+                <img src="Landscape_7.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_8.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
-            <p><img src="Landscape_8.jpg?width=60&height=50&rxy=0.69,0.37" /></p>
+            <p>
+                <img src="Landscape_8.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+            </p>
         </div>
     </section>
 
+
     <section>
         <h2>EXIF Handling : Landscape</h2>
         <p>Demonstrates that the middleware handles EXIF orientation correctly for landscape images.</p>
@@ -702,57 +829,75 @@
             <p>
                 <code>Landscape_0.jpg?width=60&height=50&ranchor=topright</code>
             </p>
-            <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=topright" /></p>
+            <p>
+                <img src="Landscape_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_1.jpg?width=60&height=50&ranchor=topright</code>
             </p>
-            <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=topright" /></p>
+            <p>
+                <img src="Landscape_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_2.jpg?width=60&height=50&ranchor=topright</code>
             </p>
-            <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=topright" /></p>
+            <p>
+                <img src="Landscape_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Landscape_3.jpg?width=60&height=50&ranchor=topright</code>
             </p>
-            <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=topright" /></p>
+            <p>
+                <img src="Landscape_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_4.jpg?width=60&height=50&ranchor=topright</code>
             </p>
-            <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=topright" /></p>
+            <p>
+                <img src="Landscape_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_5.jpg?width=60&height=50&ranchor=topright</code>
             </p>
-            <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=topright" /></p>
+            <p>
+                <img src="Landscape_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Landscape_6.jpg?width=60&height=50&ranchor=topright</code>
             </p>
-            <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=topright" /></p>
+            <p>
+                <img src="Landscape_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_7.jpg?width=60&height=50&ranchor=topright</code>
             </p>
-            <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=topright" /></p>
+            <p>
+                <img src="Landscape_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_8.jpg?width=60&height=50&ranchor=topright</code>
             </p>
-            <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=topright" /></p>
+            <p>
+                <img src="Landscape_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" />
+            </p>
         </div>
     </section>
 
@@ -763,57 +908,75 @@
             <p>
                 <code>Landscape_0.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Top" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_1.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Top" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_2.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Top" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Landscape_3.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Top" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_4.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Top" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_5.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Top" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Landscape_6.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Top" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_7.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Top" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_8.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Top" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
     </section>
 
@@ -824,57 +987,75 @@
             <p>
                 <code>Landscape_0.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_1.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_2.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Landscape_3.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_4.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_5.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Landscape_6.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_7.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_8.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
     </section>
 
@@ -885,57 +1066,75 @@
             <p>
                 <code>Landscape_0.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Bottom" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_1.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Bottom" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_2.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Bottom" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Landscape_3.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Bottom" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_4.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Bottom" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_5.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Bottom" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Landscape_6.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Bottom" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_7.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Bottom" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_8.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Bottom" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
     </section>
 
@@ -946,56 +1145,74 @@
             <p>
                 <code>Landscape_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Landscape_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
 
         <div>
             <p>
                 <code>Landscape_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
         <div>
             <p>
                 <code>Landscape_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
-            <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
+            <p>
+                <img src="Landscape_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+            </p>
         </div>
     </section>
diff --git a/src/ImageSharp.Web/ImageSharpTagHelper.cs b/src/ImageSharp.Web/ImageSharpTagHelper.cs
index 368fd4b0..8f7a38e5 100644
--- a/src/ImageSharp.Web/ImageSharpTagHelper.cs
+++ b/src/ImageSharp.Web/ImageSharpTagHelper.cs
@@ -37,7 +37,7 @@ public class ImageSharpTagHelper : UrlResolutionTagHelper
         private const string SrcAttributeName = "src";
         private const string WidthAttributeName = ResizeWebProcessor.Width;
         private const string HeightAttributeName = ResizeWebProcessor.Height;
-        private const string AttributePrefix = "asp-";
+        private const string AttributePrefix = "is-";
         private const string AnchorAttributeName = AttributePrefix + ResizeWebProcessor.Anchor;
         private const string RModeAttributeName = AttributePrefix + ResizeWebProcessor.Mode;
         private const string XyAttributeName = AttributePrefix + ResizeWebProcessor.Xy;
@@ -264,7 +264,7 @@ private void AddResizeCommands(TagHelperOutput output, CommandCollection command
 
             if (this.Center.HasValue)
             {
-                string xy = $"{this.Center.Value.Y.ToString(this.parserCulture)}{this.separator}{this.Center.Value.Y.ToString(this.parserCulture)}";
+                string xy = $"{this.Center.Value.X.ToString(this.parserCulture)}{this.separator}{this.Center.Value.Y.ToString(this.parserCulture)}";
                 commands.Add(ResizeWebProcessor.Xy, xy);
             }
 

From c6d9ba5d28040d46054baf382a0f9bba1a65dc40 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sun, 23 Oct 2022 11:57:21 +1000
Subject: [PATCH 017/102] Rename auth utilities

---
 .../DependencyInjection/ServiceCollectionExtensions.cs    | 2 +-
 src/ImageSharp.Web/ImageSharpTagHelper.cs                 | 6 +++---
 src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs     | 6 +++---
 ...ationUtilities.cs => RequestAuthorizationUtilities.cs} | 6 +++---
 .../TestUtilities/AuthenticatedServerTestBase.cs          | 8 ++++----
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename src/ImageSharp.Web/{ImageSharpRequestAuthorizationUtilities.cs => RequestAuthorizationUtilities.cs} (98%)

diff --git a/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs b/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs
index 2d42ee52..90e3fb16 100644
--- a/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs
+++ b/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs
@@ -60,7 +60,7 @@ private static void AddDefaultServices(
 
             builder.SetRequestParser<QueryCollectionRequestParser>();
 
-            builder.Services.AddSingleton<ImageSharpRequestAuthorizationUtilities>();
+            builder.Services.AddSingleton<RequestAuthorizationUtilities>();
 
             builder.SetCache<PhysicalFileSystemCache>();
 
diff --git a/src/ImageSharp.Web/ImageSharpTagHelper.cs b/src/ImageSharp.Web/ImageSharpTagHelper.cs
index 8f7a38e5..7221a2ca 100644
--- a/src/ImageSharp.Web/ImageSharpTagHelper.cs
+++ b/src/ImageSharp.Web/ImageSharpTagHelper.cs
@@ -53,7 +53,7 @@ public class ImageSharpTagHelper : UrlResolutionTagHelper
         private readonly ImageSharpMiddlewareOptions options;
         private readonly CultureInfo parserCulture;
         private readonly char separator;
-        private readonly ImageSharpRequestAuthorizationUtilities authorizationUtilities;
+        private readonly RequestAuthorizationUtilities authorizationUtilities;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageSharpTagHelper"/> class.
@@ -64,7 +64,7 @@ public class ImageSharpTagHelper : UrlResolutionTagHelper
         /// <param name="htmlEncoder">The HTML encorder.</param>
         public ImageSharpTagHelper(
             IOptions<ImageSharpMiddlewareOptions> options,
-            ImageSharpRequestAuthorizationUtilities authorizationUtilities,
+            RequestAuthorizationUtilities authorizationUtilities,
             IUrlHelperFactory urlHelperFactory,
             HtmlEncoder htmlEncoder)
             : base(urlHelperFactory, htmlEncoder)
@@ -208,7 +208,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
                 if (secret?.Length > 0)
                 {
                     string hash = this.authorizationUtilities.ComputeHMAC(src, commands, secret);
-                    commands.Add(ImageSharpRequestAuthorizationUtilities.TokenCommand, hash);
+                    commands.Add(RequestAuthorizationUtilities.TokenCommand, hash);
                 }
 
                 src = AddQueryString(src, commands);
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
index 4b4eea7b..535b6f72 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
@@ -115,7 +115,7 @@ private static readonly ConcurrentTLruCache<string, string> HMACTokenLru
         /// <summary>
         /// Contains helpers that allow authorization of image requests.
         /// </summary>
-        private readonly ImageSharpRequestAuthorizationUtilities authorizationUtilities;
+        private readonly RequestAuthorizationUtilities authorizationUtilities;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageSharpMiddleware"/> class.
@@ -146,7 +146,7 @@ public ImageSharpMiddleware(
             CommandParser commandParser,
             FormatUtilities formatUtilities,
             AsyncKeyReaderWriterLock<string> asyncKeyLock,
-            ImageSharpRequestAuthorizationUtilities requestAuthorizationUtilities)
+            RequestAuthorizationUtilities requestAuthorizationUtilities)
         {
             Guard.NotNull(next, nameof(next));
             Guard.NotNull(options, nameof(options));
@@ -217,7 +217,7 @@ private async Task Invoke(HttpContext httpContext, bool retry)
             if (secret?.Length > 0)
             {
                 checkHMAC = true;
-                token = commands.GetValueOrDefault(ImageSharpRequestAuthorizationUtilities.TokenCommand);
+                token = commands.GetValueOrDefault(RequestAuthorizationUtilities.TokenCommand);
             }
 
             this.authorizationUtilities.StripUnknownCommands(commands);
diff --git a/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs b/src/ImageSharp.Web/RequestAuthorizationUtilities.cs
similarity index 98%
rename from src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
rename to src/ImageSharp.Web/RequestAuthorizationUtilities.cs
index 6cf89846..d81e475c 100644
--- a/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
+++ b/src/ImageSharp.Web/RequestAuthorizationUtilities.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Web
     /// <summary>
     /// Contains various helper methods for authorizing image requests.
     /// </summary>
-    public sealed class ImageSharpRequestAuthorizationUtilities
+    public sealed class RequestAuthorizationUtilities
     {
         /// <summary>
         /// The command used by image requests for transporting Hash-based Message Authentication Code (HMAC) tokens.
@@ -32,14 +32,14 @@ public sealed class ImageSharpRequestAuthorizationUtilities
         private readonly IServiceProvider serviceProvider;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ImageSharpRequestAuthorizationUtilities"/> class.
+        /// Initializes a new instance of the <see cref="RequestAuthorizationUtilities"/> class.
         /// </summary>
         /// <param name="options">The middleware configuration options.</param>
         /// <param name="requestParser">An <see cref="IRequestParser"/> instance used to parse image requests for commands.</param>
         /// <param name="processors">A collection of <see cref="IImageWebProcessor"/> instances used to process images.</param>
         /// <param name="commandParser">The command parser.</param>
         /// <param name="serviceProvider">The service provider.</param>
-        public ImageSharpRequestAuthorizationUtilities(
+        public RequestAuthorizationUtilities(
             IOptions<ImageSharpMiddlewareOptions> options,
             IRequestParser requestParser,
             IEnumerable<IImageWebProcessor> processors,
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs
index 2759aa94..bb718789 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs
@@ -13,14 +13,14 @@ namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
     public abstract class AuthenticatedServerTestBase<TFixture> : ServerTestBase<TFixture>
          where TFixture : AuthenticatedTestServerFixture
     {
-        private readonly ImageSharpRequestAuthorizationUtilities authorizationUtilities;
+        private readonly RequestAuthorizationUtilities authorizationUtilities;
         private readonly string relativeImageSouce;
 
         protected AuthenticatedServerTestBase(TFixture fixture, ITestOutputHelper outputHelper, string imageSource)
             : base(fixture, outputHelper, imageSource)
         {
             this.authorizationUtilities =
-                       this.Fixture.Services.GetRequiredService<ImageSharpRequestAuthorizationUtilities>();
+                       this.Fixture.Services.GetRequiredService<RequestAuthorizationUtilities>();
 
             this.relativeImageSouce = this.ImageSource.Replace("http://localhost", string.Empty);
         }
@@ -37,7 +37,7 @@ public async Task CanRejectUnauthorizedRequestAsync()
             Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
 
             // Now send an invalid token
-            response = await this.HttpClient.GetAsync(url + this.Fixture.Commands[0] + "&" + ImageSharpRequestAuthorizationUtilities.TokenCommand + "=INVALID");
+            response = await this.HttpClient.GetAsync(url + this.Fixture.Commands[0] + "&" + RequestAuthorizationUtilities.TokenCommand + "=INVALID");
             Assert.NotNull(response);
             Assert.False(response.IsSuccessStatusCode);
             Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
@@ -47,7 +47,7 @@ protected override async Task<string> AugmentCommandAsync(string command)
         {
             string uri = this.relativeImageSouce + command;
             string token = await this.GetTokenAsync(uri);
-            return command + "&" + ImageSharpRequestAuthorizationUtilities.TokenCommand + "=" + token;
+            return command + "&" + RequestAuthorizationUtilities.TokenCommand + "=" + token;
         }
 
         private async Task<string> GetTokenAsync(string uri)

From bb4856b34f81b58e709da6ddc38de3d48de61666 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sun, 23 Oct 2022 12:39:08 +1000
Subject: [PATCH 018/102] Make Format and Resampler commands expandable

---
 src/ImageSharp.Web/Format.cs              |  28 ++---
 src/ImageSharp.Web/FormatCommand.cs       |  22 ++++
 src/ImageSharp.Web/ImageSharpTagHelper.cs |   8 +-
 src/ImageSharp.Web/Resampler.cs           | 134 ++++++++--------------
 src/ImageSharp.Web/ResamplerCommand.cs    |  22 ++++
 5 files changed, 110 insertions(+), 104 deletions(-)
 create mode 100644 src/ImageSharp.Web/FormatCommand.cs
 create mode 100644 src/ImageSharp.Web/ResamplerCommand.cs

diff --git a/src/ImageSharp.Web/Format.cs b/src/ImageSharp.Web/Format.cs
index 0ecd9a21..a25ab6dd 100644
--- a/src/ImageSharp.Web/Format.cs
+++ b/src/ImageSharp.Web/Format.cs
@@ -4,38 +4,38 @@
 namespace SixLabors.ImageSharp.Web
 {
     /// <summary>
-    /// Provides enumeration of possible image formats.
+    /// Contains reusable static instances of known image formats.
     /// </summary>
-    public enum Format
+    public static class Format
     {
         /// <summary>
-        /// Bmp.
+        /// Gets the Bmp encoding format.
         /// </summary>
-        Bmp,
+        public static FormatCommand Bmp { get; } = new(nameof(Bmp));
 
         /// <summary>
-        /// Gif.
+        /// Gets the Gif encoding format.
         /// </summary>
-        Gif,
+        public static FormatCommand Gif { get; } = new(nameof(Gif));
 
         /// <summary>
-        /// Jpg.
+        /// Gets the Jpg encoding format.
         /// </summary>
-        Jpg,
+        public static FormatCommand Jpg { get; } = new(nameof(Jpg));
 
         /// <summary>
-        /// Png.
+        /// Gets the Gif encoding format.
         /// </summary>
-        Png,
+        public static FormatCommand Png { get; } = new(nameof(Png));
 
         /// <summary>
-        /// Tga.
+        /// Gets the Bmp encoding format.
         /// </summary>
-        Tga,
+        public static FormatCommand Tga { get; } = new(nameof(Tga));
 
         /// <summary>
-        /// WebP.
+        /// Gets the Gif encoding format.
         /// </summary>
-        WebP
+        public static FormatCommand WebP { get; } = new(nameof(WebP));
     }
 }
diff --git a/src/ImageSharp.Web/FormatCommand.cs b/src/ImageSharp.Web/FormatCommand.cs
new file mode 100644
index 00000000..59273fa4
--- /dev/null
+++ b/src/ImageSharp.Web/FormatCommand.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+namespace SixLabors.ImageSharp.Web
+{
+    /// <summary>
+    /// Represents a command for setting the type of format with which to encode processed images.
+    /// </summary>
+    public readonly struct FormatCommand
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FormatCommand"/> struct.
+        /// </summary>
+        /// <param name="name">The name of the resampler command.</param>
+        public FormatCommand(string name) => this.Name = name;
+
+        /// <summary>
+        /// Gets the name of the resampler command.
+        /// </summary>
+        public string Name { get; }
+    }
+}
diff --git a/src/ImageSharp.Web/ImageSharpTagHelper.cs b/src/ImageSharp.Web/ImageSharpTagHelper.cs
index 7221a2ca..92694ace 100644
--- a/src/ImageSharp.Web/ImageSharpTagHelper.cs
+++ b/src/ImageSharp.Web/ImageSharpTagHelper.cs
@@ -151,7 +151,7 @@ public ImageSharpTagHelper(
         /// Gets or sets the sampling algorithm to use when resizing images.
         /// </summary>
         [HtmlAttributeName(SamplerAttributeName)]
-        public Resampler? Sampler { get; set; }
+        public ResamplerCommand? Sampler { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether to automatically
@@ -165,7 +165,7 @@ public ImageSharpTagHelper(
         /// Gets or sets the image format to convert to.
         /// </summary>
         [HtmlAttributeName(FormatAttributeName)]
-        public Format? Format { get; set; }
+        public FormatCommand? Format { get; set; }
 
         /// <summary>
         /// Gets or sets the background color of the image.
@@ -285,7 +285,7 @@ private void AddResizeCommands(TagHelperOutput output, CommandCollection command
 
             if (this.Sampler.HasValue)
             {
-                commands.Add(ResizeWebProcessor.Sampler, this.Sampler.Value.ToString());
+                commands.Add(ResizeWebProcessor.Sampler, this.Sampler.Value.Name);
             }
         }
 
@@ -301,7 +301,7 @@ private void AddFormatCommands(CommandCollection commands)
         {
             if (this.Format.HasValue)
             {
-                commands.Add(FormatWebProcessor.Format, this.Format.Value.ToString());
+                commands.Add(FormatWebProcessor.Format, this.Format.Value.Name);
             }
         }
 
diff --git a/src/ImageSharp.Web/Resampler.cs b/src/ImageSharp.Web/Resampler.cs
index 78d3530a..5819d1e0 100644
--- a/src/ImageSharp.Web/Resampler.cs
+++ b/src/ImageSharp.Web/Resampler.cs
@@ -1,96 +1,58 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using SixLabors.ImageSharp.Processing;
+
 namespace SixLabors.ImageSharp.Web
 {
     /// <summary>
-    /// Provides enumeration of known resampler algorithms.
+    /// Contains reusable static instances of known resampling algorithms.
     /// </summary>
-    public enum Resampler
+    public static class Resampler
     {
-        /// <summary>
-        /// Bicubic sampler that implements the bicubic kernel algorithm W(x).
-        /// </summary>
-        Bicubic,
-
-        /// <summary>
-        /// Similar to nearest neighbor when upscaling.
-        /// When downscaling the pixels will average, merging pixels together.
-        /// </summary>
-        Box,
-
-        /// <summary>
-        /// A well known standard Cubic Filter often used as a interpolation function
-        /// </summary>
-        CatmullRom,
-
-        /// <summary>
-        /// A type of smoothed triangular interpolation filter that rounds off strong edges while
-        /// preserving flat 'color levels' in the original image.
-        /// </summary>
-        Hermite,
-
-        /// <summary>
-        /// Lanczos kernel sampler that implements smooth interpolation with a radius of 2 pixels.
-        /// This algorithm provides sharpened results when compared to others when downsampling.
-        /// </summary>
-        Lanczos2,
-
-        /// <summary>
-        /// Lanczos kernel sampler that implements smooth interpolation with a radius of 3 pixels.
-        /// This algorithm provides sharpened results when compared to others when downsampling.
-        /// </summary>
-        Lanczos3,
-
-        /// <summary>
-        /// Lanczos kernel sampler that implements smooth interpolation with a radius of 5 pixels.
-        /// This algorithm provides sharpened results when compared to others when downsampling.
-        /// </summary>
-        Lanczos5,
-
-        /// <summary>
-        /// Lanczos kernel sampler that implements smooth interpolation with a radius of 8 pixels.
-        /// This algorithm provides sharpened results when compared to others when downsampling.
-        /// </summary>
-        Lanczos8,
-
-        /// <summary>
-        /// This seperable cubic algorithm yields a very good equilibrium between
-        /// detail preservation (sharpness) and smoothness.
-        /// </summary>
-        MitchellNetravali,
-
-        /// <summary>
-        /// This uses a very fast, unscaled filter
-        /// which will select the closest pixel to the new pixels position.
-        /// </summary>
-        NearestNeighbor,
-
-        /// <summary>
-        /// This algorithm developed by Nicolas Robidoux providing a very good equilibrium between
-        /// detail preservation (sharpness) and smoothness comparable to <see cref="MitchellNetravali"/>.
-        /// </summary>
-        Robidoux,
-
-        /// <summary>
-        /// A sharpened form of the <see cref="Robidoux"/> sampler.
-        /// </summary>
-        RobidouxSharp,
-
-        /// <summary>
-        /// A separable cubic algorithm similar to <see cref="MitchellNetravali"/> but yielding smoother results.
-        /// </summary>
-        Spline,
-
-        /// <summary>
-        /// This interpolation algorithm can be used where perfect image transformation
-        /// with pixel matching is impossible, so that one can calculate and assign appropriate intensity values to pixels.
-        /// </summary>
-        Triangle,
-
-        /// <summary>
-        /// A high speed algorithm that delivers very sharpened results.
-        /// </summary>
-        Welch,
+        /// <inheritdoc cref="KnownResamplers.Bicubic"/>
+        public static ResamplerCommand Bicubic { get; } = new(nameof(Bicubic));
+
+        /// <inheritdoc cref="KnownResamplers.Box"/>
+        public static ResamplerCommand Box { get; } = new(nameof(Box));
+
+        /// <inheritdoc cref="KnownResamplers.CatmullRom"/>
+        public static ResamplerCommand CatmullRom { get; } = new(nameof(CatmullRom));
+
+        /// <inheritdoc cref="KnownResamplers.Hermite"/>
+        public static ResamplerCommand Hermite { get; } = new(nameof(Hermite));
+
+        /// <inheritdoc cref="KnownResamplers.Lanczos2"/>
+        public static ResamplerCommand Lanczos2 { get; } = new(nameof(Lanczos2));
+
+        /// <inheritdoc cref="KnownResamplers.Lanczos3"/>
+        public static ResamplerCommand Lanczos3 { get; } = new(nameof(Lanczos3));
+
+        /// <inheritdoc cref="KnownResamplers.Lanczos5"/>
+        public static ResamplerCommand Lanczos5 { get; } = new(nameof(Lanczos5));
+
+        /// <inheritdoc cref="KnownResamplers.Lanczos8"/>
+        public static ResamplerCommand Lanczos8 { get; } = new(nameof(Lanczos8));
+
+        /// <inheritdoc cref="KnownResamplers.MitchellNetravali"/>
+        public static ResamplerCommand MitchellNetravali { get; } = new(nameof(MitchellNetravali));
+
+        /// <inheritdoc cref="KnownResamplers.NearestNeighbor"/>
+        public static ResamplerCommand NearestNeighbor { get; } = new(nameof(NearestNeighbor));
+
+        /// <inheritdoc cref="KnownResamplers.Robidoux"/>
+        public static ResamplerCommand Robidoux { get; } = new(nameof(Robidoux));
+
+        /// <inheritdoc cref="KnownResamplers.RobidouxSharp"/>
+        public static ResamplerCommand RobidouxSharp { get; } = new(nameof(RobidouxSharp));
+
+        /// <inheritdoc cref="KnownResamplers.Spline"/>
+        public static ResamplerCommand Spline { get; } = new(nameof(Spline));
+
+        /// <inheritdoc cref="KnownResamplers.Triangle"/>
+        public static ResamplerCommand Triangle { get; } = new(nameof(Triangle));
+
+        /// <inheritdoc cref="KnownResamplers.Welch"/>
+        public static ResamplerCommand Welch { get; } = new(nameof(Welch));
     }
 }
diff --git a/src/ImageSharp.Web/ResamplerCommand.cs b/src/ImageSharp.Web/ResamplerCommand.cs
new file mode 100644
index 00000000..bb1add92
--- /dev/null
+++ b/src/ImageSharp.Web/ResamplerCommand.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+namespace SixLabors.ImageSharp.Web
+{
+    /// <summary>
+    /// Represents a command for setting the type of sampler to use for resampling operations.
+    /// </summary>
+    public readonly struct ResamplerCommand
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ResamplerCommand"/> struct.
+        /// </summary>
+        /// <param name="name">The name of the resampler command.</param>
+        public ResamplerCommand(string name) => this.Name = name;
+
+        /// <summary>
+        /// Gets the name of the resampler command.
+        /// </summary>
+        public string Name { get; }
+    }
+}

From 2847e1ab7e7b9253f23b6e162a77ab6123c06976 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sun, 23 Oct 2022 14:29:47 +1000
Subject: [PATCH 019/102] Begin adding taghelper tests

---
 src/ImageSharp.Web/ImageSharpTagHelper.cs     |  14 +-
 .../Commands/ImageSharpTagHelperTests.cs      | 358 ++++++++++++++++++
 2 files changed, 366 insertions(+), 6 deletions(-)
 create mode 100644 tests/ImageSharp.Web.Tests/Commands/ImageSharpTagHelperTests.cs

diff --git a/src/ImageSharp.Web/ImageSharpTagHelper.cs b/src/ImageSharp.Web/ImageSharpTagHelper.cs
index 92694ace..b0e4209e 100644
--- a/src/ImageSharp.Web/ImageSharpTagHelper.cs
+++ b/src/ImageSharp.Web/ImageSharpTagHelper.cs
@@ -240,16 +240,18 @@ protected virtual void AddProcessingCommands(
 
         private void AddResizeCommands(TagHelperOutput output, CommandCollection commands)
         {
-            if (this.Width.HasValue)
+            int? width = this.Width ?? output.Attributes[WidthAttributeName]?.Value as int?;
+            if (width.HasValue)
             {
-                commands.Add(ResizeWebProcessor.Width, this.Width.Value.ToString(this.parserCulture));
-                output.Attributes.SetAttribute(WidthAttributeName, this.Width);
+                commands.Add(ResizeWebProcessor.Width, width.Value.ToString(this.parserCulture));
+                output.Attributes.SetAttribute(WidthAttributeName, width);
             }
 
-            if (this.Height.HasValue)
+            int? height = this.Height ?? output.Attributes[HeightAttributeName]?.Value as int?;
+            if (height.HasValue)
             {
-                commands.Add(ResizeWebProcessor.Height, this.Height.Value.ToString(this.parserCulture));
-                output.Attributes.SetAttribute(HeightAttributeName, this.Height);
+                commands.Add(ResizeWebProcessor.Height, height.Value.ToString(this.parserCulture));
+                output.Attributes.SetAttribute(HeightAttributeName, height);
             }
 
             if (this.ResizeMode.HasValue)
diff --git a/tests/ImageSharp.Web.Tests/Commands/ImageSharpTagHelperTests.cs b/tests/ImageSharp.Web.Tests/Commands/ImageSharpTagHelperTests.cs
new file mode 100644
index 00000000..4b566f9a
--- /dev/null
+++ b/tests/ImageSharp.Web.Tests/Commands/ImageSharpTagHelperTests.cs
@@ -0,0 +1,358 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Extensions.WebEncoders.Testing;
+using SixLabors.ImageSharp.Web.DependencyInjection;
+using SixLabors.ImageSharp.Web.Middleware;
+using Xunit;
+
+namespace SixLabors.ImageSharp.Web.Tests.Commands
+{
+    public sealed class ImageSharpTagHelperTests : IDisposable
+    {
+        public ImageSharpTagHelperTests()
+        {
+            ServiceCollection services = new();
+            services.AddSingleton<IWebHostEnvironment, FakeWebHostEnvironment>();
+            services.AddImageSharp();
+            this.Provider = services.BuildServiceProvider();
+        }
+
+        public ServiceProvider Provider { get; }
+
+        [Theory]
+        [InlineData(null, "test.jpg", "test.jpg")]
+        [InlineData("abcd.jpg", "test.jpg", "test.jpg")]
+        [InlineData(null, "~/test.jpg", "virtualRoot/test.jpg")]
+        [InlineData("abcd.jpg", "~/test.jpg", "virtualRoot/test.jpg")]
+        public void Process_SrcDefaultsToTagHelperOutputSrcAttributeAddedByOtherTagHelper(
+            string src,
+            string srcOutput,
+            string expectedSrcPrefix)
+        {
+            // Arrange
+            var allAttributes = new TagHelperAttributeList(
+                new TagHelperAttributeList
+                {
+                    { "alt", new HtmlString("Testing") },
+                    { "width", 100 },
+                });
+            TagHelperContext context = MakeTagHelperContext(allAttributes);
+            var outputAttributes = new TagHelperAttributeList
+                {
+                    { "alt", new HtmlString("Testing") },
+                    { "src", srcOutput },
+                };
+            var output = new TagHelperOutput(
+                "img",
+                outputAttributes,
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+
+            var urlHelperFactory = new FakeUrlHelperFactory();
+
+            ImageSharpTagHelper helper = this.GetHelper(urlHelperFactory: urlHelperFactory);
+            helper.Src = src;
+            helper.Width = 100;
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(
+                expectedSrcPrefix + "?width=100",
+                (string)output.Attributes["src"].Value,
+                StringComparer.Ordinal);
+        }
+
+        [Fact]
+        public void PreservesOrderOfSourceAttributesWhenRun()
+        {
+            // Arrange
+            TagHelperContext context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "alt", new HtmlString("alt text") },
+                    { "data-extra", new HtmlString("something") },
+                    { "title", new HtmlString("Image title") },
+                    { "src", "testimage.png" },
+                    { "width", 50 },
+                    { "height", 60 }
+                });
+
+            TagHelperOutput output = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "alt", new HtmlString("alt text") },
+                    { "data-extra", new HtmlString("something") },
+                    { "title", new HtmlString("Image title") },
+                    { "width", 50 },
+                    { "height", 60 }
+                });
+
+            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "alt", new HtmlString("alt text") },
+                    { "data-extra", new HtmlString("something") },
+                    { "title", new HtmlString("Image title") },
+                    { "src", "testimage.png?width=50&height=60" },
+                    { "width", 50 },
+                    { "height", 60 }
+                });
+
+            ImageSharpTagHelper helper = this.GetHelper();
+            helper.Src = "testimage.png";
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedOutput.TagName, output.TagName);
+            Assert.Equal(6, output.Attributes.Count);
+
+            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
+            {
+                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+                TagHelperAttribute actualAttribute = output.Attributes[i];
+                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString());
+            }
+        }
+
+        [Fact]
+        public void RendersImageTag_AddsAttributes_WithRequestPathBase()
+        {
+            // Arrange
+            TagHelperContext context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "alt", new HtmlString("alt text") },
+                    { "src", "/bar/images/image.jpg" },
+                    { "width", 100 },
+                    { "height", 200 },
+                });
+            TagHelperOutput output = MakeImageTagHelperOutput(attributes: new TagHelperAttributeList
+            {
+                { "alt", new HtmlString("alt text") },
+            });
+
+            ViewContext viewContext = MakeViewContext("/bar");
+
+            ImageSharpTagHelper helper = this.GetHelper();
+            helper.Src = "/bar/images/image.jpg";
+            helper.Width = 100;
+            helper.Height = 200;
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.Equal("img", output.TagName);
+            Assert.Equal(4, output.Attributes.Count);
+            TagHelperAttribute srcAttribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("src"));
+            Assert.Equal("/bar/images/image.jpg?width=100&height=200", srcAttribute.Value);
+        }
+
+        private ImageSharpTagHelper GetHelper(
+            IUrlHelperFactory urlHelperFactory = null,
+            ViewContext viewContext = null)
+        {
+            urlHelperFactory ??= new FakeUrlHelperFactory();
+            viewContext ??= MakeViewContext();
+
+            return new ImageSharpTagHelper(
+                Options.Create<ImageSharpMiddlewareOptions>(new()),
+                this.Provider.GetRequiredService<RequestAuthorizationUtilities>(),
+                urlHelperFactory,
+                new HtmlTestEncoder())
+            {
+                ViewContext = viewContext,
+            };
+        }
+
+        private static TagHelperContext MakeTagHelperContext(
+            TagHelperAttributeList attributes)
+            => new(
+                tagName: "image",
+                allAttributes: attributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: Guid.NewGuid().ToString("N"));
+
+        private static TagHelperOutput MakeImageTagHelperOutput(TagHelperAttributeList attributes)
+        {
+            attributes ??= new TagHelperAttributeList();
+
+            return new TagHelperOutput(
+                "img",
+                attributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent(default);
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+        }
+
+        private static ViewContext MakeViewContext(string requestPathBase = null)
+        {
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+            if (requestPathBase != null)
+            {
+                actionContext.HttpContext.Request.PathBase = new PathString(requestPathBase);
+            }
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary(metadataProvider, new ModelStateDictionary());
+            return new ViewContext(
+                actionContext,
+                new FakeView(),
+                viewData,
+                new FakeTempDataDictionary(),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+        }
+
+        public void Dispose() => this.Provider.Dispose();
+
+        private class FakeView : IView
+        {
+            public string Path { get; }
+
+            public Task RenderAsync(ViewContext context) => throw new NotSupportedException();
+        }
+
+        private class FakeTempDataDictionary : Dictionary<string, object>, ITempDataDictionary
+        {
+            public void Keep() => throw new NotSupportedException();
+
+            public void Keep(string key) => throw new NotSupportedException();
+
+            public void Load() => throw new NotSupportedException();
+
+            public object Peek(string key) => throw new NotSupportedException();
+
+            public void Save() => throw new NotSupportedException();
+        }
+
+        private class FakeWebHostEnvironment : IWebHostEnvironment
+        {
+            public string WebRootPath { get; set; }
+
+            public IFileProvider WebRootFileProvider { get; set; } = new FakeFileProvider();
+
+            public string ApplicationName { get; set; }
+
+            public IFileProvider ContentRootFileProvider { get; set; }
+
+            public string ContentRootPath { get; set; }
+
+            public string EnvironmentName { get; set; }
+        }
+
+        private class FakeFileProvider : IFileProvider
+        {
+            public IDirectoryContents GetDirectoryContents(string subpath) => new FakeDirectoryContents();
+
+            public IFileInfo GetFileInfo(string subpath) => new FakeFileInfo();
+
+            public IChangeToken Watch(string filter) => new FakeFileChangeToken();
+        }
+
+        private class FakeFileChangeToken : IChangeToken
+        {
+            public FakeFileChangeToken(string filter = "") => this.Filter = filter;
+
+            public bool ActiveChangeCallbacks => false;
+
+            public bool HasChanged { get; set; }
+
+            public string Filter { get; }
+
+            public IDisposable RegisterChangeCallback(Action<object> callback, object state) => new NullDisposable();
+
+            private sealed class NullDisposable : IDisposable
+            {
+                public void Dispose()
+                {
+                }
+            }
+
+            public override string ToString() => this.Filter;
+        }
+
+        private class FakeDirectoryContents : IDirectoryContents
+        {
+            public bool Exists { get; }
+
+            public IEnumerator<IFileInfo> GetEnumerator() => Enumerable.Empty<IFileInfo>().GetEnumerator();
+
+            IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+        }
+
+        private class FakeFileInfo : IFileInfo
+        {
+            public bool Exists { get; } = true;
+
+            public bool IsDirectory { get; }
+
+            public DateTimeOffset LastModified { get; }
+
+            public long Length { get; }
+
+            public string Name { get; }
+
+            public string PhysicalPath { get; }
+
+            public Stream CreateReadStream() => new MemoryStream(Encoding.UTF8.GetBytes("Hello World!"));
+        }
+
+        private class FakeUrlHelperFactory : IUrlHelperFactory
+        {
+            public IUrlHelper GetUrlHelper(ActionContext context) => new FakeUrlHelper() { ActionContext = context };
+        }
+
+        private class FakeUrlHelper : IUrlHelper
+        {
+            public ActionContext ActionContext { get; set; }
+
+            public string Action(UrlActionContext actionContext) => throw new NotSupportedException();
+
+            // Ensure expanded path does not look like an absolute path on Linux, avoiding
+            // https://github.com/aspnet/External/issues/21
+            [return: NotNullIfNotNull("contentPath")]
+            public string Content(string contentPath) => contentPath.Replace("~/", "virtualRoot/");
+
+            public bool IsLocalUrl([NotNullWhen(true)] string url) => throw new NotSupportedException();
+
+            public string Link(string routeName, object values) => throw new NotSupportedException();
+
+            public string RouteUrl(UrlRouteContext routeContext) => throw new NotSupportedException();
+        }
+    }
+}

From 4aed81bd5d93028090e4e19cef73ff901b5ac311 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sun, 23 Oct 2022 16:04:25 +1000
Subject: [PATCH 020/102] Add additional tests

---
 src/ImageSharp.Web/ImageSharpTagHelper.cs     |   6 +-
 .../Commands/ImageSharpTagHelperTests.cs      | 517 ++++++++++++++++++
 2 files changed, 520 insertions(+), 3 deletions(-)

diff --git a/src/ImageSharp.Web/ImageSharpTagHelper.cs b/src/ImageSharp.Web/ImageSharpTagHelper.cs
index b0e4209e..45b39f9f 100644
--- a/src/ImageSharp.Web/ImageSharpTagHelper.cs
+++ b/src/ImageSharp.Web/ImageSharpTagHelper.cs
@@ -118,7 +118,7 @@ public ImageSharpTagHelper(
         /// Gets or sets the anchor position.
         /// </summary>
         [HtmlAttributeName(AnchorAttributeName)]
-        public AnchorPositionMode? Position { get; set; }
+        public AnchorPositionMode? AnchorPosition { get; set; }
 
         /// <summary>
         /// Gets or sets the center coordinates.
@@ -259,9 +259,9 @@ private void AddResizeCommands(TagHelperOutput output, CommandCollection command
                 commands.Add(ResizeWebProcessor.Mode, this.ResizeMode.Value.ToString());
             }
 
-            if (this.Position.HasValue)
+            if (this.AnchorPosition.HasValue)
             {
-                commands.Add(ResizeWebProcessor.Anchor, this.Position.Value.ToString());
+                commands.Add(ResizeWebProcessor.Anchor, this.AnchorPosition.Value.ToString());
             }
 
             if (this.Center.HasValue)
diff --git a/tests/ImageSharp.Web.Tests/Commands/ImageSharpTagHelperTests.cs b/tests/ImageSharp.Web.Tests/Commands/ImageSharpTagHelperTests.cs
index 4b566f9a..c454f17c 100644
--- a/tests/ImageSharp.Web.Tests/Commands/ImageSharpTagHelperTests.cs
+++ b/tests/ImageSharp.Web.Tests/Commands/ImageSharpTagHelperTests.cs
@@ -26,8 +26,10 @@
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 using Microsoft.Extensions.WebEncoders.Testing;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Web.DependencyInjection;
 using SixLabors.ImageSharp.Web.Middleware;
+using SixLabors.ImageSharp.Web.Processors;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Web.Tests.Commands
@@ -179,6 +181,521 @@ public void RendersImageTag_AddsAttributes_WithRequestPathBase()
             Assert.Equal("/bar/images/image.jpg?width=100&height=200", srcAttribute.Value);
         }
 
+        [Fact]
+        public void RendersImageTag_SrcIncludes_ResizeMode()
+        {
+            // Arrange
+            TagHelperContext context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", "testimage.png" },
+                    { "width", 50 }
+                });
+
+            TagHelperOutput output = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "width", 50 }
+                });
+
+            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", $"testimage.png?width=50&{ResizeWebProcessor.Mode}={nameof(ResizeMode.Stretch)}" },
+                    { "width", 50 }
+                });
+
+            ImageSharpTagHelper helper = this.GetHelper();
+            helper.Src = "testimage.png";
+            helper.ResizeMode = ResizeMode.Stretch;
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedOutput.TagName, output.TagName);
+            Assert.Equal(2, output.Attributes.Count);
+
+            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
+            {
+                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+                TagHelperAttribute actualAttribute = output.Attributes[i];
+                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
+            }
+        }
+
+        [Fact]
+        public void RendersImageTag_SrcIncludes_ResizePosition()
+        {
+            // Arrange
+            TagHelperContext context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", "testimage.png" },
+                    { "width", 50 }
+                });
+
+            TagHelperOutput output = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "width", 50 }
+                });
+
+            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", $"testimage.png?width=50&{ResizeWebProcessor.Xy}=20,50" },
+                    { "width", 50 }
+                });
+
+            ImageSharpTagHelper helper = this.GetHelper();
+            helper.Src = "testimage.png";
+            helper.Center = new(20, 50);
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedOutput.TagName, output.TagName);
+            Assert.Equal(2, output.Attributes.Count);
+
+            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
+            {
+                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+                TagHelperAttribute actualAttribute = output.Attributes[i];
+                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
+            }
+        }
+
+        [Fact]
+        public void RendersImageTag_SrcIncludes_ResizeAnchor()
+        {
+            // Arrange
+            TagHelperContext context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", "testimage.png" },
+                    { "width", 50 }
+                });
+
+            TagHelperOutput output = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "width", 50 }
+                });
+
+            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", $"testimage.png?width=50&{ResizeWebProcessor.Anchor}={nameof(AnchorPositionMode.Top)}" },
+                    { "width", 50 }
+                });
+
+            ImageSharpTagHelper helper = this.GetHelper();
+            helper.Src = "testimage.png";
+            helper.AnchorPosition = AnchorPositionMode.Top;
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedOutput.TagName, output.TagName);
+            Assert.Equal(2, output.Attributes.Count);
+
+            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
+            {
+                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+                TagHelperAttribute actualAttribute = output.Attributes[i];
+                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
+            }
+        }
+
+        [Fact]
+        public void RendersImageTag_SrcIncludes_ResizePadColor()
+        {
+            // Arrange
+            TagHelperContext context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", "testimage.png" },
+                    { "width", 50 }
+                });
+
+            TagHelperOutput output = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "width", 50 }
+                });
+
+            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", $"testimage.png?width=50&{ResizeWebProcessor.Color}={Color.LimeGreen.ToHex()}" },
+                    { "width", 50 }
+                });
+
+            ImageSharpTagHelper helper = this.GetHelper();
+            helper.Src = "testimage.png";
+            helper.PadColor = Color.LimeGreen;
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedOutput.TagName, output.TagName);
+            Assert.Equal(2, output.Attributes.Count);
+
+            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
+            {
+                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+                TagHelperAttribute actualAttribute = output.Attributes[i];
+                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
+            }
+        }
+
+        [Fact]
+        public void RendersImageTag_SrcIncludes_ResizeCompand()
+        {
+            // Arrange
+            TagHelperContext context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", "testimage.png" },
+                    { "width", 50 }
+                });
+
+            TagHelperOutput output = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "width", 50 }
+                });
+
+            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", $"testimage.png?width=50&{ResizeWebProcessor.Compand}={bool.TrueString}" },
+                    { "width", 50 }
+                });
+
+            ImageSharpTagHelper helper = this.GetHelper();
+            helper.Src = "testimage.png";
+            helper.Compand = true;
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedOutput.TagName, output.TagName);
+            Assert.Equal(2, output.Attributes.Count);
+
+            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
+            {
+                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+                TagHelperAttribute actualAttribute = output.Attributes[i];
+                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
+            }
+        }
+
+        [Fact]
+        public void RendersImageTag_SrcIncludes_ResizeOrient()
+        {
+            // Arrange
+            TagHelperContext context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", "testimage.png" },
+                    { "width", 50 }
+                });
+
+            TagHelperOutput output = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "width", 50 }
+                });
+
+            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", $"testimage.png?width=50&{ResizeWebProcessor.Orient}={bool.TrueString}" },
+                    { "width", 50 }
+                });
+
+            ImageSharpTagHelper helper = this.GetHelper();
+            helper.Src = "testimage.png";
+            helper.Orient = true;
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedOutput.TagName, output.TagName);
+            Assert.Equal(2, output.Attributes.Count);
+
+            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
+            {
+                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+                TagHelperAttribute actualAttribute = output.Attributes[i];
+                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
+            }
+        }
+
+        public static TheoryData<ResamplerCommand> ResamplerCommands { get; } = new()
+        {
+            { Resampler.Bicubic },
+            { Resampler.Box },
+            { Resampler.CatmullRom },
+            { Resampler.Hermite },
+            { Resampler.Lanczos2 },
+            { Resampler.Lanczos3 },
+            { Resampler.Lanczos5 },
+            { Resampler.Lanczos8 },
+            { Resampler.MitchellNetravali },
+            { Resampler.NearestNeighbor },
+            { Resampler.Robidoux },
+            { Resampler.RobidouxSharp },
+            { Resampler.Spline },
+            { Resampler.Triangle },
+            { Resampler.Welch }
+        };
+
+        [Theory]
+        [MemberData(nameof(ResamplerCommands))]
+        public void RendersImageTag_SrcIncludes_Resampler(ResamplerCommand resampler)
+        {
+            // Arrange
+            TagHelperContext context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", "testimage.png" },
+                    { "width", 50 }
+                });
+
+            TagHelperOutput output = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "width", 50 }
+                });
+
+            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", $"testimage.png?width=50&{ResizeWebProcessor.Sampler}={resampler.Name}" },
+                    { "width", 50 }
+                });
+
+            ImageSharpTagHelper helper = this.GetHelper();
+            helper.Src = "testimage.png";
+            helper.Sampler = resampler;
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedOutput.TagName, output.TagName);
+            Assert.Equal(2, output.Attributes.Count);
+
+            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
+            {
+                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+                TagHelperAttribute actualAttribute = output.Attributes[i];
+                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
+            }
+        }
+
+        [Fact]
+        public void RendersImageTag_SrcIncludes_AutoOrient()
+        {
+            // Arrange
+            TagHelperContext context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", "testimage.png" },
+                    { "width", 50 }
+                });
+
+            TagHelperOutput output = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "width", 50 }
+                });
+
+            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", $"testimage.png?width=50&{AutoOrientWebProcessor.AutoOrient}={bool.TrueString}" },
+                    { "width", 50 }
+                });
+
+            ImageSharpTagHelper helper = this.GetHelper();
+            helper.Src = "testimage.png";
+            helper.AutoOrient = true;
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedOutput.TagName, output.TagName);
+            Assert.Equal(2, output.Attributes.Count);
+
+            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
+            {
+                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+                TagHelperAttribute actualAttribute = output.Attributes[i];
+                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
+            }
+        }
+
+        public static TheoryData<FormatCommand> FormatCommands { get; } = new()
+        {
+            { Format.Bmp },
+            { Format.Gif },
+            { Format.Jpg },
+            { Format.Png },
+            { Format.Tga },
+            { Format.WebP }
+        };
+
+        [Theory]
+        [MemberData(nameof(FormatCommands))]
+        public void RendersImageTag_SrcIncludes_Format(FormatCommand format)
+        {
+            // Arrange
+            TagHelperContext context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", "testimage.png" },
+                    { "width", 50 }
+                });
+
+            TagHelperOutput output = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "width", 50 }
+                });
+
+            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", $"testimage.png?width=50&{FormatWebProcessor.Format}={format.Name}" },
+                    { "width", 50 }
+                });
+
+            ImageSharpTagHelper helper = this.GetHelper();
+            helper.Src = "testimage.png";
+            helper.Format = format;
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedOutput.TagName, output.TagName);
+            Assert.Equal(2, output.Attributes.Count);
+
+            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
+            {
+                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+                TagHelperAttribute actualAttribute = output.Attributes[i];
+                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
+            }
+        }
+
+        [Fact]
+        public void RendersImageTag_SrcIncludes_BackgroundColor()
+        {
+            // Arrange
+            TagHelperContext context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", "testimage.png" },
+                    { "width", 50 }
+                });
+
+            TagHelperOutput output = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "width", 50 }
+                });
+
+            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", $"testimage.png?width=50&{BackgroundColorWebProcessor.Color}={Color.Red.ToHex()}" },
+                    { "width", 50 }
+                });
+
+            ImageSharpTagHelper helper = this.GetHelper();
+            helper.Src = "testimage.png";
+            helper.BackgroundColor = Color.Red;
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedOutput.TagName, output.TagName);
+            Assert.Equal(2, output.Attributes.Count);
+
+            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
+            {
+                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+                TagHelperAttribute actualAttribute = output.Attributes[i];
+                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
+            }
+        }
+
+        [Fact]
+        public void RendersImageTag_SrcIncludes_Quality()
+        {
+            // Arrange
+            TagHelperContext context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", "testimage.png" },
+                    { "width", 50 }
+                });
+
+            TagHelperOutput output = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "width", 50 }
+                });
+
+            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", $"testimage.png?width=50&{QualityWebProcessor.Quality}={42}" },
+                    { "width", 50 }
+                });
+
+            ImageSharpTagHelper helper = this.GetHelper();
+            helper.Src = "testimage.png";
+            helper.Quality = 42;
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedOutput.TagName, output.TagName);
+            Assert.Equal(2, output.Attributes.Count);
+
+            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
+            {
+                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+                TagHelperAttribute actualAttribute = output.Attributes[i];
+                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
+            }
+        }
+
         private ImageSharpTagHelper GetHelper(
             IUrlHelperFactory urlHelperFactory = null,
             ViewContext viewContext = null)

From 8fb6c9688fca1a83fd77f8249c09aba7f729966e Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sun, 23 Oct 2022 16:34:16 +1000
Subject: [PATCH 021/102] Verbose is best

---
 .../ImageSharp.Web.Sample/Pages/Index.cshtml  | 256 +++++++++---------
 src/ImageSharp.Web/ImageSharpTagHelper.cs     |   2 +-
 2 files changed, 129 insertions(+), 129 deletions(-)

diff --git a/samples/ImageSharp.Web.Sample/Pages/Index.cshtml b/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
index 728bf8c1..922edcb0 100644
--- a/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
+++ b/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
@@ -74,7 +74,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&height=200&rmode=stretch</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" height="200" is-rmode="ResizeMode.Stretch" />
+                <img src="sixlabors.imagesharp.web.png" width="300" height="200" imagesharp-rmode="ResizeMode.Stretch" />
             </p>
         </div>
         <div>
@@ -82,7 +82,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&height=200&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" height="200" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="sixlabors.imagesharp.web.png" width="300" height="200" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -90,7 +90,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&rsampler=lanczos3</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" is-rsampler="Resampler.Lanczos3" />
+                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-rsampler="Resampler.Lanczos3" />
             </p>
         </div>
         <div>
@@ -98,7 +98,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&rsampler=nearestneighbor</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" is-rsampler="Resampler.NearestNeighbor" />
+                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-rsampler="Resampler.NearestNeighbor" />
             </p>
         </div>
     </section>
@@ -110,7 +110,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=jpg</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" is-format="Format.Jpg" />
+                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-format="Format.Jpg" />
             </p>
         </div>
         <div>
@@ -118,7 +118,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=bmp</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" is-format="Format.Bmp" />
+                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-format="Format.Bmp" />
             </p>
         </div>
         <div>
@@ -126,7 +126,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=gif</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" is-format="Format.Gif" />
+                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-format="Format.Gif" />
             </p>
         </div>
         <div>
@@ -134,7 +134,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=webp</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" is-format="Format.WebP" />
+                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-format="Format.WebP" />
             </p>
         </div>
     </section>
@@ -146,7 +146,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=jpg&quality=100</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" is-quality="100" />
+                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-quality="100" />
             </p>
         </div>
         <div>
@@ -154,7 +154,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=jpg&quality=50</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" is-quality="50" />
+                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-quality="50" />
             </p>
         </div>
         <div>
@@ -162,7 +162,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=jpg&quality=1</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" is-quality="1" />
+                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-quality="1" />
             </p>
         </div>
     </section>
@@ -174,7 +174,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=webp&quality=100</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" is-format="Format.WebP" is-quality="100" />
+                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-format="Format.WebP" imagesharp-quality="100" />
             </p>
         </div>
         <div>
@@ -182,7 +182,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=webp&quality=50</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" is-format="Format.WebP" is-quality="50" />
+                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-format="Format.WebP" imagesharp-quality="50" />
             </p>
         </div>
         <div>
@@ -190,7 +190,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=webp&quality=1</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" is-format="Format.WebP" is-quality="1" />
+                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-format="Format.WebP" imagesharp-quality="1" />
             </p>
         </div>
     </section>
@@ -202,7 +202,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&bgcolor=red</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" is-bgcolor="Color.Red" />
+                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-bgcolor="Color.Red" />
             </p>
         </div>
         <div>
@@ -210,7 +210,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&bgcolor=FFFF00</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" is-bgcolor='Color.ParseHex("FFFF00")' />
+                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-bgcolor='Color.ParseHex("FFFF00")' />
             </p>
         </div>
         <div>
@@ -218,7 +218,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&bgcolor=128,28,32</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" is-bgcolor="Color.FromRgb(128, 28, 32)" />
+                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-bgcolor="Color.FromRgb(128, 28, 32)" />
             </p>
         </div>
         <div>
@@ -226,7 +226,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&bgcolor=C1FF0080</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" is-bgcolor='Color.ParseHex("C1FF0080")' />
+                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-bgcolor='Color.ParseHex("C1FF0080")' />
             </p>
         </div>
         <div>
@@ -234,7 +234,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&bgcolor=128,28,32,128</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" is-bgcolor="Color.FromRgba(128, 28, 32, 128)" />
+                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-bgcolor="Color.FromRgba(128, 28, 32, 128)" />
             </p>
         </div>
     </section>
@@ -267,7 +267,7 @@
             </p>
         </div>
     </section>
-    @*TODO: Convert the rest of these queries to use the tag helper.*@
+
     <section>
         <h2>EXIF Handling Portrait</h2>
         <p>Demonstrates that the middleware handles EXIF orientation correctly for portrait images.</p>
@@ -276,7 +276,7 @@
                 <code>Portrait_0.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Portrait_0.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+                <img src="Portrait_0.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -284,7 +284,7 @@
                 <code>Portrait_1.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Portrait_1.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+                <img src="Portrait_1.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -292,7 +292,7 @@
                 <code>Portrait_2.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Portrait_2.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+                <img src="Portrait_2.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
 
@@ -301,7 +301,7 @@
                 <code>Portrait_3.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Portrait_3.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+                <img src="Portrait_3.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -309,7 +309,7 @@
                 <code>Portrait_4.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Portrait_4.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+                <img src="Portrait_4.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -317,7 +317,7 @@
                 <code>Portrait_5.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Portrait_5.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+                <img src="Portrait_5.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
 
@@ -326,7 +326,7 @@
                 <code>Portrait_6.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Portrait_6.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+                <img src="Portrait_6.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -334,7 +334,7 @@
                 <code>Portrait_7.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Portrait_7.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+                <img src="Portrait_7.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -342,7 +342,7 @@
                 <code>Portrait_8.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Portrait_8.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+                <img src="Portrait_8.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
     </section>
@@ -355,7 +355,7 @@
                 <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
             <p>
-                <img src="Portrait_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" />
+                <img src="Portrait_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
             </p>
         </div>
         <div>
@@ -363,7 +363,7 @@
                 <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
             <p>
-                <img src="Portrait_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" />
+                <img src="Portrait_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
             </p>
         </div>
         <div>
@@ -371,7 +371,7 @@
                 <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
             <p>
-                <img src="Portrait_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" />
+                <img src="Portrait_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
             </p>
         </div>
 
@@ -380,7 +380,7 @@
                 <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
             <p>
-                <img src="Portrait_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" />
+                <img src="Portrait_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
             </p>
         </div>
         <div>
@@ -388,7 +388,7 @@
                 <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
             <p>
-                <img src="Portrait_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" />
+                <img src="Portrait_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
             </p>
         </div>
         <div>
@@ -396,7 +396,7 @@
                 <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
             <p>
-                <img src="Portrait_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" />
+                <img src="Portrait_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
             </p>
         </div>
 
@@ -405,7 +405,7 @@
                 <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
             <p>
-                <img src="Portrait_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" />
+                <img src="Portrait_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
             </p>
         </div>
         <div>
@@ -413,7 +413,7 @@
                 <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
             <p>
-                <img src="Portrait_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" />
+                <img src="Portrait_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
             </p>
         </div>
         <div>
@@ -421,7 +421,7 @@
                 <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
             <p>
-                <img src="Portrait_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" />
+                <img src="Portrait_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
             </p>
         </div>
     </section>
@@ -434,7 +434,7 @@
                 <code>Portrait_0.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Left" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -442,7 +442,7 @@
                 <code>Portrait_1.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Left" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -450,7 +450,7 @@
                 <code>Portrait_2.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Left" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -459,7 +459,7 @@
                 <code>Portrait_3.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Left" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -467,7 +467,7 @@
                 <code>Portrait_4.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Left" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -475,7 +475,7 @@
                 <code>Portrait_5.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Left" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -484,7 +484,7 @@
                 <code>Portrait_6.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Left" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -492,7 +492,7 @@
                 <code>Portrait_7.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Left" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -500,7 +500,7 @@
                 <code>Portrait_8.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Left" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
     </section>
@@ -513,7 +513,7 @@
                 <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -521,7 +521,7 @@
                 <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -529,7 +529,7 @@
                 <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -538,7 +538,7 @@
                 <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -546,7 +546,7 @@
                 <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -554,7 +554,7 @@
                 <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -563,7 +563,7 @@
                 <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -571,7 +571,7 @@
                 <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -579,7 +579,7 @@
                 <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
     </section>
@@ -592,7 +592,7 @@
                 <code>Portrait_0.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Right" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -600,7 +600,7 @@
                 <code>Portrait_1.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Right" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -608,7 +608,7 @@
                 <code>Portrait_2.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Right" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -617,7 +617,7 @@
                 <code>Portrait_3.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Right" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -625,7 +625,7 @@
                 <code>Portrait_4.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Right" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -633,7 +633,7 @@
                 <code>Portrait_5.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Right" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -642,7 +642,7 @@
                 <code>Portrait_6.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Right" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -650,7 +650,7 @@
                 <code>Portrait_7.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Right" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -658,7 +658,7 @@
                 <code>Portrait_8.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Right" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
     </section>
@@ -671,7 +671,7 @@
                 <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -679,7 +679,7 @@
                 <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -687,7 +687,7 @@
                 <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -696,7 +696,7 @@
                 <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -704,7 +704,7 @@
                 <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -712,7 +712,7 @@
                 <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -721,7 +721,7 @@
                 <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -729,7 +729,7 @@
                 <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -737,7 +737,7 @@
                 <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Portrait_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
     </section>
@@ -750,7 +750,7 @@
                 <code>Landscape_0.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Landscape_0.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+                <img src="Landscape_0.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -758,7 +758,7 @@
                 <code>Landscape_1.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Landscape_1.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+                <img src="Landscape_1.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -766,7 +766,7 @@
                 <code>Landscape_2.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Landscape_2.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+                <img src="Landscape_2.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
 
@@ -775,7 +775,7 @@
                 <code>Landscape_3.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Landscape_3.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+                <img src="Landscape_3.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -783,7 +783,7 @@
                 <code>Landscape_4.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Landscape_4.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+                <img src="Landscape_4.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -791,7 +791,7 @@
                 <code>Landscape_5.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Landscape_5.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+                <img src="Landscape_5.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
 
@@ -800,7 +800,7 @@
                 <code>Landscape_6.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Landscape_6.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+                <img src="Landscape_6.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -808,7 +808,7 @@
                 <code>Landscape_7.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Landscape_7.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+                <img src="Landscape_7.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -816,7 +816,7 @@
                 <code>Landscape_8.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Landscape_8.jpg" width="60" height="50" is-rxy="new(0.69F,0.37F)" />
+                <img src="Landscape_8.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
     </section>
@@ -830,7 +830,7 @@
                 <code>Landscape_0.jpg?width=60&height=50&ranchor=topright</code>
             </p>
             <p>
-                <img src="Landscape_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" />
+                <img src="Landscape_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
             </p>
         </div>
         <div>
@@ -838,7 +838,7 @@
                 <code>Landscape_1.jpg?width=60&height=50&ranchor=topright</code>
             </p>
             <p>
-                <img src="Landscape_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" />
+                <img src="Landscape_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
             </p>
         </div>
         <div>
@@ -846,7 +846,7 @@
                 <code>Landscape_2.jpg?width=60&height=50&ranchor=topright</code>
             </p>
             <p>
-                <img src="Landscape_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" />
+                <img src="Landscape_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
             </p>
         </div>
 
@@ -855,7 +855,7 @@
                 <code>Landscape_3.jpg?width=60&height=50&ranchor=topright</code>
             </p>
             <p>
-                <img src="Landscape_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" />
+                <img src="Landscape_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
             </p>
         </div>
         <div>
@@ -863,7 +863,7 @@
                 <code>Landscape_4.jpg?width=60&height=50&ranchor=topright</code>
             </p>
             <p>
-                <img src="Landscape_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" />
+                <img src="Landscape_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
             </p>
         </div>
         <div>
@@ -871,7 +871,7 @@
                 <code>Landscape_5.jpg?width=60&height=50&ranchor=topright</code>
             </p>
             <p>
-                <img src="Landscape_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" />
+                <img src="Landscape_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
             </p>
         </div>
 
@@ -880,7 +880,7 @@
                 <code>Landscape_6.jpg?width=60&height=50&ranchor=topright</code>
             </p>
             <p>
-                <img src="Landscape_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" />
+                <img src="Landscape_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
             </p>
         </div>
         <div>
@@ -888,7 +888,7 @@
                 <code>Landscape_7.jpg?width=60&height=50&ranchor=topright</code>
             </p>
             <p>
-                <img src="Landscape_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" />
+                <img src="Landscape_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
             </p>
         </div>
         <div>
@@ -896,7 +896,7 @@
                 <code>Landscape_8.jpg?width=60&height=50&ranchor=topright</code>
             </p>
             <p>
-                <img src="Landscape_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" />
+                <img src="Landscape_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
             </p>
         </div>
     </section>
@@ -909,7 +909,7 @@
                 <code>Landscape_0.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Top" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -917,7 +917,7 @@
                 <code>Landscape_1.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Top" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -925,7 +925,7 @@
                 <code>Landscape_2.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Top" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -934,7 +934,7 @@
                 <code>Landscape_3.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Top" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -942,7 +942,7 @@
                 <code>Landscape_4.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Top" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -950,7 +950,7 @@
                 <code>Landscape_5.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Top" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -959,7 +959,7 @@
                 <code>Landscape_6.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Top" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -967,7 +967,7 @@
                 <code>Landscape_7.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Top" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -975,7 +975,7 @@
                 <code>Landscape_8.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Top" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
     </section>
@@ -988,7 +988,7 @@
                 <code>Landscape_0.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -996,7 +996,7 @@
                 <code>Landscape_1.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1004,7 +1004,7 @@
                 <code>Landscape_2.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -1013,7 +1013,7 @@
                 <code>Landscape_3.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1021,7 +1021,7 @@
                 <code>Landscape_4.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1029,7 +1029,7 @@
                 <code>Landscape_5.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -1038,7 +1038,7 @@
                 <code>Landscape_6.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1046,7 +1046,7 @@
                 <code>Landscape_7.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1054,7 +1054,7 @@
                 <code>Landscape_8.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.TopRight" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
     </section>
@@ -1067,7 +1067,7 @@
                 <code>Landscape_0.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Bottom" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1075,7 +1075,7 @@
                 <code>Landscape_1.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Bottom" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1083,7 +1083,7 @@
                 <code>Landscape_2.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Bottom" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -1092,7 +1092,7 @@
                 <code>Landscape_3.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Bottom" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1100,7 +1100,7 @@
                 <code>Landscape_4.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Bottom" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1108,7 +1108,7 @@
                 <code>Landscape_5.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Bottom" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -1117,7 +1117,7 @@
                 <code>Landscape_6.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Bottom" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1125,7 +1125,7 @@
                 <code>Landscape_7.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Bottom" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1133,7 +1133,7 @@
                 <code>Landscape_8.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.Bottom" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
     </section>
@@ -1146,7 +1146,7 @@
                 <code>Landscape_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_0.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1154,7 +1154,7 @@
                 <code>Landscape_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_1.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1162,7 +1162,7 @@
                 <code>Landscape_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_2.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -1171,7 +1171,7 @@
                 <code>Landscape_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_3.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1179,7 +1179,7 @@
                 <code>Landscape_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_4.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1187,7 +1187,7 @@
                 <code>Landscape_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_5.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -1196,7 +1196,7 @@
                 <code>Landscape_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_6.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1204,7 +1204,7 @@
                 <code>Landscape_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_7.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1212,7 +1212,7 @@
                 <code>Landscape_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_8.jpg" width="60" height="50" is-ranchor="AnchorPositionMode.BottomLeft" is-rmode="ResizeMode.Pad" is-rcolor="Color.LimeGreen" />
+                <img src="Landscape_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
     </section>
diff --git a/src/ImageSharp.Web/ImageSharpTagHelper.cs b/src/ImageSharp.Web/ImageSharpTagHelper.cs
index 45b39f9f..1ceeb556 100644
--- a/src/ImageSharp.Web/ImageSharpTagHelper.cs
+++ b/src/ImageSharp.Web/ImageSharpTagHelper.cs
@@ -37,7 +37,7 @@ public class ImageSharpTagHelper : UrlResolutionTagHelper
         private const string SrcAttributeName = "src";
         private const string WidthAttributeName = ResizeWebProcessor.Width;
         private const string HeightAttributeName = ResizeWebProcessor.Height;
-        private const string AttributePrefix = "is-";
+        private const string AttributePrefix = "imagesharp-";
         private const string AnchorAttributeName = AttributePrefix + ResizeWebProcessor.Anchor;
         private const string RModeAttributeName = AttributePrefix + ResizeWebProcessor.Mode;
         private const string XyAttributeName = AttributePrefix + ResizeWebProcessor.Xy;

From 08e3d9de27c09e117841219f1842e37bb8cae5ab Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Thu, 27 Oct 2022 19:19:42 +1000
Subject: [PATCH 022/102] Use ReadOnlySpan<char>

---
 src/ImageSharp.Web/ImageSharpTagHelper.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/ImageSharp.Web/ImageSharpTagHelper.cs b/src/ImageSharp.Web/ImageSharpTagHelper.cs
index 1ceeb556..168dae2a 100644
--- a/src/ImageSharp.Web/ImageSharpTagHelper.cs
+++ b/src/ImageSharp.Web/ImageSharpTagHelper.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
@@ -324,18 +325,18 @@ private void AddQualityCommands(CommandCollection commands)
         }
 
         private static string AddQueryString(
-            string uri,
+            ReadOnlySpan<char> uri,
             CommandCollection commands)
         {
-            int anchorIndex = uri.IndexOf('#');
-            string uriToBeAppended = uri;
-            string anchorText = string.Empty;
+            ReadOnlySpan<char> uriToBeAppended = uri;
+            ReadOnlySpan<char> anchorText = default;
 
             // If there is an anchor, then the query string must be inserted before its first occurrence.
+            int anchorIndex = uri.IndexOf('#');
             if (anchorIndex != -1)
             {
-                anchorText = uri.Substring(anchorIndex);
-                uriToBeAppended = uri.Substring(0, anchorIndex);
+                anchorText = uri.Slice(anchorIndex);
+                uriToBeAppended = uri.Slice(0, anchorIndex);
             }
 
             int queryIndex = uriToBeAppended.IndexOf('?');
@@ -346,7 +347,7 @@ private static string AddQueryString(
 
             foreach (KeyValuePair<string, string> parameter in commands)
             {
-                if (parameter.Value == null)
+                if (parameter.Value is null)
                 {
                     continue;
                 }

From efb2baefeb78128dfeaa898b7ba4642e791a9f56 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 28 Oct 2022 11:11:25 +1100
Subject: [PATCH 023/102] Update src/ImageSharp.Web/Format.cs

Co-authored-by: Brian Popow <38701097+brianpopow@users.noreply.github.com>
---
 src/ImageSharp.Web/Format.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ImageSharp.Web/Format.cs b/src/ImageSharp.Web/Format.cs
index a25ab6dd..ba572bf7 100644
--- a/src/ImageSharp.Web/Format.cs
+++ b/src/ImageSharp.Web/Format.cs
@@ -24,7 +24,7 @@ public static class Format
         public static FormatCommand Jpg { get; } = new(nameof(Jpg));
 
         /// <summary>
-        /// Gets the Gif encoding format.
+        /// Gets the Png encoding format.
         /// </summary>
         public static FormatCommand Png { get; } = new(nameof(Png));
 

From 36c0e08a98d6489f83e5795b73e4515488630503 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 28 Oct 2022 11:11:34 +1100
Subject: [PATCH 024/102] Update src/ImageSharp.Web/Format.cs

Co-authored-by: Brian Popow <38701097+brianpopow@users.noreply.github.com>
---
 src/ImageSharp.Web/Format.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ImageSharp.Web/Format.cs b/src/ImageSharp.Web/Format.cs
index ba572bf7..bfeeee6f 100644
--- a/src/ImageSharp.Web/Format.cs
+++ b/src/ImageSharp.Web/Format.cs
@@ -29,7 +29,7 @@ public static class Format
         public static FormatCommand Png { get; } = new(nameof(Png));
 
         /// <summary>
-        /// Gets the Bmp encoding format.
+        /// Gets the Tga encoding format.
         /// </summary>
         public static FormatCommand Tga { get; } = new(nameof(Tga));
 

From 84e9ab6f84000d90c30984031a9a2d778d5f0161 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 28 Oct 2022 11:11:43 +1100
Subject: [PATCH 025/102] Update src/ImageSharp.Web/ImageSharpTagHelper.cs

Co-authored-by: Ronald Barendse <ronald@barend.se>
---
 src/ImageSharp.Web/ImageSharpTagHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ImageSharp.Web/ImageSharpTagHelper.cs b/src/ImageSharp.Web/ImageSharpTagHelper.cs
index 168dae2a..4e09a00d 100644
--- a/src/ImageSharp.Web/ImageSharpTagHelper.cs
+++ b/src/ImageSharp.Web/ImageSharpTagHelper.cs
@@ -16,7 +16,7 @@
 using SixLabors.ImageSharp.Web.Middleware;
 using SixLabors.ImageSharp.Web.Processors;
 
-namespace SixLabors.ImageSharp.Web
+namespace SixLabors.ImageSharp.Web.TagHelpers
 {
     /// <summary>
     /// A TagHelper implementation targeting &lt;img&gt; element that allows the automatic generation of HMAC protected processing commands.

From dff9d9dd6b4193962230b9efc56e7f265d2ff9e0 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 28 Oct 2022 20:23:39 +1000
Subject: [PATCH 026/102] Move/rename helper and use explicit width/height
 commands

---
 .../ImageSharp.Web.Sample/Pages/Index.cshtml  | 266 +++++++++---------
 samples/ImageSharp.Web.Sample/Program.cs      |   8 +
 src/ImageSharp.Web/Middleware/ImageContext.cs |  28 +-
 .../Middleware/ImageSharpMiddleware.cs        |  34 ++-
 .../Middleware/ImageSharpMiddlewareOptions.cs |   7 +
 .../ImageTagHelper.cs}                        |  28 +-
 .../ImageTagHelperTests.cs}                   |  72 +++--
 7 files changed, 263 insertions(+), 180 deletions(-)
 rename src/ImageSharp.Web/{ImageSharpTagHelper.cs => TagHelpers/ImageTagHelper.cs} (92%)
 rename tests/ImageSharp.Web.Tests/{Commands/ImageSharpTagHelperTests.cs => TagHelpers/ImageTagHelperTests.cs} (92%)

diff --git a/samples/ImageSharp.Web.Sample/Pages/Index.cshtml b/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
index 922edcb0..6e8e6a01 100644
--- a/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
+++ b/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
@@ -47,7 +47,7 @@
                 <code>sixlabors.imagesharp.web.svg?width=300</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.svg" width="300" />
+                <img src="sixlabors.imagesharp.web.svg" imagesharp-width="300" />
             </p>
         </div>
     </section>
@@ -58,7 +58,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" />
             </p>
         </div>
         <div>
@@ -66,7 +66,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&height=200</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" height="200" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-height="200" />
             </p>
         </div>
         <div>
@@ -74,7 +74,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&height=200&rmode=stretch</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" height="200" imagesharp-rmode="ResizeMode.Stretch" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-height="200" imagesharp-rmode="ResizeMode.Stretch" />
             </p>
         </div>
         <div>
@@ -82,7 +82,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&height=200&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" height="200" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-height="200" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -90,7 +90,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&rsampler=lanczos3</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-rsampler="Resampler.Lanczos3" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-rsampler="Resampler.Lanczos3" />
             </p>
         </div>
         <div>
@@ -98,7 +98,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&rsampler=nearestneighbor</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-rsampler="Resampler.NearestNeighbor" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-rsampler="Resampler.NearestNeighbor" />
             </p>
         </div>
     </section>
@@ -110,7 +110,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=jpg</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-format="Format.Jpg" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-format="Format.Jpg" />
             </p>
         </div>
         <div>
@@ -118,7 +118,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=bmp</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-format="Format.Bmp" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-format="Format.Bmp" />
             </p>
         </div>
         <div>
@@ -126,7 +126,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=gif</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-format="Format.Gif" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-format="Format.Gif" />
             </p>
         </div>
         <div>
@@ -134,7 +134,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=webp</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-format="Format.WebP" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-format="Format.WebP" />
             </p>
         </div>
     </section>
@@ -146,7 +146,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=jpg&quality=100</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-quality="100" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-quality="100" />
             </p>
         </div>
         <div>
@@ -154,7 +154,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=jpg&quality=50</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-quality="50" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-quality="50" />
             </p>
         </div>
         <div>
@@ -162,7 +162,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=jpg&quality=1</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-quality="1" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-quality="1" />
             </p>
         </div>
     </section>
@@ -174,7 +174,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=webp&quality=100</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-format="Format.WebP" imagesharp-quality="100" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-format="Format.WebP" imagesharp-quality="100" />
             </p>
         </div>
         <div>
@@ -182,7 +182,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=webp&quality=50</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-format="Format.WebP" imagesharp-quality="50" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-format="Format.WebP" imagesharp-quality="50" />
             </p>
         </div>
         <div>
@@ -190,7 +190,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&format=webp&quality=1</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-format="Format.WebP" imagesharp-quality="1" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-format="Format.WebP" imagesharp-quality="1" />
             </p>
         </div>
     </section>
@@ -202,7 +202,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&bgcolor=red</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-bgcolor="Color.Red" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-bgcolor="Color.Red" />
             </p>
         </div>
         <div>
@@ -210,7 +210,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&bgcolor=FFFF00</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-bgcolor='Color.ParseHex("FFFF00")' />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-bgcolor='Color.ParseHex("FFFF00")' />
             </p>
         </div>
         <div>
@@ -218,7 +218,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&bgcolor=128,28,32</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-bgcolor="Color.FromRgb(128, 28, 32)" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-bgcolor="Color.FromRgb(128, 28, 32)" />
             </p>
         </div>
         <div>
@@ -226,7 +226,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&bgcolor=C1FF0080</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-bgcolor='Color.ParseHex("C1FF0080")' />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-bgcolor='Color.ParseHex("C1FF0080")' />
             </p>
         </div>
         <div>
@@ -234,7 +234,7 @@
                 <code>sixlabors.imagesharp.web.png?width=300&bgcolor=128,28,32,128</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-bgcolor="Color.FromRgba(128, 28, 32, 128)" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="300" imagesharp-bgcolor="Color.FromRgba(128, 28, 32, 128)" />
             </p>
         </div>
     </section>
@@ -247,7 +247,7 @@
                 <code>sixlabors.imagesharp.web.png?width=123</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="123" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="123" />
             </p>
         </div>
         <div>
@@ -255,7 +255,7 @@
                 <code>sixlabors.imagesharp.web.png?width=123</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="123" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="123" />
             </p>
         </div>
         <div>
@@ -263,7 +263,7 @@
                 <code>sixlabors.imagesharp.web.png?width=123</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="123" />
+                <img src="sixlabors.imagesharp.web.png" imagesharp-width="123" />
             </p>
         </div>
     </section>
@@ -276,7 +276,7 @@
                 <code>Portrait_0.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Portrait_0.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
+                <img src="Portrait_0.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -284,7 +284,7 @@
                 <code>Portrait_1.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Portrait_1.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
+                <img src="Portrait_1.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -292,7 +292,7 @@
                 <code>Portrait_2.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Portrait_2.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
+                <img src="Portrait_2.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
 
@@ -301,7 +301,7 @@
                 <code>Portrait_3.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Portrait_3.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
+                <img src="Portrait_3.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -309,7 +309,7 @@
                 <code>Portrait_4.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Portrait_4.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
+                <img src="Portrait_4.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -317,7 +317,7 @@
                 <code>Portrait_5.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Portrait_5.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
+                <img src="Portrait_5.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
 
@@ -326,7 +326,7 @@
                 <code>Portrait_6.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Portrait_6.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
+                <img src="Portrait_6.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -334,7 +334,7 @@
                 <code>Portrait_7.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Portrait_7.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
+                <img src="Portrait_7.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -342,7 +342,7 @@
                 <code>Portrait_8.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Portrait_8.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
+                <img src="Portrait_8.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
     </section>
@@ -355,7 +355,7 @@
                 <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
             <p>
-                <img src="Portrait_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
+                <img src="Portrait_0.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
             </p>
         </div>
         <div>
@@ -363,7 +363,7 @@
                 <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
             <p>
-                <img src="Portrait_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
+                <img src="Portrait_1.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
             </p>
         </div>
         <div>
@@ -371,7 +371,7 @@
                 <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
             <p>
-                <img src="Portrait_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
+                <img src="Portrait_2.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
             </p>
         </div>
 
@@ -380,7 +380,7 @@
                 <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
             <p>
-                <img src="Portrait_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
+                <img src="Portrait_3.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
             </p>
         </div>
         <div>
@@ -388,7 +388,7 @@
                 <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
             <p>
-                <img src="Portrait_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
+                <img src="Portrait_4.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
             </p>
         </div>
         <div>
@@ -396,7 +396,7 @@
                 <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
             <p>
-                <img src="Portrait_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
+                <img src="Portrait_5.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
             </p>
         </div>
 
@@ -405,7 +405,7 @@
                 <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
             <p>
-                <img src="Portrait_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
+                <img src="Portrait_6.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
             </p>
         </div>
         <div>
@@ -413,7 +413,7 @@
                 <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
             <p>
-                <img src="Portrait_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
+                <img src="Portrait_7.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
             </p>
         </div>
         <div>
@@ -421,7 +421,7 @@
                 <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomleft</code>
             </p>
             <p>
-                <img src="Portrait_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
+                <img src="Portrait_8.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" />
             </p>
         </div>
     </section>
@@ -434,7 +434,7 @@
                 <code>Portrait_0.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_0.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -442,7 +442,7 @@
                 <code>Portrait_1.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_1.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -450,7 +450,7 @@
                 <code>Portrait_2.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_2.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -459,7 +459,7 @@
                 <code>Portrait_3.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_3.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -467,7 +467,7 @@
                 <code>Portrait_4.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_4.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -475,7 +475,7 @@
                 <code>Portrait_5.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_5.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -484,7 +484,7 @@
                 <code>Portrait_6.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_6.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -492,7 +492,7 @@
                 <code>Portrait_7.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_7.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -500,7 +500,7 @@
                 <code>Portrait_8.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_8.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Left" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
     </section>
@@ -513,7 +513,7 @@
                 <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_0.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -521,7 +521,7 @@
                 <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_1.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -529,7 +529,7 @@
                 <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_2.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -538,7 +538,7 @@
                 <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_3.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -546,7 +546,7 @@
                 <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_4.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -554,7 +554,7 @@
                 <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_5.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -563,7 +563,7 @@
                 <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_6.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -571,7 +571,7 @@
                 <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_7.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -579,7 +579,7 @@
                 <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_8.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
     </section>
@@ -592,7 +592,7 @@
                 <code>Portrait_0.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_0.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -600,7 +600,7 @@
                 <code>Portrait_1.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_1.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -608,7 +608,7 @@
                 <code>Portrait_2.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_2.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -617,7 +617,7 @@
                 <code>Portrait_3.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_3.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -625,7 +625,7 @@
                 <code>Portrait_4.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_4.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -633,7 +633,7 @@
                 <code>Portrait_5.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_5.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -642,7 +642,7 @@
                 <code>Portrait_6.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_6.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -650,7 +650,7 @@
                 <code>Portrait_7.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_7.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -658,7 +658,7 @@
                 <code>Portrait_8.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_8.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Right" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
     </section>
@@ -671,7 +671,7 @@
                 <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_0.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -679,7 +679,7 @@
                 <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_1.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -687,7 +687,7 @@
                 <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_2.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -696,7 +696,7 @@
                 <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_3.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -704,7 +704,7 @@
                 <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_4.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -712,7 +712,7 @@
                 <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_5.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -721,7 +721,7 @@
                 <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_6.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -729,7 +729,7 @@
                 <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_7.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -737,7 +737,7 @@
                 <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Portrait_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Portrait_8.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
     </section>
@@ -750,7 +750,7 @@
                 <code>Landscape_0.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Landscape_0.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
+                <img src="Landscape_0.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -758,7 +758,7 @@
                 <code>Landscape_1.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Landscape_1.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
+                <img src="Landscape_1.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -766,7 +766,7 @@
                 <code>Landscape_2.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Landscape_2.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
+                <img src="Landscape_2.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
 
@@ -775,7 +775,7 @@
                 <code>Landscape_3.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Landscape_3.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
+                <img src="Landscape_3.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -783,7 +783,7 @@
                 <code>Landscape_4.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Landscape_4.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
+                <img src="Landscape_4.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -791,7 +791,7 @@
                 <code>Landscape_5.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Landscape_5.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
+                <img src="Landscape_5.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
 
@@ -800,7 +800,7 @@
                 <code>Landscape_6.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Landscape_6.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
+                <img src="Landscape_6.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -808,7 +808,7 @@
                 <code>Landscape_7.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Landscape_7.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
+                <img src="Landscape_7.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
         <div>
@@ -816,7 +816,7 @@
                 <code>Landscape_8.jpg?width=60&height=50&rxy=0.69,0.37</code>
             </p>
             <p>
-                <img src="Landscape_8.jpg" width="60" height="50" imagesharp-rxy="new(0.69F,0.37F)" />
+                <img src="Landscape_8.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-rxy="new(0.69F,0.37F)" />
             </p>
         </div>
     </section>
@@ -830,7 +830,7 @@
                 <code>Landscape_0.jpg?width=60&height=50&ranchor=topright</code>
             </p>
             <p>
-                <img src="Landscape_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
+                <img src="Landscape_0.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
             </p>
         </div>
         <div>
@@ -838,7 +838,7 @@
                 <code>Landscape_1.jpg?width=60&height=50&ranchor=topright</code>
             </p>
             <p>
-                <img src="Landscape_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
+                <img src="Landscape_1.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
             </p>
         </div>
         <div>
@@ -846,7 +846,7 @@
                 <code>Landscape_2.jpg?width=60&height=50&ranchor=topright</code>
             </p>
             <p>
-                <img src="Landscape_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
+                <img src="Landscape_2.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
             </p>
         </div>
 
@@ -855,7 +855,7 @@
                 <code>Landscape_3.jpg?width=60&height=50&ranchor=topright</code>
             </p>
             <p>
-                <img src="Landscape_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
+                <img src="Landscape_3.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
             </p>
         </div>
         <div>
@@ -863,7 +863,7 @@
                 <code>Landscape_4.jpg?width=60&height=50&ranchor=topright</code>
             </p>
             <p>
-                <img src="Landscape_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
+                <img src="Landscape_4.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
             </p>
         </div>
         <div>
@@ -871,7 +871,7 @@
                 <code>Landscape_5.jpg?width=60&height=50&ranchor=topright</code>
             </p>
             <p>
-                <img src="Landscape_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
+                <img src="Landscape_5.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
             </p>
         </div>
 
@@ -880,7 +880,7 @@
                 <code>Landscape_6.jpg?width=60&height=50&ranchor=topright</code>
             </p>
             <p>
-                <img src="Landscape_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
+                <img src="Landscape_6.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
             </p>
         </div>
         <div>
@@ -888,7 +888,7 @@
                 <code>Landscape_7.jpg?width=60&height=50&ranchor=topright</code>
             </p>
             <p>
-                <img src="Landscape_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
+                <img src="Landscape_7.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
             </p>
         </div>
         <div>
@@ -896,7 +896,7 @@
                 <code>Landscape_8.jpg?width=60&height=50&ranchor=topright</code>
             </p>
             <p>
-                <img src="Landscape_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
+                <img src="Landscape_8.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" />
             </p>
         </div>
     </section>
@@ -909,7 +909,7 @@
                 <code>Landscape_0.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_0.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -917,7 +917,7 @@
                 <code>Landscape_1.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_1.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -925,7 +925,7 @@
                 <code>Landscape_2.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_2.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -934,7 +934,7 @@
                 <code>Landscape_3.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_3.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -942,7 +942,7 @@
                 <code>Landscape_4.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_4.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -950,7 +950,7 @@
                 <code>Landscape_5.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_5.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -959,7 +959,7 @@
                 <code>Landscape_6.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_6.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -967,7 +967,7 @@
                 <code>Landscape_7.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_7.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -975,7 +975,7 @@
                 <code>Landscape_8.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_8.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Top" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
     </section>
@@ -988,7 +988,7 @@
                 <code>Landscape_0.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_0.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -996,7 +996,7 @@
                 <code>Landscape_1.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_1.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1004,7 +1004,7 @@
                 <code>Landscape_2.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_2.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -1013,7 +1013,7 @@
                 <code>Landscape_3.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_3.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1021,7 +1021,7 @@
                 <code>Landscape_4.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_4.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1029,7 +1029,7 @@
                 <code>Landscape_5.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_5.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -1038,7 +1038,7 @@
                 <code>Landscape_6.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_6.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1046,7 +1046,7 @@
                 <code>Landscape_7.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_7.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1054,7 +1054,7 @@
                 <code>Landscape_8.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_8.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.TopRight" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
     </section>
@@ -1067,7 +1067,7 @@
                 <code>Landscape_0.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_0.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1075,7 +1075,7 @@
                 <code>Landscape_1.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_1.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1083,7 +1083,7 @@
                 <code>Landscape_2.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_2.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -1092,7 +1092,7 @@
                 <code>Landscape_3.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_3.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1100,7 +1100,7 @@
                 <code>Landscape_4.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_4.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1108,7 +1108,7 @@
                 <code>Landscape_5.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_5.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -1117,7 +1117,7 @@
                 <code>Landscape_6.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_6.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1125,7 +1125,7 @@
                 <code>Landscape_7.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_7.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1133,7 +1133,7 @@
                 <code>Landscape_8.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_8.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.Bottom" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
     </section>
@@ -1146,7 +1146,7 @@
                 <code>Landscape_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_0.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_0.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1154,7 +1154,7 @@
                 <code>Landscape_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_1.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_1.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1162,7 +1162,7 @@
                 <code>Landscape_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_2.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_2.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -1171,7 +1171,7 @@
                 <code>Landscape_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_3.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_3.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1179,7 +1179,7 @@
                 <code>Landscape_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_4.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_4.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1187,7 +1187,7 @@
                 <code>Landscape_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_5.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_5.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
 
@@ -1196,7 +1196,7 @@
                 <code>Landscape_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_6.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_6.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1204,7 +1204,7 @@
                 <code>Landscape_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_7.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_7.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
         <div>
@@ -1212,7 +1212,7 @@
                 <code>Landscape_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
             </p>
             <p>
-                <img src="Landscape_8.jpg" width="60" height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
+                <img src="Landscape_8.jpg" imagesharp-width="60" imagesharp-height="50" imagesharp-ranchor="AnchorPositionMode.BottomLeft" imagesharp-rmode="ResizeMode.Pad" imagesharp-rcolor="Color.LimeGreen" />
             </p>
         </div>
     </section>
diff --git a/samples/ImageSharp.Web.Sample/Program.cs b/samples/ImageSharp.Web.Sample/Program.cs
index 5850e688..e37283a5 100644
--- a/samples/ImageSharp.Web.Sample/Program.cs
+++ b/samples/ImageSharp.Web.Sample/Program.cs
@@ -46,8 +46,14 @@ public static void Main(string[] args)
                 .AddProcessor<QualityWebProcessor>()
                 .AddProcessor<AutoOrientWebProcessor>();
 
+            services.AddCors(options => options.AddDefaultPolicy(
+                    builder => builder.WithOrigins("https://localhost:8080").AllowAnyHeader().AllowAnyMethod()));
+
             WebApplication app = builder.Build();
 
+           // app.Urls.Clear();
+           // app.Urls.Add("https://*:7227");
+
             // Configure the HTTP request pipeline.
             if (!app.Environment.IsDevelopment())
             {
@@ -63,6 +69,8 @@ public static void Main(string[] args)
 
             app.UseStaticFiles();
 
+            app.UseCors();
+
             app.UseRouting();
 
             app.UseAuthorization();
diff --git a/src/ImageSharp.Web/Middleware/ImageContext.cs b/src/ImageSharp.Web/Middleware/ImageContext.cs
index 69224d06..d15b71ec 100644
--- a/src/ImageSharp.Web/Middleware/ImageContext.cs
+++ b/src/ImageSharp.Web/Middleware/ImageContext.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Http.Headers;
@@ -33,12 +34,24 @@ internal struct ImageContext
         private PreconditionState ifModifiedSinceState;
         private PreconditionState ifUnmodifiedSinceState;
 
+        private readonly CorsOptions corsOptions;
+        private readonly ICorsService corsService;
+        private readonly ICorsPolicyProvider corsPolicyProvider;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageContext"/> struct.
         /// </summary>
         /// <param name="context">The current HTTP request context.</param>
         /// <param name="options">The middleware options.</param>
-        public ImageContext(HttpContext context, ImageSharpMiddlewareOptions options)
+        /// <param name="corsOptions">Provides programmatic configuration for CORS.</param>
+        /// <param name="corsService">The CORS service which is used to apply CORS headers to the HTTP response.</param>
+        /// <param name="corsProvider">Provides CORS policies for a given HTTP context.</param>
+        public ImageContext(
+            HttpContext context,
+            ImageSharpMiddlewareOptions options,
+            CorsOptions corsOptions,
+            ICorsService corsService,
+            ICorsPolicyProvider corsProvider)
         {
             this.context = context;
             this.request = context.Request;
@@ -57,6 +70,10 @@ public ImageContext(HttpContext context, ImageSharpMiddlewareOptions options)
             this.ifNoneMatchState = PreconditionState.Unspecified;
             this.ifModifiedSinceState = PreconditionState.Unspecified;
             this.ifUnmodifiedSinceState = PreconditionState.Unspecified;
+
+            this.corsOptions = corsOptions;
+            this.corsService = corsService;
+            this.corsPolicyProvider = corsProvider;
         }
 
         /// <summary>
@@ -186,6 +203,15 @@ private async Task ApplyResponseHeadersAsync(
             TimeSpan maxAge)
         {
             this.response.StatusCode = statusCode;
+
+            if (this.corsPolicyProvider is not null)
+            {
+                string name = this.options.CorsPolicyName ?? this.corsOptions.DefaultPolicyName;
+                CorsPolicy policy = await this.corsPolicyProvider.GetPolicyAsync(this.context, name);
+                CorsResult result = this.corsService.EvaluatePolicy(this.context, policy);
+                this.corsService.ApplyResult(result, this.response);
+            }
+
             if (statusCode < 400)
             {
                 // These headers are returned for 200 and 304
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
index 535b6f72..56d816dd 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
@@ -7,9 +7,12 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Net.Http;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.IO;
@@ -117,6 +120,21 @@ private static readonly ConcurrentTLruCache<string, string> HMACTokenLru
         /// </summary>
         private readonly RequestAuthorizationUtilities authorizationUtilities;
 
+        /// <summary>
+        /// Provides programmatic configuration for CORS.
+        /// </summary>
+        private readonly CorsOptions corsOptions;
+
+        /// <summary>
+        /// The CORS service which is used to apply CORS headers to the HTTP response.
+        /// </summary>
+        private readonly ICorsService corsService;
+
+        /// <summary>
+        /// Provides CORS policies for a given HTTP context.
+        /// </summary>
+        private readonly ICorsPolicyProvider corsPolicyProvider;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageSharpMiddleware"/> class.
         /// </summary>
@@ -133,6 +151,7 @@ private static readonly ConcurrentTLruCache<string, string> HMACTokenLru
         /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
         /// <param name="asyncKeyLock">The async key lock.</param>
         /// <param name="requestAuthorizationUtilities">Contains helpers that allow authorization of image requests.</param>
+        /// <param name="serviceProvider">The service provider.</param>
         public ImageSharpMiddleware(
             RequestDelegate next,
             IOptions<ImageSharpMiddlewareOptions> options,
@@ -146,7 +165,8 @@ public ImageSharpMiddleware(
             CommandParser commandParser,
             FormatUtilities formatUtilities,
             AsyncKeyReaderWriterLock<string> asyncKeyLock,
-            RequestAuthorizationUtilities requestAuthorizationUtilities)
+            RequestAuthorizationUtilities requestAuthorizationUtilities,
+            IServiceProvider serviceProvider)
         {
             Guard.NotNull(next, nameof(next));
             Guard.NotNull(options, nameof(options));
@@ -179,6 +199,16 @@ public ImageSharpMiddleware(
             this.formatUtilities = formatUtilities;
             this.asyncKeyLock = asyncKeyLock;
             this.authorizationUtilities = requestAuthorizationUtilities;
+
+            // We cannot create a constructor containing these injected types since the CorsMiddleware
+            // might not be registered. We have to use the service provider to get them.
+            using IServiceScope scope = serviceProvider.CreateScope();
+            this.corsPolicyProvider = scope.ServiceProvider.GetService<ICorsPolicyProvider>();
+            if (this.corsPolicyProvider is not null)
+            {
+                this.corsOptions = scope.ServiceProvider.GetRequiredService<IOptions<CorsOptions>>().Value;
+                this.corsService = scope.ServiceProvider.GetRequiredService<ICorsService>();
+            }
         }
 
         /// <summary>
@@ -273,7 +303,7 @@ private async Task Invoke(HttpContext httpContext, bool retry)
             await this.ProcessRequestAsync(
                 httpContext,
                 sourceImageResolver,
-                new ImageContext(httpContext, this.options),
+                new ImageContext(httpContext, this.options, this.corsOptions, this.corsService, this.corsPolicyProvider),
                 commands,
                 retry);
         }
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
index da717127..bff6eced 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Globalization;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Http;
 using Microsoft.IO;
 using SixLabors.ImageSharp.Web.Commands;
@@ -83,6 +84,12 @@ public class ImageSharpMiddlewareOptions
         /// </remarks>
         public byte[] HMACSecretKey { get; set; } = Array.Empty<byte>();
 
+        /// <summary>
+        /// Gets or sets the optionsal CORS policy name to use when CORS middleware is registered against the service collection.
+        /// If not set, <see cref="CorsOptions.DefaultPolicyName"/> will be used.
+        /// </summary>
+        public string CorsPolicyName { get; set; }
+
         /// <summary>
         /// Gets or sets the method used to compute a Hash-based Message Authentication Code (HMAC) for request authentication.
         /// Defaults to <see cref="HMACUtilities.ComputeHMACSHA256(string, byte[])"/> using an invariant lowercase relative Uri
diff --git a/src/ImageSharp.Web/ImageSharpTagHelper.cs b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
similarity index 92%
rename from src/ImageSharp.Web/ImageSharpTagHelper.cs
rename to src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
index 4e09a00d..855f6fc7 100644
--- a/src/ImageSharp.Web/ImageSharpTagHelper.cs
+++ b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
@@ -33,12 +33,12 @@ namespace SixLabors.ImageSharp.Web.TagHelpers
     [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + FormatAttributeName, TagStructure = TagStructure.WithoutEndTag)]
     [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + BgColorAttributeName, TagStructure = TagStructure.WithoutEndTag)]
     [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + QualityAttributeName, TagStructure = TagStructure.WithoutEndTag)]
-    public class ImageSharpTagHelper : UrlResolutionTagHelper
+    public class ImageTagHelper : UrlResolutionTagHelper
     {
         private const string SrcAttributeName = "src";
-        private const string WidthAttributeName = ResizeWebProcessor.Width;
-        private const string HeightAttributeName = ResizeWebProcessor.Height;
         private const string AttributePrefix = "imagesharp-";
+        private const string WidthAttributeName = AttributePrefix + ResizeWebProcessor.Width;
+        private const string HeightAttributeName = AttributePrefix + ResizeWebProcessor.Height;
         private const string AnchorAttributeName = AttributePrefix + ResizeWebProcessor.Anchor;
         private const string RModeAttributeName = AttributePrefix + ResizeWebProcessor.Mode;
         private const string XyAttributeName = AttributePrefix + ResizeWebProcessor.Xy;
@@ -57,13 +57,13 @@ public class ImageSharpTagHelper : UrlResolutionTagHelper
         private readonly RequestAuthorizationUtilities authorizationUtilities;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ImageSharpTagHelper"/> class.
+        /// Initializes a new instance of the <see cref="ImageTagHelper"/> class.
         /// </summary>
         /// <param name="options">The middleware configuration options.</param>
         /// <param name="authorizationUtilities">Contains helpers that allow authorization of image requests.</param>
         /// <param name="urlHelperFactory">The URL helper factory.</param>
         /// <param name="htmlEncoder">The HTML encorder.</param>
-        public ImageSharpTagHelper(
+        public ImageTagHelper(
             IOptions<ImageSharpMiddlewareOptions> options,
             RequestAuthorizationUtilities authorizationUtilities,
             IUrlHelperFactory urlHelperFactory,
@@ -241,18 +241,20 @@ protected virtual void AddProcessingCommands(
 
         private void AddResizeCommands(TagHelperOutput output, CommandCollection commands)
         {
-            int? width = this.Width ?? output.Attributes[WidthAttributeName]?.Value as int?;
-            if (width.HasValue)
+            // If no explicit width/height has been set on the image, set the attributes to match the
+            // width/height from the process commands if present.
+            int? width = output.Attributes[ResizeWebProcessor.Width]?.Value as int?;
+            if (this.Width.HasValue)
             {
-                commands.Add(ResizeWebProcessor.Width, width.Value.ToString(this.parserCulture));
-                output.Attributes.SetAttribute(WidthAttributeName, width);
+                commands.Add(ResizeWebProcessor.Width, this.Width.Value.ToString(this.parserCulture));
+                output.Attributes.SetAttribute(ResizeWebProcessor.Width, width ?? this.Width);
             }
 
-            int? height = this.Height ?? output.Attributes[HeightAttributeName]?.Value as int?;
-            if (height.HasValue)
+            int? height = output.Attributes[ResizeWebProcessor.Height]?.Value as int?;
+            if (this.Height.HasValue)
             {
-                commands.Add(ResizeWebProcessor.Height, height.Value.ToString(this.parserCulture));
-                output.Attributes.SetAttribute(HeightAttributeName, height);
+                commands.Add(ResizeWebProcessor.Height, this.Height.Value.ToString(this.parserCulture));
+                output.Attributes.SetAttribute(ResizeWebProcessor.Height, height ?? this.Height);
             }
 
             if (this.ResizeMode.HasValue)
diff --git a/tests/ImageSharp.Web.Tests/Commands/ImageSharpTagHelperTests.cs b/tests/ImageSharp.Web.Tests/TagHelpers/ImageTagHelperTests.cs
similarity index 92%
rename from tests/ImageSharp.Web.Tests/Commands/ImageSharpTagHelperTests.cs
rename to tests/ImageSharp.Web.Tests/TagHelpers/ImageTagHelperTests.cs
index c454f17c..8c61758b 100644
--- a/tests/ImageSharp.Web.Tests/Commands/ImageSharpTagHelperTests.cs
+++ b/tests/ImageSharp.Web.Tests/TagHelpers/ImageTagHelperTests.cs
@@ -30,13 +30,14 @@
 using SixLabors.ImageSharp.Web.DependencyInjection;
 using SixLabors.ImageSharp.Web.Middleware;
 using SixLabors.ImageSharp.Web.Processors;
+using SixLabors.ImageSharp.Web.TagHelpers;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Commands
+namespace SixLabors.ImageSharp.Web.Tests.TagHelpers
 {
-    public sealed class ImageSharpTagHelperTests : IDisposable
+    public sealed class ImageTagHelperTests : IDisposable
     {
-        public ImageSharpTagHelperTests()
+        public ImageTagHelperTests()
         {
             ServiceCollection services = new();
             services.AddSingleton<IWebHostEnvironment, FakeWebHostEnvironment>();
@@ -77,7 +78,7 @@ public void Process_SrcDefaultsToTagHelperOutputSrcAttributeAddedByOtherTagHelpe
 
             var urlHelperFactory = new FakeUrlHelperFactory();
 
-            ImageSharpTagHelper helper = this.GetHelper(urlHelperFactory: urlHelperFactory);
+            ImageTagHelper helper = this.GetHelper(urlHelperFactory: urlHelperFactory);
             helper.Src = src;
             helper.Width = 100;
 
@@ -122,13 +123,15 @@ public void PreservesOrderOfSourceAttributesWhenRun()
                     { "alt", new HtmlString("alt text") },
                     { "data-extra", new HtmlString("something") },
                     { "title", new HtmlString("Image title") },
-                    { "src", "testimage.png?width=50&height=60" },
+                    { "src", "testimage.png?width=100&height=120" },
                     { "width", 50 },
                     { "height", 60 }
                 });
 
-            ImageSharpTagHelper helper = this.GetHelper();
+            ImageTagHelper helper = this.GetHelper();
             helper.Src = "testimage.png";
+            helper.Width = 100;
+            helper.Height = 120;
 
             // Act
             helper.Process(context, output);
@@ -165,7 +168,7 @@ public void RendersImageTag_AddsAttributes_WithRequestPathBase()
 
             ViewContext viewContext = MakeViewContext("/bar");
 
-            ImageSharpTagHelper helper = this.GetHelper();
+            ImageTagHelper helper = this.GetHelper();
             helper.Src = "/bar/images/image.jpg";
             helper.Width = 100;
             helper.Height = 200;
@@ -201,12 +204,13 @@ public void RendersImageTag_SrcIncludes_ResizeMode()
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "src", $"testimage.png?width=50&{ResizeWebProcessor.Mode}={nameof(ResizeMode.Stretch)}" },
+                    { "src", $"testimage.png?width=100&{ResizeWebProcessor.Mode}={nameof(ResizeMode.Stretch)}" },
                     { "width", 50 }
                 });
 
-            ImageSharpTagHelper helper = this.GetHelper();
+            ImageTagHelper helper = this.GetHelper();
             helper.Src = "testimage.png";
+            helper.Width = 100;
             helper.ResizeMode = ResizeMode.Stretch;
 
             // Act
@@ -245,12 +249,13 @@ public void RendersImageTag_SrcIncludes_ResizePosition()
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "src", $"testimage.png?width=50&{ResizeWebProcessor.Xy}=20,50" },
+                    { "src", $"testimage.png?width=100&{ResizeWebProcessor.Xy}=20,50" },
                     { "width", 50 }
                 });
 
-            ImageSharpTagHelper helper = this.GetHelper();
+            ImageTagHelper helper = this.GetHelper();
             helper.Src = "testimage.png";
+            helper.Width = 100;
             helper.Center = new(20, 50);
 
             // Act
@@ -289,12 +294,13 @@ public void RendersImageTag_SrcIncludes_ResizeAnchor()
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "src", $"testimage.png?width=50&{ResizeWebProcessor.Anchor}={nameof(AnchorPositionMode.Top)}" },
+                    { "src", $"testimage.png?width=100&{ResizeWebProcessor.Anchor}={nameof(AnchorPositionMode.Top)}" },
                     { "width", 50 }
                 });
 
-            ImageSharpTagHelper helper = this.GetHelper();
+            ImageTagHelper helper = this.GetHelper();
             helper.Src = "testimage.png";
+            helper.Width = 100;
             helper.AnchorPosition = AnchorPositionMode.Top;
 
             // Act
@@ -333,12 +339,13 @@ public void RendersImageTag_SrcIncludes_ResizePadColor()
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "src", $"testimage.png?width=50&{ResizeWebProcessor.Color}={Color.LimeGreen.ToHex()}" },
+                    { "src", $"testimage.png?width=100&{ResizeWebProcessor.Color}={Color.LimeGreen.ToHex()}" },
                     { "width", 50 }
                 });
 
-            ImageSharpTagHelper helper = this.GetHelper();
+            ImageTagHelper helper = this.GetHelper();
             helper.Src = "testimage.png";
+            helper.Width = 100;
             helper.PadColor = Color.LimeGreen;
 
             // Act
@@ -377,12 +384,13 @@ public void RendersImageTag_SrcIncludes_ResizeCompand()
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "src", $"testimage.png?width=50&{ResizeWebProcessor.Compand}={bool.TrueString}" },
+                    { "src", $"testimage.png?width=100&{ResizeWebProcessor.Compand}={bool.TrueString}" },
                     { "width", 50 }
                 });
 
-            ImageSharpTagHelper helper = this.GetHelper();
+            ImageTagHelper helper = this.GetHelper();
             helper.Src = "testimage.png";
+            helper.Width = 100;
             helper.Compand = true;
 
             // Act
@@ -421,12 +429,13 @@ public void RendersImageTag_SrcIncludes_ResizeOrient()
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "src", $"testimage.png?width=50&{ResizeWebProcessor.Orient}={bool.TrueString}" },
+                    { "src", $"testimage.png?width=100&{ResizeWebProcessor.Orient}={bool.TrueString}" },
                     { "width", 50 }
                 });
 
-            ImageSharpTagHelper helper = this.GetHelper();
+            ImageTagHelper helper = this.GetHelper();
             helper.Src = "testimage.png";
+            helper.Width = 100;
             helper.Orient = true;
 
             // Act
@@ -485,12 +494,13 @@ public void RendersImageTag_SrcIncludes_Resampler(ResamplerCommand resampler)
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "src", $"testimage.png?width=50&{ResizeWebProcessor.Sampler}={resampler.Name}" },
+                    { "src", $"testimage.png?width=100&{ResizeWebProcessor.Sampler}={resampler.Name}" },
                     { "width", 50 }
                 });
 
-            ImageSharpTagHelper helper = this.GetHelper();
+            ImageTagHelper helper = this.GetHelper();
             helper.Src = "testimage.png";
+            helper.Width = 100;
             helper.Sampler = resampler;
 
             // Act
@@ -529,11 +539,11 @@ public void RendersImageTag_SrcIncludes_AutoOrient()
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "src", $"testimage.png?width=50&{AutoOrientWebProcessor.AutoOrient}={bool.TrueString}" },
+                    { "src", $"testimage.png?{AutoOrientWebProcessor.AutoOrient}={bool.TrueString}" },
                     { "width", 50 }
                 });
 
-            ImageSharpTagHelper helper = this.GetHelper();
+            ImageTagHelper helper = this.GetHelper();
             helper.Src = "testimage.png";
             helper.AutoOrient = true;
 
@@ -584,11 +594,11 @@ public void RendersImageTag_SrcIncludes_Format(FormatCommand format)
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "src", $"testimage.png?width=50&{FormatWebProcessor.Format}={format.Name}" },
+                    { "src", $"testimage.png?{FormatWebProcessor.Format}={format.Name}" },
                     { "width", 50 }
                 });
 
-            ImageSharpTagHelper helper = this.GetHelper();
+            ImageTagHelper helper = this.GetHelper();
             helper.Src = "testimage.png";
             helper.Format = format;
 
@@ -628,11 +638,11 @@ public void RendersImageTag_SrcIncludes_BackgroundColor()
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "src", $"testimage.png?width=50&{BackgroundColorWebProcessor.Color}={Color.Red.ToHex()}" },
+                    { "src", $"testimage.png?{BackgroundColorWebProcessor.Color}={Color.Red.ToHex()}" },
                     { "width", 50 }
                 });
 
-            ImageSharpTagHelper helper = this.GetHelper();
+            ImageTagHelper helper = this.GetHelper();
             helper.Src = "testimage.png";
             helper.BackgroundColor = Color.Red;
 
@@ -672,11 +682,11 @@ public void RendersImageTag_SrcIncludes_Quality()
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "src", $"testimage.png?width=50&{QualityWebProcessor.Quality}={42}" },
+                    { "src", $"testimage.png?{QualityWebProcessor.Quality}={42}" },
                     { "width", 50 }
                 });
 
-            ImageSharpTagHelper helper = this.GetHelper();
+            ImageTagHelper helper = this.GetHelper();
             helper.Src = "testimage.png";
             helper.Quality = 42;
 
@@ -696,14 +706,14 @@ public void RendersImageTag_SrcIncludes_Quality()
             }
         }
 
-        private ImageSharpTagHelper GetHelper(
+        private ImageTagHelper GetHelper(
             IUrlHelperFactory urlHelperFactory = null,
             ViewContext viewContext = null)
         {
             urlHelperFactory ??= new FakeUrlHelperFactory();
             viewContext ??= MakeViewContext();
 
-            return new ImageSharpTagHelper(
+            return new ImageTagHelper(
                 Options.Create<ImageSharpMiddlewareOptions>(new()),
                 this.Provider.GetRequiredService<RequestAuthorizationUtilities>(),
                 urlHelperFactory,

From b393055d0614eec9fafc53bcc707a694a953d716 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 28 Oct 2022 20:40:04 +1000
Subject: [PATCH 027/102] Add implicit usings

---
 SixLabors.ImageSharp.Web.props                   | 11 +++++++++++
 samples/ImageSharp.Web.Sample/Pages/Index.cshtml |  8 ++++++++
 src/ImageSharp.Web/ImageSharp.Web.csproj         |  1 +
 3 files changed, 20 insertions(+)
 create mode 100644 SixLabors.ImageSharp.Web.props

diff --git a/SixLabors.ImageSharp.Web.props b/SixLabors.ImageSharp.Web.props
new file mode 100644
index 00000000..2d95d7d1
--- /dev/null
+++ b/SixLabors.ImageSharp.Web.props
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <!--Add common namespaces to implicit global usings if enabled.-->
+  <ItemGroup Condition="'$(ImplicitUsings)'=='enable' OR '$(ImplicitUsings)'=='true'">
+    <Using Include="SixLabors.ImageSharp" />
+    <Using Include="SixLabors.ImageSharp.Processing" />
+    <Using Include="SixLabors.ImageSharp.Web" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/ImageSharp.Web.Sample/Pages/Index.cshtml b/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
index 6e8e6a01..6085df9b 100644
--- a/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
+++ b/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
@@ -42,6 +42,14 @@
 }
     <section>
         <h2>Unmodified</h2>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.svg</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.svg" width="300" />
+            </p>
+        </div>
         <div>
             <p>
                 <code>sixlabors.imagesharp.web.svg?width=300</code>
diff --git a/src/ImageSharp.Web/ImageSharp.Web.csproj b/src/ImageSharp.Web/ImageSharp.Web.csproj
index e7122cab..579a3829 100644
--- a/src/ImageSharp.Web/ImageSharp.Web.csproj
+++ b/src/ImageSharp.Web/ImageSharp.Web.csproj
@@ -28,6 +28,7 @@
 
   <ItemGroup>
     <None Include="..\..\shared-infrastructure\branding\icons\imagesharp.web\sixlabors.imagesharp.web.128.png" Pack="true" PackagePath="" />
+    <None Include="..\..\SixLabors.ImageSharp.Web.props" Pack="true" PackagePath="build" />
   </ItemGroup>
 
   <ItemGroup>

From bec9e83f6249739174635f424c561fa3aa380301 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 28 Oct 2022 20:48:07 +1000
Subject: [PATCH 028/102] Revert experimental changes.

---
 samples/ImageSharp.Web.Sample/Program.cs                    | 6 ------
 .../Middleware/ImageSharpMiddlewareOptions.cs               | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/samples/ImageSharp.Web.Sample/Program.cs b/samples/ImageSharp.Web.Sample/Program.cs
index e37283a5..1fdfbce0 100644
--- a/samples/ImageSharp.Web.Sample/Program.cs
+++ b/samples/ImageSharp.Web.Sample/Program.cs
@@ -46,14 +46,8 @@ public static void Main(string[] args)
                 .AddProcessor<QualityWebProcessor>()
                 .AddProcessor<AutoOrientWebProcessor>();
 
-            services.AddCors(options => options.AddDefaultPolicy(
-                    builder => builder.WithOrigins("https://localhost:8080").AllowAnyHeader().AllowAnyMethod()));
-
             WebApplication app = builder.Build();
 
-           // app.Urls.Clear();
-           // app.Urls.Add("https://*:7227");
-
             // Configure the HTTP request pipeline.
             if (!app.Environment.IsDevelopment())
             {
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
index bff6eced..02d813c0 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
@@ -84,12 +84,6 @@ public class ImageSharpMiddlewareOptions
         /// </remarks>
         public byte[] HMACSecretKey { get; set; } = Array.Empty<byte>();
 
-        /// <summary>
-        /// Gets or sets the optionsal CORS policy name to use when CORS middleware is registered against the service collection.
-        /// If not set, <see cref="CorsOptions.DefaultPolicyName"/> will be used.
-        /// </summary>
-        public string CorsPolicyName { get; set; }
-
         /// <summary>
         /// Gets or sets the method used to compute a Hash-based Message Authentication Code (HMAC) for request authentication.
         /// Defaults to <see cref="HMACUtilities.ComputeHMACSHA256(string, byte[])"/> using an invariant lowercase relative Uri

From 6f7b792632ac2f601b2745a3a08512cef5ced68c Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 28 Oct 2022 20:52:16 +1000
Subject: [PATCH 029/102] Remove experimental code.

---
 src/ImageSharp.Web/Middleware/ImageContext.cs | 27 +--------------
 .../Middleware/ImageSharpMiddleware.cs        | 34 ++-----------------
 2 files changed, 3 insertions(+), 58 deletions(-)

diff --git a/src/ImageSharp.Web/Middleware/ImageContext.cs b/src/ImageSharp.Web/Middleware/ImageContext.cs
index d15b71ec..cc4edbbd 100644
--- a/src/ImageSharp.Web/Middleware/ImageContext.cs
+++ b/src/ImageSharp.Web/Middleware/ImageContext.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Http.Headers;
@@ -34,24 +33,12 @@ internal struct ImageContext
         private PreconditionState ifModifiedSinceState;
         private PreconditionState ifUnmodifiedSinceState;
 
-        private readonly CorsOptions corsOptions;
-        private readonly ICorsService corsService;
-        private readonly ICorsPolicyProvider corsPolicyProvider;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageContext"/> struct.
         /// </summary>
         /// <param name="context">The current HTTP request context.</param>
         /// <param name="options">The middleware options.</param>
-        /// <param name="corsOptions">Provides programmatic configuration for CORS.</param>
-        /// <param name="corsService">The CORS service which is used to apply CORS headers to the HTTP response.</param>
-        /// <param name="corsProvider">Provides CORS policies for a given HTTP context.</param>
-        public ImageContext(
-            HttpContext context,
-            ImageSharpMiddlewareOptions options,
-            CorsOptions corsOptions,
-            ICorsService corsService,
-            ICorsPolicyProvider corsProvider)
+        public ImageContext(HttpContext context, ImageSharpMiddlewareOptions options)
         {
             this.context = context;
             this.request = context.Request;
@@ -70,10 +57,6 @@ public ImageContext(
             this.ifNoneMatchState = PreconditionState.Unspecified;
             this.ifModifiedSinceState = PreconditionState.Unspecified;
             this.ifUnmodifiedSinceState = PreconditionState.Unspecified;
-
-            this.corsOptions = corsOptions;
-            this.corsService = corsService;
-            this.corsPolicyProvider = corsProvider;
         }
 
         /// <summary>
@@ -204,14 +187,6 @@ private async Task ApplyResponseHeadersAsync(
         {
             this.response.StatusCode = statusCode;
 
-            if (this.corsPolicyProvider is not null)
-            {
-                string name = this.options.CorsPolicyName ?? this.corsOptions.DefaultPolicyName;
-                CorsPolicy policy = await this.corsPolicyProvider.GetPolicyAsync(this.context, name);
-                CorsResult result = this.corsService.EvaluatePolicy(this.context, policy);
-                this.corsService.ApplyResult(result, this.response);
-            }
-
             if (statusCode < 400)
             {
                 // These headers are returned for 200 and 304
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
index 56d816dd..535b6f72 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
@@ -7,12 +7,9 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.IO;
@@ -120,21 +117,6 @@ private static readonly ConcurrentTLruCache<string, string> HMACTokenLru
         /// </summary>
         private readonly RequestAuthorizationUtilities authorizationUtilities;
 
-        /// <summary>
-        /// Provides programmatic configuration for CORS.
-        /// </summary>
-        private readonly CorsOptions corsOptions;
-
-        /// <summary>
-        /// The CORS service which is used to apply CORS headers to the HTTP response.
-        /// </summary>
-        private readonly ICorsService corsService;
-
-        /// <summary>
-        /// Provides CORS policies for a given HTTP context.
-        /// </summary>
-        private readonly ICorsPolicyProvider corsPolicyProvider;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageSharpMiddleware"/> class.
         /// </summary>
@@ -151,7 +133,6 @@ private static readonly ConcurrentTLruCache<string, string> HMACTokenLru
         /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
         /// <param name="asyncKeyLock">The async key lock.</param>
         /// <param name="requestAuthorizationUtilities">Contains helpers that allow authorization of image requests.</param>
-        /// <param name="serviceProvider">The service provider.</param>
         public ImageSharpMiddleware(
             RequestDelegate next,
             IOptions<ImageSharpMiddlewareOptions> options,
@@ -165,8 +146,7 @@ public ImageSharpMiddleware(
             CommandParser commandParser,
             FormatUtilities formatUtilities,
             AsyncKeyReaderWriterLock<string> asyncKeyLock,
-            RequestAuthorizationUtilities requestAuthorizationUtilities,
-            IServiceProvider serviceProvider)
+            RequestAuthorizationUtilities requestAuthorizationUtilities)
         {
             Guard.NotNull(next, nameof(next));
             Guard.NotNull(options, nameof(options));
@@ -199,16 +179,6 @@ public ImageSharpMiddleware(
             this.formatUtilities = formatUtilities;
             this.asyncKeyLock = asyncKeyLock;
             this.authorizationUtilities = requestAuthorizationUtilities;
-
-            // We cannot create a constructor containing these injected types since the CorsMiddleware
-            // might not be registered. We have to use the service provider to get them.
-            using IServiceScope scope = serviceProvider.CreateScope();
-            this.corsPolicyProvider = scope.ServiceProvider.GetService<ICorsPolicyProvider>();
-            if (this.corsPolicyProvider is not null)
-            {
-                this.corsOptions = scope.ServiceProvider.GetRequiredService<IOptions<CorsOptions>>().Value;
-                this.corsService = scope.ServiceProvider.GetRequiredService<ICorsService>();
-            }
         }
 
         /// <summary>
@@ -303,7 +273,7 @@ private async Task Invoke(HttpContext httpContext, bool retry)
             await this.ProcessRequestAsync(
                 httpContext,
                 sourceImageResolver,
-                new ImageContext(httpContext, this.options, this.corsOptions, this.corsService, this.corsPolicyProvider),
+                new ImageContext(httpContext, this.options),
                 commands,
                 retry);
         }

From 9415d9571d41ff5ec76e001fecaa2831d806d4f4 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 28 Oct 2022 21:56:17 +1100
Subject: [PATCH 030/102] Update src/ImageSharp.Web/Format.cs

Co-authored-by: Brian Popow <38701097+brianpopow@users.noreply.github.com>
---
 src/ImageSharp.Web/Format.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ImageSharp.Web/Format.cs b/src/ImageSharp.Web/Format.cs
index bfeeee6f..8718c8ef 100644
--- a/src/ImageSharp.Web/Format.cs
+++ b/src/ImageSharp.Web/Format.cs
@@ -34,7 +34,7 @@ public static class Format
         public static FormatCommand Tga { get; } = new(nameof(Tga));
 
         /// <summary>
-        /// Gets the Gif encoding format.
+        /// Gets the WebP encoding format.
         /// </summary>
         public static FormatCommand WebP { get; } = new(nameof(WebP));
     }

From ecf329ec507f847d2d7a1de0bcc7684d119b8792 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sat, 29 Oct 2022 07:50:31 +1000
Subject: [PATCH 031/102] Remove bad setup call from samples

---
 samples/ImageSharp.Web.Sample/Program.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/samples/ImageSharp.Web.Sample/Program.cs b/samples/ImageSharp.Web.Sample/Program.cs
index 1fdfbce0..5850e688 100644
--- a/samples/ImageSharp.Web.Sample/Program.cs
+++ b/samples/ImageSharp.Web.Sample/Program.cs
@@ -63,8 +63,6 @@ public static void Main(string[] args)
 
             app.UseStaticFiles();
 
-            app.UseCors();
-
             app.UseRouting();
 
             app.UseAuthorization();

From 424102d53032106f05c4e17944f8fe0ff386678f Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sat, 29 Oct 2022 07:56:15 +1000
Subject: [PATCH 032/102] Use implicit usings in sample

---
 samples/ImageSharp.Web.Sample/ImageSharp.Web.Sample.csproj | 2 ++
 samples/ImageSharp.Web.Sample/Pages/_ViewImports.cshtml    | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/samples/ImageSharp.Web.Sample/ImageSharp.Web.Sample.csproj b/samples/ImageSharp.Web.Sample/ImageSharp.Web.Sample.csproj
index 237520c0..d20146da 100644
--- a/samples/ImageSharp.Web.Sample/ImageSharp.Web.Sample.csproj
+++ b/samples/ImageSharp.Web.Sample/ImageSharp.Web.Sample.csproj
@@ -11,4 +11,6 @@
     <ProjectReference Include="..\..\src\ImageSharp.Web\ImageSharp.Web.csproj" />
   </ItemGroup>
 
+  <Import Project="..\..\SixLabors.ImageSharp.Web.props" />
+
 </Project>
diff --git a/samples/ImageSharp.Web.Sample/Pages/_ViewImports.cshtml b/samples/ImageSharp.Web.Sample/Pages/_ViewImports.cshtml
index cd1556e4..f5dfabe4 100644
--- a/samples/ImageSharp.Web.Sample/Pages/_ViewImports.cshtml
+++ b/samples/ImageSharp.Web.Sample/Pages/_ViewImports.cshtml
@@ -1,7 +1,4 @@
 @using ImageSharp.Web.Sample
-@using SixLabors.ImageSharp
-@using SixLabors.ImageSharp.Processing
-@using SixLabors.ImageSharp.Web
 @namespace ImageSharp.Web.Sample.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @addTagHelper *, SixLabors.ImageSharp.Web

From f96daf5db077c0f3c7b1705b401636497c457fbc Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sat, 29 Oct 2022 09:17:45 +1000
Subject: [PATCH 033/102] Allow explicit hmac includes

---
 samples/ImageSharp.Web.Sample/Pages/Index.cshtml   | 11 +++++++++++
 samples/ImageSharp.Web.Sample/Program.cs           |  2 +-
 .../Middleware/ImageSharpMiddlewareOptions.cs      |  1 -
 .../Providers/FileProviderImageProvider.cs         |  1 -
 src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs    | 14 ++++++++++++--
 5 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/samples/ImageSharp.Web.Sample/Pages/Index.cshtml b/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
index 6085df9b..2c9d2911 100644
--- a/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
+++ b/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
@@ -58,6 +58,17 @@
                 <img src="sixlabors.imagesharp.web.svg" imagesharp-width="300" />
             </p>
         </div>
+    </section>
+        <section>
+        <h2>HMAC - No Commands</h2>
+        <div>
+            <p>
+                <code>sixlabors.imagesharp.web.png?hmac=...</code>
+            </p>
+            <p>
+                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-hmac />
+            </p>
+        </div>
     </section>
     <section>
         <h2>Resize</h2>
diff --git a/samples/ImageSharp.Web.Sample/Program.cs b/samples/ImageSharp.Web.Sample/Program.cs
index 5850e688..69db0774 100644
--- a/samples/ImageSharp.Web.Sample/Program.cs
+++ b/samples/ImageSharp.Web.Sample/Program.cs
@@ -27,7 +27,7 @@ public static void Main(string[] args)
             services.AddRazorPages();
 
             // TODO: Enable HMAC
-            services.AddImageSharp(options => options.HMACSecretKey = null) // new byte[] { 1, 2, 3, 4, 5 })
+            services.AddImageSharp(options => options.HMACSecretKey = new byte[] { 1, 2, 3, 4, 5 }) 
                 .SetRequestParser<QueryCollectionRequestParser>()
                 .Configure<PhysicalFileSystemCacheOptions>(options =>
                 {
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
index 02d813c0..da717127 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Globalization;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Http;
 using Microsoft.IO;
 using SixLabors.ImageSharp.Web.Commands;
diff --git a/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs b/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs
index 920a4e68..7b4f1cb7 100644
--- a/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs
+++ b/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
diff --git a/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
index 855f6fc7..ce3d7a30 100644
--- a/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
+++ b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
@@ -33,6 +33,7 @@ namespace SixLabors.ImageSharp.Web.TagHelpers
     [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + FormatAttributeName, TagStructure = TagStructure.WithoutEndTag)]
     [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + BgColorAttributeName, TagStructure = TagStructure.WithoutEndTag)]
     [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + QualityAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + HMACAttributeName, TagStructure = TagStructure.WithoutEndTag)]
     public class ImageTagHelper : UrlResolutionTagHelper
     {
         private const string SrcAttributeName = "src";
@@ -50,6 +51,7 @@ public class ImageTagHelper : UrlResolutionTagHelper
         private const string FormatAttributeName = AttributePrefix + FormatWebProcessor.Format;
         private const string BgColorAttributeName = AttributePrefix + BackgroundColorWebProcessor.Color;
         private const string QualityAttributeName = AttributePrefix + QualityWebProcessor.Quality;
+        private const string HMACAttributeName = AttributePrefix + RequestAuthorizationUtilities.TokenCommand;
 
         private readonly ImageSharpMiddlewareOptions options;
         private readonly CultureInfo parserCulture;
@@ -181,6 +183,14 @@ public ImageTagHelper(
         [HtmlAttributeName(QualityAttributeName)]
         public int? Quality { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether to append a HMAC token to the request.
+        /// This value is always <see langword="true"/>. HMAC token usage is controlled by populating the
+        /// <see cref="ImageSharpMiddlewareOptions.HMACSecretKey"/> property.
+        /// </summary>
+        [HtmlAttributeName(HMACAttributeName)]
+        public bool AppendHMac { get => true; set => _ = true; }
+
         /// <inheritdoc />
         public override void Process(TagHelperContext context, TagHelperOutput output)
         {
@@ -199,13 +209,13 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
             CommandCollection commands = new();
             this.AddProcessingCommands(context, output, commands, this.parserCulture);
 
-            if (commands.Count > 0)
+            byte[] secret = this.options.HMACSecretKey;
+            if (commands.Count > 0 || secret?.Length > 0)
             {
                 // Retrieve the TagHelperOutput variation of the "src" attribute in case other TagHelpers in the
                 // pipeline have touched the value. If the value is already encoded this helper may
                 // not function properly.
                 src = output.Attributes[SrcAttributeName].Value as string;
-                byte[] secret = this.options.HMACSecretKey;
                 if (secret?.Length > 0)
                 {
                     string hash = this.authorizationUtilities.ComputeHMAC(src, commands, secret);

From b86cab15328bab494ae71c92ff789d26c992fb4f Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sat, 29 Oct 2022 09:26:50 +1000
Subject: [PATCH 034/102] Add test for HMAC attribute

---
 .../TagHelpers/ImageTagHelper.cs              |  2 +-
 .../TagHelpers/ImageTagHelperTests.cs         | 49 ++++++++++++++++++-
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
index ce3d7a30..89bff9a3 100644
--- a/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
+++ b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
@@ -189,7 +189,7 @@ public ImageTagHelper(
         /// <see cref="ImageSharpMiddlewareOptions.HMACSecretKey"/> property.
         /// </summary>
         [HtmlAttributeName(HMACAttributeName)]
-        public bool AppendHMac { get => true; set => _ = true; }
+        public bool AppendHMAC { get => true; set => _ = true; }
 
         /// <inheritdoc />
         public override void Process(TagHelperContext context, TagHelperOutput output)
diff --git a/tests/ImageSharp.Web.Tests/TagHelpers/ImageTagHelperTests.cs b/tests/ImageSharp.Web.Tests/TagHelpers/ImageTagHelperTests.cs
index 8c61758b..b45c99dc 100644
--- a/tests/ImageSharp.Web.Tests/TagHelpers/ImageTagHelperTests.cs
+++ b/tests/ImageSharp.Web.Tests/TagHelpers/ImageTagHelperTests.cs
@@ -706,15 +706,60 @@ public void RendersImageTag_SrcIncludes_Quality()
             }
         }
 
+        [Fact]
+        public void RendersImageTag_SrcIncludes_HMAC()
+        {
+            // Arrange
+            TagHelperContext context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", "testimage.png" },
+                    { "width", 50 },
+                    { "imagesharp-hmac", true }
+                });
+
+            TagHelperOutput output = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "width", 50 }
+                });
+
+            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "src", "testimage.png?hmac=ef09cd10210025e6d588fc2c12b91bf609c3e45f6d5d05dd650b8e6746cba288" },
+                    { "width", 50 }
+                });
+
+            ImageTagHelper helper = this.GetHelper(hmac: true);
+            helper.Src = "testimage.png";
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedOutput.TagName, output.TagName);
+            Assert.Equal(2, output.Attributes.Count);
+
+            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
+            {
+                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+                TagHelperAttribute actualAttribute = output.Attributes[i];
+                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
+            }
+        }
+
         private ImageTagHelper GetHelper(
             IUrlHelperFactory urlHelperFactory = null,
-            ViewContext viewContext = null)
+            ViewContext viewContext = null,
+            bool hmac = false)
         {
             urlHelperFactory ??= new FakeUrlHelperFactory();
             viewContext ??= MakeViewContext();
 
             return new ImageTagHelper(
-                Options.Create<ImageSharpMiddlewareOptions>(new()),
+                Options.Create<ImageSharpMiddlewareOptions>(new() { HMACSecretKey = hmac ? new byte[] { 1, 2, 3, 4, 5 } : null }),
                 this.Provider.GetRequiredService<RequestAuthorizationUtilities>(),
                 urlHelperFactory,
                 new HtmlTestEncoder())

From 569cc2b97b7c4cd8c25617b6c20cca71cf4e2dcc Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sun, 6 Nov 2022 13:54:21 +1000
Subject: [PATCH 035/102] Parse width/height HTML attributes as string

---
 .../TagHelpers/ImageTagHelper.cs              | 10 ++-
 .../TagHelpers/ImageTagHelperTests.cs         | 78 +++++++++----------
 2 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
index 89bff9a3..01566ffb 100644
--- a/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
+++ b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
@@ -253,14 +253,20 @@ private void AddResizeCommands(TagHelperOutput output, CommandCollection command
         {
             // If no explicit width/height has been set on the image, set the attributes to match the
             // width/height from the process commands if present.
-            int? width = output.Attributes[ResizeWebProcessor.Width]?.Value as int?;
+            int? width = output.Attributes.ContainsName(ResizeWebProcessor.Width)
+                ? int.Parse(output.Attributes[ResizeWebProcessor.Width].Value.ToString(), this.parserCulture)
+                : null;
+
             if (this.Width.HasValue)
             {
                 commands.Add(ResizeWebProcessor.Width, this.Width.Value.ToString(this.parserCulture));
                 output.Attributes.SetAttribute(ResizeWebProcessor.Width, width ?? this.Width);
             }
 
-            int? height = output.Attributes[ResizeWebProcessor.Height]?.Value as int?;
+            int? height = output.Attributes.ContainsName(ResizeWebProcessor.Height)
+                ? int.Parse(output.Attributes[ResizeWebProcessor.Height].Value.ToString(), this.parserCulture)
+                : null;
+
             if (this.Height.HasValue)
             {
                 commands.Add(ResizeWebProcessor.Height, this.Height.Value.ToString(this.parserCulture));
diff --git a/tests/ImageSharp.Web.Tests/TagHelpers/ImageTagHelperTests.cs b/tests/ImageSharp.Web.Tests/TagHelpers/ImageTagHelperTests.cs
index b45c99dc..07143c52 100644
--- a/tests/ImageSharp.Web.Tests/TagHelpers/ImageTagHelperTests.cs
+++ b/tests/ImageSharp.Web.Tests/TagHelpers/ImageTagHelperTests.cs
@@ -103,7 +103,7 @@ public void PreservesOrderOfSourceAttributesWhenRun()
                     { "data-extra", new HtmlString("something") },
                     { "title", new HtmlString("Image title") },
                     { "src", "testimage.png" },
-                    { "width", 50 },
+                    { "width", "50" },
                     { "height", 60 }
                 });
 
@@ -113,7 +113,7 @@ public void PreservesOrderOfSourceAttributesWhenRun()
                     { "alt", new HtmlString("alt text") },
                     { "data-extra", new HtmlString("something") },
                     { "title", new HtmlString("Image title") },
-                    { "width", 50 },
+                    { "width", "50" },
                     { "height", 60 }
                 });
 
@@ -124,7 +124,7 @@ public void PreservesOrderOfSourceAttributesWhenRun()
                     { "data-extra", new HtmlString("something") },
                     { "title", new HtmlString("Image title") },
                     { "src", "testimage.png?width=100&height=120" },
-                    { "width", 50 },
+                    { "width", "50" },
                     { "height", 60 }
                 });
 
@@ -192,20 +192,20 @@ public void RendersImageTag_SrcIncludes_ResizeMode()
                 attributes: new TagHelperAttributeList
                 {
                     { "src", "testimage.png" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput output = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
                     { "src", $"testimage.png?width=100&{ResizeWebProcessor.Mode}={nameof(ResizeMode.Stretch)}" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             ImageTagHelper helper = this.GetHelper();
@@ -237,20 +237,20 @@ public void RendersImageTag_SrcIncludes_ResizePosition()
                 attributes: new TagHelperAttributeList
                 {
                     { "src", "testimage.png" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput output = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
                     { "src", $"testimage.png?width=100&{ResizeWebProcessor.Xy}=20,50" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             ImageTagHelper helper = this.GetHelper();
@@ -282,20 +282,20 @@ public void RendersImageTag_SrcIncludes_ResizeAnchor()
                 attributes: new TagHelperAttributeList
                 {
                     { "src", "testimage.png" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput output = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
                     { "src", $"testimage.png?width=100&{ResizeWebProcessor.Anchor}={nameof(AnchorPositionMode.Top)}" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             ImageTagHelper helper = this.GetHelper();
@@ -327,20 +327,20 @@ public void RendersImageTag_SrcIncludes_ResizePadColor()
                 attributes: new TagHelperAttributeList
                 {
                     { "src", "testimage.png" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput output = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
                     { "src", $"testimage.png?width=100&{ResizeWebProcessor.Color}={Color.LimeGreen.ToHex()}" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             ImageTagHelper helper = this.GetHelper();
@@ -372,20 +372,20 @@ public void RendersImageTag_SrcIncludes_ResizeCompand()
                 attributes: new TagHelperAttributeList
                 {
                     { "src", "testimage.png" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput output = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
                     { "src", $"testimage.png?width=100&{ResizeWebProcessor.Compand}={bool.TrueString}" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             ImageTagHelper helper = this.GetHelper();
@@ -417,20 +417,20 @@ public void RendersImageTag_SrcIncludes_ResizeOrient()
                 attributes: new TagHelperAttributeList
                 {
                     { "src", "testimage.png" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput output = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
                     { "src", $"testimage.png?width=100&{ResizeWebProcessor.Orient}={bool.TrueString}" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             ImageTagHelper helper = this.GetHelper();
@@ -482,20 +482,20 @@ public void RendersImageTag_SrcIncludes_Resampler(ResamplerCommand resampler)
                 attributes: new TagHelperAttributeList
                 {
                     { "src", "testimage.png" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput output = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
                     { "src", $"testimage.png?width=100&{ResizeWebProcessor.Sampler}={resampler.Name}" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             ImageTagHelper helper = this.GetHelper();
@@ -527,20 +527,20 @@ public void RendersImageTag_SrcIncludes_AutoOrient()
                 attributes: new TagHelperAttributeList
                 {
                     { "src", "testimage.png" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput output = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
                     { "src", $"testimage.png?{AutoOrientWebProcessor.AutoOrient}={bool.TrueString}" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             ImageTagHelper helper = this.GetHelper();
@@ -582,20 +582,20 @@ public void RendersImageTag_SrcIncludes_Format(FormatCommand format)
                 attributes: new TagHelperAttributeList
                 {
                     { "src", "testimage.png" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput output = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
                     { "src", $"testimage.png?{FormatWebProcessor.Format}={format.Name}" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             ImageTagHelper helper = this.GetHelper();
@@ -626,20 +626,20 @@ public void RendersImageTag_SrcIncludes_BackgroundColor()
                 attributes: new TagHelperAttributeList
                 {
                     { "src", "testimage.png" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput output = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
                     { "src", $"testimage.png?{BackgroundColorWebProcessor.Color}={Color.Red.ToHex()}" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             ImageTagHelper helper = this.GetHelper();
@@ -670,20 +670,20 @@ public void RendersImageTag_SrcIncludes_Quality()
                 attributes: new TagHelperAttributeList
                 {
                     { "src", "testimage.png" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput output = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
                     { "src", $"testimage.png?{QualityWebProcessor.Quality}={42}" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             ImageTagHelper helper = this.GetHelper();
@@ -714,21 +714,21 @@ public void RendersImageTag_SrcIncludes_HMAC()
                 attributes: new TagHelperAttributeList
                 {
                     { "src", "testimage.png" },
-                    { "width", 50 },
+                    { "width", "50" },
                     { "imagesharp-hmac", true }
                 });
 
             TagHelperOutput output = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
                 attributes: new TagHelperAttributeList
                 {
                     { "src", "testimage.png?hmac=ef09cd10210025e6d588fc2c12b91bf609c3e45f6d5d05dd650b8e6746cba288" },
-                    { "width", 50 }
+                    { "width", "50" }
                 });
 
             ImageTagHelper helper = this.GetHelper(hmac: true);

From fc7067992e810780b30002d8e4afde268706e312 Mon Sep 17 00:00:00 2001
From: Mark Cilia Vincenti <markciliavincenti@gmail.com>
Date: Fri, 16 Dec 2022 18:32:07 +0100
Subject: [PATCH 036/102] Fixed build status shield

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 984129a4..51fc14d8 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,7 @@ SixLabors.ImageSharp.Web
 </h1>
 
 <div align="center">
-
-[![Build Status](https://img.shields.io/github/workflow/status/SixLabors/ImageSharp.Web/Build/main)](https://github.com/SixLabors/ImageSharp.Web/actions)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/SixLabors/ImageSharp.Web/build-and-test.yml?branch=main)](https://github.com/SixLabors/ImageSharp.Web/actions)
 [![Code coverage](https://codecov.io/gh/SixLabors/ImageSharp.Web/branch/main/graph/badge.svg)](https://codecov.io/gh/SixLabors/ImageSharp.Web)
 [![License: Apache 2.0](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![GitHub issues](https://img.shields.io/github/issues/SixLabors/ImageSharp.Web.svg)](https://github.com/SixLabors/ImageSharp.Web/issues)

From 42d56bf8b69724f691176bcd599e916ca359397b Mon Sep 17 00:00:00 2001
From: Mark Cilia Vincenti <markciliavincenti@gmail.com>
Date: Fri, 16 Dec 2022 18:34:30 +0100
Subject: [PATCH 037/102] Fixed build status shield

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 51fc14d8..6c52a299 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@ SixLabors.ImageSharp.Web
 </h1>
 
 <div align="center">
+
 [![Build Status](https://img.shields.io/github/actions/workflow/status/SixLabors/ImageSharp.Web/build-and-test.yml?branch=main)](https://github.com/SixLabors/ImageSharp.Web/actions)
 [![Code coverage](https://codecov.io/gh/SixLabors/ImageSharp.Web/branch/main/graph/badge.svg)](https://codecov.io/gh/SixLabors/ImageSharp.Web)
 [![License: Apache 2.0](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)

From 33346090d65e202c3d42b0d1a5eec1c4db5a1939 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Wed, 8 Feb 2023 20:50:35 +1000
Subject: [PATCH 038/102] Disallow data URIs

---
 src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
index 01566ffb..04a51c24 100644
--- a/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
+++ b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
@@ -198,8 +198,9 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
             Guard.NotNull(output, nameof(output));
 
             string src = output.Attributes[SrcAttributeName]?.Value as string ?? this.Src;
-            if (string.IsNullOrWhiteSpace(src))
+            if (string.IsNullOrWhiteSpace(src) || src.StartsWith("data", StringComparison.OrdinalIgnoreCase))
             {
+                base.Process(context, output);
                 return;
             }
 

From 1743f6d999e1567cfc99524e691e0adf880be782 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Wed, 8 Feb 2023 21:45:07 +1000
Subject: [PATCH 039/102] Update target framework, infrastructure, and fix
 build warnings

---
 .editorconfig                                 |  33 +-
 .github/workflows/build-and-test.yml          |  14 +-
 LICENSE                                       | 216 +---
 README.md                                     |  12 +-
 .../ImageSharp.Web.Sample.csproj              |   2 +-
 samples/ImageSharp.Web.Sample/Program.cs      |  38 +-
 samples/ImageSharp.Web.Sample/Startup.cs      | 234 ++---
 shared-infrastructure                         |   2 +-
 .../AmazonS3ClientFactory.cs                  |  95 +-
 .../Caching/AWSS3StorageCache.cs              | 261 +++--
 .../Caching/AWSS3StorageCacheOptions.cs       |  45 +-
 .../IAWSS3BucketClientOptions.cs              |  94 +-
 .../ImageSharp.Web.Providers.AWS.csproj       |  18 +-
 .../Providers/AWSS3StorageImageProvider.cs    | 251 +++--
 .../AWSS3StorageImageProviderOptions.cs       |  61 +-
 .../Resolvers/AWSS3StorageCacheResolver.cs    |  73 +-
 .../Resolvers/AWSS3StorageImageResolver.cs    |  77 +-
 .../Caching/AzureBlobStorageCache.cs          | 120 ++-
 .../Caching/AzureBlobStorageCacheOptions.cs   |  24 +-
 .../IAzureBlobContainerClientOptions.cs       |  34 +-
 .../ImageSharp.Web.Providers.Azure.csproj     |  18 +-
 .../AzureBlobStorageImageProvider.cs          | 221 ++--
 .../AzureBlobStorageImageProviderOptions.cs   |  40 +-
 .../AzureBlobStorageCacheResolver.cs          |  50 +-
 .../AzureBlobStorageImageResolver.cs          |  65 +-
 src/ImageSharp.Web/AsyncHelper.cs             |  87 +-
 src/ImageSharp.Web/Caching/HexEncoder.cs      |  84 +-
 src/ImageSharp.Web/Caching/ICacheHash.cs      |  26 +-
 src/ImageSharp.Web/Caching/ICacheKey.cs       |  30 +-
 src/ImageSharp.Web/Caching/IImageCache.cs     |  42 +-
 .../Caching/LegacyV1CacheKey.cs               |  49 +-
 .../ConcurrentTLruCache{TKey,TValue}.cs       | 563 +++++-----
 .../Caching/LruCache/ItemDestination.cs       |  15 +-
 .../LongTickCountLruItem{TKey,TValue}.cs      |  56 +-
 .../TLruLongTicksPolicy{TKey,TValue}.cs       | 127 ++-
 .../Caching/PhysicalFileSystemCache.cs        | 308 +++---
 .../Caching/PhysicalFileSystemCacheOptions.cs |  54 +-
 src/ImageSharp.Web/Caching/SHA256CacheHash.cs |  91 +-
 .../Caching/UriAbsoluteCacheKey.cs            |  32 +-
 .../UriAbsoluteLowerInvariantCacheKey.cs      |  32 +-
 .../Caching/UriRelativeCacheKey.cs            |  22 +-
 .../UriRelativeLowerInvariantCacheKey.cs      |  22 +-
 src/ImageSharp.Web/CaseHandlingUriBuilder.cs  | 399 ++++----
 src/ImageSharp.Web/CommandHandling.cs         |  30 +-
 .../Commands/CommandCollection.cs             | 280 +++--
 .../Commands/CommandCollectionExtensions.cs   |  30 +-
 src/ImageSharp.Web/Commands/CommandParser.cs  | 107 +-
 .../Commands/Converters/ArrayConverter{T}.cs  |  75 +-
 .../Commands/Converters/ColorConverter.cs     | 140 ++-
 .../Commands/Converters/EnumConverter.cs      | 104 +-
 .../Commands/Converters/ICommandConverter.cs  |  61 +-
 .../Converters/IntegralNumberConverter{T}.cs  | 119 ++-
 .../Commands/Converters/ListConverter{T}.cs   |  75 +-
 .../Converters/SimpleCommandConverter{T}.cs   |  61 +-
 src/ImageSharp.Web/Commands/IRequestParser.cs |  25 +-
 .../PresetOnlyQueryCollectionRequestParser.cs | 109 +-
 ...OnlyQueryCollectionRequestParserOptions.cs |  20 +-
 .../Commands/QueryCollectionRequestParser.cs  |  45 +-
 src/ImageSharp.Web/Commands/TypeConstants.cs  | 104 +-
 .../ApplicationBuilderExtensions.cs           |  28 +-
 .../DependencyInjection/IImageSharpBuilder.cs |  20 +-
 .../DependencyInjection/ImageSharpBuilder.cs  |  26 +-
 .../ImageSharpBuilderExtensions.cs            | 624 ++++++------
 .../ServiceCollectionExtensions.cs            | 219 ++--
 .../ExifOrientationUtilities.cs               | 432 ++++----
 src/ImageSharp.Web/FormatUtilities.cs         | 151 ++-
 src/ImageSharp.Web/FormattedImage.cs          | 293 +++---
 src/ImageSharp.Web/HMACUtilities.cs           | 149 ++-
 src/ImageSharp.Web/ImageCacheMetadata.cs      | 364 ++++---
 src/ImageSharp.Web/ImageMetadata.cs           | 171 ++--
 src/ImageSharp.Web/ImageSharp.Web.csproj      |  18 +-
 ...ImageSharpRequestAuthorizationUtilities.cs | 443 ++++----
 .../Middleware/ImageCommandContext.cs         |  78 +-
 src/ImageSharp.Web/Middleware/ImageContext.cs | 444 ++++----
 .../Middleware/ImageProcessingContext.cs      | 102 +-
 .../Middleware/ImageSharpMiddleware.cs        | 961 +++++++++---------
 .../Middleware/ImageSharpMiddlewareOptions.cs | 272 +++--
 .../Middleware/ImageWorkerResult.cs           |  74 +-
 .../Middleware/LoggerExtensions.cs            | 167 ++-
 .../Middleware/ResponseConstants.cs           |  39 +-
 src/ImageSharp.Web/PathUtilities.cs           |  36 +-
 .../Processors/AutoOrientWebProcessor.cs      |  69 +-
 .../Processors/BackgroundColorWebProcessor.cs |  71 +-
 .../Processors/FormatWebProcessor.cs          |  91 +-
 .../Processors/IImageWebProcessor.cs          |  83 +-
 .../Processors/QualityWebProcessor.cs         | 125 ++-
 .../Processors/ResizeWebProcessor.cs          | 405 ++++----
 .../Processors/WebProcessingExtensions.cs     | 184 ++--
 .../Providers/FileProviderImageProvider.cs    |  89 +-
 .../Providers/IImageProvider.cs               |  58 +-
 .../Providers/PhysicalFileSystemProvider.cs   |  90 +-
 .../PhysicalFileSystemProviderOptions.cs      |  46 +-
 .../Providers/ProcessingBehavior.cs           |  27 +-
 .../Providers/WebRootImageProvider.cs         |  30 +-
 .../Resolvers/FileProviderImageResolver.cs    |  36 +-
 .../Resolvers/IImageCacheResolver.cs          |  33 +-
 .../Resolvers/IImageResolver.cs               |  33 +-
 .../PhysicalFileSystemCacheResolver.cs        | 102 +-
 .../Synchronization/AsyncKeyLock.cs           | 119 ++-
 .../AsyncKeyReaderWriterLock.cs               | 109 +-
 .../Synchronization/AsyncLock.cs              | 133 ++-
 .../Synchronization/AsyncReaderWriterLock.cs  | 331 +++---
 .../RefCountedConcurrentDictionary.cs         | 363 ++++---
 .../Caching/CacheHashBaseline.cs              |  47 +-
 .../Caching/CacheHashBenchmarks.cs            |  59 +-
 .../Caching/CacheKeyBenchmarks.cs             |  96 +-
 .../Caching/StringJoinBenchmarks.cs           |  86 +-
 .../Caching/ToHexBenchmarks.cs                | 120 ++-
 .../ImageSharp.Web.Benchmarks.csproj          |  14 +-
 .../ImageSharp.Web.Benchmarks/MemoryConfig.cs |  11 +-
 tests/ImageSharp.Web.Benchmarks/Program.cs    |  13 +-
 .../Synchronization/AsyncLockBenchmarks.cs    |  99 +-
 ...efCountedConcurrentDictionaryBenchmarks.cs | 117 ++-
 .../Caching/CacheHashTests.cs                 |  92 +-
 .../Caching/CacheKeyTests.cs                  | 151 ++-
 .../Caching/HexEncoderTests.cs                |  50 +-
 .../Caching/ImageCacheMetadataTests.cs        | 101 +-
 .../Caching/ImageMetaDataTests.cs             |  61 +-
 .../Caching/PhysicialFileSystemCacheTests.cs  |  91 +-
 .../Commands/CommandCollectionTests.cs        | 336 +++---
 .../Commands/CommandParserTests.cs            | 436 ++++----
 ...etOnlyQueryCollectionRequestParserTests.cs | 138 ++-
 .../Commands/QueryCollectionUriParserTests.cs |  44 +-
 .../DependencyInjection/MockCacheHash.cs      |  11 +-
 .../DependencyInjection/MockCacheKey.cs       |  11 +-
 .../MockCommandConverter.cs                   |  24 +-
 .../DependencyInjection/MockImageCache.cs     |  15 +-
 .../DependencyInjection/MockImageProvider.cs  |  19 +-
 .../DependencyInjection/MockRequestParser.cs  |  11 +-
 .../DependencyInjection/MockWebProcessor.cs   |  29 +-
 .../ServiceRegistrationExtensionsTests.cs     | 793 +++++++--------
 .../Helpers/CaseHandlingUriBuilderTests.cs    |  41 +-
 .../Helpers/ExifOrientationUtilitiesTests.cs  | 298 +++---
 .../Helpers/FormatUtilitiesTests.cs           |  94 +-
 .../Helpers/HMACUtilitiesTests.cs             |  79 +-
 .../ImageSharp.Web.Tests.csproj               |  14 +-
 .../AWSS3StorageCacheServerTests.cs           |  13 +-
 .../AzureBlobStorageCacheServerTests.cs       |  13 +-
 ...FileSystemCacheAuthenticatedServerTests.cs |  13 +-
 .../PhysicalFileSystemCacheServerTests.cs     |  13 +-
 .../Processors/AutoOrientWebProcessorTests.cs |  48 +-
 .../BackgroundColorWebProcessorTests.cs       |  64 +-
 .../Processors/FormatWebProcessorTests.cs     |  82 +-
 .../Processors/FormattedImageTests.cs         |  91 +-
 .../Processors/QualityWebProcessorTests.cs    | 120 ++-
 .../Processors/ResizeWebProcessorTests.cs     | 494 +++++----
 .../WebProcessingExtensionsTests.cs           |  75 +-
 .../PhysicalFileSystemProviderTests.cs        |  79 +-
 .../Synchronization/AsyncKeyLockTests.cs      |  78 +-
 .../AsyncKeyReaderWriterLockTests.cs          | 180 ++--
 .../Synchronization/AsyncLockTests.cs         |  36 +-
 .../AsyncReaderWriterLockTests.cs             | 140 ++-
 .../RefCountedConcurrentDictionaryTests.cs    | 237 +++--
 .../AWSS3StorageCacheTestServerFixture.cs     |  57 +-
 .../AWSS3StorageImageProviderFactory.cs       | 151 ++-
 .../AuthenticatedServerTestBase.cs            | 100 +-
 .../AuthenticatedTestServerFixture.cs         |  25 +-
 .../AzureBlobStorageCacheTestServerFixture.cs |  41 +-
 .../AzureBlobStorageImageProviderFactory.cs   |  76 +-
 .../TestUtilities/CacheBusterWebProcessor.cs  |  30 +-
 ...stemCacheAuthenticatedTestServerFixture.cs |  17 +-
 ...hysicalFileSystemCacheTestServerFixture.cs |  17 +-
 .../TestUtilities/ServerTestBase.cs           | 203 ++--
 .../TestUtilities/TestConstants.cs            |  37 +-
 .../TestUtilities/TestEnvironment.cs          |  39 +-
 .../TestUtilities/TestServerFixture.cs        | 204 ++--
 166 files changed, 9590 insertions(+), 10044 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 33fd0577..2e3045fb 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,5 +1,5 @@
-# Version: 2.1.0 (Using https://semver.org/)
-# Updated: 2021-03-03
+# Version: 4.1.1 (Using https://semver.org/)
+# Updated: 2022-05-23
 # See https://github.com/RehanSaeed/EditorConfig/releases for release notes.
 # See https://github.com/RehanSaeed/EditorConfig for updates to this file.
 # See http://EditorConfig.org for more information about .editorconfig files.
@@ -49,11 +49,11 @@ indent_size = 2
 indent_size = 2
 
 # Markdown Files
-[*.md]
+[*.{md,mdx}]
 trim_trailing_whitespace = false
 
 # Web Files
-[*.{htm,html,js,jsm,ts,tsx,css,sass,scss,less,svg,vue}]
+[*.{htm,html,js,jsm,ts,tsx,cjs,cts,ctsx,mjs,mts,mtsx,css,sass,scss,less,pcss,svg,vue}]
 indent_size = 2
 
 # Batch Files
@@ -75,7 +75,7 @@ indent_style = tab
 
 [*.{cs,csx,cake,vb,vbx}]
 # Default Severity for all .NET Code Style rules below
-dotnet_analyzer_diagnostic.category-style.severity = warning
+dotnet_analyzer_diagnostic.severity = warning
 
 ##########################################
 # Language Rules
@@ -122,20 +122,21 @@ dotnet_style_coalesce_expression = true:warning
 dotnet_style_null_propagation = true:warning
 dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
 # File header preferences
-file_header_template = Copyright (c) Six Labors.\nLicensed under the Apache License, Version 2.0.
+file_header_template = Copyright (c) Six Labors.\nLicensed under the Six Labors Split License.
 # SA1636: File header copyright text should match
 # Justification: .editorconfig supports file headers. If this is changed to a value other than "none", a stylecop.json file will need to added to the project.
 # dotnet_diagnostic.SA1636.severity = none
 
 # Undocumented
-dotnet_style_operator_placement_when_wrapping = end_of_line
+dotnet_style_operator_placement_when_wrapping = end_of_line:warning
+csharp_style_prefer_null_check_over_type_check = true:warning
 
 # C# Style Rules
 # https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/language-rules#c-style-rules
 [*.{cs,csx,cake}]
 # 'var' preferences
-csharp_style_var_for_built_in_types = never
-csharp_style_var_when_type_is_apparent = true:warning
+csharp_style_var_for_built_in_types = false:warning
+csharp_style_var_when_type_is_apparent = false:warning
 csharp_style_var_elsewhere = false:warning
 # Expression-bodied members
 csharp_style_expression_bodied_methods = true:warning
@@ -200,12 +201,15 @@ dotnet_diagnostic.IDE0059.severity = suggestion
 # Organize using directives
 dotnet_sort_system_directives_first = true
 dotnet_separate_import_directive_groups = false
+# Dotnet namespace options
+dotnet_style_namespace_match_folder = true:suggestion
+dotnet_diagnostic.IDE0130.severity = suggestion
 
 # C# formatting rules
 # https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/formatting-rules#c-formatting-rules
 [*.{cs,csx,cake}]
 # Newline options
-# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#new-line-options
+# https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/formatting-rules#new-line-options
 csharp_new_line_before_open_brace = all
 csharp_new_line_before_else = true
 csharp_new_line_before_catch = true
@@ -214,7 +218,7 @@ csharp_new_line_before_members_in_object_initializers = true
 csharp_new_line_before_members_in_anonymous_types = true
 csharp_new_line_between_query_expression_clauses = true
 # Indentation options
-# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#indentation-options
+# https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/formatting-rules#indentation-options
 csharp_indent_case_contents = true
 csharp_indent_switch_labels = true
 csharp_indent_labels = no_change
@@ -222,7 +226,7 @@ csharp_indent_block_contents = true
 csharp_indent_braces = false
 csharp_indent_case_contents_when_block = false
 # Spacing options
-# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#spacing-options
+# https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/formatting-rules#spacing-options
 csharp_space_after_cast = false
 csharp_space_after_keywords_in_control_flow_statements = true
 csharp_space_between_parentheses = false
@@ -246,9 +250,12 @@ csharp_space_before_open_square_brackets = false
 csharp_space_between_empty_square_brackets = false
 csharp_space_between_square_brackets = false
 # Wrap options
-# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#wrap-options
+# https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/formatting-rules#wrap-options
 csharp_preserve_single_line_statements = false
 csharp_preserve_single_line_blocks = true
+# Namespace options
+# https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/formatting-rules#namespace-options
+csharp_style_namespace_declarations = file_scoped:warning
 
 ##########################################
 # .NET Naming Rules
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index d9cf46dd..4b8d6d39 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -16,27 +16,27 @@ jobs:
       matrix:
         options:
           - os: ubuntu-latest
-            framework: net6.0
+            framework: net7.0
             runtime: -x64
             codecov: false
           - os: macos-latest
-            framework: net6.0
+            framework: net7.0
             runtime: -x64
             codecov: false
           - os: windows-latest
-            framework: net6.0
+            framework: net7.0
             runtime: -x64
             codecov: true
           - os: ubuntu-latest
-            framework: netcoreapp3.1
+            framework: net6.0
             runtime: -x64
             codecov: false
           - os: macos-latest
-            framework: netcoreapp3.1
+            framework: net6.0
             runtime: -x64
             codecov: false
           - os: windows-latest
-            framework: netcoreapp3.1
+            framework: net6.0
             runtime: -x64
             codecov: false
 
@@ -112,8 +112,8 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
+            7.0.x
             6.0.x
-            3.1.x
 
       - name: DotNet Build
         shell: pwsh
diff --git a/LICENSE b/LICENSE
index 8d5852d3..a68eb678 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,201 +1,43 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+Six Labors Split License
+Version 1.0, June 2022
+Copyright (c) Six Labors
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-   1. Definitions.
+1. Definitions.
 
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
+   "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
 
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
+   "Source" form shall mean the preferred form for making modifications, including but not limited to software source
+    code, documentation source, and configuration files.
 
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
+   "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including
+    but not limited to compiled object code, generated documentation, and conversions to other media types.
 
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
+   "Work" (or "Works") shall mean any Six Labors software made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work.
 
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
+   "Direct Package Dependency" shall mean any Work in Source or Object form that is installed directly by You.
 
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
+   "Transitive Package Dependency" shall mean any Work in Object form that is installed indirectly by a third party
+    dependency unrelated to Six Labors.
 
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
+2. License
 
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
+   Works in Source or Object form are split licensed and may be licensed under the Apache License, Version 2.0 or a
+   Six Labors Commercial Use License.
 
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
+   Licenses are granted based upon You meeting the qualified criteria as stated. Once granted,
+   You must reference the granted license only in all documentation.
 
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
+   Works in Source or Object form are licensed to You under the Apache License, Version 2.0 if.
 
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
+   - You are consuming the Work in for use in software licensed under an Open Source or Source Available license.
+   - You are consuming the Work as a Transitive Package Dependency.
+   - You are consuming the Work as a Direct Package Dependency in the capacity of a For-profit company/individual with
+     less than 1M USD annual gross revenue.
+   - You are consuming the Work as a Direct Package Dependency in the capacity of a Non-profit organization
+     or Registered Charity.
 
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright (c) Six Labors
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+   For all other scenarios, Works in Source or Object form are licensed to You under the Six Labors Commercial License
+   which may be purchased by visiting https://sixlabors.com/pricing/.
diff --git a/README.md b/README.md
index 6c52a299..0ded0990 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ SixLabors.ImageSharp.Web
 
 [![Build Status](https://img.shields.io/github/actions/workflow/status/SixLabors/ImageSharp.Web/build-and-test.yml?branch=main)](https://github.com/SixLabors/ImageSharp.Web/actions)
 [![Code coverage](https://codecov.io/gh/SixLabors/ImageSharp.Web/branch/main/graph/badge.svg)](https://codecov.io/gh/SixLabors/ImageSharp.Web)
-[![License: Apache 2.0](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![License: Six Labors Split](https://img.shields.io/badge/license-Six%20Labors%20Split-%23e30183)](https://github.com/SixLabors/ImageSharp/blob/main/LICENSE)
 [![GitHub issues](https://img.shields.io/github/issues/SixLabors/ImageSharp.Web.svg)](https://github.com/SixLabors/ImageSharp.Web/issues)
 
 [![GitHub stars](https://img.shields.io/github/stars/SixLabors/ImageSharp.Web.svg)](https://github.com/SixLabors/ImageSharp.Web/stargazers)
@@ -17,13 +17,11 @@ SixLabors.ImageSharp.Web
 [![Twitter](https://img.shields.io/twitter/url/http/shields.io.svg?style=flat&logo=twitter)](https://twitter.com/intent/tweet?hashtags=imagesharp,dotnet,oss&text=ImageSharp.+A+new+cross-platform+2D+graphics+API+in+C%23&url=https%3a%2f%2fgithub.com%2fSixLabors%2fImageSharp&via=sixlabors)
 </div>
 
-### **ImageSharp.Web** is a new high-performance ASP.NET Core middleware leveraging the ImageSharp graphics library to allow on-the-fly image manipulation via URL based commands.
+### **ImageSharp.Web** is a high-performance ASP.NET Core middleware leveraging the ImageSharp graphics library to allow on-the-fly image manipulation via URL based commands.
 
 ## License
   
-- ImageSharp.Web is licensed under the [Apache License, Version 2.0](https://opensource.org/licenses/Apache-2.0)  
-- An alternative Commercial Support License can be purchased **for projects and applications requiring support**.
-Please visit https://sixlabors.com/pricing for details.
+- ImageSharp.Web is licensed under the [Six Labors Split License, Version 1.0](https://github.com/SixLabors/ImageSharp/blob/main/LICEN
 
 ## Support Six Labors
 
@@ -57,9 +55,9 @@ Install stable releases via Nuget; development releases are available via MyGet.
 
 If you prefer, you can compile ImageSharp.Web yourself (please do and help!)
 
-- Using [Visual Studio 2019](https://visualstudio.microsoft.com/vs/)
+- Using [Visual Studio 2022](https://visualstudio.microsoft.com/vs/)
   - Make sure you have the latest version installed
-  - Make sure you have [the .NET Core 3.1 SDK](https://www.microsoft.com/net/core#windows) installed
+  - Make sure you have [the .NET 6 SDK](https://www.microsoft.com/net/core#windows) installed
 
 Alternatively, you can work from command line and/or with a lightweight editor on **both Linux/Unix and Windows**:
 
diff --git a/samples/ImageSharp.Web.Sample/ImageSharp.Web.Sample.csproj b/samples/ImageSharp.Web.Sample/ImageSharp.Web.Sample.csproj
index 744de963..9c2462b4 100644
--- a/samples/ImageSharp.Web.Sample/ImageSharp.Web.Sample.csproj
+++ b/samples/ImageSharp.Web.Sample/ImageSharp.Web.Sample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/ImageSharp.Web.Sample/Program.cs b/samples/ImageSharp.Web.Sample/Program.cs
index 9c4bb394..d691ebeb 100644
--- a/samples/ImageSharp.Web.Sample/Program.cs
+++ b/samples/ImageSharp.Web.Sample/Program.cs
@@ -1,29 +1,25 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
+namespace SixLabors.ImageSharp.Web.Sample;
 
-namespace SixLabors.ImageSharp.Web.Sample
+/// <summary>
+/// The running application.
+/// </summary>
+public static class Program
 {
     /// <summary>
-    /// The running application.
+    /// The main entry point to the running application.
     /// </summary>
-    public static class Program
-    {
-        /// <summary>
-        /// The main entry point to the running application.
-        /// </summary>
-        /// <param name="args">Any arguments to pass to the application.</param>
-        public static void Main(string[] args) => CreateHostBuilder(args).Build().Run();
+    /// <param name="args">Any arguments to pass to the application.</param>
+    public static void Main(string[] args) => CreateHostBuilder(args).Build().Run();
 
-        /// <summary>
-        /// Creates an <see cref="IHostBuilder"/> instance used to create a configured <see cref="IHost"/>.
-        /// </summary>
-        /// <param name="args">Any arguments to pass to the application.</param>
-        /// <returns>The <see cref="IHostBuilder"/>.</returns>
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());
-    }
+    /// <summary>
+    /// Creates an <see cref="IHostBuilder"/> instance used to create a configured <see cref="IHost"/>.
+    /// </summary>
+    /// <param name="args">Any arguments to pass to the application.</param>
+    /// <returns>The <see cref="IHostBuilder"/>.</returns>
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        Host.CreateDefaultBuilder(args)
+            .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());
 }
diff --git a/samples/ImageSharp.Web.Sample/Startup.cs b/samples/ImageSharp.Web.Sample/Startup.cs
index 26bca69c..eaf01e31 100644
--- a/samples/ImageSharp.Web.Sample/Startup.cs
+++ b/samples/ImageSharp.Web.Sample/Startup.cs
@@ -1,150 +1,142 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.DependencyInjection;
 using SixLabors.ImageSharp.Web.Processors;
 using SixLabors.ImageSharp.Web.Providers;
 
-namespace SixLabors.ImageSharp.Web.Sample
+namespace SixLabors.ImageSharp.Web.Sample;
+
+/// <summary>
+/// Contains application configuration allowing the addition of services to the container.
+/// </summary>
+public class Startup
 {
     /// <summary>
-    /// Contains application configuration allowing the addition of services to the container.
+    /// Initializes a new instance of the <see cref="Startup"/> class.
     /// </summary>
-    public class Startup
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Startup"/> class.
-        /// </summary>
-        /// <param name="configuration">The configuration properties.</param>
-        public Startup(IConfiguration configuration) => this.AppConfiguration = configuration;
+    /// <param name="configuration">The configuration properties.</param>
+    public Startup(IConfiguration configuration) => this.AppConfiguration = configuration;
 
-        /// <summary>
-        /// Gets the configuration properties.
-        /// </summary>
-        public IConfiguration AppConfiguration { get; }
+    /// <summary>
+    /// Gets the configuration properties.
+    /// </summary>
+    public IConfiguration AppConfiguration { get; }
 
-        /// <summary>
-        /// This method gets called by the runtime. Use this method to add services to the container.
-        /// </summary>
-        /// <param name="services">The collection of service descriptors.</param>
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddImageSharp()
-                .SetRequestParser<QueryCollectionRequestParser>()
-                .Configure<PhysicalFileSystemCacheOptions>(options =>
-                {
-                    options.CacheRootPath = null;
-                    options.CacheFolder = "is-cache";
-                    options.CacheFolderDepth = 8;
-                })
-                .SetCache<PhysicalFileSystemCache>()
-                .SetCacheKey<UriRelativeLowerInvariantCacheKey>()
-                .SetCacheHash<SHA256CacheHash>()
-                .Configure<PhysicalFileSystemProviderOptions>(options =>
-                {
-                    options.ProviderRootPath = null;
-                })
-                .AddProvider<PhysicalFileSystemProvider>()
-                .AddProcessor<ResizeWebProcessor>()
-                .AddProcessor<FormatWebProcessor>()
-                .AddProcessor<BackgroundColorWebProcessor>()
-                .AddProcessor<QualityWebProcessor>()
-                .AddProcessor<AutoOrientWebProcessor>();
+    /// <summary>
+    /// This method gets called by the runtime. Use this method to add services to the container.
+    /// </summary>
+    /// <param name="services">The collection of service descriptors.</param>
+    public void ConfigureServices(IServiceCollection services)
+    {
+        services.AddImageSharp()
+            .SetRequestParser<QueryCollectionRequestParser>()
+            .Configure<PhysicalFileSystemCacheOptions>(options =>
+            {
+                options.CacheRootPath = null;
+                options.CacheFolder = "is-cache";
+                options.CacheFolderDepth = 8;
+            })
+            .SetCache<PhysicalFileSystemCache>()
+            .SetCacheKey<UriRelativeLowerInvariantCacheKey>()
+            .SetCacheHash<SHA256CacheHash>()
+            .Configure<PhysicalFileSystemProviderOptions>(options =>
+            {
+                options.ProviderRootPath = null;
+            })
+            .AddProvider<PhysicalFileSystemProvider>()
+            .AddProcessor<ResizeWebProcessor>()
+            .AddProcessor<FormatWebProcessor>()
+            .AddProcessor<BackgroundColorWebProcessor>()
+            .AddProcessor<QualityWebProcessor>()
+            .AddProcessor<AutoOrientWebProcessor>();
 
-            // Add the default service and options.
-            //
-            // services.AddImageSharp();
+        // Add the default service and options.
+        //
+        // services.AddImageSharp();
 
-            // Or add the default service and custom options.
-            //
-            // this.ConfigureDefaultServicesAndCustomOptions(services);
+        // Or add the default service and custom options.
+        //
+        // this.ConfigureDefaultServicesAndCustomOptions(services);
 
-            // Or we can fine-grain control adding the default options and configure all other services.
-            //
-            // this.ConfigureCustomServicesAndDefaultOptions(services);
+        // Or we can fine-grain control adding the default options and configure all other services.
+        //
+        // this.ConfigureCustomServicesAndDefaultOptions(services);
 
-            // Or we can fine-grain control adding custom options and configure all other services
-            // There are also factory methods for each builder that will allow building from configuration files.
-            //
-            // this.ConfigureCustomServicesAndCustomOptions(services);
-        }
+        // Or we can fine-grain control adding custom options and configure all other services
+        // There are also factory methods for each builder that will allow building from configuration files.
+        //
+        // this.ConfigureCustomServicesAndCustomOptions(services);
+    }
 
-        private void ConfigureDefaultServicesAndCustomOptions(IServiceCollection services)
+    private void ConfigureDefaultServicesAndCustomOptions(IServiceCollection services)
+    {
+        services.AddImageSharp(options =>
         {
-            services.AddImageSharp(options =>
-            {
-                options.Configuration = Configuration.Default;
-                options.BrowserMaxAge = TimeSpan.FromDays(7);
-                options.CacheMaxAge = TimeSpan.FromDays(365);
-                options.CacheHashLength = 8;
-                options.OnParseCommandsAsync = _ => Task.CompletedTask;
-                options.OnBeforeSaveAsync = _ => Task.CompletedTask;
-                options.OnProcessedAsync = _ => Task.CompletedTask;
-                options.OnPrepareResponseAsync = _ => Task.CompletedTask;
-            });
-        }
+            options.Configuration = Configuration.Default;
+            options.BrowserMaxAge = TimeSpan.FromDays(7);
+            options.CacheMaxAge = TimeSpan.FromDays(365);
+            options.CacheHashLength = 8;
+            options.OnParseCommandsAsync = _ => Task.CompletedTask;
+            options.OnBeforeSaveAsync = _ => Task.CompletedTask;
+            options.OnProcessedAsync = _ => Task.CompletedTask;
+            options.OnPrepareResponseAsync = _ => Task.CompletedTask;
+        });
+    }
 
-        private void ConfigureCustomServicesAndDefaultOptions(IServiceCollection services)
-        {
-            services.AddImageSharp()
-                    .RemoveProcessor<FormatWebProcessor>()
-                    .RemoveProcessor<BackgroundColorWebProcessor>();
-        }
+    private void ConfigureCustomServicesAndDefaultOptions(IServiceCollection services)
+    {
+        services.AddImageSharp()
+                .RemoveProcessor<FormatWebProcessor>()
+                .RemoveProcessor<BackgroundColorWebProcessor>();
+    }
 
-        private void ConfigureCustomServicesAndCustomOptions(IServiceCollection services)
+    private void ConfigureCustomServicesAndCustomOptions(IServiceCollection services)
+    {
+        services.AddImageSharp(options =>
         {
-            services.AddImageSharp(options =>
+            options.Configuration = Configuration.Default;
+            options.BrowserMaxAge = TimeSpan.FromDays(7);
+            options.CacheMaxAge = TimeSpan.FromDays(365);
+            options.CacheHashLength = 8;
+            options.OnParseCommandsAsync = _ => Task.CompletedTask;
+            options.OnBeforeSaveAsync = _ => Task.CompletedTask;
+            options.OnProcessedAsync = _ => Task.CompletedTask;
+            options.OnPrepareResponseAsync = _ => Task.CompletedTask;
+        })
+            .SetRequestParser<QueryCollectionRequestParser>()
+            .Configure<PhysicalFileSystemCacheOptions>(options =>
             {
-                options.Configuration = Configuration.Default;
-                options.BrowserMaxAge = TimeSpan.FromDays(7);
-                options.CacheMaxAge = TimeSpan.FromDays(365);
-                options.CacheHashLength = 8;
-                options.OnParseCommandsAsync = _ => Task.CompletedTask;
-                options.OnBeforeSaveAsync = _ => Task.CompletedTask;
-                options.OnProcessedAsync = _ => Task.CompletedTask;
-                options.OnPrepareResponseAsync = _ => Task.CompletedTask;
+                options.CacheFolder = "different-cache";
             })
-                .SetRequestParser<QueryCollectionRequestParser>()
-                .Configure<PhysicalFileSystemCacheOptions>(options =>
-                {
-                    options.CacheFolder = "different-cache";
-                })
-                .SetCache<PhysicalFileSystemCache>()
-                .SetCacheKey<UriRelativeLowerInvariantCacheKey>()
-                .SetCacheHash<SHA256CacheHash>()
-                .ClearProviders()
-                .AddProvider<PhysicalFileSystemProvider>()
-                .ClearProcessors()
-                .AddProcessor<ResizeWebProcessor>()
-                .AddProcessor<FormatWebProcessor>()
-                .AddProcessor<BackgroundColorWebProcessor>()
-                .AddProcessor<QualityWebProcessor>();
-        }
+            .SetCache<PhysicalFileSystemCache>()
+            .SetCacheKey<UriRelativeLowerInvariantCacheKey>()
+            .SetCacheHash<SHA256CacheHash>()
+            .ClearProviders()
+            .AddProvider<PhysicalFileSystemProvider>()
+            .ClearProcessors()
+            .AddProcessor<ResizeWebProcessor>()
+            .AddProcessor<FormatWebProcessor>()
+            .AddProcessor<BackgroundColorWebProcessor>()
+            .AddProcessor<QualityWebProcessor>();
+    }
 
-        /// <summary>
-        /// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        /// </summary>
-        /// <param name="app">The application builder.</param>
-        /// <param name="env">The hosting environment the application is running in.</param>
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+    /// <summary>
+    /// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+    /// </summary>
+    /// <param name="app">The application builder.</param>
+    /// <param name="env">The hosting environment the application is running in.</param>
+    public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+    {
+        if (env.IsDevelopment())
         {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-
-            app.UseDefaultFiles();
-            app.UseImageSharp();
-            app.UseStaticFiles();
+            app.UseDeveloperExceptionPage();
         }
+
+        app.UseDefaultFiles();
+        app.UseImageSharp();
+        app.UseStaticFiles();
     }
 }
diff --git a/shared-infrastructure b/shared-infrastructure
index f351ed4d..6c52486c 160000
--- a/shared-infrastructure
+++ b/shared-infrastructure
@@ -1 +1 @@
-Subproject commit f351ed4dbcf7e17c297caa715e51c7659edc528a
+Subproject commit 6c52486c512357475cbb92bbb7c4c0af4d85b1db
diff --git a/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs b/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs
index 98a683dc..772cc42d 100644
--- a/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs
+++ b/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs
@@ -1,63 +1,62 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
 using Amazon;
 using Amazon.Runtime;
 using Amazon.S3;
 
-namespace SixLabors.ImageSharp.Web
+namespace SixLabors.ImageSharp.Web;
+
+internal static class AmazonS3ClientFactory
 {
-    internal static class AmazonS3ClientFactory
+    /// <summary>
+    /// Creates a new bucket under the specified account if a bucket
+    /// with the same name does not already exist.
+    /// </summary>
+    /// <param name="options">The AWS S3 Storage cache options.</param>
+    /// <returns>
+    /// A new <see cref="AmazonS3Client"/>.
+    /// </returns>
+    public static AmazonS3Client CreateClient(IAWSS3BucketClientOptions options)
     {
-        /// <summary>
-        /// Creates a new bucket under the specified account if a bucket
-        /// with the same name does not already exist.
-        /// </summary>
-        /// <param name="options">The AWS S3 Storage cache options.</param>
-        /// <returns>
-        /// A new <see cref="AmazonS3Client"/>.
-        /// </returns>
-        public static AmazonS3Client CreateClient(IAWSS3BucketClientOptions options)
+        if (!string.IsNullOrWhiteSpace(options.Endpoint))
+        {
+            // AccessKey can be empty.
+            // AccessSecret can be empty.
+            // PathStyle endpoint doesn't support AccelerateEndpoint.
+            AmazonS3Config config = new() { ServiceURL = options.Endpoint, ForcePathStyle = true, AuthenticationRegion = options.Region };
+            SetTimeout(config, options.Timeout);
+            return new AmazonS3Client(options.AccessKey, options.AccessSecret, config);
+        }
+        else if (!string.IsNullOrWhiteSpace(options.AccessKey))
+        {
+            // AccessSecret can be empty.
+            Guard.NotNullOrWhiteSpace(options.Region, nameof(options.Region));
+            var region = RegionEndpoint.GetBySystemName(options.Region);
+            AmazonS3Config config = new() { RegionEndpoint = region, UseAccelerateEndpoint = options.UseAccelerateEndpoint };
+            SetTimeout(config, options.Timeout);
+            return new AmazonS3Client(options.AccessKey, options.AccessSecret, config);
+        }
+        else if (!string.IsNullOrWhiteSpace(options.Region))
         {
-            if (!string.IsNullOrWhiteSpace(options.Endpoint))
-            {
-                // AccessKey can be empty.
-                // AccessSecret can be empty.
-                // PathStyle endpoint doesn't support AccelerateEndpoint.
-                AmazonS3Config config = new() { ServiceURL = options.Endpoint, ForcePathStyle = true, AuthenticationRegion = options.Region };
-                SetTimeout(config, options.Timeout);
-                return new AmazonS3Client(options.AccessKey, options.AccessSecret, config);
-            }
-            else if (!string.IsNullOrWhiteSpace(options.AccessKey))
-            {
-                // AccessSecret can be empty.
-                Guard.NotNullOrWhiteSpace(options.Region, nameof(options.Region));
-                var region = RegionEndpoint.GetBySystemName(options.Region);
-                AmazonS3Config config = new() { RegionEndpoint = region, UseAccelerateEndpoint = options.UseAccelerateEndpoint };
-                SetTimeout(config, options.Timeout);
-                return new AmazonS3Client(options.AccessKey, options.AccessSecret, config);
-            }
-            else if (!string.IsNullOrWhiteSpace(options.Region))
-            {
-                var region = RegionEndpoint.GetBySystemName(options.Region);
-                AmazonS3Config config = new() { RegionEndpoint = region, UseAccelerateEndpoint = options.UseAccelerateEndpoint };
-                SetTimeout(config, options.Timeout);
-                return new AmazonS3Client(config);
-            }
-            else
-            {
-                throw new ArgumentException("Invalid configuration.", nameof(options));
-            }
+            var region = RegionEndpoint.GetBySystemName(options.Region);
+            AmazonS3Config config = new() { RegionEndpoint = region, UseAccelerateEndpoint = options.UseAccelerateEndpoint };
+            SetTimeout(config, options.Timeout);
+            return new AmazonS3Client(config);
         }
+        else
+        {
+            throw new ArgumentException("Invalid configuration.", nameof(options));
+        }
+    }
 
-        private static void SetTimeout(ClientConfig config, TimeSpan? timeout)
+    private static void SetTimeout(ClientConfig config, TimeSpan? timeout)
+    {
+        // We don't want to override the default timeout if it's not set.
+        if (timeout.HasValue)
         {
-            // We don't want to override the default timeout if it's not set.
-            if (timeout.HasValue)
-            {
-                config.Timeout = timeout.Value;
-            }
+            config.Timeout = timeout.Value;
         }
     }
 }
diff --git a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs
index b904c86d..c3d2644a 100644
--- a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs
@@ -1,174 +1,169 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 using Amazon.S3;
 using Amazon.S3.Model;
 using Microsoft.Extensions.Options;
 using SixLabors.ImageSharp.Web.Resolvers;
 using SixLabors.ImageSharp.Web.Resolvers.AWS;
 
-namespace SixLabors.ImageSharp.Web.Caching.AWS
+namespace SixLabors.ImageSharp.Web.Caching.AWS;
+
+/// <summary>
+/// Implements an AWS S3 Storage based cache.
+/// </summary>
+public class AWSS3StorageCache : IImageCache
 {
+    private readonly IAmazonS3 amazonS3Client;
+    private readonly string bucket;
+
     /// <summary>
-    /// Implements an AWS S3 Storage based cache.
+    /// Initializes a new instance of the <see cref="AWSS3StorageCache"/> class.
     /// </summary>
-    public class AWSS3StorageCache : IImageCache
+    /// <param name="cacheOptions">The cache options.</param>
+    public AWSS3StorageCache(IOptions<AWSS3StorageCacheOptions> cacheOptions)
     {
-        private readonly IAmazonS3 amazonS3Client;
-        private readonly string bucket;
+        Guard.NotNull(cacheOptions, nameof(cacheOptions));
+        AWSS3StorageCacheOptions options = cacheOptions.Value;
+        this.bucket = options.BucketName;
+        this.amazonS3Client = AmazonS3ClientFactory.CreateClient(options);
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AWSS3StorageCache"/> class.
-        /// </summary>
-        /// <param name="cacheOptions">The cache options.</param>
-        public AWSS3StorageCache(IOptions<AWSS3StorageCacheOptions> cacheOptions)
+    /// <inheritdoc/>
+    public async Task<IImageCacheResolver> GetAsync(string key)
+    {
+        GetObjectMetadataRequest request = new() { BucketName = this.bucket, Key = key };
+        try
         {
-            Guard.NotNull(cacheOptions, nameof(cacheOptions));
-            AWSS3StorageCacheOptions options = cacheOptions.Value;
-            this.bucket = options.BucketName;
-            this.amazonS3Client = AmazonS3ClientFactory.CreateClient(options);
+            // HEAD request throws a 404 if not found.
+            MetadataCollection metadata = (await this.amazonS3Client.GetObjectMetadataAsync(request)).Metadata;
+            return new AWSS3StorageCacheResolver(this.amazonS3Client, this.bucket, key, metadata);
         }
+        catch
+        {
+            return null;
+        }
+    }
 
-        /// <inheritdoc/>
-        public async Task<IImageCacheResolver> GetAsync(string key)
+    /// <inheritdoc/>
+    public Task SetAsync(string key, Stream stream, ImageCacheMetadata metadata)
+    {
+        PutObjectRequest request = new()
         {
-            GetObjectMetadataRequest request = new() { BucketName = this.bucket, Key = key };
-            try
-            {
-                // HEAD request throws a 404 if not found.
-                MetadataCollection metadata = (await this.amazonS3Client.GetObjectMetadataAsync(request)).Metadata;
-                return new AWSS3StorageCacheResolver(this.amazonS3Client, this.bucket, key, metadata);
-            }
-            catch
+            BucketName = this.bucket,
+            Key = key,
+            ContentType = metadata.ContentType,
+            InputStream = stream,
+            AutoCloseStream = false
+        };
+
+        foreach (KeyValuePair<string, string> d in metadata.ToDictionary())
+        {
+            request.Metadata.Add(d.Key, d.Value);
+        }
+
+        return this.amazonS3Client.PutObjectAsync(request);
+    }
+
+    /// <summary>
+    /// Creates a new bucket under the specified account if a bucket
+    /// with the same name does not already exist.
+    /// </summary>
+    /// <param name="options">The AWS S3 Storage cache options.</param>
+    /// <param name="acl">
+    /// Specifies whether data in the bucket may be accessed publicly and the level of access.
+    /// <see cref="S3CannedACL.PublicRead"/> specifies full public read access for bucket
+    /// and object data. <see cref="S3CannedACL.Private"/> specifies that the bucket
+    /// data is private to the account owner.
+    /// </param>
+    /// <returns>
+    /// If the bucket does not already exist, a <see cref="PutBucketResponse"/> describing the newly
+    /// created bucket. If the container already exists, <see langword="null"/>.
+    /// </returns>
+    public static PutBucketResponse CreateIfNotExists(
+        AWSS3StorageCacheOptions options,
+        S3CannedACL acl)
+        => AsyncHelper.RunSync(() => CreateIfNotExistsAsync(options, acl));
+
+    private static async Task<PutBucketResponse> CreateIfNotExistsAsync(
+        AWSS3StorageCacheOptions options,
+        S3CannedACL acl)
+    {
+        AmazonS3Client client = AmazonS3ClientFactory.CreateClient(options);
+
+        bool foundBucket = false;
+        ListBucketsResponse listBucketsResponse = await client.ListBucketsAsync();
+        foreach (S3Bucket b in listBucketsResponse.Buckets)
+        {
+            if (b.BucketName == options.BucketName)
             {
-                return null;
+                foundBucket = true;
+                break;
             }
         }
 
-        /// <inheritdoc/>
-        public Task SetAsync(string key, Stream stream, ImageCacheMetadata metadata)
+        if (!foundBucket)
         {
-            var request = new PutObjectRequest()
+            PutBucketRequest putBucketRequest = new()
             {
-                BucketName = this.bucket,
-                Key = key,
-                ContentType = metadata.ContentType,
-                InputStream = stream,
-                AutoCloseStream = false
+                BucketName = options.BucketName,
+                BucketRegion = options.Region,
+                CannedACL = acl
             };
 
-            foreach (KeyValuePair<string, string> d in metadata.ToDictionary())
-            {
-                request.Metadata.Add(d.Key, d.Value);
-            }
-
-            return this.amazonS3Client.PutObjectAsync(request);
+            return await client.PutBucketAsync(putBucketRequest);
         }
 
+        return null;
+    }
+
+    /// <summary>
+    /// <see href="https://github.com/aspnet/AspNetIdentity/blob/b7826741279450c58b230ece98bd04b4815beabf/src/Microsoft.AspNet.Identity.Core/AsyncHelper.cs"/>
+    /// </summary>
+    private static class AsyncHelper
+    {
+        private static readonly TaskFactory TaskFactory
+            = new(
+                CancellationToken.None,
+                TaskCreationOptions.None,
+                TaskContinuationOptions.None,
+                TaskScheduler.Default);
+
         /// <summary>
-        /// Creates a new bucket under the specified account if a bucket
-        /// with the same name does not already exist.
+        /// Executes an async <see cref="Task"/> method synchronously.
         /// </summary>
-        /// <param name="options">The AWS S3 Storage cache options.</param>
-        /// <param name="acl">
-        /// Specifies whether data in the bucket may be accessed publicly and the level of access.
-        /// <see cref="S3CannedACL.PublicRead"/> specifies full public read access for bucket
-        /// and object data. <see cref="S3CannedACL.Private"/> specifies that the bucket
-        /// data is private to the account owner.
-        /// </param>
-        /// <returns>
-        /// If the bucket does not already exist, a <see cref="PutBucketResponse"/> describing the newly
-        /// created bucket. If the container already exists, <see langword="null"/>.
-        /// </returns>
-        public static PutBucketResponse CreateIfNotExists(
-            AWSS3StorageCacheOptions options,
-            S3CannedACL acl)
-            => AsyncHelper.RunSync(() => CreateIfNotExistsAsync(options, acl));
-
-        private static async Task<PutBucketResponse> CreateIfNotExistsAsync(
-            AWSS3StorageCacheOptions options,
-            S3CannedACL acl)
+        /// <param name="task">The task to excecute.</param>
+        public static void RunSync(Func<Task> task)
         {
-            AmazonS3Client client = AmazonS3ClientFactory.CreateClient(options);
-
-            bool foundBucket = false;
-            ListBucketsResponse listBucketsResponse = await client.ListBucketsAsync();
-            foreach (S3Bucket b in listBucketsResponse.Buckets)
+            CultureInfo cultureUi = CultureInfo.CurrentUICulture;
+            CultureInfo culture = CultureInfo.CurrentCulture;
+            TaskFactory.StartNew(() =>
             {
-                if (b.BucketName == options.BucketName)
-                {
-                    foundBucket = true;
-                    break;
-                }
-            }
-
-            if (!foundBucket)
-            {
-                var putBucketRequest = new PutBucketRequest
-                {
-                    BucketName = options.BucketName,
-                    BucketRegion = options.Region,
-                    CannedACL = acl
-                };
-
-                return await client.PutBucketAsync(putBucketRequest);
-            }
-
-            return null;
+                Thread.CurrentThread.CurrentCulture = culture;
+                Thread.CurrentThread.CurrentUICulture = cultureUi;
+                return task();
+            }).Unwrap().GetAwaiter().GetResult();
         }
 
         /// <summary>
-        /// <see href="https://github.com/aspnet/AspNetIdentity/blob/b7826741279450c58b230ece98bd04b4815beabf/src/Microsoft.AspNet.Identity.Core/AsyncHelper.cs"/>
+        /// Executes an async <see cref="Task{TResult}"/> method which has
+        /// a <paramref name="task"/> return type synchronously.
         /// </summary>
-        private static class AsyncHelper
+        /// <typeparam name="TResult">The type of result to return.</typeparam>
+        /// <param name="task">The task to excecute.</param>
+        /// <returns>The <typeparamref name="TResult"/>.</returns>
+        public static TResult RunSync<TResult>(Func<Task<TResult>> task)
         {
-            private static readonly TaskFactory TaskFactory
-                = new(
-                    CancellationToken.None,
-                    TaskCreationOptions.None,
-                    TaskContinuationOptions.None,
-                    TaskScheduler.Default);
-
-            /// <summary>
-            /// Executes an async <see cref="Task"/> method synchronously.
-            /// </summary>
-            /// <param name="task">The task to excecute.</param>
-            public static void RunSync(Func<Task> task)
+            CultureInfo cultureUi = CultureInfo.CurrentUICulture;
+            CultureInfo culture = CultureInfo.CurrentCulture;
+            return TaskFactory.StartNew(() =>
             {
-                CultureInfo cultureUi = CultureInfo.CurrentUICulture;
-                CultureInfo culture = CultureInfo.CurrentCulture;
-                TaskFactory.StartNew(() =>
-                {
-                    Thread.CurrentThread.CurrentCulture = culture;
-                    Thread.CurrentThread.CurrentUICulture = cultureUi;
-                    return task();
-                }).Unwrap().GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Executes an async <see cref="Task{TResult}"/> method which has
-            /// a <paramref name="task"/> return type synchronously.
-            /// </summary>
-            /// <typeparam name="TResult">The type of result to return.</typeparam>
-            /// <param name="task">The task to excecute.</param>
-            /// <returns>The <typeparamref name="TResult"/>.</returns>
-            public static TResult RunSync<TResult>(Func<Task<TResult>> task)
-            {
-                CultureInfo cultureUi = CultureInfo.CurrentUICulture;
-                CultureInfo culture = CultureInfo.CurrentCulture;
-                return TaskFactory.StartNew(() =>
-                {
-                    Thread.CurrentThread.CurrentCulture = culture;
-                    Thread.CurrentThread.CurrentUICulture = cultureUi;
-                    return task();
-                }).Unwrap().GetAwaiter().GetResult();
-            }
+                Thread.CurrentThread.CurrentCulture = culture;
+                Thread.CurrentThread.CurrentUICulture = cultureUi;
+                return task();
+            }).Unwrap().GetAwaiter().GetResult();
         }
     }
 }
diff --git a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs
index 865f4c00..f2845385 100644
--- a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs
@@ -1,33 +1,32 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
-using System;
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-namespace SixLabors.ImageSharp.Web.Caching.AWS
+namespace SixLabors.ImageSharp.Web.Caching.AWS;
+
+/// <summary>
+/// Configuration options for the <see cref="AWSS3StorageCache"/> provider.
+/// </summary>
+public class AWSS3StorageCacheOptions : IAWSS3BucketClientOptions
 {
-    /// <summary>
-    /// Configuration options for the <see cref="AWSS3StorageCache"/> provider.
-    /// </summary>
-    public class AWSS3StorageCacheOptions : IAWSS3BucketClientOptions
-    {
-        /// <inheritdoc/>
-        public string Region { get; set; }
+    /// <inheritdoc/>
+    public string Region { get; set; }
 
-        /// <inheritdoc/>
-        public string BucketName { get; set; }
+    /// <inheritdoc/>
+    public string BucketName { get; set; }
 
-        /// <inheritdoc/>
-        public string AccessKey { get; set; }
+    /// <inheritdoc/>
+    public string AccessKey { get; set; }
 
-        /// <inheritdoc/>
-        public string AccessSecret { get; set; }
+    /// <inheritdoc/>
+    public string AccessSecret { get; set; }
 
-        /// <inheritdoc/>
-        public string Endpoint { get; set; }
+    /// <inheritdoc/>
+    public string Endpoint { get; set; }
 
-        /// <inheritdoc/>
-        public bool UseAccelerateEndpoint { get; set; }
+    /// <inheritdoc/>
+    public bool UseAccelerateEndpoint { get; set; }
 
-        /// <inheritdoc/>
-        public TimeSpan? Timeout { get; set; }
-    }
+    /// <inheritdoc/>
+    public TimeSpan? Timeout { get; set; }
 }
diff --git a/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs b/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs
index 6ef40a40..6a1f285f 100644
--- a/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs
+++ b/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs
@@ -1,55 +1,53 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
+namespace SixLabors.ImageSharp.Web;
 
-namespace SixLabors.ImageSharp.Web
+/// <summary>
+/// Provides a common interface for AWS S3 Bucket Client Options.
+/// </summary>
+internal interface IAWSS3BucketClientOptions
 {
     /// <summary>
-    /// Provides a common interface for AWS S3 Bucket Client Options.
+    /// Gets or sets the AWS region endpoint (us-east-1/us-west-1/ap-southeast-2).
     /// </summary>
-    internal interface IAWSS3BucketClientOptions
-    {
-        /// <summary>
-        /// Gets or sets the AWS region endpoint (us-east-1/us-west-1/ap-southeast-2).
-        /// </summary>
-        string Region { get; set; }
-
-        /// <summary>
-        /// Gets or sets the AWS bucket name.
-        /// </summary>
-        string BucketName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the AWS key - Can be used to override keys provided by the environment.
-        /// If deploying inside an EC2 instance AWS keys will already be available via environment
-        /// variables and don't need to be specified. Follow AWS best security practices on  <see href="https://docs.aws.amazon.com/general/latest/gr/aws-access-keys-best-practices.html"/>.
-        /// </summary>
-        string AccessKey { get; set; }
-
-        /// <summary>
-        /// Gets or sets the AWS secret - Can be used to override keys provided by the environment.
-        /// If deploying inside an EC2 instance AWS keys will already be available via environment
-        /// variables and don't need to be specified. Follow AWS best security practices on  <see href="https://docs.aws.amazon.com/general/latest/gr/aws-access-keys-best-practices.html"/>.
-        /// </summary>
-        string AccessSecret { get; set; }
-
-        /// <summary>
-        /// Gets or sets the AWS endpoint - used for testing to over region endpoint allowing it
-        /// to be set to localhost.
-        /// </summary>
-        string Endpoint { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the S3 accelerate endpoint is used.
-        /// The feature must be enabled on the bucket. Follow AWS instruction on <see href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/transfer-acceleration.html"/>.
-        /// </summary>
-        bool UseAccelerateEndpoint { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating the timeout for the S3 client.
-        /// If the value is set, the value is assigned to the Timeout property of the HttpWebRequest/HttpClient object used to send requests.
-        /// </summary>
-        TimeSpan? Timeout { get; set; }
-    }
+    string Region { get; set; }
+
+    /// <summary>
+    /// Gets or sets the AWS bucket name.
+    /// </summary>
+    string BucketName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the AWS key - Can be used to override keys provided by the environment.
+    /// If deploying inside an EC2 instance AWS keys will already be available via environment
+    /// variables and don't need to be specified. Follow AWS best security practices on  <see href="https://docs.aws.amazon.com/general/latest/gr/aws-access-keys-best-practices.html"/>.
+    /// </summary>
+    string AccessKey { get; set; }
+
+    /// <summary>
+    /// Gets or sets the AWS secret - Can be used to override keys provided by the environment.
+    /// If deploying inside an EC2 instance AWS keys will already be available via environment
+    /// variables and don't need to be specified. Follow AWS best security practices on  <see href="https://docs.aws.amazon.com/general/latest/gr/aws-access-keys-best-practices.html"/>.
+    /// </summary>
+    string AccessSecret { get; set; }
+
+    /// <summary>
+    /// Gets or sets the AWS endpoint - used for testing to over region endpoint allowing it
+    /// to be set to localhost.
+    /// </summary>
+    string Endpoint { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the S3 accelerate endpoint is used.
+    /// The feature must be enabled on the bucket. Follow AWS instruction on <see href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/transfer-acceleration.html"/>.
+    /// </summary>
+    bool UseAccelerateEndpoint { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating the timeout for the S3 client.
+    /// If the value is set, the value is assigned to the Timeout property of the HttpWebRequest/HttpClient object used to send requests.
+    /// </summary>
+    TimeSpan? Timeout { get; set; }
 }
diff --git a/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj b/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj
index 1e1a6f11..4cf1f6b1 100644
--- a/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj
+++ b/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj
@@ -6,27 +6,39 @@
     <RootNamespace>SixLabors.ImageSharp.Web</RootNamespace>
     <PackageId>SixLabors.ImageSharp.Web.Providers.AWS</PackageId>
     <PackageIcon>sixlabors.imagesharp.web.128.png</PackageIcon>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <RepositoryUrl Condition="'$(RepositoryUrl)' == ''">https://github.com/SixLabors/ImageSharp.Web/</RepositoryUrl>
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
     <PackageTags>Image Middleware Resize Crop Gif Jpg Jpeg Bitmap Png AWS</PackageTags>
     <Description>A provider for resolving and caching images via AWS S3 Storage.</Description>
   </PropertyGroup>
 
+  <!--  This enables the nullable analysis and treats all nullable warnings as error-->
+  <PropertyGroup>
+    <Nullable>enable</Nullable>
+    <WarningsAsErrors>Nullable</WarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!--Bump to V3 prior to tagged release.-->
+    <MinVerMinimumMajorMinor>3.0</MinVerMinimumMajorMinor>
+  </PropertyGroup>
+  
   <Choose>
     <When Condition="$(SIXLABORS_TESTING) == true">
       <PropertyGroup>
-        <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net6.0</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
   <ItemGroup>
+    <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
     <None Include="..\..\shared-infrastructure\branding\icons\imagesharp.web\sixlabors.imagesharp.web.128.png" Pack="true" PackagePath="" />
   </ItemGroup>
 
diff --git a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs
index a32389cd..dec40df1 100644
--- a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs
@@ -1,9 +1,7 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using Amazon.S3;
 using Amazon.S3.Model;
 using Microsoft.AspNetCore.Http;
@@ -12,163 +10,162 @@
 using SixLabors.ImageSharp.Web.Resolvers;
 using SixLabors.ImageSharp.Web.Resolvers.AWS;
 
-namespace SixLabors.ImageSharp.Web.Providers.AWS
+namespace SixLabors.ImageSharp.Web.Providers.AWS;
+
+/// <summary>
+/// Returns images stored in AWS S3.
+/// </summary>
+public class AWSS3StorageImageProvider : IImageProvider
 {
     /// <summary>
-    /// Returns images stored in AWS S3.
+    /// Character array to remove from paths.
+    /// </summary>
+    private static readonly char[] SlashChars = { '\\', '/' };
+
+    /// <summary>
+    /// The containers for the blob services.
+    /// </summary>
+    private readonly Dictionary<string, AmazonS3Client> buckets
+        = new();
+
+    private readonly AWSS3StorageImageProviderOptions storageOptions;
+    private Func<HttpContext, bool> match;
+
+    /// <summary>
+    /// Contains various helper methods based on the current configuration.
+    /// </summary>
+    private readonly FormatUtilities formatUtilities;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AWSS3StorageImageProvider"/> class.
     /// </summary>
-    public class AWSS3StorageImageProvider : IImageProvider
+    /// <param name="storageOptions">The S3 storage options</param>
+    /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
+    public AWSS3StorageImageProvider(IOptions<AWSS3StorageImageProviderOptions> storageOptions, FormatUtilities formatUtilities)
     {
-        /// <summary>
-        /// Character array to remove from paths.
-        /// </summary>
-        private static readonly char[] SlashChars = { '\\', '/' };
-
-        /// <summary>
-        /// The containers for the blob services.
-        /// </summary>
-        private readonly Dictionary<string, AmazonS3Client> buckets
-            = new();
-
-        private readonly AWSS3StorageImageProviderOptions storageOptions;
-        private Func<HttpContext, bool> match;
-
-        /// <summary>
-        /// Contains various helper methods based on the current configuration.
-        /// </summary>
-        private readonly FormatUtilities formatUtilities;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AWSS3StorageImageProvider"/> class.
-        /// </summary>
-        /// <param name="storageOptions">The S3 storage options</param>
-        /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
-        public AWSS3StorageImageProvider(IOptions<AWSS3StorageImageProviderOptions> storageOptions, FormatUtilities formatUtilities)
+        Guard.NotNull(storageOptions, nameof(storageOptions));
+
+        this.storageOptions = storageOptions.Value;
+
+        this.formatUtilities = formatUtilities;
+
+        foreach (AWSS3BucketClientOptions bucket in this.storageOptions.S3Buckets)
         {
-            Guard.NotNull(storageOptions, nameof(storageOptions));
+            this.buckets.Add(bucket.BucketName, AmazonS3ClientFactory.CreateClient(bucket));
+        }
+    }
 
-            this.storageOptions = storageOptions.Value;
+    /// <inheritdoc/>
+    public ProcessingBehavior ProcessingBehavior { get; } = ProcessingBehavior.All;
 
-            this.formatUtilities = formatUtilities;
+    /// <inheritdoc />
+    public Func<HttpContext, bool> Match
+    {
+        get => this.match ?? this.IsMatch;
+        set => this.match = value;
+    }
 
-            foreach (AWSS3BucketClientOptions bucket in this.storageOptions.S3Buckets)
+    /// <inheritdoc />
+    public bool IsValidRequest(HttpContext context)
+        => this.formatUtilities.TryGetExtensionFromUri(context.Request.GetDisplayUrl(), out _);
+
+    /// <inheritdoc />
+    public async Task<IImageResolver> GetAsync(HttpContext context)
+    {
+        // Strip the leading slash and bucket name from the HTTP request path and treat
+        // the remaining path string as the key.
+        // Path has already been correctly parsed before here.
+        string bucketName = string.Empty;
+        IAmazonS3 s3Client = null;
+
+        // We want an exact match here to ensure that bucket names starting with
+        // the same prefix are not mixed up.
+        string path = context.Request.Path.Value.TrimStart(SlashChars);
+        int index = path.IndexOfAny(SlashChars);
+        string nameToMatch = index != -1 ? path.Substring(0, index) : path;
+
+        foreach (string k in this.buckets.Keys)
+        {
+            if (nameToMatch.Equals(k, StringComparison.OrdinalIgnoreCase))
             {
-                this.buckets.Add(bucket.BucketName, AmazonS3ClientFactory.CreateClient(bucket));
+                bucketName = k;
+                s3Client = this.buckets[k];
+                break;
             }
         }
 
-        /// <inheritdoc/>
-        public ProcessingBehavior ProcessingBehavior { get; } = ProcessingBehavior.All;
-
-        /// <inheritdoc />
-        public Func<HttpContext, bool> Match
+        // Something has gone horribly wrong for this to happen but check anyway.
+        if (s3Client is null)
         {
-            get => this.match ?? this.IsMatch;
-            set => this.match = value;
+            return null;
         }
 
-        /// <inheritdoc />
-        public bool IsValidRequest(HttpContext context)
-            => this.formatUtilities.TryGetExtensionFromUri(context.Request.GetDisplayUrl(), out _);
+        // Key should be the remaining path string.
+        string key = path.Substring(bucketName.Length).TrimStart(SlashChars);
 
-        /// <inheritdoc />
-        public async Task<IImageResolver> GetAsync(HttpContext context)
+        if (string.IsNullOrWhiteSpace(key))
         {
-            // Strip the leading slash and bucket name from the HTTP request path and treat
-            // the remaining path string as the key.
-            // Path has already been correctly parsed before here.
-            string bucketName = string.Empty;
-            IAmazonS3 s3Client = null;
-
-            // We want an exact match here to ensure that bucket names starting with
-            // the same prefix are not mixed up.
-            string path = context.Request.Path.Value.TrimStart(SlashChars);
-            int index = path.IndexOfAny(SlashChars);
-            string nameToMatch = index != -1 ? path.Substring(0, index) : path;
-
-            foreach (string k in this.buckets.Keys)
-            {
-                if (nameToMatch.Equals(k, StringComparison.OrdinalIgnoreCase))
-                {
-                    bucketName = k;
-                    s3Client = this.buckets[k];
-                    break;
-                }
-            }
+            return null;
+        }
 
-            // Something has gone horribly wrong for this to happen but check anyway.
-            if (s3Client is null)
-            {
-                return null;
-            }
+        if (!await KeyExists(s3Client, bucketName, key))
+        {
+            return null;
+        }
 
-            // Key should be the remaining path string.
-            string key = path.Substring(bucketName.Length).TrimStart(SlashChars);
+        return new AWSS3StorageImageResolver(s3Client, bucketName, key);
+    }
 
-            if (string.IsNullOrWhiteSpace(key))
+    private bool IsMatch(HttpContext context)
+    {
+        // Only match loosly here for performance.
+        // Path matching conflicts should be dealt with by configuration.
+        string path = context.Request.Path.Value.TrimStart(SlashChars);
+        foreach (string bucket in this.buckets.Keys)
+        {
+            if (path.StartsWith(bucket, StringComparison.OrdinalIgnoreCase))
             {
-                return null;
+                return true;
             }
+        }
 
-            if (!await this.KeyExists(s3Client, bucketName, key))
+        return false;
+    }
+
+    // ref https://github.com/aws/aws-sdk-net/blob/master/sdk/src/Services/S3/Custom/_bcl/IO/S3FileInfo.cs#L118
+    private static async Task<bool> KeyExists(IAmazonS3 s3Client, string bucketName, string key)
+    {
+        try
+        {
+            GetObjectMetadataRequest request = new()
             {
-                return null;
-            }
+                BucketName = bucketName,
+                Key = key
+            };
 
-            return new AWSS3StorageImageResolver(s3Client, bucketName, key);
+            // If the object doesn't exist then a "NotFound" will be thrown
+            await s3Client.GetObjectMetadataAsync(request);
+            return true;
         }
-
-        private bool IsMatch(HttpContext context)
+        catch (AmazonS3Exception e)
         {
-            // Only match loosly here for performance.
-            // Path matching conflicts should be dealt with by configuration.
-            string path = context.Request.Path.Value.TrimStart(SlashChars);
-            foreach (string bucket in this.buckets.Keys)
+            if (string.Equals(e.ErrorCode, "NoSuchBucket", StringComparison.Ordinal))
             {
-                if (path.StartsWith(bucket, StringComparison.OrdinalIgnoreCase))
-                {
-                    return true;
-                }
+                return false;
             }
 
-            return false;
-        }
-
-        // ref https://github.com/aws/aws-sdk-net/blob/master/sdk/src/Services/S3/Custom/_bcl/IO/S3FileInfo.cs#L118
-        private async Task<bool> KeyExists(IAmazonS3 s3Client, string bucketName, string key)
-        {
-            try
+            if (string.Equals(e.ErrorCode, "NotFound", StringComparison.Ordinal))
             {
-                var request = new GetObjectMetadataRequest
-                {
-                    BucketName = bucketName,
-                    Key = key
-                };
-
-                // If the object doesn't exist then a "NotFound" will be thrown
-                await s3Client.GetObjectMetadataAsync(request);
-                return true;
+                return false;
             }
-            catch (AmazonS3Exception e)
+
+            // If the object exists but the client is not authorized to access it, then a "Forbidden" will be thrown.
+            if (string.Equals(e.ErrorCode, "Forbidden", StringComparison.Ordinal))
             {
-                if (string.Equals(e.ErrorCode, "NoSuchBucket"))
-                {
-                    return false;
-                }
-
-                if (string.Equals(e.ErrorCode, "NotFound"))
-                {
-                    return false;
-                }
-
-                // If the object exists but the client is not authorized to access it, then a "Forbidden" will be thrown.
-                if (string.Equals(e.ErrorCode, "Forbidden"))
-                {
-                    return false;
-                }
-
-                throw;
+                return false;
             }
+
+            throw;
         }
     }
 }
diff --git a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs
index 6fcf4f06..14eac3e6 100644
--- a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs
@@ -1,46 +1,43 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
+namespace SixLabors.ImageSharp.Web.Providers.AWS;
 
-namespace SixLabors.ImageSharp.Web.Providers.AWS
+/// <summary>
+/// Configuration options for the <see cref="AWSS3StorageImageProviderOptions"/> provider.
+/// </summary>
+public class AWSS3StorageImageProviderOptions
 {
     /// <summary>
-    /// Configuration options for the <see cref="AWSS3StorageImageProviderOptions"/> provider.
+    /// Gets or sets the collection of blob container client options.
     /// </summary>
-    public class AWSS3StorageImageProviderOptions
-    {
-        /// <summary>
-        /// Gets or sets the collection of blob container client options.
-        /// </summary>
-        public ICollection<AWSS3BucketClientOptions> S3Buckets { get; set; } = new HashSet<AWSS3BucketClientOptions>();
-    }
+    public ICollection<AWSS3BucketClientOptions> S3Buckets { get; set; } = new HashSet<AWSS3BucketClientOptions>();
+}
 
-    /// <summary>
-    /// Configuration options for the <see cref="AWSS3StorageImageProvider"/> provider.
-    /// </summary>
-    public class AWSS3BucketClientOptions : IAWSS3BucketClientOptions
-    {
-        /// <inheritdoc/>
-        public string Region { get; set; }
+/// <summary>
+/// Configuration options for the <see cref="AWSS3StorageImageProvider"/> provider.
+/// </summary>
+public class AWSS3BucketClientOptions : IAWSS3BucketClientOptions
+{
+    /// <inheritdoc/>
+    public string Region { get; set; }
 
-        /// <inheritdoc/>
-        public string BucketName { get; set; }
+    /// <inheritdoc/>
+    public string BucketName { get; set; }
 
-        /// <inheritdoc/>
-        public string AccessKey { get; set; }
+    /// <inheritdoc/>
+    public string AccessKey { get; set; }
 
-        /// <inheritdoc/>
-        public string AccessSecret { get; set; }
+    /// <inheritdoc/>
+    public string AccessSecret { get; set; }
 
-        /// <inheritdoc/>
-        public string Endpoint { get; set; }
+    /// <inheritdoc/>
+    public string Endpoint { get; set; }
 
-        /// <inheritdoc/>
-        public bool UseAccelerateEndpoint { get; set; }
+    /// <inheritdoc/>
+    public bool UseAccelerateEndpoint { get; set; }
 
-        /// <inheritdoc/>
-        public TimeSpan? Timeout { get; set; }
-    }
+    /// <inheritdoc/>
+    public TimeSpan? Timeout { get; set; }
 }
diff --git a/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageCacheResolver.cs b/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageCacheResolver.cs
index 66097233..7fbf750e 100644
--- a/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageCacheResolver.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageCacheResolver.cs
@@ -1,53 +1,50 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
 using Amazon.S3;
 using Amazon.S3.Model;
 
-namespace SixLabors.ImageSharp.Web.Resolvers.AWS
+namespace SixLabors.ImageSharp.Web.Resolvers.AWS;
+
+/// <summary>
+/// Provides means to manage image buffers within the <see cref="AWSS3StorageCacheResolver"/>.
+/// </summary>
+public class AWSS3StorageCacheResolver : IImageCacheResolver
 {
+    private readonly IAmazonS3 amazonS3;
+    private readonly string bucketName;
+    private readonly string imagePath;
+    private readonly MetadataCollection metadata;
+
     /// <summary>
-    /// Provides means to manage image buffers within the <see cref="AWSS3StorageCacheResolver"/>.
+    /// Initializes a new instance of the <see cref="AWSS3StorageCacheResolver"/> class.
     /// </summary>
-    public class AWSS3StorageCacheResolver : IImageCacheResolver
+    /// <param name="amazonS3">The Amazon S3 Client</param>
+    /// <param name="bucketName">The bucket name.</param>
+    /// <param name="imagePath">The image path.</param>
+    /// <param name="metadata">The metadata collection.</param>
+    public AWSS3StorageCacheResolver(IAmazonS3 amazonS3, string bucketName, string imagePath, MetadataCollection metadata)
     {
-        private readonly IAmazonS3 amazonS3;
-        private readonly string bucketName;
-        private readonly string imagePath;
-        private readonly MetadataCollection metadata;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AWSS3StorageCacheResolver"/> class.
-        /// </summary>
-        /// <param name="amazonS3">The Amazon S3 Client</param>
-        /// <param name="bucketName">The bucket name.</param>
-        /// <param name="imagePath">The image path.</param>
-        /// <param name="metadata">The metadata collection.</param>
-        public AWSS3StorageCacheResolver(IAmazonS3 amazonS3, string bucketName, string imagePath, MetadataCollection metadata)
-        {
-            this.amazonS3 = amazonS3;
-            this.bucketName = bucketName;
-            this.imagePath = imagePath;
-            this.metadata = metadata;
-        }
+        this.amazonS3 = amazonS3;
+        this.bucketName = bucketName;
+        this.imagePath = imagePath;
+        this.metadata = metadata;
+    }
 
-        /// <inheritdoc/>
-        public Task<ImageCacheMetadata> GetMetaDataAsync()
+    /// <inheritdoc/>
+    public Task<ImageCacheMetadata> GetMetaDataAsync()
+    {
+        Dictionary<string, string> dict = new();
+        foreach (string key in this.metadata.Keys)
         {
-            Dictionary<string, string> dict = new();
-            foreach (string key in this.metadata.Keys)
-            {
-                // Trim automatically added x-amz-meta-
-                dict.Add(key.Substring(11).ToUpperInvariant(), this.metadata[key]);
-            }
-
-            return Task.FromResult(ImageCacheMetadata.FromDictionary(dict));
+            // Trim automatically added x-amz-meta-
+            dict.Add(key.Substring(11).ToUpperInvariant(), this.metadata[key]);
         }
 
-        /// <inheritdoc/>
-        public Task<Stream> OpenReadAsync() => this.amazonS3.GetObjectStreamAsync(this.bucketName, this.imagePath, null);
+        return Task.FromResult(ImageCacheMetadata.FromDictionary(dict));
     }
+
+    /// <inheritdoc/>
+    public Task<Stream> OpenReadAsync() => this.amazonS3.GetObjectStreamAsync(this.bucketName, this.imagePath, null);
 }
diff --git a/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs b/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs
index bbb47cdf..f58930ed 100644
--- a/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs
@@ -1,58 +1,55 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.IO;
 using System.Net.Http.Headers;
-using System.Threading.Tasks;
 using Amazon.S3;
 using Amazon.S3.Model;
 
-namespace SixLabors.ImageSharp.Web.Resolvers.AWS
+namespace SixLabors.ImageSharp.Web.Resolvers.AWS;
+
+/// <summary>
+/// Provides means to manage image buffers within the AWS S3 file system.
+/// </summary>
+public class AWSS3StorageImageResolver : IImageResolver
 {
+    private readonly IAmazonS3 amazonS3;
+    private readonly string bucketName;
+    private readonly string imagePath;
+
     /// <summary>
-    /// Provides means to manage image buffers within the AWS S3 file system.
+    /// Initializes a new instance of the <see cref="AWSS3StorageImageResolver"/> class.
     /// </summary>
-    public class AWSS3StorageImageResolver : IImageResolver
+    /// <param name="amazonS3">The Amazon S3 Client</param>
+    /// <param name="bucketName">The bucket name.</param>
+    /// <param name="imagePath">The image path.</param>
+    public AWSS3StorageImageResolver(IAmazonS3 amazonS3, string bucketName, string imagePath)
     {
-        private readonly IAmazonS3 amazonS3;
-        private readonly string bucketName;
-        private readonly string imagePath;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AWSS3StorageImageResolver"/> class.
-        /// </summary>
-        /// <param name="amazonS3">The Amazon S3 Client</param>
-        /// <param name="bucketName">The bucket name.</param>
-        /// <param name="imagePath">The image path.</param>
-        public AWSS3StorageImageResolver(IAmazonS3 amazonS3, string bucketName, string imagePath)
-        {
-            this.amazonS3 = amazonS3;
-            this.bucketName = bucketName;
-            this.imagePath = imagePath;
-        }
+        this.amazonS3 = amazonS3;
+        this.bucketName = bucketName;
+        this.imagePath = imagePath;
+    }
 
-        /// <inheritdoc />
-        public async Task<ImageMetadata> GetMetaDataAsync()
-        {
-            GetObjectMetadataResponse metadata = await this.amazonS3.GetObjectMetadataAsync(this.bucketName, this.imagePath);
+    /// <inheritdoc />
+    public async Task<ImageMetadata> GetMetaDataAsync()
+    {
+        GetObjectMetadataResponse metadata = await this.amazonS3.GetObjectMetadataAsync(this.bucketName, this.imagePath);
 
-            // Try to parse the max age from the source. If it's not zero then we pass it along
-            // to set the cache control headers for the response.
-            TimeSpan maxAge = TimeSpan.MinValue;
-            if (CacheControlHeaderValue.TryParse(metadata.Headers.CacheControl, out CacheControlHeaderValue cacheControl))
+        // Try to parse the max age from the source. If it's not zero then we pass it along
+        // to set the cache control headers for the response.
+        TimeSpan maxAge = TimeSpan.MinValue;
+        if (CacheControlHeaderValue.TryParse(metadata.Headers.CacheControl, out CacheControlHeaderValue cacheControl))
+        {
+            // Weirdly passing null to TryParse returns true.
+            if (cacheControl?.MaxAge.HasValue == true)
             {
-                // Weirdly passing null to TryParse returns true.
-                if (cacheControl?.MaxAge.HasValue == true)
-                {
-                    maxAge = cacheControl.MaxAge.Value;
-                }
+                maxAge = cacheControl.MaxAge.Value;
             }
-
-            return new ImageMetadata(metadata.LastModified, maxAge, metadata.ContentLength);
         }
 
-        /// <inheritdoc />
-        public Task<Stream> OpenReadAsync() => this.amazonS3.GetObjectStreamAsync(this.bucketName, this.imagePath, null);
+        return new ImageMetadata(metadata.LastModified, maxAge, metadata.ContentLength);
     }
+
+    /// <inheritdoc />
+    public Task<Stream> OpenReadAsync() => this.amazonS3.GetObjectStreamAsync(this.bucketName, this.imagePath, null);
 }
diff --git a/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCache.cs b/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCache.cs
index d1224cab..d147b217 100644
--- a/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCache.cs
+++ b/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCache.cs
@@ -1,8 +1,7 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.IO;
-using System.Threading.Tasks;
 using Azure;
 using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
@@ -10,76 +9,75 @@
 using SixLabors.ImageSharp.Web.Resolvers;
 using SixLabors.ImageSharp.Web.Resolvers.Azure;
 
-namespace SixLabors.ImageSharp.Web.Caching.Azure
+namespace SixLabors.ImageSharp.Web.Caching.Azure;
+
+/// <summary>
+/// Implements an Azure Blob Storage based cache.
+/// </summary>
+public class AzureBlobStorageCache : IImageCache
 {
+    private readonly BlobContainerClient container;
+
     /// <summary>
-    /// Implements an Azure Blob Storage based cache.
+    /// Initializes a new instance of the <see cref="AzureBlobStorageCache"/> class.
     /// </summary>
-    public class AzureBlobStorageCache : IImageCache
+    /// <param name="cacheOptions">The cache options.</param>
+    public AzureBlobStorageCache(IOptions<AzureBlobStorageCacheOptions> cacheOptions)
     {
-        private readonly BlobContainerClient container;
+        Guard.NotNull(cacheOptions, nameof(cacheOptions));
+        AzureBlobStorageCacheOptions options = cacheOptions.Value;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AzureBlobStorageCache"/> class.
-        /// </summary>
-        /// <param name="cacheOptions">The cache options.</param>
-        public AzureBlobStorageCache(IOptions<AzureBlobStorageCacheOptions> cacheOptions)
-        {
-            Guard.NotNull(cacheOptions, nameof(cacheOptions));
-            AzureBlobStorageCacheOptions options = cacheOptions.Value;
+        this.container = new BlobContainerClient(options.ConnectionString, options.ContainerName);
+    }
 
-            this.container = new BlobContainerClient(options.ConnectionString, options.ContainerName);
-        }
+    /// <inheritdoc/>
+    public async Task<IImageCacheResolver> GetAsync(string key)
+    {
+        BlobClient blob = this.container.GetBlobClient(key);
 
-        /// <inheritdoc/>
-        public async Task<IImageCacheResolver> GetAsync(string key)
+        if (!await blob.ExistsAsync())
         {
-            BlobClient blob = this.container.GetBlobClient(key);
-
-            if (!await blob.ExistsAsync())
-            {
-                return null;
-            }
-
-            return new AzureBlobStorageCacheResolver(blob);
+            return null;
         }
 
-        /// <inheritdoc/>
-        public Task SetAsync(string key, Stream stream, ImageCacheMetadata metadata)
-        {
-            BlobClient blob = this.container.GetBlobClient(key);
+        return new AzureBlobStorageCacheResolver(blob);
+    }
 
-            var headers = new BlobHttpHeaders
-            {
-                ContentType = metadata.ContentType,
-            };
+    /// <inheritdoc/>
+    public Task SetAsync(string key, Stream stream, ImageCacheMetadata metadata)
+    {
+        BlobClient blob = this.container.GetBlobClient(key);
 
-            return blob.UploadAsync(stream, httpHeaders: headers, metadata: metadata.ToDictionary());
-        }
+        BlobHttpHeaders headers = new()
+        {
+            ContentType = metadata.ContentType,
+        };
 
-        /// <summary>
-        /// Creates a new container under the specified account if a container
-        /// with the same name does not already exist.
-        /// </summary>
-        /// <param name="options">The Azure Blob Storage cache options.</param>
-        /// <param name="accessType">
-        /// Optionally specifies whether data in the container may be accessed publicly and
-        /// the level of access. <see cref="PublicAccessType.BlobContainer"/>
-        /// specifies full public read access for container and blob data. Clients can enumerate
-        /// blobs within the container via anonymous request, but cannot enumerate containers
-        /// within the storage account. <see cref="PublicAccessType.Blob"/>
-        /// specifies public read access for blobs. Blob data within this container can be
-        /// read via anonymous request, but container data is not available. Clients cannot
-        /// enumerate blobs within the container via anonymous request. <see cref="PublicAccessType.None"/>
-        /// specifies that the container data is private to the account owner.
-        /// </param>
-        /// <returns>
-        /// If the container does not already exist, a <see cref="Response{T}"/> describing the newly
-        /// created container. If the container already exists, <see langword="null"/>.
-        /// </returns>
-        public static Response<BlobContainerInfo> CreateIfNotExists(
-            AzureBlobStorageCacheOptions options,
-            PublicAccessType accessType)
-            => new BlobContainerClient(options.ConnectionString, options.ContainerName).CreateIfNotExists(accessType);
+        return blob.UploadAsync(stream, httpHeaders: headers, metadata: metadata.ToDictionary());
     }
+
+    /// <summary>
+    /// Creates a new container under the specified account if a container
+    /// with the same name does not already exist.
+    /// </summary>
+    /// <param name="options">The Azure Blob Storage cache options.</param>
+    /// <param name="accessType">
+    /// Optionally specifies whether data in the container may be accessed publicly and
+    /// the level of access. <see cref="PublicAccessType.BlobContainer"/>
+    /// specifies full public read access for container and blob data. Clients can enumerate
+    /// blobs within the container via anonymous request, but cannot enumerate containers
+    /// within the storage account. <see cref="PublicAccessType.Blob"/>
+    /// specifies public read access for blobs. Blob data within this container can be
+    /// read via anonymous request, but container data is not available. Clients cannot
+    /// enumerate blobs within the container via anonymous request. <see cref="PublicAccessType.None"/>
+    /// specifies that the container data is private to the account owner.
+    /// </param>
+    /// <returns>
+    /// If the container does not already exist, a <see cref="Response{T}"/> describing the newly
+    /// created container. If the container already exists, <see langword="null"/>.
+    /// </returns>
+    public static Response<BlobContainerInfo> CreateIfNotExists(
+        AzureBlobStorageCacheOptions options,
+        PublicAccessType accessType)
+        => new BlobContainerClient(options.ConnectionString, options.ContainerName).CreateIfNotExists(accessType);
 }
diff --git a/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCacheOptions.cs b/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCacheOptions.cs
index adddb58e..640b5fc6 100644
--- a/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCacheOptions.cs
+++ b/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCacheOptions.cs
@@ -1,17 +1,17 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-namespace SixLabors.ImageSharp.Web.Caching.Azure
+namespace SixLabors.ImageSharp.Web.Caching.Azure;
+
+/// <summary>
+/// Configuration options for the <see cref="AzureBlobStorageCache"/>.
+/// </summary>
+public class AzureBlobStorageCacheOptions : IAzureBlobContainerClientOptions
 {
-    /// <summary>
-    /// Configuration options for the <see cref="AzureBlobStorageCache"/>.
-    /// </summary>
-    public class AzureBlobStorageCacheOptions : IAzureBlobContainerClientOptions
-    {
-        /// <inheritdoc/>
-        public string ConnectionString { get; set; }
+    /// <inheritdoc/>
+    public string ConnectionString { get; set; }
 
-        /// <inheritdoc/>
-        public string ContainerName { get; set; }
-    }
+    /// <inheritdoc/>
+    public string ContainerName { get; set; }
 }
diff --git a/src/ImageSharp.Web.Providers.Azure/IAzureBlobContainerClientOptions.cs b/src/ImageSharp.Web.Providers.Azure/IAzureBlobContainerClientOptions.cs
index 6048b5e6..b3ee1e1d 100644
--- a/src/ImageSharp.Web.Providers.Azure/IAzureBlobContainerClientOptions.cs
+++ b/src/ImageSharp.Web.Providers.Azure/IAzureBlobContainerClientOptions.cs
@@ -1,24 +1,24 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-namespace SixLabors.ImageSharp.Web
+namespace SixLabors.ImageSharp.Web;
+
+/// <summary>
+/// Provides a common interface for Azure Blob Container Options.
+/// </summary>
+internal interface IAzureBlobContainerClientOptions
 {
     /// <summary>
-    /// Provides a common interface for Azure Blob Container Options.
+    /// Gets or sets the Azure Blob Storage connection string.
+    /// <see href="https://docs.microsoft.com/en-us/azure/storage/common/storage-configure-connection-string."/>
     /// </summary>
-    internal interface IAzureBlobContainerClientOptions
-    {
-        /// <summary>
-        /// Gets or sets the Azure Blob Storage connection string.
-        /// <see href="https://docs.microsoft.com/en-us/azure/storage/common/storage-configure-connection-string."/>
-        /// </summary>
-        public string ConnectionString { get; set; }
+    public string ConnectionString { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Azure Blob Storage container name.
-        /// Must conform to Azure Blob Storage container naming guidlines.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/storageservices/naming-and-referencing-containers--blobs--and-metadata#container-names"/>
-        /// </summary>
-        public string ContainerName { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the Azure Blob Storage container name.
+    /// Must conform to Azure Blob Storage container naming guidlines.
+    /// <see href="https://docs.microsoft.com/en-us/rest/api/storageservices/naming-and-referencing-containers--blobs--and-metadata#container-names"/>
+    /// </summary>
+    public string ContainerName { get; set; }
 }
diff --git a/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj b/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj
index f4ae2f6d..ed03b642 100644
--- a/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj
+++ b/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj
@@ -6,27 +6,39 @@
     <RootNamespace>SixLabors.ImageSharp.Web</RootNamespace>
     <PackageId>SixLabors.ImageSharp.Web.Providers.Azure</PackageId>
     <PackageIcon>sixlabors.imagesharp.web.128.png</PackageIcon>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <RepositoryUrl Condition="'$(RepositoryUrl)' == ''">https://github.com/SixLabors/ImageSharp.Web/</RepositoryUrl>
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
     <PackageTags>Image Middleware Resize Crop Gif Jpg Jpeg Bitmap Png Azure</PackageTags>
     <Description>A provider for resolving and caching images via Azure Blob Storage.</Description>
   </PropertyGroup>
 
+  <!--  This enables the nullable analysis and treats all nullable warnings as error-->
+  <PropertyGroup>
+    <Nullable>enable</Nullable>
+    <WarningsAsErrors>Nullable</WarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!--Bump to V3 prior to tagged release.-->
+    <MinVerMinimumMajorMinor>3.0</MinVerMinimumMajorMinor>
+  </PropertyGroup>
+  
   <Choose>
     <When Condition="$(SIXLABORS_TESTING) == true">
       <PropertyGroup>
-        <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net6.0</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
   <ItemGroup>
+    <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
     <None Include="..\..\shared-infrastructure\branding\icons\imagesharp.web\sixlabors.imagesharp.web.128.png" Pack="true" PackagePath="" />
   </ItemGroup>
 
diff --git a/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProvider.cs b/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProvider.cs
index 2627ec27..32d4ca19 100644
--- a/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProvider.cs
+++ b/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProvider.cs
@@ -1,9 +1,7 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using Azure.Storage.Blobs;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
@@ -11,138 +9,137 @@
 using SixLabors.ImageSharp.Web.Resolvers;
 using SixLabors.ImageSharp.Web.Resolvers.Azure;
 
-namespace SixLabors.ImageSharp.Web.Providers.Azure
+namespace SixLabors.ImageSharp.Web.Providers.Azure;
+
+/// <summary>
+/// Returns images stored in Azure Blob Storage.
+/// </summary>
+public class AzureBlobStorageImageProvider : IImageProvider
 {
     /// <summary>
-    /// Returns images stored in Azure Blob Storage.
+    /// Character array to remove from paths.
     /// </summary>
-    public class AzureBlobStorageImageProvider : IImageProvider
-    {
-        /// <summary>
-        /// Character array to remove from paths.
-        /// </summary>
-        private static readonly char[] SlashChars = { '\\', '/' };
-
-        /// <summary>
-        /// The containers for the blob services.
-        /// </summary>
-        private readonly Dictionary<string, BlobContainerClient> containers
-            = new();
-
-        /// <summary>
-        /// The blob storage options.
-        /// </summary>
-        private readonly AzureBlobStorageImageProviderOptions storageOptions;
-
-        /// <summary>
-        /// Contains various helper methods based on the current configuration.
-        /// </summary>
-        private readonly FormatUtilities formatUtilities;
-
-        /// <summary>
-        /// A match function used by the resolver to identify itself as the correct resolver to use.
-        /// </summary>
-        private Func<HttpContext, bool> match;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AzureBlobStorageImageProvider"/> class.
-        /// </summary>
-        /// <param name="storageOptions">The blob storage options.</param>
-        /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
-        public AzureBlobStorageImageProvider(
-            IOptions<AzureBlobStorageImageProviderOptions> storageOptions,
-            FormatUtilities formatUtilities)
-        {
-            Guard.NotNull(storageOptions, nameof(storageOptions));
+    private static readonly char[] SlashChars = { '\\', '/' };
 
-            this.storageOptions = storageOptions.Value;
-            this.formatUtilities = formatUtilities;
+    /// <summary>
+    /// The containers for the blob services.
+    /// </summary>
+    private readonly Dictionary<string, BlobContainerClient> containers
+        = new();
 
-            foreach (AzureBlobContainerClientOptions container in this.storageOptions.BlobContainers)
-            {
-                this.containers.Add(
-                    container.ContainerName,
-                    new BlobContainerClient(container.ConnectionString, container.ContainerName));
-            }
-        }
+    /// <summary>
+    /// The blob storage options.
+    /// </summary>
+    private readonly AzureBlobStorageImageProviderOptions storageOptions;
+
+    /// <summary>
+    /// Contains various helper methods based on the current configuration.
+    /// </summary>
+    private readonly FormatUtilities formatUtilities;
 
-        /// <inheritdoc/>
-        public ProcessingBehavior ProcessingBehavior { get; } = ProcessingBehavior.All;
+    /// <summary>
+    /// A match function used by the resolver to identify itself as the correct resolver to use.
+    /// </summary>
+    private Func<HttpContext, bool> match;
 
-        /// <inheritdoc/>
-        public Func<HttpContext, bool> Match
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AzureBlobStorageImageProvider"/> class.
+    /// </summary>
+    /// <param name="storageOptions">The blob storage options.</param>
+    /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
+    public AzureBlobStorageImageProvider(
+        IOptions<AzureBlobStorageImageProviderOptions> storageOptions,
+        FormatUtilities formatUtilities)
+    {
+        Guard.NotNull(storageOptions, nameof(storageOptions));
+
+        this.storageOptions = storageOptions.Value;
+        this.formatUtilities = formatUtilities;
+
+        foreach (AzureBlobContainerClientOptions container in this.storageOptions.BlobContainers)
         {
-            get => this.match ?? this.IsMatch;
-            set => this.match = value;
+            this.containers.Add(
+                container.ContainerName,
+                new BlobContainerClient(container.ConnectionString, container.ContainerName));
         }
+    }
 
-        /// <inheritdoc/>
-        public async Task<IImageResolver> GetAsync(HttpContext context)
-        {
-            // Strip the leading slash and container name from the HTTP request path and treat
-            // the remaining path string as the blob name.
-            // Path has already been correctly parsed before here.
-            string containerName = string.Empty;
-            BlobContainerClient container = null;
-
-            // We want an exact match here to ensure that container names starting with
-            // the same prefix are not mixed up.
-            string path = context.Request.Path.Value.TrimStart(SlashChars);
-            int index = path.IndexOfAny(SlashChars);
-            string nameToMatch = index != -1 ? path.Substring(0, index) : path;
-
-            foreach (string key in this.containers.Keys)
-            {
-                if (nameToMatch.Equals(key, StringComparison.OrdinalIgnoreCase))
-                {
-                    containerName = key;
-                    container = this.containers[key];
-                    break;
-                }
-            }
+    /// <inheritdoc/>
+    public ProcessingBehavior ProcessingBehavior { get; } = ProcessingBehavior.All;
+
+    /// <inheritdoc/>
+    public Func<HttpContext, bool> Match
+    {
+        get => this.match ?? this.IsMatch;
+        set => this.match = value;
+    }
 
-            // Something has gone horribly wrong for this to happen but check anyway.
-            if (container is null)
+    /// <inheritdoc/>
+    public async Task<IImageResolver> GetAsync(HttpContext context)
+    {
+        // Strip the leading slash and container name from the HTTP request path and treat
+        // the remaining path string as the blob name.
+        // Path has already been correctly parsed before here.
+        string containerName = string.Empty;
+        BlobContainerClient container = null;
+
+        // We want an exact match here to ensure that container names starting with
+        // the same prefix are not mixed up.
+        string path = context.Request.Path.Value.TrimStart(SlashChars);
+        int index = path.IndexOfAny(SlashChars);
+        string nameToMatch = index != -1 ? path.Substring(0, index) : path;
+
+        foreach (string key in this.containers.Keys)
+        {
+            if (nameToMatch.Equals(key, StringComparison.OrdinalIgnoreCase))
             {
-                return null;
+                containerName = key;
+                container = this.containers[key];
+                break;
             }
+        }
 
-            // Blob name should be the remaining path string.
-            string blobName = path.Substring(containerName.Length).TrimStart(SlashChars);
+        // Something has gone horribly wrong for this to happen but check anyway.
+        if (container is null)
+        {
+            return null;
+        }
 
-            if (string.IsNullOrWhiteSpace(blobName))
-            {
-                return null;
-            }
+        // Blob name should be the remaining path string.
+        string blobName = path.Substring(containerName.Length).TrimStart(SlashChars);
 
-            BlobClient blob = container.GetBlobClient(blobName);
+        if (string.IsNullOrWhiteSpace(blobName))
+        {
+            return null;
+        }
 
-            if (!await blob.ExistsAsync())
-            {
-                return null;
-            }
+        BlobClient blob = container.GetBlobClient(blobName);
 
-            return new AzureBlobStorageImageResolver(blob);
+        if (!await blob.ExistsAsync())
+        {
+            return null;
         }
 
-        /// <inheritdoc/>
-        public bool IsValidRequest(HttpContext context)
-            => this.formatUtilities.TryGetExtensionFromUri(context.Request.GetDisplayUrl(), out _);
+        return new AzureBlobStorageImageResolver(blob);
+    }
+
+    /// <inheritdoc/>
+    public bool IsValidRequest(HttpContext context)
+        => this.formatUtilities.TryGetExtensionFromUri(context.Request.GetDisplayUrl(), out _);
 
-        private bool IsMatch(HttpContext context)
+    private bool IsMatch(HttpContext context)
+    {
+        // Only match loosly here for performance.
+        // Path matching conflicts should be dealt with by configuration.
+        string path = context.Request.Path.Value.TrimStart(SlashChars);
+        foreach (string container in this.containers.Keys)
         {
-            // Only match loosly here for performance.
-            // Path matching conflicts should be dealt with by configuration.
-            string path = context.Request.Path.Value.TrimStart(SlashChars);
-            foreach (string container in this.containers.Keys)
+            if (path.StartsWith(container, StringComparison.OrdinalIgnoreCase))
             {
-                if (path.StartsWith(container, StringComparison.OrdinalIgnoreCase))
-                {
-                    return true;
-                }
+                return true;
             }
-
-            return false;
         }
+
+        return false;
     }
 }
diff --git a/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProviderOptions.cs b/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProviderOptions.cs
index 6afd6538..a5d8e92c 100644
--- a/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProviderOptions.cs
+++ b/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProviderOptions.cs
@@ -1,30 +1,28 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.Collections.Generic;
+namespace SixLabors.ImageSharp.Web.Providers.Azure;
 
-namespace SixLabors.ImageSharp.Web.Providers.Azure
+/// <summary>
+/// Configuration options for the <see cref="AzureBlobStorageImageProvider"/> provider.
+/// </summary>
+public class AzureBlobStorageImageProviderOptions
 {
     /// <summary>
-    /// Configuration options for the <see cref="AzureBlobStorageImageProvider"/> provider.
+    /// Gets or sets the collection of blob container client options.
     /// </summary>
-    public class AzureBlobStorageImageProviderOptions
-    {
-        /// <summary>
-        /// Gets or sets the collection of blob container client options.
-        /// </summary>
-        public ICollection<AzureBlobContainerClientOptions> BlobContainers { get; set; } = new HashSet<AzureBlobContainerClientOptions>();
-    }
+    public ICollection<AzureBlobContainerClientOptions> BlobContainers { get; set; } = new HashSet<AzureBlobContainerClientOptions>();
+}
 
-    /// <summary>
-    /// Represents a single Azure Blob Storage connection and container.
-    /// </summary>
-    public class AzureBlobContainerClientOptions : IAzureBlobContainerClientOptions
-    {
-        /// <inheritdoc/>
-        public string ConnectionString { get; set; }
+/// <summary>
+/// Represents a single Azure Blob Storage connection and container.
+/// </summary>
+public class AzureBlobContainerClientOptions : IAzureBlobContainerClientOptions
+{
+    /// <inheritdoc/>
+    public string ConnectionString { get; set; }
 
-        /// <inheritdoc/>
-        public string ContainerName { get; set; }
-    }
+    /// <inheritdoc/>
+    public string ContainerName { get; set; }
 }
diff --git a/src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageCacheResolver.cs b/src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageCacheResolver.cs
index 82922bed..708dc899 100644
--- a/src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageCacheResolver.cs
+++ b/src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageCacheResolver.cs
@@ -1,38 +1,36 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.IO;
-using System.Threading.Tasks;
 using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
 using SixLabors.ImageSharp.Web.Caching.Azure;
 
-namespace SixLabors.ImageSharp.Web.Resolvers.Azure
+namespace SixLabors.ImageSharp.Web.Resolvers.Azure;
+
+/// <summary>
+/// Provides means to manage image buffers within the <see cref="AzureBlobStorageCache"/>.
+/// </summary>
+public class AzureBlobStorageCacheResolver : IImageCacheResolver
 {
+    private readonly BlobClient blob;
+
     /// <summary>
-    /// Provides means to manage image buffers within the <see cref="AzureBlobStorageCache"/>.
+    /// Initializes a new instance of the <see cref="AzureBlobStorageCacheResolver"/> class.
     /// </summary>
-    public class AzureBlobStorageCacheResolver : IImageCacheResolver
-    {
-        private readonly BlobClient blob;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AzureBlobStorageCacheResolver"/> class.
-        /// </summary>
-        /// <param name="blob">The Azure blob.</param>
-        public AzureBlobStorageCacheResolver(BlobClient blob)
-            => this.blob = blob;
+    /// <param name="blob">The Azure blob.</param>
+    public AzureBlobStorageCacheResolver(BlobClient blob)
+        => this.blob = blob;
 
-        /// <inheritdoc/>
-        public async Task<ImageCacheMetadata> GetMetaDataAsync()
-        {
-            // I've had a good read through the SDK source and I believe we cannot get
-            // a 304 here since 'If-Modified-Since' header is not set by default.
-            BlobProperties properties = await this.blob.GetPropertiesAsync();
-            return ImageCacheMetadata.FromDictionary(properties.Metadata);
-        }
-
-        /// <inheritdoc/>
-        public Task<Stream> OpenReadAsync() => this.blob.OpenReadAsync();
+    /// <inheritdoc/>
+    public async Task<ImageCacheMetadata> GetMetaDataAsync()
+    {
+        // I've had a good read through the SDK source and I believe we cannot get
+        // a 304 here since 'If-Modified-Since' header is not set by default.
+        BlobProperties properties = await this.blob.GetPropertiesAsync();
+        return ImageCacheMetadata.FromDictionary(properties.Metadata);
     }
+
+    /// <inheritdoc/>
+    public Task<Stream> OpenReadAsync() => this.blob.OpenReadAsync();
 }
diff --git a/src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageImageResolver.cs b/src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageImageResolver.cs
index 118aeaf3..dfb79c3f 100644
--- a/src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageImageResolver.cs
+++ b/src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageImageResolver.cs
@@ -1,52 +1,49 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.IO;
 using System.Net.Http.Headers;
-using System.Threading.Tasks;
 using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
 
-namespace SixLabors.ImageSharp.Web.Resolvers.Azure
+namespace SixLabors.ImageSharp.Web.Resolvers.Azure;
+
+/// <summary>
+/// Provides means to manage image buffers within the Azure Blob file system.
+/// </summary>
+public class AzureBlobStorageImageResolver : IImageResolver
 {
+    private readonly BlobClient blob;
+
     /// <summary>
-    /// Provides means to manage image buffers within the Azure Blob file system.
+    /// Initializes a new instance of the <see cref="AzureBlobStorageImageResolver"/> class.
     /// </summary>
-    public class AzureBlobStorageImageResolver : IImageResolver
-    {
-        private readonly BlobClient blob;
+    /// <param name="blob">The Azure blob.</param>
+    public AzureBlobStorageImageResolver(BlobClient blob)
+        => this.blob = blob;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AzureBlobStorageImageResolver"/> class.
-        /// </summary>
-        /// <param name="blob">The Azure blob.</param>
-        public AzureBlobStorageImageResolver(BlobClient blob)
-            => this.blob = blob;
+    /// <inheritdoc/>
+    public async Task<ImageMetadata> GetMetaDataAsync()
+    {
+        // I've had a good read through the SDK source and I believe we cannot get
+        // a 304 here since 'If-Modified-Since' header is not set by default.
+        BlobProperties properties = (await this.blob.GetPropertiesAsync()).Value;
 
-        /// <inheritdoc/>
-        public async Task<ImageMetadata> GetMetaDataAsync()
+        // Try to parse the max age from the source. If it's not zero then we pass it along
+        // to set the cache control headers for the response.
+        TimeSpan maxAge = TimeSpan.MinValue;
+        if (CacheControlHeaderValue.TryParse(properties.CacheControl, out CacheControlHeaderValue cacheControl))
         {
-            // I've had a good read through the SDK source and I believe we cannot get
-            // a 304 here since 'If-Modified-Since' header is not set by default.
-            BlobProperties properties = (await this.blob.GetPropertiesAsync()).Value;
-
-            // Try to parse the max age from the source. If it's not zero then we pass it along
-            // to set the cache control headers for the response.
-            TimeSpan maxAge = TimeSpan.MinValue;
-            if (CacheControlHeaderValue.TryParse(properties.CacheControl, out CacheControlHeaderValue cacheControl))
+            // Weirdly passing null to TryParse returns true.
+            if (cacheControl?.MaxAge.HasValue == true)
             {
-                // Weirdly passing null to TryParse returns true.
-                if (cacheControl?.MaxAge.HasValue == true)
-                {
-                    maxAge = cacheControl.MaxAge.Value;
-                }
+                maxAge = cacheControl.MaxAge.Value;
             }
-
-            return new ImageMetadata(properties.LastModified.UtcDateTime, maxAge, properties.ContentLength);
         }
 
-        /// <inheritdoc/>
-        public Task<Stream> OpenReadAsync() => this.blob.OpenReadAsync();
+        return new ImageMetadata(properties.LastModified.UtcDateTime, maxAge, properties.ContentLength);
     }
+
+    /// <inheritdoc/>
+    public Task<Stream> OpenReadAsync() => this.blob.OpenReadAsync();
 }
diff --git a/src/ImageSharp.Web/AsyncHelper.cs b/src/ImageSharp.Web/AsyncHelper.cs
index 342880c7..8bc52d93 100644
--- a/src/ImageSharp.Web/AsyncHelper.cs
+++ b/src/ImageSharp.Web/AsyncHelper.cs
@@ -1,58 +1,55 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
 using System.Globalization;
-using System.Threading;
-using System.Threading.Tasks;
 
-namespace SixLabors.ImageSharp.Web
+namespace SixLabors.ImageSharp.Web;
+
+/// <summary>
+/// <see href="https://github.com/aspnet/AspNetIdentity/blob/b7826741279450c58b230ece98bd04b4815beabf/src/Microsoft.AspNet.Identity.Core/AsyncHelper.cs"/>
+/// </summary>
+internal static class AsyncHelper
 {
+    private static readonly TaskFactory TaskFactory
+        = new(
+            CancellationToken.None,
+            TaskCreationOptions.None,
+            TaskContinuationOptions.None,
+            TaskScheduler.Default);
+
     /// <summary>
-    /// <see href="https://github.com/aspnet/AspNetIdentity/blob/b7826741279450c58b230ece98bd04b4815beabf/src/Microsoft.AspNet.Identity.Core/AsyncHelper.cs"/>
+    /// Executes an async <see cref="Task"/> method synchronously.
     /// </summary>
-    internal static class AsyncHelper
+    /// <param name="task">The task to excecute.</param>
+    public static void RunSync(Func<Task> task)
     {
-        private static readonly TaskFactory TaskFactory
-            = new(
-                CancellationToken.None,
-                TaskCreationOptions.None,
-                TaskContinuationOptions.None,
-                TaskScheduler.Default);
-
-        /// <summary>
-        /// Executes an async <see cref="Task"/> method synchronously.
-        /// </summary>
-        /// <param name="task">The task to excecute.</param>
-        public static void RunSync(Func<Task> task)
+        CultureInfo cultureUi = CultureInfo.CurrentUICulture;
+        CultureInfo culture = CultureInfo.CurrentCulture;
+        TaskFactory.StartNew(() =>
         {
-            CultureInfo cultureUi = CultureInfo.CurrentUICulture;
-            CultureInfo culture = CultureInfo.CurrentCulture;
-            TaskFactory.StartNew(() =>
-            {
-                Thread.CurrentThread.CurrentCulture = culture;
-                Thread.CurrentThread.CurrentUICulture = cultureUi;
-                return task();
-            }).Unwrap().GetAwaiter().GetResult();
-        }
+            Thread.CurrentThread.CurrentCulture = culture;
+            Thread.CurrentThread.CurrentUICulture = cultureUi;
+            return task();
+        }).Unwrap().GetAwaiter().GetResult();
+    }
 
-        /// <summary>
-        /// Executes an async <see cref="Task{TResult}"/> method which has
-        /// a <paramref name="task"/> return type synchronously.
-        /// </summary>
-        /// <typeparam name="TResult">The type of result to return.</typeparam>
-        /// <param name="task">The task to excecute.</param>
-        /// <returns>The <typeparamref name="TResult"/>.</returns>
-        public static TResult RunSync<TResult>(Func<Task<TResult>> task)
+    /// <summary>
+    /// Executes an async <see cref="Task{TResult}"/> method which has
+    /// a <paramref name="task"/> return type synchronously.
+    /// </summary>
+    /// <typeparam name="TResult">The type of result to return.</typeparam>
+    /// <param name="task">The task to excecute.</param>
+    /// <returns>The <typeparamref name="TResult"/>.</returns>
+    public static TResult RunSync<TResult>(Func<Task<TResult>> task)
+    {
+        CultureInfo cultureUi = CultureInfo.CurrentUICulture;
+        CultureInfo culture = CultureInfo.CurrentCulture;
+        return TaskFactory.StartNew(() =>
         {
-            CultureInfo cultureUi = CultureInfo.CurrentUICulture;
-            CultureInfo culture = CultureInfo.CurrentCulture;
-            return TaskFactory.StartNew(() =>
-            {
-                Thread.CurrentThread.CurrentCulture = culture;
-                Thread.CurrentThread.CurrentUICulture = cultureUi;
-                return task();
-            }).Unwrap().GetAwaiter().GetResult();
-        }
+            Thread.CurrentThread.CurrentCulture = culture;
+            Thread.CurrentThread.CurrentUICulture = cultureUi;
+            return task();
+        }).Unwrap().GetAwaiter().GetResult();
     }
 }
diff --git a/src/ImageSharp.Web/Caching/HexEncoder.cs b/src/ImageSharp.Web/Caching/HexEncoder.cs
index 0f72a5b6..7687cc3f 100644
--- a/src/ImageSharp.Web/Caching/HexEncoder.cs
+++ b/src/ImageSharp.Web/Caching/HexEncoder.cs
@@ -1,60 +1,58 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace SixLabors.ImageSharp.Web.Caching
+namespace SixLabors.ImageSharp.Web.Caching;
+
+/// <summary>
+/// Provides methods for encoding byte arrays into hexidecimal strings.
+/// </summary>
+internal static class HexEncoder
 {
+    // LUT's that provide the hexidecimal representation of each possible byte value.
+    private static readonly char[] HexLutBase = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+
+    // The base LUT arranged in 16x each item order. 0 * 16, 1 * 16, .... F * 16
+    private static readonly char[] HexLutHi = Enumerable.Range(0, 256).Select(x => HexLutBase[x / 0x10]).ToArray();
+
+    // The base LUT repeated 16x.
+    private static readonly char[] HexLutLo = Enumerable.Range(0, 256).Select(x => HexLutBase[x % 0x10]).ToArray();
+
     /// <summary>
-    /// Provides methods for encoding byte arrays into hexidecimal strings.
+    /// Converts a <see cref="ReadOnlySpan{Byte}"/> to a hexidecimal formatted <see cref="string"/> padded to 2 digits.
     /// </summary>
-    internal static class HexEncoder
+    /// <param name="bytes">The bytes.</param>
+    /// <returns>The <see cref="string"/>.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static unsafe string Encode(ReadOnlySpan<byte> bytes)
     {
-        // LUT's that provide the hexidecimal representation of each possible byte value.
-        private static readonly char[] HexLutBase = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-
-        // The base LUT arranged in 16x each item order. 0 * 16, 1 * 16, .... F * 16
-        private static readonly char[] HexLutHi = Enumerable.Range(0, 256).Select(x => HexLutBase[x / 0x10]).ToArray();
-
-        // The base LUT repeated 16x.
-        private static readonly char[] HexLutLo = Enumerable.Range(0, 256).Select(x => HexLutBase[x % 0x10]).ToArray();
-
-        /// <summary>
-        /// Converts a <see cref="ReadOnlySpan{Byte}"/> to a hexidecimal formatted <see cref="string"/> padded to 2 digits.
-        /// </summary>
-        /// <param name="bytes">The bytes.</param>
-        /// <returns>The <see cref="string"/>.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe string Encode(ReadOnlySpan<byte> bytes)
+        fixed (byte* bytesPtr = bytes)
         {
-            fixed (byte* bytesPtr = bytes)
+            return string.Create(bytes.Length * 2, (Ptr: (IntPtr)bytesPtr, bytes.Length), (chars, args) =>
             {
-                return string.Create(bytes.Length * 2, (Ptr: (IntPtr)bytesPtr, bytes.Length), (chars, args) =>
-                {
-                    var ros = new ReadOnlySpan<byte>((byte*)args.Ptr, args.Length);
-                    EncodeToUtf16(ros, chars);
-                });
-            }
+                var ros = new ReadOnlySpan<byte>((byte*)args.Ptr, args.Length);
+                EncodeToUtf16(ros, chars);
+            });
         }
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static void EncodeToUtf16(ReadOnlySpan<byte> bytes, Span<char> chars)
-        {
-            ref byte bytesRef = ref MemoryMarshal.GetReference(bytes);
-            ref char charRef = ref MemoryMarshal.GetReference(chars);
-            ref char hiRef = ref MemoryMarshal.GetReference<char>(HexLutHi);
-            ref char lowRef = ref MemoryMarshal.GetReference<char>(HexLutLo);
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static void EncodeToUtf16(ReadOnlySpan<byte> bytes, Span<char> chars)
+    {
+        ref byte bytesRef = ref MemoryMarshal.GetReference(bytes);
+        ref char charRef = ref MemoryMarshal.GetReference(chars);
+        ref char hiRef = ref MemoryMarshal.GetReference<char>(HexLutHi);
+        ref char lowRef = ref MemoryMarshal.GetReference<char>(HexLutLo);
 
-            int index = 0;
-            for (int i = 0; i < bytes.Length; i++)
-            {
-                byte byteIndex = Unsafe.Add(ref bytesRef, i);
-                Unsafe.Add(ref charRef, index++) = Unsafe.Add(ref hiRef, byteIndex);
-                Unsafe.Add(ref charRef, index++) = Unsafe.Add(ref lowRef, byteIndex);
-            }
+        int index = 0;
+        for (int i = 0; i < bytes.Length; i++)
+        {
+            byte byteIndex = Unsafe.Add(ref bytesRef, i);
+            Unsafe.Add(ref charRef, index++) = Unsafe.Add(ref hiRef, byteIndex);
+            Unsafe.Add(ref charRef, index++) = Unsafe.Add(ref lowRef, byteIndex);
         }
     }
 }
diff --git a/src/ImageSharp.Web/Caching/ICacheHash.cs b/src/ImageSharp.Web/Caching/ICacheHash.cs
index 3d42246e..bf262d0e 100644
--- a/src/ImageSharp.Web/Caching/ICacheHash.cs
+++ b/src/ImageSharp.Web/Caching/ICacheHash.cs
@@ -1,19 +1,19 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-namespace SixLabors.ImageSharp.Web.Caching
+namespace SixLabors.ImageSharp.Web.Caching;
+
+/// <summary>
+/// Defines a contract that allows the creation of hashed file names for storing cached images.
+/// </summary>
+public interface ICacheHash
 {
     /// <summary>
-    /// Defines a contract that allows the creation of hashed file names for storing cached images.
+    /// Returns the hashed file name for the cached image file.
     /// </summary>
-    public interface ICacheHash
-    {
-        /// <summary>
-        /// Returns the hashed file name for the cached image file.
-        /// </summary>
-        /// <param name="value">The input value to hash.</param>
-        /// <param name="length">The length of the returned hash without any extensions.</param>
-        /// <returns>The <see cref="string"/>.</returns>
-        string Create(string value, uint length);
-    }
+    /// <param name="value">The input value to hash.</param>
+    /// <param name="length">The length of the returned hash without any extensions.</param>
+    /// <returns>The <see cref="string"/>.</returns>
+    string Create(string value, uint length);
 }
diff --git a/src/ImageSharp.Web/Caching/ICacheKey.cs b/src/ImageSharp.Web/Caching/ICacheKey.cs
index 227e2b72..2a23d42a 100644
--- a/src/ImageSharp.Web/Caching/ICacheKey.cs
+++ b/src/ImageSharp.Web/Caching/ICacheKey.cs
@@ -1,24 +1,24 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Caching
+namespace SixLabors.ImageSharp.Web.Caching;
+
+/// <summary>
+/// Defines a contract that allows the creation of cache keys (used by <see cref="ICacheHash"/> to create hashed file names for storing cached images).
+/// </summary>
+public interface ICacheKey
 {
     /// <summary>
-    /// Defines a contract that allows the creation of cache keys (used by <see cref="ICacheHash"/> to create hashed file names for storing cached images).
+    /// Creates the cache key based on the specified context and commands.
     /// </summary>
-    public interface ICacheKey
-    {
-        /// <summary>
-        /// Creates the cache key based on the specified context and commands.
-        /// </summary>
-        /// <param name="context">The HTTP context.</param>
-        /// <param name="commands">The commands.</param>
-        /// <returns>
-        /// The cache key.
-        /// </returns>
-        string Create(HttpContext context, CommandCollection commands);
-    }
+    /// <param name="context">The HTTP context.</param>
+    /// <param name="commands">The commands.</param>
+    /// <returns>
+    /// The cache key.
+    /// </returns>
+    string Create(HttpContext context, CommandCollection commands);
 }
diff --git a/src/ImageSharp.Web/Caching/IImageCache.cs b/src/ImageSharp.Web/Caching/IImageCache.cs
index 20bd6e64..bdd22c6b 100644
--- a/src/ImageSharp.Web/Caching/IImageCache.cs
+++ b/src/ImageSharp.Web/Caching/IImageCache.cs
@@ -1,32 +1,30 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.IO;
-using System.Threading.Tasks;
 using SixLabors.ImageSharp.Web.Resolvers;
 
 // TODO: Do we add cleanup to this? Scalable caches probably shouldn't do so.
-namespace SixLabors.ImageSharp.Web.Caching
+namespace SixLabors.ImageSharp.Web.Caching;
+
+/// <summary>
+/// Specifies the contract for caching images.
+/// </summary>
+public interface IImageCache
 {
     /// <summary>
-    /// Specifies the contract for caching images.
+    /// Gets the image resolver associated with the specified key.
     /// </summary>
-    public interface IImageCache
-    {
-        /// <summary>
-        /// Gets the image resolver associated with the specified key.
-        /// </summary>
-        /// <param name="key">The cache key.</param>
-        /// <returns>The <see cref="IImageResolver"/>.</returns>
-        Task<IImageCacheResolver> GetAsync(string key);
+    /// <param name="key">The cache key.</param>
+    /// <returns>The <see cref="IImageResolver"/>.</returns>
+    Task<IImageCacheResolver> GetAsync(string key);
 
-        /// <summary>
-        /// Sets the value associated with the specified key.
-        /// </summary>
-        /// <param name="key">The cache key.</param>
-        /// <param name="stream">The stream containing the image to store.</param>
-        /// <param name="metadata">The <see cref="ImageCacheMetadata"/> associated with the image to store.</param>
-        /// <returns>The task.</returns>
-        Task SetAsync(string key, Stream stream, ImageCacheMetadata metadata);
-    }
+    /// <summary>
+    /// Sets the value associated with the specified key.
+    /// </summary>
+    /// <param name="key">The cache key.</param>
+    /// <param name="stream">The stream containing the image to store.</param>
+    /// <param name="metadata">The <see cref="ImageCacheMetadata"/> associated with the image to store.</param>
+    /// <returns>The task.</returns>
+    Task SetAsync(string key, Stream stream, ImageCacheMetadata metadata);
 }
diff --git a/src/ImageSharp.Web/Caching/LegacyV1CacheKey.cs b/src/ImageSharp.Web/Caching/LegacyV1CacheKey.cs
index 0d72b045..e3abe213 100644
--- a/src/ImageSharp.Web/Caching/LegacyV1CacheKey.cs
+++ b/src/ImageSharp.Web/Caching/LegacyV1CacheKey.cs
@@ -1,38 +1,39 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
+using System.Globalization;
 using System.Text;
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Caching
+namespace SixLabors.ImageSharp.Web.Caching;
+
+/// <summary>
+/// Maintained for compatibility purposes only this cache key implementation generates the same
+/// out as the V1 middleware. If possible, it is recommended to use the <see cref="UriRelativeLowerInvariantCacheKey"/>.
+/// </summary>
+public class LegacyV1CacheKey : ICacheKey
 {
-    /// <summary>
-    /// Maintained for compatibility purposes only this cache key implementation generates the same
-    /// out as the V1 middleware. If possible, it is recommended to use the <see cref="UriRelativeLowerInvariantCacheKey"/>.
-    /// </summary>
-    public class LegacyV1CacheKey : ICacheKey
+    /// <inheritdoc/>
+    public string Create(HttpContext context, CommandCollection commands)
     {
-        /// <inheritdoc/>
-        public string Create(HttpContext context, CommandCollection commands)
-        {
-            var sb = new StringBuilder(context.Request.Host.ToString());
+        StringBuilder sb = new(context.Request.Host.ToString());
 
-            string pathBase = context.Request.PathBase.ToString();
-            if (!string.IsNullOrWhiteSpace(pathBase))
-            {
-                sb.AppendFormat("{0}/", pathBase);
-            }
+        string pathBase = context.Request.PathBase.ToString();
+        if (!string.IsNullOrWhiteSpace(pathBase))
+        {
+            sb.AppendFormat(CultureInfo.InvariantCulture, "{0}/", pathBase);
+        }
 
-            string path = context.Request.Path.ToString();
-            if (!string.IsNullOrWhiteSpace(path))
-            {
-                sb.Append(path);
-            }
+        string path = context.Request.Path.ToString();
+        if (!string.IsNullOrWhiteSpace(path))
+        {
+            sb.Append(path);
+        }
 
-            sb.Append(QueryString.Create(commands));
+        sb.Append(QueryString.Create(commands));
 
-            return sb.ToString().ToLowerInvariant();
-        }
+        return sb.ToString().ToLowerInvariant();
     }
 }
diff --git a/src/ImageSharp.Web/Caching/LruCache/ConcurrentTLruCache{TKey,TValue}.cs b/src/ImageSharp.Web/Caching/LruCache/ConcurrentTLruCache{TKey,TValue}.cs
index ce16a203..8e9e7494 100644
--- a/src/ImageSharp.Web/Caching/LruCache/ConcurrentTLruCache{TKey,TValue}.cs
+++ b/src/ImageSharp.Web/Caching/LruCache/ConcurrentTLruCache{TKey,TValue}.cs
@@ -1,376 +1,371 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
 
-namespace SixLabors.ImageSharp.Web.Caching
+namespace SixLabors.ImageSharp.Web.Caching;
+
+/// <summary>
+/// Pseudo LRU implementation where LRU list is composed of 3 segments: hot, warm and cold. Cost of maintaining
+/// segments is amortized across requests. Items are only cycled when capacity is exceeded. Pure read does
+/// not cycle items if all segments are within capacity constraints.
+/// There are no global locks. On cache miss, a new item is added. Tail items in each segment are dequeued,
+/// examined, and are either enqueued or discarded.
+/// This scheme of hot, warm and cold is based on the implementation used in MemCached described online here:
+/// https://memcached.org/blog/modern-lru/
+/// </summary>
+/// <remarks>
+/// Each segment has a capacity. When segment capacity is exceeded, items are moved as follows:
+/// 1. New items are added to hot, WasAccessed = false
+/// 2. When items are accessed, update WasAccessed = true
+/// 3. When items are moved WasAccessed is set to false.
+/// 4. When hot is full, hot tail is moved to either Warm or Cold depending on WasAccessed.
+/// 5. When warm is full, warm tail is moved to warm head or cold depending on WasAccessed.
+/// 6. When cold is full, cold tail is moved to warm head or removed from dictionary on depending on WasAccessed.
+/// </remarks>
+internal class ConcurrentTLruCache<TKey, TValue>
 {
+    private readonly ConcurrentDictionary<TKey, LongTickCountLruItem<TKey, TValue>> dictionary;
+
+    private readonly ConcurrentQueue<LongTickCountLruItem<TKey, TValue>> hotQueue;
+    private readonly ConcurrentQueue<LongTickCountLruItem<TKey, TValue>> warmQueue;
+    private readonly ConcurrentQueue<LongTickCountLruItem<TKey, TValue>> coldQueue;
+
+    // Maintain count outside ConcurrentQueue, since ConcurrentQueue.Count holds a global lock
+    private int hotCount;
+    private int warmCount;
+    private int coldCount;
+
+    private readonly int hotCapacity;
+    private readonly int warmCapacity;
+    private readonly int coldCapacity;
+
+    private readonly TLruLongTicksPolicy<TKey, TValue> policy;
+
     /// <summary>
-    /// Pseudo LRU implementation where LRU list is composed of 3 segments: hot, warm and cold. Cost of maintaining
-    /// segments is amortized across requests. Items are only cycled when capacity is exceeded. Pure read does
-    /// not cycle items if all segments are within capacity constraints.
-    /// There are no global locks. On cache miss, a new item is added. Tail items in each segment are dequeued,
-    /// examined, and are either enqueued or discarded.
-    /// This scheme of hot, warm and cold is based on the implementation used in MemCached described online here:
-    /// https://memcached.org/blog/modern-lru/
+    /// Initializes a new instance of the <see cref="ConcurrentTLruCache{K, V}"/> class with the specified capacity and time to live that has the default.
+    /// concurrency level, and uses the default comparer for the key type.
     /// </summary>
-    /// <remarks>
-    /// Each segment has a capacity. When segment capacity is exceeded, items are moved as follows:
-    /// 1. New items are added to hot, WasAccessed = false
-    /// 2. When items are accessed, update WasAccessed = true
-    /// 3. When items are moved WasAccessed is set to false.
-    /// 4. When hot is full, hot tail is moved to either Warm or Cold depending on WasAccessed.
-    /// 5. When warm is full, warm tail is moved to warm head or cold depending on WasAccessed.
-    /// 6. When cold is full, cold tail is moved to warm head or removed from dictionary on depending on WasAccessed.
-    /// </remarks>
-    internal class ConcurrentTLruCache<TKey, TValue>
+    /// <param name="capacity">The maximum number of elements that the FastConcurrentTLru can contain.</param>
+    /// <param name="timeToLive">The time to live for cached values.</param>
+    public ConcurrentTLruCache(int capacity, TimeSpan timeToLive)
+        : this(Environment.ProcessorCount, capacity, EqualityComparer<TKey>.Default, timeToLive)
     {
-        private readonly ConcurrentDictionary<TKey, LongTickCountLruItem<TKey, TValue>> dictionary;
-
-        private readonly ConcurrentQueue<LongTickCountLruItem<TKey, TValue>> hotQueue;
-        private readonly ConcurrentQueue<LongTickCountLruItem<TKey, TValue>> warmQueue;
-        private readonly ConcurrentQueue<LongTickCountLruItem<TKey, TValue>> coldQueue;
-
-        // Maintain count outside ConcurrentQueue, since ConcurrentQueue.Count holds a global lock
-        private int hotCount;
-        private int warmCount;
-        private int coldCount;
-
-        private readonly int hotCapacity;
-        private readonly int warmCapacity;
-        private readonly int coldCapacity;
-
-        private readonly TLruLongTicksPolicy<TKey, TValue> policy;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConcurrentTLruCache{K, V}"/> class with the specified capacity and time to live that has the default.
-        /// concurrency level, and uses the default comparer for the key type.
-        /// </summary>
-        /// <param name="capacity">The maximum number of elements that the FastConcurrentTLru can contain.</param>
-        /// <param name="timeToLive">The time to live for cached values.</param>
-        public ConcurrentTLruCache(int capacity, TimeSpan timeToLive)
-            : this(Environment.ProcessorCount, capacity, EqualityComparer<TKey>.Default, timeToLive)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConcurrentTLruCache{K, V}"/> class that has the specified concurrency level, has the.
-        /// specified initial capacity, uses the specified <see cref="IEqualityComparer{T}"/>, and has the specified time to live.
-        /// </summary>
-        /// <param name="concurrencyLevel">The estimated number of threads that will update the ConcurrentTLru concurrently.</param>
-        /// <param name="capacity">The maximum number of elements that the ConcurrentTLru can contain.</param>
-        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> implementation to use when comparing keys.</param>
-        /// <param name="timeToLive">The time to live for cached values.</param>
-        public ConcurrentTLruCache(int concurrencyLevel, int capacity, IEqualityComparer<TKey> comparer, TimeSpan timeToLive)
-        {
-            Guard.MustBeGreaterThanOrEqualTo(capacity, 3, nameof(capacity));
-            Guard.NotNull(comparer, nameof(comparer));
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ConcurrentTLruCache{K, V}"/> class that has the specified concurrency level, has the.
+    /// specified initial capacity, uses the specified <see cref="IEqualityComparer{T}"/>, and has the specified time to live.
+    /// </summary>
+    /// <param name="concurrencyLevel">The estimated number of threads that will update the ConcurrentTLru concurrently.</param>
+    /// <param name="capacity">The maximum number of elements that the ConcurrentTLru can contain.</param>
+    /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> implementation to use when comparing keys.</param>
+    /// <param name="timeToLive">The time to live for cached values.</param>
+    public ConcurrentTLruCache(int concurrencyLevel, int capacity, IEqualityComparer<TKey> comparer, TimeSpan timeToLive)
+    {
+        Guard.MustBeGreaterThanOrEqualTo(capacity, 3, nameof(capacity));
+        Guard.NotNull(comparer, nameof(comparer));
 
-            this.hotCapacity = capacity / 3;
-            this.warmCapacity = capacity / 3;
-            this.coldCapacity = capacity / 3;
+        this.hotCapacity = capacity / 3;
+        this.warmCapacity = capacity / 3;
+        this.coldCapacity = capacity / 3;
 
-            this.hotQueue = new ConcurrentQueue<LongTickCountLruItem<TKey, TValue>>();
-            this.warmQueue = new ConcurrentQueue<LongTickCountLruItem<TKey, TValue>>();
-            this.coldQueue = new ConcurrentQueue<LongTickCountLruItem<TKey, TValue>>();
+        this.hotQueue = new ConcurrentQueue<LongTickCountLruItem<TKey, TValue>>();
+        this.warmQueue = new ConcurrentQueue<LongTickCountLruItem<TKey, TValue>>();
+        this.coldQueue = new ConcurrentQueue<LongTickCountLruItem<TKey, TValue>>();
 
-            int dictionaryCapacity = this.hotCapacity + this.warmCapacity + this.coldCapacity + 1;
+        int dictionaryCapacity = this.hotCapacity + this.warmCapacity + this.coldCapacity + 1;
 
-            this.dictionary = new ConcurrentDictionary<TKey, LongTickCountLruItem<TKey, TValue>>(concurrencyLevel, dictionaryCapacity, comparer);
-            this.policy = new TLruLongTicksPolicy<TKey, TValue>(timeToLive);
-        }
+        this.dictionary = new ConcurrentDictionary<TKey, LongTickCountLruItem<TKey, TValue>>(concurrencyLevel, dictionaryCapacity, comparer);
+        this.policy = new TLruLongTicksPolicy<TKey, TValue>(timeToLive);
+    }
 
-        // No lock count: https://arbel.net/2013/02/03/best-practices-for-using-concurrentdictionary/
-        public int Count => this.dictionary.Skip(0).Count();
+    // No lock count: https://arbel.net/2013/02/03/best-practices-for-using-concurrentdictionary/
+    public int Count => this.dictionary.Skip(0).Count();
 
-        public int HotCount => this.hotCount;
+    public int HotCount => this.hotCount;
 
-        public int WarmCount => this.warmCount;
+    public int WarmCount => this.warmCount;
 
-        public int ColdCount => this.coldCount;
+    public int ColdCount => this.coldCount;
 
-        /// <summary>
-        /// Attempts to get the value associated with the specified key from the cache.
-        /// </summary>
-        /// <param name="key">The key of the value to get.</param>
-        /// <param name="value">When this method returns, contains the object from the cache that has the specified key, or the default value of the type if the operation failed.</param>
-        /// <returns><see langword="true"/> if the key was found in the cache; otherwise, <see langword="false"/>.</returns>
-        public bool TryGet(TKey key, out TValue value)
+    /// <summary>
+    /// Attempts to get the value associated with the specified key from the cache.
+    /// </summary>
+    /// <param name="key">The key of the value to get.</param>
+    /// <param name="value">When this method returns, contains the object from the cache that has the specified key, or the default value of the type if the operation failed.</param>
+    /// <returns><see langword="true"/> if the key was found in the cache; otherwise, <see langword="false"/>.</returns>
+    public bool TryGet(TKey key, out TValue value)
+    {
+        if (this.dictionary.TryGetValue(key, out LongTickCountLruItem<TKey, TValue> item))
         {
-            if (this.dictionary.TryGetValue(key, out LongTickCountLruItem<TKey, TValue> item))
-            {
-                return this.GetOrDiscard(item, out value);
-            }
+            return this.GetOrDiscard(item, out value);
+        }
 
+        value = default;
+        return false;
+    }
+
+    // AggressiveInlining forces the JIT to inline policy.ShouldDiscard(). For LRU policy
+    // the first branch is completely eliminated due to JIT time constant propogation.
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private bool GetOrDiscard(LongTickCountLruItem<TKey, TValue> item, out TValue value)
+    {
+        if (this.policy.ShouldDiscard(item))
+        {
+            this.Move(item, ItemDestination.Remove);
             value = default;
             return false;
         }
 
-        // AggressiveInlining forces the JIT to inline policy.ShouldDiscard(). For LRU policy
-        // the first branch is completely eliminated due to JIT time constant propogation.
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private bool GetOrDiscard(LongTickCountLruItem<TKey, TValue> item, out TValue value)
-        {
-            if (this.policy.ShouldDiscard(item))
-            {
-                this.Move(item, ItemDestination.Remove);
-                value = default;
-                return false;
-            }
+        value = item.Value;
+        TLruLongTicksPolicy<TKey, TValue>.Touch(item);
+        return true;
+    }
 
-            value = item.Value;
-            this.policy.Touch(item);
-            return true;
+    /// <summary>
+    /// Adds a key/value pair to the cache if the key does not already exist. Returns the new value, or the
+    /// existing value if the key already exists.
+    /// </summary>
+    /// <param name="key">The key of the element to add.</param>
+    /// <param name="valueFactory">The factory function used to generate a value for the key.</param>
+    /// <returns>The value for the key. This will be either the existing value for the key if the key is already
+    /// in the cache, or the new value if the key was not in the dictionary.</returns>
+    public TValue GetOrAdd(TKey key, Func<TKey, TValue> valueFactory)
+    {
+        if (this.TryGet(key, out TValue value))
+        {
+            return value;
         }
 
-        /// <summary>
-        /// Adds a key/value pair to the cache if the key does not already exist. Returns the new value, or the
-        /// existing value if the key already exists.
-        /// </summary>
-        /// <param name="key">The key of the element to add.</param>
-        /// <param name="valueFactory">The factory function used to generate a value for the key.</param>
-        /// <returns>The value for the key. This will be either the existing value for the key if the key is already
-        /// in the cache, or the new value if the key was not in the dictionary.</returns>
-        public TValue GetOrAdd(TKey key, Func<TKey, TValue> valueFactory)
-        {
-            if (this.TryGet(key, out TValue value))
-            {
-                return value;
-            }
+        // The value factory may be called concurrently for the same key, but the first write to the dictionary wins.
+        // This is identical logic in ConcurrentDictionary.GetOrAdd method.
+        LongTickCountLruItem<TKey, TValue> newItem = TLruLongTicksPolicy<TKey, TValue>.CreateItem(key, valueFactory(key));
 
-            // The value factory may be called concurrently for the same key, but the first write to the dictionary wins.
-            // This is identical logic in ConcurrentDictionary.GetOrAdd method.
-            LongTickCountLruItem<TKey, TValue> newItem = this.policy.CreateItem(key, valueFactory(key));
+        if (this.dictionary.TryAdd(key, newItem))
+        {
+            this.hotQueue.Enqueue(newItem);
+            Interlocked.Increment(ref this.hotCount);
+            this.Cycle();
+            return newItem.Value;
+        }
 
-            if (this.dictionary.TryAdd(key, newItem))
-            {
-                this.hotQueue.Enqueue(newItem);
-                Interlocked.Increment(ref this.hotCount);
-                this.Cycle();
-                return newItem.Value;
-            }
+        return this.GetOrAdd(key, valueFactory);
+    }
 
-            return this.GetOrAdd(key, valueFactory);
+    /// <summary>
+    /// Adds a key/value pair to the cache if the key does not already exist. Returns the new value, or the
+    /// existing value if the key already exists.
+    /// </summary>
+    /// <param name="key">The key of the element to add.</param>
+    /// <param name="valueFactory">The factory function used to asynchronously generate a value for the key.</param>
+    /// <returns>A task that represents the asynchronous <see cref="GetOrAdd(TKey, Func{TKey, TValue})"/> operation.</returns>
+    public async Task<TValue> GetOrAddAsync(TKey key, Func<TKey, Task<TValue>> valueFactory)
+    {
+        if (this.TryGet(key, out TValue value))
+        {
+            return value;
         }
 
-        /// <summary>
-        /// Adds a key/value pair to the cache if the key does not already exist. Returns the new value, or the
-        /// existing value if the key already exists.
-        /// </summary>
-        /// <param name="key">The key of the element to add.</param>
-        /// <param name="valueFactory">The factory function used to asynchronously generate a value for the key.</param>
-        /// <returns>A task that represents the asynchronous <see cref="GetOrAdd(TKey, Func{TKey, TValue})"/> operation.</returns>
-        public async Task<TValue> GetOrAddAsync(TKey key, Func<TKey, Task<TValue>> valueFactory)
+        // The value factory may be called concurrently for the same key, but the first write to the dictionary wins.
+        // This is identical logic in ConcurrentDictionary.GetOrAdd method.
+        LongTickCountLruItem<TKey, TValue> newItem = TLruLongTicksPolicy<TKey, TValue>.CreateItem(key, await valueFactory(key).ConfigureAwait(false));
+
+        if (this.dictionary.TryAdd(key, newItem))
         {
-            if (this.TryGet(key, out TValue value))
-            {
-                return value;
-            }
+            this.hotQueue.Enqueue(newItem);
+            Interlocked.Increment(ref this.hotCount);
+            this.Cycle();
+            return newItem.Value;
+        }
 
-            // The value factory may be called concurrently for the same key, but the first write to the dictionary wins.
-            // This is identical logic in ConcurrentDictionary.GetOrAdd method.
-            LongTickCountLruItem<TKey, TValue> newItem = this.policy.CreateItem(key, await valueFactory(key).ConfigureAwait(false));
+        return await this.GetOrAddAsync(key, valueFactory).ConfigureAwait(false);
+    }
 
-            if (this.dictionary.TryAdd(key, newItem))
+    /// <summary>
+    /// Attempts to remove and return the value that has the specified key from the cache.
+    /// </summary>
+    /// <param name="key">The key of the element to remove.</param>
+    /// <returns><see langword="true"/> if the object was removed successfully; otherwise, <see langword="false"/>.</returns>
+    public bool TryRemove(TKey key)
+    {
+        // Possible race condition:
+        // Thread A TryRemove(1), removes LruItem1, has reference to removed item but not yet marked as removed
+        // Thread B GetOrAdd(1) => Adds LruItem1*
+        // Thread C GetOrAdd(2), Cycle, Move(LruItem1, Removed)
+        //
+        // Thread C can run and remove LruItem1* from this.dictionary before Thread A has marked LruItem1 as removed.
+        //
+        // In this situation, a subsequent attempt to fetch 1 will be a miss. The queues will still contain LruItem1*,
+        // and it will not be marked as removed. If key 1 is fetched while LruItem1* is still in the queue, there will
+        // be two queue entries for key 1, and neither is marked as removed. Thus when LruItem1 * ages out, it will
+        // incorrectly remove 1 from the dictionary, and this cycle can repeat.
+        if (this.dictionary.TryGetValue(key, out LongTickCountLruItem<TKey, TValue> existing))
+        {
+            if (existing.WasRemoved)
             {
-                this.hotQueue.Enqueue(newItem);
-                Interlocked.Increment(ref this.hotCount);
-                this.Cycle();
-                return newItem.Value;
+                return false;
             }
 
-            return await this.GetOrAddAsync(key, valueFactory).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Attempts to remove and return the value that has the specified key from the cache.
-        /// </summary>
-        /// <param name="key">The key of the element to remove.</param>
-        /// <returns><see langword="true"/> if the object was removed successfully; otherwise, <see langword="false"/>.</returns>
-        public bool TryRemove(TKey key)
-        {
-            // Possible race condition:
-            // Thread A TryRemove(1), removes LruItem1, has reference to removed item but not yet marked as removed
-            // Thread B GetOrAdd(1) => Adds LruItem1*
-            // Thread C GetOrAdd(2), Cycle, Move(LruItem1, Removed)
-            //
-            // Thread C can run and remove LruItem1* from this.dictionary before Thread A has marked LruItem1 as removed.
-            //
-            // In this situation, a subsequent attempt to fetch 1 will be a miss. The queues will still contain LruItem1*,
-            // and it will not be marked as removed. If key 1 is fetched while LruItem1* is still in the queue, there will
-            // be two queue entries for key 1, and neither is marked as removed. Thus when LruItem1 * ages out, it will
-            // incorrectly remove 1 from the dictionary, and this cycle can repeat.
-            if (this.dictionary.TryGetValue(key, out LongTickCountLruItem<TKey, TValue> existing))
+            lock (existing)
             {
                 if (existing.WasRemoved)
                 {
                     return false;
                 }
 
-                lock (existing)
-                {
-                    if (existing.WasRemoved)
-                    {
-                        return false;
-                    }
+                existing.WasRemoved = true;
+            }
 
-                    existing.WasRemoved = true;
-                }
+            if (this.dictionary.TryRemove(key, out LongTickCountLruItem<TKey, TValue> removedItem))
+            {
+                // Mark as not accessed, it will later be cycled out of the queues because it can never be fetched
+                // from the dictionary. Note: Hot/Warm/Cold count will reflect the removed item until it is cycled
+                // from the queue.
+                removedItem.WasAccessed = false;
 
-                if (this.dictionary.TryRemove(key, out LongTickCountLruItem<TKey, TValue> removedItem))
+                if (removedItem.Value is IDisposable d)
                 {
-                    // Mark as not accessed, it will later be cycled out of the queues because it can never be fetched
-                    // from the dictionary. Note: Hot/Warm/Cold count will reflect the removed item until it is cycled
-                    // from the queue.
-                    removedItem.WasAccessed = false;
-
-                    if (removedItem.Value is IDisposable d)
-                    {
-                        d.Dispose();
-                    }
-
-                    return true;
+                    d.Dispose();
                 }
-            }
 
-            return false;
+                return true;
+            }
         }
 
-        private void Cycle()
-        {
-            // There will be races when queue count == queue capacity. Two threads may each dequeue items.
-            // This will prematurely free slots for the next caller. Each thread will still only cycle at most 5 items.
-            // Since TryDequeue is thread safe, only 1 thread can dequeue each item. Thus counts and queue state will always
-            // converge on correct over time.
-            this.CycleHot();
-
-            // Multi-threaded stress tests show that due to races, the warm and cold count can increase beyond capacity when
-            // hit rate is very high. Double cycle results in stable count under all conditions. When contention is low,
-            // secondary cycles have no effect.
-            this.CycleWarm();
-            this.CycleWarm();
-            this.CycleCold();
-            this.CycleCold();
-        }
+        return false;
+    }
+
+    private void Cycle()
+    {
+        // There will be races when queue count == queue capacity. Two threads may each dequeue items.
+        // This will prematurely free slots for the next caller. Each thread will still only cycle at most 5 items.
+        // Since TryDequeue is thread safe, only 1 thread can dequeue each item. Thus counts and queue state will always
+        // converge on correct over time.
+        this.CycleHot();
+
+        // Multi-threaded stress tests show that due to races, the warm and cold count can increase beyond capacity when
+        // hit rate is very high. Double cycle results in stable count under all conditions. When contention is low,
+        // secondary cycles have no effect.
+        this.CycleWarm();
+        this.CycleWarm();
+        this.CycleCold();
+        this.CycleCold();
+    }
 
-        private void CycleHot()
+    private void CycleHot()
+    {
+        if (this.hotCount > this.hotCapacity)
         {
-            if (this.hotCount > this.hotCapacity)
-            {
-                Interlocked.Decrement(ref this.hotCount);
+            Interlocked.Decrement(ref this.hotCount);
 
-                if (this.hotQueue.TryDequeue(out LongTickCountLruItem<TKey, TValue> item))
-                {
-                    ItemDestination where = this.policy.RouteHot(item);
-                    this.Move(item, where);
-                }
-                else
-                {
-                    Interlocked.Increment(ref this.hotCount);
-                }
+            if (this.hotQueue.TryDequeue(out LongTickCountLruItem<TKey, TValue> item))
+            {
+                ItemDestination where = this.policy.RouteHot(item);
+                this.Move(item, where);
+            }
+            else
+            {
+                Interlocked.Increment(ref this.hotCount);
             }
         }
+    }
 
-        private void CycleWarm()
+    private void CycleWarm()
+    {
+        if (this.warmCount > this.warmCapacity)
         {
-            if (this.warmCount > this.warmCapacity)
+            Interlocked.Decrement(ref this.warmCount);
+
+            if (this.warmQueue.TryDequeue(out LongTickCountLruItem<TKey, TValue> item))
             {
-                Interlocked.Decrement(ref this.warmCount);
+                ItemDestination where = this.policy.RouteWarm(item);
 
-                if (this.warmQueue.TryDequeue(out LongTickCountLruItem<TKey, TValue> item))
+                // When the warm queue is full, we allow an overflow of 1 item before redirecting warm items to cold.
+                // This only happens when hit rate is high, in which case we can consider all items relatively equal in
+                // terms of which was least recently used.
+                if (where == ItemDestination.Warm && this.warmCount <= this.warmCapacity)
                 {
-                    ItemDestination where = this.policy.RouteWarm(item);
-
-                    // When the warm queue is full, we allow an overflow of 1 item before redirecting warm items to cold.
-                    // This only happens when hit rate is high, in which case we can consider all items relatively equal in
-                    // terms of which was least recently used.
-                    if (where == ItemDestination.Warm && this.warmCount <= this.warmCapacity)
-                    {
-                        this.Move(item, where);
-                    }
-                    else
-                    {
-                        this.Move(item, ItemDestination.Cold);
-                    }
+                    this.Move(item, where);
                 }
                 else
                 {
-                    Interlocked.Increment(ref this.warmCount);
+                    this.Move(item, ItemDestination.Cold);
                 }
             }
+            else
+            {
+                Interlocked.Increment(ref this.warmCount);
+            }
         }
+    }
 
-        private void CycleCold()
+    private void CycleCold()
+    {
+        if (this.coldCount > this.coldCapacity)
         {
-            if (this.coldCount > this.coldCapacity)
+            Interlocked.Decrement(ref this.coldCount);
+
+            if (this.coldQueue.TryDequeue(out LongTickCountLruItem<TKey, TValue> item))
             {
-                Interlocked.Decrement(ref this.coldCount);
+                ItemDestination where = this.policy.RouteCold(item);
 
-                if (this.coldQueue.TryDequeue(out LongTickCountLruItem<TKey, TValue> item))
+                if (where == ItemDestination.Warm && this.warmCount <= this.warmCapacity)
                 {
-                    ItemDestination where = this.policy.RouteCold(item);
-
-                    if (where == ItemDestination.Warm && this.warmCount <= this.warmCapacity)
-                    {
-                        this.Move(item, where);
-                    }
-                    else
-                    {
-                        this.Move(item, ItemDestination.Remove);
-                    }
+                    this.Move(item, where);
                 }
                 else
                 {
-                    Interlocked.Increment(ref this.coldCount);
+                    this.Move(item, ItemDestination.Remove);
                 }
             }
+            else
+            {
+                Interlocked.Increment(ref this.coldCount);
+            }
         }
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void Move(LongTickCountLruItem<TKey, TValue> item, ItemDestination where)
-        {
-            item.WasAccessed = false;
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private void Move(LongTickCountLruItem<TKey, TValue> item, ItemDestination where)
+    {
+        item.WasAccessed = false;
 
-            switch (where)
-            {
-                case ItemDestination.Warm:
-                    this.warmQueue.Enqueue(item);
-                    Interlocked.Increment(ref this.warmCount);
-                    break;
-                case ItemDestination.Cold:
-                    this.coldQueue.Enqueue(item);
-                    Interlocked.Increment(ref this.coldCount);
-                    break;
-                case ItemDestination.Remove:
-                    if (!item.WasRemoved)
+        switch (where)
+        {
+            case ItemDestination.Warm:
+                this.warmQueue.Enqueue(item);
+                Interlocked.Increment(ref this.warmCount);
+                break;
+            case ItemDestination.Cold:
+                this.coldQueue.Enqueue(item);
+                Interlocked.Increment(ref this.coldCount);
+                break;
+            case ItemDestination.Remove:
+                if (!item.WasRemoved)
+                {
+                    // Avoid race where 2 threads could remove the same key - see TryRemove for details.
+                    lock (item)
                     {
-                        // Avoid race where 2 threads could remove the same key - see TryRemove for details.
-                        lock (item)
+                        if (item.WasRemoved)
                         {
-                            if (item.WasRemoved)
-                            {
-                                break;
-                            }
+                            break;
+                        }
 
-                            if (this.dictionary.TryRemove(item.Key, out LongTickCountLruItem<TKey, TValue> removedItem))
+                        if (this.dictionary.TryRemove(item.Key, out LongTickCountLruItem<TKey, TValue> removedItem))
+                        {
+                            item.WasRemoved = true;
+                            if (removedItem.Value is IDisposable d)
                             {
-                                item.WasRemoved = true;
-                                if (removedItem.Value is IDisposable d)
-                                {
-                                    d.Dispose();
-                                }
+                                d.Dispose();
                             }
                         }
                     }
+                }
 
-                    break;
-            }
+                break;
         }
     }
 }
diff --git a/src/ImageSharp.Web/Caching/LruCache/ItemDestination.cs b/src/ImageSharp.Web/Caching/LruCache/ItemDestination.cs
index d887e2e6..2275ccc8 100644
--- a/src/ImageSharp.Web/Caching/LruCache/ItemDestination.cs
+++ b/src/ImageSharp.Web/Caching/LruCache/ItemDestination.cs
@@ -1,12 +1,11 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Web.Caching
+namespace SixLabors.ImageSharp.Web.Caching;
+
+internal enum ItemDestination
 {
-    internal enum ItemDestination
-    {
-        Warm,
-        Cold,
-        Remove
-    }
+    Warm,
+    Cold,
+    Remove
 }
diff --git a/src/ImageSharp.Web/Caching/LruCache/LongTickCountLruItem{TKey,TValue}.cs b/src/ImageSharp.Web/Caching/LruCache/LongTickCountLruItem{TKey,TValue}.cs
index d0d24a15..7bd0a76d 100644
--- a/src/ImageSharp.Web/Caching/LruCache/LongTickCountLruItem{TKey,TValue}.cs
+++ b/src/ImageSharp.Web/Caching/LruCache/LongTickCountLruItem{TKey,TValue}.cs
@@ -1,38 +1,38 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-namespace SixLabors.ImageSharp.Web.Caching
+namespace SixLabors.ImageSharp.Web.Caching;
+
+internal class LongTickCountLruItem<TKey, TValue>
 {
-    internal class LongTickCountLruItem<TKey, TValue>
-    {
-        private volatile bool wasAccessed;
-        private volatile bool wasRemoved;
+    private volatile bool wasAccessed;
+    private volatile bool wasRemoved;
 
 #pragma warning disable SA1401 // Fields should be private
-        public readonly TKey Key;
+    public readonly TKey Key;
 
-        public readonly TValue Value;
+    public readonly TValue Value;
 #pragma warning restore SA1401 // Fields should be private
 
-        public LongTickCountLruItem(TKey k, TValue v, long tickCount)
-        {
-            this.Key = k;
-            this.Value = v;
-            this.TickCount = tickCount;
-        }
-
-        public long TickCount { get; set; }
-
-        public bool WasAccessed
-        {
-            get => this.wasAccessed;
-            set => this.wasAccessed = value;
-        }
-
-        public bool WasRemoved
-        {
-            get => this.wasRemoved;
-            set => this.wasRemoved = value;
-        }
+    public LongTickCountLruItem(TKey k, TValue v, long tickCount)
+    {
+        this.Key = k;
+        this.Value = v;
+        this.TickCount = tickCount;
+    }
+
+    public long TickCount { get; set; }
+
+    public bool WasAccessed
+    {
+        get => this.wasAccessed;
+        set => this.wasAccessed = value;
+    }
+
+    public bool WasRemoved
+    {
+        get => this.wasRemoved;
+        set => this.wasRemoved = value;
     }
 }
diff --git a/src/ImageSharp.Web/Caching/LruCache/TLruLongTicksPolicy{TKey,TValue}.cs b/src/ImageSharp.Web/Caching/LruCache/TLruLongTicksPolicy{TKey,TValue}.cs
index e63d6233..30f28b4f 100644
--- a/src/ImageSharp.Web/Caching/LruCache/TLruLongTicksPolicy{TKey,TValue}.cs
+++ b/src/ImageSharp.Web/Caching/LruCache/TLruLongTicksPolicy{TKey,TValue}.cs
@@ -1,97 +1,84 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
-namespace SixLabors.ImageSharp.Web.Caching
+namespace SixLabors.ImageSharp.Web.Caching;
+
+/// <summary>
+/// Time aware Least Recently Used (TLRU) is a variant of LRU which discards the least
+/// recently used items first, and any item that has expired.
+/// </summary>
+/// <typeparam name="TKey">The type of key object.</typeparam>
+/// <typeparam name="TValue">The type of value object.</typeparam>
+/// <remarks>
+/// This class measures time using stopwatch.
+/// </remarks>
+internal readonly struct TLruLongTicksPolicy<TKey, TValue>
 {
-    /// <summary>
-    /// Time aware Least Recently Used (TLRU) is a variant of LRU which discards the least
-    /// recently used items first, and any item that has expired.
-    /// </summary>
-    /// <remarks>
-    /// This class measures time using stopwatch.
-    /// </remarks>
-    internal readonly struct TLruLongTicksPolicy<TKey, TValue>
-    {
-        private readonly long timeToLive;
+    private readonly long timeToLive;
 
-        public TLruLongTicksPolicy(TimeSpan timeToLive)
-        {
-            this.timeToLive = timeToLive.Ticks;
-        }
+    public TLruLongTicksPolicy(TimeSpan timeToLive)
+        => this.timeToLive = timeToLive.Ticks;
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public LongTickCountLruItem<TKey, TValue> CreateItem(TKey key, TValue value)
-        {
-            return new LongTickCountLruItem<TKey, TValue>(key, value, Stopwatch.GetTimestamp());
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static LongTickCountLruItem<TKey, TValue> CreateItem(TKey key, TValue value)
+        => new(key, value, Stopwatch.GetTimestamp());
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void Touch(LongTickCountLruItem<TKey, TValue> item)
-        {
-            item.WasAccessed = true;
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static void Touch(LongTickCountLruItem<TKey, TValue> item) => item.WasAccessed = true;
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool ShouldDiscard(LongTickCountLruItem<TKey, TValue> item)
-        {
-            if (Stopwatch.GetTimestamp() - item.TickCount > this.timeToLive)
-            {
-                return true;
-            }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public bool ShouldDiscard(LongTickCountLruItem<TKey, TValue> item)
+        => Stopwatch.GetTimestamp() - item.TickCount > this.timeToLive;
 
-            return false;
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public ItemDestination RouteHot(LongTickCountLruItem<TKey, TValue> item)
+    {
+        if (this.ShouldDiscard(item))
+        {
+            return ItemDestination.Remove;
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ItemDestination RouteHot(LongTickCountLruItem<TKey, TValue> item)
+        if (item.WasAccessed)
         {
-            if (this.ShouldDiscard(item))
-            {
-                return ItemDestination.Remove;
-            }
+            return ItemDestination.Warm;
+        }
 
-            if (item.WasAccessed)
-            {
-                return ItemDestination.Warm;
-            }
+        return ItemDestination.Cold;
+    }
 
-            return ItemDestination.Cold;
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public ItemDestination RouteWarm(LongTickCountLruItem<TKey, TValue> item)
+    {
+        if (this.ShouldDiscard(item))
+        {
+            return ItemDestination.Remove;
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ItemDestination RouteWarm(LongTickCountLruItem<TKey, TValue> item)
+        if (item.WasAccessed)
         {
-            if (this.ShouldDiscard(item))
-            {
-                return ItemDestination.Remove;
-            }
+            return ItemDestination.Warm;
+        }
 
-            if (item.WasAccessed)
-            {
-                return ItemDestination.Warm;
-            }
+        return ItemDestination.Cold;
+    }
 
-            return ItemDestination.Cold;
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public ItemDestination RouteCold(LongTickCountLruItem<TKey, TValue> item)
+    {
+        if (this.ShouldDiscard(item))
+        {
+            return ItemDestination.Remove;
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ItemDestination RouteCold(LongTickCountLruItem<TKey, TValue> item)
+        if (item.WasAccessed)
         {
-            if (this.ShouldDiscard(item))
-            {
-                return ItemDestination.Remove;
-            }
-
-            if (item.WasAccessed)
-            {
-                return ItemDestination.Warm;
-            }
-
-            return ItemDestination.Remove;
+            return ItemDestination.Warm;
         }
+
+        return ItemDestination.Remove;
     }
 }
diff --git a/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs b/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs
index 5f3d660f..ff0847e0 100644
--- a/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs
+++ b/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs
@@ -1,194 +1,192 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Options;
 using SixLabors.ImageSharp.Web.Resolvers;
 
-namespace SixLabors.ImageSharp.Web.Caching
+namespace SixLabors.ImageSharp.Web.Caching;
+
+/// <summary>
+/// Implements a physical file system based cache.
+/// </summary>
+public class PhysicalFileSystemCache : IImageCache
 {
     /// <summary>
-    /// Implements a physical file system based cache.
+    /// The root path for the cache.
+    /// </summary>
+    private readonly string cacheRootPath;
+
+    /// <summary>
+    /// The depth of the nested cache folders structure to store the images.
+    /// </summary>
+    private readonly int cacheFolderDepth;
+
+    /// <summary>
+    /// Contains various format helper methods based on the current configuration.
     /// </summary>
-    public class PhysicalFileSystemCache : IImageCache
+    private readonly FormatUtilities formatUtilities;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PhysicalFileSystemCache"/> class.
+    /// </summary>
+    /// <param name="options">The cache configuration options.</param>
+    /// <param name="environment">The hosting environment the application is running in.</param>
+    /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
+    public PhysicalFileSystemCache(
+        IOptions<PhysicalFileSystemCacheOptions> options,
+        IWebHostEnvironment environment,
+        FormatUtilities formatUtilities)
     {
-        /// <summary>
-        /// The root path for the cache.
-        /// </summary>
-        private readonly string cacheRootPath;
-
-        /// <summary>
-        /// The depth of the nested cache folders structure to store the images.
-        /// </summary>
-        private readonly int cacheFolderDepth;
-
-        /// <summary>
-        /// Contains various format helper methods based on the current configuration.
-        /// </summary>
-        private readonly FormatUtilities formatUtilities;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PhysicalFileSystemCache"/> class.
-        /// </summary>
-        /// <param name="options">The cache configuration options.</param>
-        /// <param name="environment">The hosting environment the application is running in.</param>
-        /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
-        public PhysicalFileSystemCache(
-            IOptions<PhysicalFileSystemCacheOptions> options,
-            IWebHostEnvironment environment,
-            FormatUtilities formatUtilities)
-        {
-            Guard.NotNull(options, nameof(options));
-            Guard.NotNull(environment, nameof(environment));
+        Guard.NotNull(options, nameof(options));
+        Guard.NotNull(environment, nameof(environment));
 
-            this.cacheRootPath = GetCacheRoot(options.Value, environment.WebRootPath, environment.ContentRootPath);
-            this.cacheFolderDepth = (int)options.Value.CacheFolderDepth;
-            this.formatUtilities = formatUtilities;
+        this.cacheRootPath = GetCacheRoot(options.Value, environment.WebRootPath, environment.ContentRootPath);
+        this.cacheFolderDepth = (int)options.Value.CacheFolderDepth;
+        this.formatUtilities = formatUtilities;
+    }
+
+    /// <summary>
+    /// Determine the cache root path
+    /// </summary>
+    /// <param name="cacheOptions">The cache options.</param>
+    /// <param name="webRootPath">The web root path.</param>
+    /// <param name="contentRootPath">The content root path.</param>
+    /// <returns><see cref="string"/> representing the fully qualified cache root path.</returns>
+    /// <exception cref="InvalidOperationException">The cache root path cannot be determined.</exception>
+    internal static string GetCacheRoot(PhysicalFileSystemCacheOptions cacheOptions, string webRootPath, string contentRootPath)
+    {
+        string cacheRootPath = cacheOptions.CacheRootPath ?? webRootPath;
+        if (string.IsNullOrEmpty(cacheRootPath))
+        {
+            throw new InvalidOperationException("The cache root path cannot be determined, make sure it's explicitly configured or the webroot is set.");
         }
 
-        /// <summary>
-        /// Determine the cache root path
-        /// </summary>
-        /// <param name="cacheOptions">The cache options.</param>
-        /// <param name="webRootPath">The web root path.</param>
-        /// <param name="contentRootPath">The content root path.</param>
-        /// <returns><see cref="string"/> representing the fully qualified cache root path.</returns>
-        internal static string GetCacheRoot(PhysicalFileSystemCacheOptions cacheOptions, string webRootPath, string contentRootPath)
+        if (!Path.IsPathFullyQualified(cacheRootPath))
         {
-            string cacheRootPath = cacheOptions.CacheRootPath ?? webRootPath;
-            if (string.IsNullOrEmpty(cacheRootPath))
-            {
-                throw new InvalidOperationException("The cache root path cannot be determined, make sure it's explicitly configured or the webroot is set.");
-            }
+            // Ensure this is an absolute path (resolved to the content root path)
+            cacheRootPath = Path.GetFullPath(cacheRootPath, contentRootPath);
+        }
 
-            if (!Path.IsPathFullyQualified(cacheRootPath))
-            {
-                // Ensure this is an absolute path (resolved to the content root path)
-                cacheRootPath = Path.GetFullPath(cacheRootPath, contentRootPath);
-            }
+        string cacheFolderPath = Path.Combine(cacheRootPath, cacheOptions.CacheFolder);
 
-            string cacheFolderPath = Path.Combine(cacheRootPath, cacheOptions.CacheFolder);
+        return PathUtilities.EnsureTrailingSlash(cacheFolderPath);
+    }
 
-            return PathUtilities.EnsureTrailingSlash(cacheFolderPath);
-        }
+    /// <inheritdoc/>
+    public Task<IImageCacheResolver> GetAsync(string key)
+    {
+        string path = Path.Combine(this.cacheRootPath, ToFilePath(key, this.cacheFolderDepth));
 
-        /// <inheritdoc/>
-        public Task<IImageCacheResolver> GetAsync(string key)
+        FileInfo metaFileInfo = new(ToMetaDataFilePath(path));
+        if (!metaFileInfo.Exists)
         {
-            string path = Path.Combine(this.cacheRootPath, ToFilePath(key, this.cacheFolderDepth));
+            return Task.FromResult<IImageCacheResolver>(null);
+        }
 
-            var metaFileInfo = new FileInfo(this.ToMetaDataFilePath(path));
-            if (!metaFileInfo.Exists)
-            {
-                return Task.FromResult<IImageCacheResolver>(null);
-            }
+        return Task.FromResult<IImageCacheResolver>(new PhysicalFileSystemCacheResolver(metaFileInfo, this.formatUtilities));
+    }
+
+    /// <inheritdoc/>
+    public async Task SetAsync(string key, Stream stream, ImageCacheMetadata metadata)
+    {
+        string path = Path.Combine(this.cacheRootPath, ToFilePath(key, this.cacheFolderDepth));
+        string imagePath = this.ToImageFilePath(path, metadata);
+        string metaPath = ToMetaDataFilePath(path);
+        string directory = Path.GetDirectoryName(path);
 
-            return Task.FromResult<IImageCacheResolver>(new PhysicalFileSystemCacheResolver(metaFileInfo, this.formatUtilities));
+        // Ensure cache directory is created before creating files
+        if (!Directory.Exists(directory))
+        {
+            Directory.CreateDirectory(directory);
         }
 
-        /// <inheritdoc/>
-        public async Task SetAsync(string key, Stream stream, ImageCacheMetadata metadata)
+        using (FileStream fileStream = File.Create(imagePath))
         {
-            string path = Path.Combine(this.cacheRootPath, ToFilePath(key, this.cacheFolderDepth));
-            string imagePath = this.ToImageFilePath(path, metadata);
-            string metaPath = this.ToMetaDataFilePath(path);
-            string directory = Path.GetDirectoryName(path);
+            await stream.CopyToAsync(fileStream);
+        }
 
-            // Ensure cache directory is created before creating files
-            if (!Directory.Exists(directory))
-            {
-                Directory.CreateDirectory(directory);
-            }
+        using (FileStream fileStream = File.Create(metaPath))
+        {
+            await metadata.WriteAsync(fileStream);
+        }
+    }
 
-            using (FileStream fileStream = File.Create(imagePath))
-            {
-                await stream.CopyToAsync(fileStream);
-            }
+    /// <summary>
+    /// Gets the path to the image file based on the supplied root and metadata.
+    /// </summary>
+    /// <param name="path">The root path.</param>
+    /// <param name="metaData">The image metadata.</param>
+    /// <returns>The <see cref="string"/>.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private string ToImageFilePath(string path, in ImageCacheMetadata metaData)
+        => $"{path}.{this.formatUtilities.GetExtensionFromContentType(metaData.ContentType)}";
 
-            using (FileStream fileStream = File.Create(metaPath))
-            {
-                await metadata.WriteAsync(fileStream);
-            }
+    /// <summary>
+    /// Gets the path to the image file based on the supplied root.
+    /// </summary>
+    /// <param name="path">The root path.</param>
+    /// <returns>The <see cref="string"/>.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static string ToMetaDataFilePath(string path) => $"{path}.meta";
+
+    /// <summary>
+    /// Converts the key into a nested file path.
+    /// </summary>
+    /// <param name="key">The cache key.</param>
+    /// <param name="cacheFolderDepth">The depth of the nested cache folders structure to store the images.</param>
+    /// <returns>
+    /// The <see cref="string" />.
+    /// </returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    internal static unsafe string ToFilePath(string key, int cacheFolderDepth)
+    {
+        if (cacheFolderDepth == 0)
+        {
+            // Short-circuit when not nesting folders
+            return key;
         }
 
-        /// <summary>
-        /// Gets the path to the image file based on the supplied root and metadata.
-        /// </summary>
-        /// <param name="path">The root path.</param>
-        /// <param name="metaData">The image metadata.</param>
-        /// <returns>The <see cref="string"/>.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private string ToImageFilePath(string path, in ImageCacheMetadata metaData)
-            => $"{path}.{this.formatUtilities.GetExtensionFromContentType(metaData.ContentType)}";
-
-        /// <summary>
-        /// Gets the path to the image file based on the supplied root.
-        /// </summary>
-        /// <param name="path">The root path.</param>
-        /// <returns>The <see cref="string"/>.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private string ToMetaDataFilePath(string path) => $"{path}.meta";
-
-        /// <summary>
-        /// Converts the key into a nested file path.
-        /// </summary>
-        /// <param name="key">The cache key.</param>
-        /// <param name="cacheFolderDepth">The depth of the nested cache folders structure to store the images.</param>
-        /// <returns>
-        /// The <see cref="string" />.
-        /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static unsafe string ToFilePath(string key, int cacheFolderDepth)
+        int length;
+        int nameStartIndex;
+        if (cacheFolderDepth >= key.Length)
         {
-            if (cacheFolderDepth == 0)
-            {
-                // Short-circuit when not nesting folders
-                return key;
-            }
+            // Keep all characters in file name (legacy behavior)
+            cacheFolderDepth = key.Length;
+            length = (cacheFolderDepth * 2) + key.Length;
+            nameStartIndex = 0;
+        }
+        else
+        {
+            // Remove characters used in folders from file name
+            length = cacheFolderDepth + key.Length;
+            nameStartIndex = cacheFolderDepth;
+        }
 
-            int length;
-            int nameStartIndex;
-            if (cacheFolderDepth >= key.Length)
-            {
-                // Keep all characters in file name (legacy behavior)
-                cacheFolderDepth = key.Length;
-                length = (cacheFolderDepth * 2) + key.Length;
-                nameStartIndex = 0;
-            }
-            else
+        fixed (char* keyPtr = key)
+        {
+            return string.Create(length, (Ptr: (IntPtr)keyPtr, key.Length), (chars, args) =>
             {
-                // Remove characters used in folders from file name
-                length = cacheFolderDepth + key.Length;
-                nameStartIndex = cacheFolderDepth;
-            }
+                const char separator = '/';
+                ReadOnlySpan<char> keySpan = new((char*)args.Ptr, args.Length);
+                ref char keyRef = ref MemoryMarshal.GetReference(keySpan);
+                ref char charRef = ref MemoryMarshal.GetReference(chars);
 
-            fixed (char* keyPtr = key)
-            {
-                return string.Create(length, (Ptr: (IntPtr)keyPtr, key.Length), (chars, args) =>
+                int index = 0;
+                for (int i = 0; i < cacheFolderDepth; i++)
+                {
+                    Unsafe.Add(ref charRef, index++) = Unsafe.Add(ref keyRef, i);
+                    Unsafe.Add(ref charRef, index++) = separator;
+                }
+
+                for (int i = nameStartIndex; i < keySpan.Length; i++)
                 {
-                    const char separator = '/';
-                    var keySpan = new ReadOnlySpan<char>((char*)args.Ptr, args.Length);
-                    ref char keyRef = ref MemoryMarshal.GetReference(keySpan);
-                    ref char charRef = ref MemoryMarshal.GetReference(chars);
-
-                    int index = 0;
-                    for (int i = 0; i < cacheFolderDepth; i++)
-                    {
-                        Unsafe.Add(ref charRef, index++) = Unsafe.Add(ref keyRef, i);
-                        Unsafe.Add(ref charRef, index++) = separator;
-                    }
-
-                    for (int i = nameStartIndex; i < keySpan.Length; i++)
-                    {
-                        Unsafe.Add(ref charRef, index++) = Unsafe.Add(ref keyRef, i);
-                    }
-                });
-            }
+                    Unsafe.Add(ref charRef, index++) = Unsafe.Add(ref keyRef, i);
+                }
+            });
         }
     }
 }
diff --git a/src/ImageSharp.Web/Caching/PhysicalFileSystemCacheOptions.cs b/src/ImageSharp.Web/Caching/PhysicalFileSystemCacheOptions.cs
index 9996f329..ad09f177 100644
--- a/src/ImageSharp.Web/Caching/PhysicalFileSystemCacheOptions.cs
+++ b/src/ImageSharp.Web/Caching/PhysicalFileSystemCacheOptions.cs
@@ -1,35 +1,35 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-namespace SixLabors.ImageSharp.Web.Caching
+namespace SixLabors.ImageSharp.Web.Caching;
+
+/// <summary>
+/// Configuration options for the <see cref="PhysicalFileSystemCache" />.
+/// </summary>
+public class PhysicalFileSystemCacheOptions
 {
     /// <summary>
-    /// Configuration options for the <see cref="PhysicalFileSystemCache" />.
+    /// Gets or sets the optional cache root folder path.
+    /// <para>
+    /// This value can be <see langword="null"/>, a fully qualified absolute path,
+    /// or a path relative to the directory that contains the application
+    /// content files.
+    /// </para>
+    /// <para>
+    /// If not set, this will default to the directory that contains the web-servable
+    /// application content files; commonly 'wwwroot'.
+    /// </para>
     /// </summary>
-    public class PhysicalFileSystemCacheOptions
-    {
-        /// <summary>
-        /// Gets or sets the optional cache root folder path.
-        /// <para>
-        /// This value can be <see langword="null"/>, a fully qualified absolute path,
-        /// or a path relative to the directory that contains the application
-        /// content files.
-        /// </para>
-        /// <para>
-        /// If not set, this will default to the directory that contains the web-servable
-        /// application content files; commonly 'wwwroot'.
-        /// </para>
-        /// </summary>
-        public string CacheRootPath { get; set; }
+    public string CacheRootPath { get; set; }
 
-        /// <summary>
-        /// Gets or sets the cache folder name.
-        /// </summary>
-        public string CacheFolder { get; set; } = "is-cache";
+    /// <summary>
+    /// Gets or sets the cache folder name.
+    /// </summary>
+    public string CacheFolder { get; set; } = "is-cache";
 
-        /// <summary>
-        /// Gets or sets the depth of the nested cache folders structure to store the images. Defaults to 8.
-        /// </summary>
-        public uint CacheFolderDepth { get; set; } = 8;
-    }
+    /// <summary>
+    /// Gets or sets the depth of the nested cache folders structure to store the images. Defaults to 8.
+    /// </summary>
+    public uint CacheFolderDepth { get; set; } = 8;
 }
diff --git a/src/ImageSharp.Web/Caching/SHA256CacheHash.cs b/src/ImageSharp.Web/Caching/SHA256CacheHash.cs
index b745ec9c..7d855c2c 100644
--- a/src/ImageSharp.Web/Caching/SHA256CacheHash.cs
+++ b/src/ImageSharp.Web/Caching/SHA256CacheHash.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
 using System.Buffers;
 using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
@@ -9,62 +9,61 @@
 using Microsoft.Extensions.Options;
 using SixLabors.ImageSharp.Web.Middleware;
 
-namespace SixLabors.ImageSharp.Web.Caching
+namespace SixLabors.ImageSharp.Web.Caching;
+
+/// <summary>
+/// Creates hashed keys for the given inputs hashing them to string of length ranging from 2 to 64.
+/// Hashed keys are the result of the SHA256 computation of the input value for the given length.
+/// This ensures low collision rates with a shorter file name.
+/// </summary>
+public sealed class SHA256CacheHash : ICacheHash
 {
     /// <summary>
-    /// Creates hashed keys for the given inputs hashing them to string of length ranging from 2 to 64.
-    /// Hashed keys are the result of the SHA256 computation of the input value for the given length.
-    /// This ensures low collision rates with a shorter file name.
+    /// Initializes a new instance of the <see cref="SHA256CacheHash"/> class.
     /// </summary>
-    public sealed class SHA256CacheHash : ICacheHash
+    /// <param name="options">The middleware configuration options.</param>
+    public SHA256CacheHash(IOptions<ImageSharpMiddlewareOptions> options)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SHA256CacheHash"/> class.
-        /// </summary>
-        /// <param name="options">The middleware configuration options.</param>
-        public SHA256CacheHash(IOptions<ImageSharpMiddlewareOptions> options)
-        {
-            Guard.NotNull(options, nameof(options));
-            Guard.MustBeBetweenOrEqualTo<uint>(options.Value.CacheHashLength, 2, 64, nameof(options.Value.CacheHashLength));
-        }
+        Guard.NotNull(options, nameof(options));
+        Guard.MustBeBetweenOrEqualTo<uint>(options.Value.CacheHashLength, 2, 64, nameof(options.Value.CacheHashLength));
+    }
 
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public string Create(string value, uint length)
-        {
-            int byteCount = Encoding.ASCII.GetByteCount(value);
-            byte[] buffer = null;
+    /// <inheritdoc/>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public string Create(string value, uint length)
+    {
+        int byteCount = Encoding.ASCII.GetByteCount(value);
+        byte[] buffer = null;
 
-            try
-            {
-                // Allocating a buffer from the pool is ~27% slower than stackalloc so use that for short strings
-                Span<byte> bytes = byteCount <= 128
-                    ? stackalloc byte[byteCount]
-                    : (buffer = ArrayPool<byte>.Shared.Rent(byteCount)).AsSpan(0, byteCount);
+        try
+        {
+            // Allocating a buffer from the pool is ~27% slower than stackalloc so use that for short strings
+            Span<byte> bytes = byteCount <= 128
+                ? stackalloc byte[byteCount]
+                : (buffer = ArrayPool<byte>.Shared.Rent(byteCount)).AsSpan(0, byteCount);
 
-                return HashValue(value, length, bytes);
-            }
-            finally
+            return HashValue(value, length, bytes);
+        }
+        finally
+        {
+            if (buffer != null)
             {
-                if (buffer != null)
-                {
-                    ArrayPool<byte>.Shared.Return(buffer);
-                }
+                ArrayPool<byte>.Shared.Return(buffer);
             }
         }
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static string HashValue(ReadOnlySpan<char> value, uint length, Span<byte> bufferSpan)
-        {
-            using var hashAlgorithm = SHA256.Create();
-            Encoding.ASCII.GetBytes(value, bufferSpan);
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static string HashValue(ReadOnlySpan<char> value, uint length, Span<byte> bufferSpan)
+    {
+        using var hashAlgorithm = SHA256.Create();
+        Encoding.ASCII.GetBytes(value, bufferSpan);
 
-            // Hashed output maxes out at 32 bytes @ 256bit/8 so we're safe to use stackalloc
-            Span<byte> hash = stackalloc byte[32];
-            hashAlgorithm.TryComputeHash(bufferSpan, hash, out int _);
+        // Hashed output maxes out at 32 bytes @ 256bit/8 so we're safe to use stackalloc
+        Span<byte> hash = stackalloc byte[32];
+        hashAlgorithm.TryComputeHash(bufferSpan, hash, out int _);
 
-            // Length maxes out at 64 since we throw if options is greater
-            return HexEncoder.Encode(hash.Slice(0, (int)(length / 2)));
-        }
+        // Length maxes out at 64 since we throw if options is greater
+        return HexEncoder.Encode(hash.Slice(0, (int)(length / 2)));
     }
 }
diff --git a/src/ImageSharp.Web/Caching/UriAbsoluteCacheKey.cs b/src/ImageSharp.Web/Caching/UriAbsoluteCacheKey.cs
index 941ffcfe..74ed4c59 100644
--- a/src/ImageSharp.Web/Caching/UriAbsoluteCacheKey.cs
+++ b/src/ImageSharp.Web/Caching/UriAbsoluteCacheKey.cs
@@ -1,23 +1,23 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Caching
+namespace SixLabors.ImageSharp.Web.Caching;
+
+/// <summary>
+/// Creates a cache key based on the request host, path and commands.
+/// </summary>
+public class UriAbsoluteCacheKey : ICacheKey
 {
-    /// <summary>
-    /// Creates a cache key based on the request host, path and commands.
-    /// </summary>
-    public class UriAbsoluteCacheKey : ICacheKey
-    {
-        /// <inheritdoc/>
-        public string Create(HttpContext context, CommandCollection commands)
-            => CaseHandlingUriBuilder.BuildAbsolute(
-                CaseHandlingUriBuilder.CaseHandling.None,
-                context.Request.Host,
-                context.Request.PathBase,
-                context.Request.Path,
-                QueryString.Create(commands));
-    }
+    /// <inheritdoc/>
+    public string Create(HttpContext context, CommandCollection commands)
+        => CaseHandlingUriBuilder.BuildAbsolute(
+            CaseHandlingUriBuilder.CaseHandling.None,
+            context.Request.Host,
+            context.Request.PathBase,
+            context.Request.Path,
+            QueryString.Create(commands));
 }
diff --git a/src/ImageSharp.Web/Caching/UriAbsoluteLowerInvariantCacheKey.cs b/src/ImageSharp.Web/Caching/UriAbsoluteLowerInvariantCacheKey.cs
index 333acbc8..1c78b30f 100644
--- a/src/ImageSharp.Web/Caching/UriAbsoluteLowerInvariantCacheKey.cs
+++ b/src/ImageSharp.Web/Caching/UriAbsoluteLowerInvariantCacheKey.cs
@@ -1,23 +1,23 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Caching
+namespace SixLabors.ImageSharp.Web.Caching;
+
+/// <summary>
+/// Creates a case insensitive cache key based on the request host, path and commands.
+/// </summary>
+public class UriAbsoluteLowerInvariantCacheKey : ICacheKey
 {
-    /// <summary>
-    /// Creates a case insensitive cache key based on the request host, path and commands.
-    /// </summary>
-    public class UriAbsoluteLowerInvariantCacheKey : ICacheKey
-    {
-        /// <inheritdoc/>
-        public string Create(HttpContext context, CommandCollection commands)
-            => CaseHandlingUriBuilder.BuildAbsolute(
-                CaseHandlingUriBuilder.CaseHandling.LowerInvariant,
-                context.Request.Host,
-                context.Request.PathBase,
-                context.Request.Path,
-                QueryString.Create(commands));
-    }
+    /// <inheritdoc/>
+    public string Create(HttpContext context, CommandCollection commands)
+        => CaseHandlingUriBuilder.BuildAbsolute(
+            CaseHandlingUriBuilder.CaseHandling.LowerInvariant,
+            context.Request.Host,
+            context.Request.PathBase,
+            context.Request.Path,
+            QueryString.Create(commands));
 }
diff --git a/src/ImageSharp.Web/Caching/UriRelativeCacheKey.cs b/src/ImageSharp.Web/Caching/UriRelativeCacheKey.cs
index e7446a24..cefe8dd0 100644
--- a/src/ImageSharp.Web/Caching/UriRelativeCacheKey.cs
+++ b/src/ImageSharp.Web/Caching/UriRelativeCacheKey.cs
@@ -1,18 +1,18 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Caching
+namespace SixLabors.ImageSharp.Web.Caching;
+
+/// <summary>
+/// Creates a cache key based on the request path and commands.
+/// </summary>
+public class UriRelativeCacheKey : ICacheKey
 {
-    /// <summary>
-    /// Creates a cache key based on the request path and commands.
-    /// </summary>
-    public class UriRelativeCacheKey : ICacheKey
-    {
-        /// <inheritdoc/>
-        public string Create(HttpContext context, CommandCollection commands)
-            => CaseHandlingUriBuilder.BuildRelative(CaseHandlingUriBuilder.CaseHandling.None, context.Request.PathBase, context.Request.Path, QueryString.Create(commands));
-    }
+    /// <inheritdoc/>
+    public string Create(HttpContext context, CommandCollection commands)
+        => CaseHandlingUriBuilder.BuildRelative(CaseHandlingUriBuilder.CaseHandling.None, context.Request.PathBase, context.Request.Path, QueryString.Create(commands));
 }
diff --git a/src/ImageSharp.Web/Caching/UriRelativeLowerInvariantCacheKey.cs b/src/ImageSharp.Web/Caching/UriRelativeLowerInvariantCacheKey.cs
index 8a9b0b19..1071c333 100644
--- a/src/ImageSharp.Web/Caching/UriRelativeLowerInvariantCacheKey.cs
+++ b/src/ImageSharp.Web/Caching/UriRelativeLowerInvariantCacheKey.cs
@@ -1,18 +1,18 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Caching
+namespace SixLabors.ImageSharp.Web.Caching;
+
+/// <summary>
+/// Creates a case insensitive cache key based on the request path and commands.
+/// </summary>
+public class UriRelativeLowerInvariantCacheKey : ICacheKey
 {
-    /// <summary>
-    /// Creates a case insensitive cache key based on the request path and commands.
-    /// </summary>
-    public class UriRelativeLowerInvariantCacheKey : ICacheKey
-    {
-        /// <inheritdoc/>
-        public string Create(HttpContext context, CommandCollection commands)
-            => CaseHandlingUriBuilder.BuildRelative(CaseHandlingUriBuilder.CaseHandling.LowerInvariant, context.Request.PathBase, context.Request.Path, QueryString.Create(commands));
-    }
+    /// <inheritdoc/>
+    public string Create(HttpContext context, CommandCollection commands)
+        => CaseHandlingUriBuilder.BuildRelative(CaseHandlingUriBuilder.CaseHandling.LowerInvariant, context.Request.PathBase, context.Request.Path, QueryString.Create(commands));
 }
diff --git a/src/ImageSharp.Web/CaseHandlingUriBuilder.cs b/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
index ca09a4f6..f257fa08 100644
--- a/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
+++ b/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
@@ -1,237 +1,236 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
 using System.Buffers;
 using System.Runtime.CompilerServices;
 using Microsoft.AspNetCore.Http;
 
-namespace SixLabors.ImageSharp.Web
+namespace SixLabors.ImageSharp.Web;
+
+/// <summary>
+/// Optimized helper methods for generating encoded Uris from URI components.
+/// Much of this code has been adapted from the MIT licensed .NET runtime.
+/// </summary>
+public static class CaseHandlingUriBuilder
 {
+    private static readonly Uri FallbackBaseUri = new("http://localhost/");
+    private static readonly SpanAction<char, (bool LowerInvariant, string Scheme, string Host, string PathBase, string Path, string Query)> InitializeAbsoluteUriStringSpanAction = new(InitializeAbsoluteUriString);
+
     /// <summary>
-    /// Optimized helper methods for generating encoded Uris from URI components.
-    /// Much of this code has been adapted from the MIT licensed .NET runtime.
+    /// Provides Uri case handling options.
     /// </summary>
-    public static class CaseHandlingUriBuilder
+    public enum CaseHandling
     {
-        private static readonly Uri FallbackBaseUri = new("http://localhost/");
-        private static readonly SpanAction<char, (bool LowerInvariant, string Scheme, string Host, string PathBase, string Path, string Query)> InitializeAbsoluteUriStringSpanAction = new(InitializeAbsoluteUriString);
-
         /// <summary>
-        /// Provides Uri case handling options.
+        /// No adjustments to casing are made.
         /// </summary>
-        public enum CaseHandling
-        {
-            /// <summary>
-            /// No adjustments to casing are made.
-            /// </summary>
-            None,
-
-            /// <summary>
-            /// All URI components are converted to lower case using the invariant culture before combining.
-            /// </summary>
-            LowerInvariant
-        }
+        None,
 
         /// <summary>
-        /// Combines the given URI components into a string that is properly encoded for use in HTTP headers.
+        /// All URI components are converted to lower case using the invariant culture before combining.
         /// </summary>
-        /// <param name="handling">Determines case handling for the result. <paramref name="query"/> is always converted to invariant lowercase.</param>
-        /// <param name="pathBase">The first portion of the request path associated with application root.</param>
-        /// <param name="path">The portion of the request path that identifies the requested resource.</param>
-        /// <param name="query">The query, if any.</param>
-        /// <returns>The combined URI components, properly encoded for use in HTTP headers.</returns>
-        public static string BuildRelative(
-            CaseHandling handling,
-            PathString pathBase = default,
-            PathString path = default,
-            QueryString query = default)
-
-            // Take any potential performance hit vs concatination for code reading sanity.
-            => BuildAbsolute(handling, default, pathBase, path, query);
+        LowerInvariant
+    }
 
-        /// <summary>
-        /// Combines the given URI components into a string that is properly encoded for use in HTTP headers.
-        /// Note that unicode in the HostString will be encoded as punycode and the scheme is not included
-        /// in the result.
-        /// </summary>
-        /// <param name="handling">Determines case handling for the result. <paramref name="query"/> is always converted to invariant lowercase.</param>
-        /// <param name="host">The host portion of the uri normally included in the Host header. This may include the port.</param>
-        /// <param name="pathBase">The first portion of the request path associated with application root.</param>
-        /// <param name="path">The portion of the request path that identifies the requested resource.</param>
-        /// <param name="query">The query, if any.</param>
-        /// <returns>The combined URI components, properly encoded for use in HTTP headers.</returns>
-        public static string BuildAbsolute(
-            CaseHandling handling,
-            HostString host,
-            PathString pathBase = default,
-            PathString path = default,
-            QueryString query = default)
-            => BuildAbsolute(handling, string.Empty, host, pathBase, path, query);
+    /// <summary>
+    /// Combines the given URI components into a string that is properly encoded for use in HTTP headers.
+    /// </summary>
+    /// <param name="handling">Determines case handling for the result. <paramref name="query"/> is always converted to invariant lowercase.</param>
+    /// <param name="pathBase">The first portion of the request path associated with application root.</param>
+    /// <param name="path">The portion of the request path that identifies the requested resource.</param>
+    /// <param name="query">The query, if any.</param>
+    /// <returns>The combined URI components, properly encoded for use in HTTP headers.</returns>
+    public static string BuildRelative(
+        CaseHandling handling,
+        PathString pathBase = default,
+        PathString path = default,
+        QueryString query = default)
+
+        // Take any potential performance hit vs concatination for code reading sanity.
+        => BuildAbsolute(handling, default, pathBase, path, query);
 
-        /// <summary>
-        /// Combines the given URI components into a string that is properly encoded for use in HTTP headers.
-        /// Note that unicode in the HostString will be encoded as punycode.
-        /// </summary>
-        /// <param name="handling">Determines case handling for the result. <paramref name="query"/> is always converted to invariant lowercase.</param>
-        /// <param name="scheme">http, https, etc.</param>
-        /// <param name="host">The host portion of the uri normally included in the Host header. This may include the port.</param>
-        /// <param name="pathBase">The first portion of the request path associated with application root.</param>
-        /// <param name="path">The portion of the request path that identifies the requested resource.</param>
-        /// <param name="query">The query, if any.</param>
-        /// <returns>The combined URI components, properly encoded for use in HTTP headers.</returns>
-        public static string BuildAbsolute(
-            CaseHandling handling,
-            string scheme,
-            HostString host,
-            PathString pathBase = default,
-            PathString path = default,
-            QueryString query = default)
+    /// <summary>
+    /// Combines the given URI components into a string that is properly encoded for use in HTTP headers.
+    /// Note that unicode in the HostString will be encoded as punycode and the scheme is not included
+    /// in the result.
+    /// </summary>
+    /// <param name="handling">Determines case handling for the result. <paramref name="query"/> is always converted to invariant lowercase.</param>
+    /// <param name="host">The host portion of the uri normally included in the Host header. This may include the port.</param>
+    /// <param name="pathBase">The first portion of the request path associated with application root.</param>
+    /// <param name="path">The portion of the request path that identifies the requested resource.</param>
+    /// <param name="query">The query, if any.</param>
+    /// <returns>The combined URI components, properly encoded for use in HTTP headers.</returns>
+    public static string BuildAbsolute(
+        CaseHandling handling,
+        HostString host,
+        PathString pathBase = default,
+        PathString path = default,
+        QueryString query = default)
+        => BuildAbsolute(handling, string.Empty, host, pathBase, path, query);
+
+    /// <summary>
+    /// Combines the given URI components into a string that is properly encoded for use in HTTP headers.
+    /// Note that unicode in the HostString will be encoded as punycode.
+    /// </summary>
+    /// <param name="handling">Determines case handling for the result. <paramref name="query"/> is always converted to invariant lowercase.</param>
+    /// <param name="scheme">http, https, etc.</param>
+    /// <param name="host">The host portion of the uri normally included in the Host header. This may include the port.</param>
+    /// <param name="pathBase">The first portion of the request path associated with application root.</param>
+    /// <param name="path">The portion of the request path that identifies the requested resource.</param>
+    /// <param name="query">The query, if any.</param>
+    /// <returns>The combined URI components, properly encoded for use in HTTP headers.</returns>
+    public static string BuildAbsolute(
+        CaseHandling handling,
+        string scheme,
+        HostString host,
+        PathString pathBase = default,
+        PathString path = default,
+        QueryString query = default)
+    {
+        Guard.NotNull(scheme, nameof(scheme));
+
+        string hostText = host.ToUriComponent();
+        string pathBaseText = pathBase.ToUriComponent();
+        string pathText = path.ToUriComponent();
+        string queryText = query.ToUriComponent();
+
+        // PERF: Calculate string length to allocate correct buffer size for string.Create.
+        int length =
+            (scheme.Length > 0 ? scheme.Length + Uri.SchemeDelimiter.Length : 0) +
+            hostText.Length +
+            pathBaseText.Length +
+            pathText.Length +
+            queryText.Length;
+
+        if (string.IsNullOrEmpty(pathText))
         {
-            Guard.NotNull(scheme, nameof(scheme));
-
-            string hostText = host.ToUriComponent();
-            string pathBaseText = pathBase.ToUriComponent();
-            string pathText = path.ToUriComponent();
-            string queryText = query.ToUriComponent();
-
-            // PERF: Calculate string length to allocate correct buffer size for string.Create.
-            int length =
-                (scheme.Length > 0 ? scheme.Length + Uri.SchemeDelimiter.Length : 0) +
-                hostText.Length +
-                pathBaseText.Length +
-                pathText.Length +
-                queryText.Length;
-
-            if (string.IsNullOrEmpty(pathText))
+            if (string.IsNullOrEmpty(pathBaseText))
             {
-                if (string.IsNullOrEmpty(pathBaseText))
-                {
-                    pathText = "/";
-                    length++;
-                }
+                pathText = "/";
+                length++;
             }
-            else if (pathBaseText.EndsWith('/'))
-            {
-                // If the path string has a trailing slash and the other string has a leading slash, we need
-                // to trim one of them.
-                // Just decrement the total length, for now.
-                length--;
-            }
-
-            return string.Create(
-                length,
-                (handling == CaseHandling.LowerInvariant, scheme, hostText, pathBaseText, pathText, queryText),
-                InitializeAbsoluteUriStringSpanAction);
         }
-
-        /// <summary>
-        /// Generates a string from the given absolute or relative Uri that is appropriately encoded for use in
-        /// HTTP headers. Note that a unicode host name will be encoded as punycode.
-        /// </summary>
-        /// <param name="handling">Determines case handling for the result.</param>
-        /// <param name="uri">The Uri to encode.</param>
-        /// <returns>The encoded string version of <paramref name="uri"/>.</returns>
-        public static string Encode(CaseHandling handling, string uri)
+        else if (pathBaseText.EndsWith('/'))
         {
-            Guard.NotNull(uri, nameof(uri));
-            return Encode(handling, new Uri(uri, UriKind.RelativeOrAbsolute));
+            // If the path string has a trailing slash and the other string has a leading slash, we need
+            // to trim one of them.
+            // Just decrement the total length, for now.
+            length--;
         }
 
-        /// <summary>
-        /// Generates a string from the given absolute or relative Uri that is appropriately encoded for use in
-        /// HTTP headers. Note that a unicode host name will be encoded as punycode.
-        /// </summary>
-        /// <param name="handling">Determines case handling for the result.</param>
-        /// <param name="uri">The Uri to encode.</param>
-        /// <returns>The encoded string version of <paramref name="uri"/>.</returns>
-        public static string Encode(CaseHandling handling, Uri uri)
+        return string.Create(
+            length,
+            (handling == CaseHandling.LowerInvariant, scheme, hostText, pathBaseText, pathText, queryText),
+            InitializeAbsoluteUriStringSpanAction);
+    }
+
+    /// <summary>
+    /// Generates a string from the given absolute or relative Uri that is appropriately encoded for use in
+    /// HTTP headers. Note that a unicode host name will be encoded as punycode.
+    /// </summary>
+    /// <param name="handling">Determines case handling for the result.</param>
+    /// <param name="uri">The Uri to encode.</param>
+    /// <returns>The encoded string version of <paramref name="uri"/>.</returns>
+    public static string Encode(CaseHandling handling, string uri)
+    {
+        Guard.NotNull(uri, nameof(uri));
+        return Encode(handling, new Uri(uri, UriKind.RelativeOrAbsolute));
+    }
+
+    /// <summary>
+    /// Generates a string from the given absolute or relative Uri that is appropriately encoded for use in
+    /// HTTP headers. Note that a unicode host name will be encoded as punycode.
+    /// </summary>
+    /// <param name="handling">Determines case handling for the result.</param>
+    /// <param name="uri">The Uri to encode.</param>
+    /// <returns>The encoded string version of <paramref name="uri"/>.</returns>
+    public static string Encode(CaseHandling handling, Uri uri)
+    {
+        Guard.NotNull(uri, nameof(uri));
+        if (uri.IsAbsoluteUri)
         {
-            Guard.NotNull(uri, nameof(uri));
-            if (uri.IsAbsoluteUri)
-            {
-                return BuildAbsolute(
-                    handling,
-                    scheme: uri.Scheme,
-                    host: HostString.FromUriComponent(uri),
-                    pathBase: PathString.FromUriComponent(uri),
-                    query: QueryString.FromUriComponent(uri));
-            }
-            else
-            {
-                Uri faux = new(FallbackBaseUri, uri);
-                return BuildRelative(
-                    handling,
-                    path: PathString.FromUriComponent(faux),
-                    query: QueryString.FromUriComponent(faux));
-            }
+            return BuildAbsolute(
+                handling,
+                scheme: uri.Scheme,
+                host: HostString.FromUriComponent(uri),
+                pathBase: PathString.FromUriComponent(uri),
+                query: QueryString.FromUriComponent(uri));
         }
-
-        /// <summary>
-        /// Copies the specified <paramref name="text"/> to the specified <paramref name="buffer"/> starting at the specified <paramref name="index"/>.
-        /// </summary>
-        /// <param name="buffer">The buffer to copy text to.</param>
-        /// <param name="index">The buffer start index.</param>
-        /// <param name="text">The text to copy.</param>
-        /// <returns>The <see cref="int"/> representing the combined text length.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static int CopyTextToBuffer(Span<char> buffer, int index, ReadOnlySpan<char> text)
+        else
         {
-            text.CopyTo(buffer.Slice(index, text.Length));
-            return index + text.Length;
+            Uri faux = new(FallbackBaseUri, uri);
+            return BuildRelative(
+                handling,
+                path: PathString.FromUriComponent(faux),
+                query: QueryString.FromUriComponent(faux));
         }
+    }
 
-        /// <summary>
-        /// Copies the specified <paramref name="text"/> to the specified <paramref name="buffer"/> starting at the specified <paramref name="index"/>
-        /// converting each character to lowercase, using the casing rules of the invariant culture.
-        /// </summary>
-        /// <param name="buffer">The buffer to copy text to.</param>
-        /// <param name="index">The buffer start index.</param>
-        /// <param name="text">The text to copy.</param>
-        /// <returns>The <see cref="int"/> representing the combined text length.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static int CopyTextToBufferLowerInvariant(Span<char> buffer, int index, ReadOnlySpan<char> text)
-            => index + text.ToLowerInvariant(buffer.Slice(index, text.Length));
+    /// <summary>
+    /// Copies the specified <paramref name="text"/> to the specified <paramref name="buffer"/> starting at the specified <paramref name="index"/>.
+    /// </summary>
+    /// <param name="buffer">The buffer to copy text to.</param>
+    /// <param name="index">The buffer start index.</param>
+    /// <param name="text">The text to copy.</param>
+    /// <returns>The <see cref="int"/> representing the combined text length.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static int CopyTextToBuffer(Span<char> buffer, int index, ReadOnlySpan<char> text)
+    {
+        text.CopyTo(buffer.Slice(index, text.Length));
+        return index + text.Length;
+    }
 
-        /// <summary>
-        /// Initializes the URI <see cref="string"/> for <see cref="BuildAbsolute(CaseHandling, HostString, PathString, PathString, QueryString)"/>.
-        /// </summary>
-        /// <param name="buffer">The URI <see cref="string"/>'s <see cref="char"/> buffer.</param>
-        /// <param name="uriParts">The URI parts.</param>
-        private static void InitializeAbsoluteUriString(Span<char> buffer, (bool Lower, string Scheme, string Host, string PathBase, string Path, string Query) uriParts)
-        {
-            int index = 0;
-            ReadOnlySpan<char> pathBaseSpan = uriParts.PathBase.AsSpan();
+    /// <summary>
+    /// Copies the specified <paramref name="text"/> to the specified <paramref name="buffer"/> starting at the specified <paramref name="index"/>
+    /// converting each character to lowercase, using the casing rules of the invariant culture.
+    /// </summary>
+    /// <param name="buffer">The buffer to copy text to.</param>
+    /// <param name="index">The buffer start index.</param>
+    /// <param name="text">The text to copy.</param>
+    /// <returns>The <see cref="int"/> representing the combined text length.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static int CopyTextToBufferLowerInvariant(Span<char> buffer, int index, ReadOnlySpan<char> text)
+        => index + text.ToLowerInvariant(buffer.Slice(index, text.Length));
 
-            if (uriParts.Path.Length > 0 && pathBaseSpan.Length > 0 && pathBaseSpan[pathBaseSpan.Length - 1] == '/')
-            {
-                // If the path string has a trailing slash and the other string has a leading slash, we need
-                // to trim one of them.
-                // Trim the last slash from pathBase. The total length was decremented before the call to string.Create.
-                pathBaseSpan = pathBaseSpan.Slice(0, pathBaseSpan.Length - 1);
-            }
+    /// <summary>
+    /// Initializes the URI <see cref="string"/> for <see cref="BuildAbsolute(CaseHandling, HostString, PathString, PathString, QueryString)"/>.
+    /// </summary>
+    /// <param name="buffer">The URI <see cref="string"/>'s <see cref="char"/> buffer.</param>
+    /// <param name="uriParts">The URI parts.</param>
+    private static void InitializeAbsoluteUriString(Span<char> buffer, (bool Lower, string Scheme, string Host, string PathBase, string Path, string Query) uriParts)
+    {
+        int index = 0;
+        ReadOnlySpan<char> pathBaseSpan = uriParts.PathBase.AsSpan();
 
-            if (uriParts.Scheme.Length > 0)
-            {
-                index = CopyTextToBufferLowerInvariant(buffer, index, uriParts.Scheme.AsSpan());
-                index = CopyTextToBuffer(buffer, index, Uri.SchemeDelimiter.AsSpan());
-            }
+        if (uriParts.Path.Length > 0 && pathBaseSpan.Length > 0 && pathBaseSpan[pathBaseSpan.Length - 1] == '/')
+        {
+            // If the path string has a trailing slash and the other string has a leading slash, we need
+            // to trim one of them.
+            // Trim the last slash from pathBase. The total length was decremented before the call to string.Create.
+            pathBaseSpan = pathBaseSpan.Slice(0, pathBaseSpan.Length - 1);
+        }
 
-            if (uriParts.Lower)
-            {
-                index = CopyTextToBufferLowerInvariant(buffer, index, uriParts.Host.AsSpan());
-                index = CopyTextToBufferLowerInvariant(buffer, index, pathBaseSpan);
-                index = CopyTextToBufferLowerInvariant(buffer, index, uriParts.Path.AsSpan());
-            }
-            else
-            {
-                index = CopyTextToBuffer(buffer, index, uriParts.Host.AsSpan());
-                index = CopyTextToBuffer(buffer, index, pathBaseSpan);
-                index = CopyTextToBuffer(buffer, index, uriParts.Path.AsSpan());
-            }
+        if (uriParts.Scheme.Length > 0)
+        {
+            index = CopyTextToBufferLowerInvariant(buffer, index, uriParts.Scheme.AsSpan());
+            index = CopyTextToBuffer(buffer, index, Uri.SchemeDelimiter.AsSpan());
+        }
 
-            // Querystring is always copied as lower invariant.
-            _ = CopyTextToBufferLowerInvariant(buffer, index, uriParts.Query.AsSpan());
+        if (uriParts.Lower)
+        {
+            index = CopyTextToBufferLowerInvariant(buffer, index, uriParts.Host.AsSpan());
+            index = CopyTextToBufferLowerInvariant(buffer, index, pathBaseSpan);
+            index = CopyTextToBufferLowerInvariant(buffer, index, uriParts.Path.AsSpan());
+        }
+        else
+        {
+            index = CopyTextToBuffer(buffer, index, uriParts.Host.AsSpan());
+            index = CopyTextToBuffer(buffer, index, pathBaseSpan);
+            index = CopyTextToBuffer(buffer, index, uriParts.Path.AsSpan());
         }
+
+        // Querystring is always copied as lower invariant.
+        _ = CopyTextToBufferLowerInvariant(buffer, index, uriParts.Query.AsSpan());
     }
 }
diff --git a/src/ImageSharp.Web/CommandHandling.cs b/src/ImageSharp.Web/CommandHandling.cs
index 5722c3f3..02f2e19b 100644
--- a/src/ImageSharp.Web/CommandHandling.cs
+++ b/src/ImageSharp.Web/CommandHandling.cs
@@ -1,24 +1,24 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web
+namespace SixLabors.ImageSharp.Web;
+
+/// <summary>
+/// Provides enumeration for handling <see cref="CommandCollection"/> instances
+/// when processing a request.
+/// </summary>
+public enum CommandHandling
 {
     /// <summary>
-    /// Provides enumeration for handling <see cref="CommandCollection"/> instances
-    /// when processing a request.
+    /// The command collection will be stripped of any unknown commands.
     /// </summary>
-    public enum CommandHandling
-    {
-        /// <summary>
-        /// The command collection will be stripped of any unknown commands.
-        /// </summary>
-        Sanitize,
+    Sanitize,
 
-        /// <summary>
-        /// The command collection will be processed unaltered.
-        /// </summary>
-        None
-    }
+    /// <summary>
+    /// The command collection will be processed unaltered.
+    /// </summary>
+    None
 }
diff --git a/src/ImageSharp.Web/Commands/CommandCollection.cs b/src/ImageSharp.Web/Commands/CommandCollection.cs
index 4e98c2de..1718384e 100644
--- a/src/ImageSharp.Web/Commands/CommandCollection.cs
+++ b/src/ImageSharp.Web/Commands/CommandCollection.cs
@@ -1,181 +1,179 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.CompilerServices;
 
-namespace SixLabors.ImageSharp.Web.Commands
+namespace SixLabors.ImageSharp.Web.Commands;
+
+/// <summary>
+/// Represents an ordered collection of processing commands.
+/// </summary>
+public sealed class CommandCollection : KeyedCollection<string, KeyValuePair<string, string>>
 {
     /// <summary>
-    /// Represents an ordered collection of processing commands.
+    /// Initializes a new instance of the <see cref="CommandCollection"/> class.
     /// </summary>
-    public sealed class CommandCollection : KeyedCollection<string, KeyValuePair<string, string>>
+    public CommandCollection()
+        : this(StringComparer.OrdinalIgnoreCase)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CommandCollection"/> class.
-        /// </summary>
-        public CommandCollection()
-            : this(StringComparer.OrdinalIgnoreCase)
-        {
-        }
+    }
 
-        private CommandCollection(IEqualityComparer<string> comparer)
-            : base(comparer)
-        {
-        }
+    private CommandCollection(IEqualityComparer<string> comparer)
+        : base(comparer)
+    {
+    }
 
-        /// <summary>
-        /// Gets an <see cref="IEnumerable{String}"/> representing the keys of the collection.
-        /// </summary>
-        public IEnumerable<string> Keys
+    /// <summary>
+    /// Gets an <see cref="IEnumerable{String}"/> representing the keys of the collection.
+    /// </summary>
+    public IEnumerable<string> Keys
+    {
+        get
         {
-            get
+            foreach (KeyValuePair<string, string> item in this)
             {
-                foreach (KeyValuePair<string, string> item in this)
-                {
-                    yield return this.GetKeyForItem(item);
-                }
+                yield return this.GetKeyForItem(item);
             }
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the value associated with the specified key.
-        /// </summary>
-        /// <param name="key">The key of the value to get or set.</param>
-        /// <returns>
-        /// The value associated with the specified key. If the specified key is not found,
-        /// a get operation throws a <see cref="KeyNotFoundException"/>, and
-        /// a set operation creates a new element with the specified key.
-        /// </returns>
-        /// <exception cref="ArgumentNullException"><paramref name="key"/> is null.</exception>
-        /// <exception cref="KeyNotFoundException">An element with the specified key does not exist in the collection.</exception>
-        public new string this[string key]
+    /// <summary>
+    /// Gets or sets the value associated with the specified key.
+    /// </summary>
+    /// <param name="key">The key of the value to get or set.</param>
+    /// <returns>
+    /// The value associated with the specified key. If the specified key is not found,
+    /// a get operation throws a <see cref="KeyNotFoundException"/>, and
+    /// a set operation creates a new element with the specified key.
+    /// </returns>
+    /// <exception cref="ArgumentNullException"><paramref name="key"/> is null.</exception>
+    /// <exception cref="KeyNotFoundException">An element with the specified key does not exist in the collection.</exception>
+    public new string this[string key]
+    {
+        get
         {
-            get
+            if (!this.TryGetValue(key, out string value))
             {
-                if (!this.TryGetValue(key, out string value))
-                {
-                    ThrowKeyNotFound();
-                }
-
-                return value;
+                ThrowKeyNotFound();
             }
 
-            set
-            {
-                if (this.TryGetValue(key, out KeyValuePair<string, string> item))
-                {
-                    this.SetItem(this.IndexOf(item), new(key, value));
-                }
-                else
-                {
-                    this.Add(key, value);
-                }
-            }
+            return value;
         }
 
-        /// <summary>
-        /// Adds an element with the provided key and value to the <see cref="CommandCollection"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="string"/> to use as the key of the element to add.</param>
-        /// <param name="value">The <see cref="string"/> to use as the value of the element to add.</param>
-        /// <exception cref="ArgumentNullException"><paramref name="key"/> is null.</exception>
-        public void Add(string key, string value) => this.Add(new(key, value));
-
-        /// <summary>
-        /// Inserts an element into the <see cref="CommandCollection"/> at the
-        /// specified index.
-        /// </summary>
-        /// <param name="index">The zero-based index at which item should be inserted.</param>
-        /// <param name="key">The <see cref="string"/> to use as the key of the element to insert.</param>
-        /// <param name="value">The <see cref="string"/> to use as the value of the element to insert.</param>
-        /// <exception cref="ArgumentOutOfRangeException">index is less than zero. -or- index is greater than <see cref="P:CommandCollection.Count"/>.</exception>
-        public void Insert(int index, string key, string value) => this.Insert(index, new(key, value));
-
-        /// <summary>
-        /// Gets the value associated with the specified key.
-        /// </summary>
-        /// <param name="key">The key whose value to get.</param>
-        /// <param name="value">
-        /// When this method returns, the value associated with the specified key, if the
-        /// key is found; otherwise, the default value for the type of the value parameter.
-        /// This parameter is passed uninitialized.
-        /// </param>
-        /// <returns>
-        /// <see langword="true"/> if the object that implements <see cref="CommandCollection"/> contains
-        /// an element with the specified key; otherwise, <see langword="false"/>.
-        /// </returns>
-        /// <exception cref="ArgumentNullException"><paramref name="key"/> is null.</exception>
-        public bool TryGetValue(string key, out string value)
+        set
         {
-            if (this.TryGetValue(key, out KeyValuePair<string, string> keyValue))
+            if (this.TryGetValue(key, out KeyValuePair<string, string> item))
             {
-                value = keyValue.Value;
-                return true;
+                this.SetItem(this.IndexOf(item), new(key, value));
+            }
+            else
+            {
+                this.Add(key, value);
             }
-
-            value = default;
-            return false;
         }
+    }
 
-        /// <summary>
-        /// Searches for an element that matches the conditions defined by the specified
-        /// predicate, and returns the zero-based index of the first occurrence within the
-        /// entire <see cref="CommandCollection"/>.
-        /// </summary>
-        /// <param name="match">
-        /// The <see cref="Predicate{T}"/> delegate that defines the conditions of the element to
-        /// search for.
-        /// </param>
-        /// <returns>
-        /// The zero-based index of the first occurrence of an element that matches the conditions
-        /// defined by match, if found; otherwise, -1.
-        /// </returns>
-        /// <exception cref="ArgumentNullException"><paramref name="match"/> is null.</exception>
-        public int FindIndex(Predicate<string> match)
-        {
-            Guard.NotNull(match, nameof(match));
-
-            int index = 0;
-            foreach (KeyValuePair<string, string> item in this)
-            {
-                if (match(item.Key))
-                {
-                    return index;
-                }
+    /// <summary>
+    /// Adds an element with the provided key and value to the <see cref="CommandCollection"/>.
+    /// </summary>
+    /// <param name="key">The <see cref="string"/> to use as the key of the element to add.</param>
+    /// <param name="value">The <see cref="string"/> to use as the value of the element to add.</param>
+    /// <exception cref="ArgumentNullException"><paramref name="key"/> is null.</exception>
+    public void Add(string key, string value) => this.Add(new(key, value));
 
-                index++;
-            }
+    /// <summary>
+    /// Inserts an element into the <see cref="CommandCollection"/> at the
+    /// specified index.
+    /// </summary>
+    /// <param name="index">The zero-based index at which item should be inserted.</param>
+    /// <param name="key">The <see cref="string"/> to use as the key of the element to insert.</param>
+    /// <param name="value">The <see cref="string"/> to use as the value of the element to insert.</param>
+    /// <exception cref="ArgumentOutOfRangeException">index is less than zero. -or- index is greater than <see cref="P:CommandCollection.Count"/>.</exception>
+    public void Insert(int index, string key, string value) => this.Insert(index, new(key, value));
 
-            return -1;
+    /// <summary>
+    /// Gets the value associated with the specified key.
+    /// </summary>
+    /// <param name="key">The key whose value to get.</param>
+    /// <param name="value">
+    /// When this method returns, the value associated with the specified key, if the
+    /// key is found; otherwise, the default value for the type of the value parameter.
+    /// This parameter is passed uninitialized.
+    /// </param>
+    /// <returns>
+    /// <see langword="true"/> if the object that implements <see cref="CommandCollection"/> contains
+    /// an element with the specified key; otherwise, <see langword="false"/>.
+    /// </returns>
+    /// <exception cref="ArgumentNullException"><paramref name="key"/> is null.</exception>
+    public bool TryGetValue(string key, out string value)
+    {
+        if (this.TryGetValue(key, out KeyValuePair<string, string> keyValue))
+        {
+            value = keyValue.Value;
+            return true;
         }
 
-        /// <summary>
-        /// Searches for the specified key and returns the zero-based index of the first
-        /// occurrence within the entire <see cref="CommandCollection"/>.
-        /// </summary>
-        /// <param name="key">The key to locate in the <see cref="CommandCollection"/>.</param>
-        /// <returns>
-        /// The zero-based index of the first occurrence of key within the entire <see cref="CommandCollection"/>,
-        /// if found; otherwise, -1.
-        /// </returns>
-        public int IndexOf(string key)
+        value = default;
+        return false;
+    }
+
+    /// <summary>
+    /// Searches for an element that matches the conditions defined by the specified
+    /// predicate, and returns the zero-based index of the first occurrence within the
+    /// entire <see cref="CommandCollection"/>.
+    /// </summary>
+    /// <param name="match">
+    /// The <see cref="Predicate{T}"/> delegate that defines the conditions of the element to
+    /// search for.
+    /// </param>
+    /// <returns>
+    /// The zero-based index of the first occurrence of an element that matches the conditions
+    /// defined by match, if found; otherwise, -1.
+    /// </returns>
+    /// <exception cref="ArgumentNullException"><paramref name="match"/> is null.</exception>
+    public int FindIndex(Predicate<string> match)
+    {
+        Guard.NotNull(match, nameof(match));
+
+        int index = 0;
+        foreach (KeyValuePair<string, string> item in this)
         {
-            if (this.TryGetValue(key, out KeyValuePair<string, string> item))
+            if (match(item.Key))
             {
-                return this.IndexOf(item);
+                return index;
             }
 
-            return -1;
+            index++;
         }
 
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        protected override string GetKeyForItem(KeyValuePair<string, string> item) => item.Key;
+        return -1;
+    }
 
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static void ThrowKeyNotFound() => throw new KeyNotFoundException();
+    /// <summary>
+    /// Searches for the specified key and returns the zero-based index of the first
+    /// occurrence within the entire <see cref="CommandCollection"/>.
+    /// </summary>
+    /// <param name="key">The key to locate in the <see cref="CommandCollection"/>.</param>
+    /// <returns>
+    /// The zero-based index of the first occurrence of key within the entire <see cref="CommandCollection"/>,
+    /// if found; otherwise, -1.
+    /// </returns>
+    public int IndexOf(string key)
+    {
+        if (this.TryGetValue(key, out KeyValuePair<string, string> item))
+        {
+            return this.IndexOf(item);
+        }
+
+        return -1;
     }
+
+    /// <inheritdoc/>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    protected override string GetKeyForItem(KeyValuePair<string, string> item) => item.Key;
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private static void ThrowKeyNotFound() => throw new KeyNotFoundException();
 }
diff --git a/src/ImageSharp.Web/Commands/CommandCollectionExtensions.cs b/src/ImageSharp.Web/Commands/CommandCollectionExtensions.cs
index c438e5eb..6d6752ca 100644
--- a/src/ImageSharp.Web/Commands/CommandCollectionExtensions.cs
+++ b/src/ImageSharp.Web/Commands/CommandCollectionExtensions.cs
@@ -1,25 +1,23 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.Collections.Generic;
+namespace SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Commands
+/// <summary>
+/// Extension methods for <see cref="CommandCollectionExtensions"/>.
+/// </summary>
+public static class CommandCollectionExtensions
 {
     /// <summary>
-    /// Extension methods for <see cref="CommandCollectionExtensions"/>.
+    /// Gets the value associated with the specified key or the default value.
     /// </summary>
-    public static class CommandCollectionExtensions
+    /// <param name="collection">The collection instance.</param>
+    /// <param name="key">The key of the value to get.</param>
+    /// <returns>The value associated with the specified key or the default value.</returns>
+    public static string GetValueOrDefault(this CommandCollection collection, string key)
     {
-        /// <summary>
-        /// Gets the value associated with the specified key or the default value.
-        /// </summary>
-        /// <param name="collection">The collection instance.</param>
-        /// <param name="key">The key of the value to get.</param>
-        /// <returns>The value associated with the specified key or the default value.</returns>
-        public static string GetValueOrDefault(this CommandCollection collection, string key)
-        {
-            collection.TryGetValue(key, out KeyValuePair<string, string> result);
-            return result.Value;
-        }
+        collection.TryGetValue(key, out KeyValuePair<string, string> result);
+        return result.Value;
     }
 }
diff --git a/src/ImageSharp.Web/Commands/CommandParser.cs b/src/ImageSharp.Web/Commands/CommandParser.cs
index 8841b7d0..e527510a 100644
--- a/src/ImageSharp.Web/Commands/CommandParser.cs
+++ b/src/ImageSharp.Web/Commands/CommandParser.cs
@@ -1,82 +1,79 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Net;
 using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.Web.Commands.Converters;
 
-namespace SixLabors.ImageSharp.Web.Commands
+namespace SixLabors.ImageSharp.Web.Commands;
+
+/// <summary>
+/// Parses URI derived command values into usable commands for processors.
+/// </summary>
+public sealed class CommandParser
 {
+    private readonly ICommandConverter[] converters;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CommandParser"/> class.
+    /// </summary>
+    /// <param name="converters">The collection of command converters.</param>
+    public CommandParser(IEnumerable<ICommandConverter> converters)
+    {
+        Guard.NotNull(converters, nameof(converters));
+        this.converters = converters.ToArray();
+    }
+
     /// <summary>
-    /// Parses URI derived command values into usable commands for processors.
+    /// Parses the given string value converting it to the given type.
     /// </summary>
-    public sealed class CommandParser
+    /// <param name="value">The string value to parse.</param>
+    /// <param name="culture">The <see cref="CultureInfo"/> to use as the current culture.</param>
+    /// <typeparam name="T">
+    /// The <see cref="Type"/> to convert the string to.
+    /// </typeparam>
+    /// <returns>The converted instance or the default.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public T ParseValue<T>(string value, CultureInfo culture)
     {
-        private readonly ICommandConverter[] converters;
+        DebugGuard.NotNull(culture, nameof(culture));
+
+        Type type = typeof(T);
+        ICommandConverter converter = Array.Find(this.converters, x => x.Type.Equals(type));
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CommandParser"/> class.
-        /// </summary>
-        /// <param name="converters">The collection of command converters.</param>
-        public CommandParser(IEnumerable<ICommandConverter> converters)
+        if (converter != null)
         {
-            Guard.NotNull(converters, nameof(converters));
-            this.converters = converters.ToArray();
+            return ((ICommandConverter<T>)converter).ConvertFrom(
+                this,
+                culture,
+                WebUtility.UrlDecode(value),
+                type);
         }
 
-        /// <summary>
-        /// Parses the given string value converting it to the given type.
-        /// </summary>
-        /// <param name="value">The string value to parse.</param>
-        /// <param name="culture">The <see cref="CultureInfo"/> to use as the current culture.</param>
-        /// <typeparam name="T">
-        /// The <see cref="Type"/> to convert the string to.
-        /// </typeparam>
-        /// <returns>The converted instance or the default.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public T ParseValue<T>(string value, CultureInfo culture)
+        // This special case allows us to reuse the same converter for infinite enum types
+        // if one has not already been configured.
+        if (type.IsEnum)
         {
-            DebugGuard.NotNull(culture, nameof(culture));
-
-            Type type = typeof(T);
-            ICommandConverter converter = Array.Find(this.converters, x => x.Type.Equals(type));
-
+            converter = Array.Find(this.converters, x => x.Type.Equals(typeof(Enum)));
             if (converter != null)
             {
-                return ((ICommandConverter<T>)converter).ConvertFrom(
+                return (T)((ICommandConverter<object>)converter).ConvertFrom(
                     this,
                     culture,
                     WebUtility.UrlDecode(value),
                     type);
             }
-
-            // This special case allows us to reuse the same converter for infinite enum types
-            // if one has not already been configured.
-            if (type.IsEnum)
-            {
-                converter = Array.Find(this.converters, x => x.Type.Equals(typeof(Enum)));
-                if (converter != null)
-                {
-                    return (T)((ICommandConverter<object>)converter).ConvertFrom(
-                        this,
-                        culture,
-                        WebUtility.UrlDecode(value),
-                        type);
-                }
-            }
-
-            // We don't actually return here.
-            // The compiler just cannot see our exception.
-            ThrowNotSupported(type);
-            return default;
         }
 
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static void ThrowNotSupported(Type type)
-            => throw new NotSupportedException($"Cannot convert to {type.FullName}.");
+        // We don't actually return here.
+        // The compiler just cannot see our exception.
+        ThrowNotSupported(type);
+        return default;
     }
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private static void ThrowNotSupported(Type type)
+        => throw new NotSupportedException($"Cannot convert to {type.FullName}.");
 }
diff --git a/src/ImageSharp.Web/Commands/Converters/ArrayConverter{T}.cs b/src/ImageSharp.Web/Commands/Converters/ArrayConverter{T}.cs
index 04a6b955..0616e18e 100644
--- a/src/ImageSharp.Web/Commands/Converters/ArrayConverter{T}.cs
+++ b/src/ImageSharp.Web/Commands/Converters/ArrayConverter{T}.cs
@@ -1,54 +1,51 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Runtime.CompilerServices;
 
-namespace SixLabors.ImageSharp.Web.Commands.Converters
+namespace SixLabors.ImageSharp.Web.Commands.Converters;
+
+/// <summary>
+/// Converts the value of a string to a generic array.
+/// </summary>
+/// <typeparam name="T">The parameter type to convert to.</typeparam>
+public sealed class ArrayConverter<T> : ICommandConverter<T[]>
 {
-    /// <summary>
-    /// Converts the value of a string to a generic array.
-    /// </summary>
-    /// <typeparam name="T">The parameter type to convert to.</typeparam>
-    public sealed class ArrayConverter<T> : ICommandConverter<T[]>
-    {
-        /// <inheritdoc/>
-        public Type Type => typeof(T[]);
+    /// <inheritdoc/>
+    public Type Type => typeof(T[]);
 
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public T[] ConvertFrom(
-            CommandParser parser,
-            CultureInfo culture,
-            string value,
-            Type propertyType)
+    /// <inheritdoc/>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public T[] ConvertFrom(
+        CommandParser parser,
+        CultureInfo culture,
+        string value,
+        Type propertyType)
+    {
+        if (string.IsNullOrWhiteSpace(value))
         {
-            if (string.IsNullOrWhiteSpace(value))
-            {
-                return Array.Empty<T>();
-            }
+            return Array.Empty<T>();
+        }
 
-            var result = new List<T>();
-            foreach (string pill in GetStringArray(value, culture))
+        var result = new List<T>();
+        foreach (string pill in GetStringArray(value, culture))
+        {
+            T item = parser.ParseValue<T>(pill, culture);
+            if (item != null)
             {
-                T item = parser.ParseValue<T>(pill, culture);
-                if (item != null)
-                {
-                    result.Add(item);
-                }
+                result.Add(item);
             }
-
-            return result.ToArray();
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static string[] GetStringArray(string input, CultureInfo culture)
-        {
-            char separator = culture.TextInfo.ListSeparator[0];
-            return input.Split(separator).Select(s => s.Trim()).ToArray();
-        }
+        return result.ToArray();
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static string[] GetStringArray(string input, CultureInfo culture)
+    {
+        char separator = culture.TextInfo.ListSeparator[0];
+        return input.Split(separator).Select(s => s.Trim()).ToArray();
     }
 }
diff --git a/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs b/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs
index 129e071b..bebc3587 100644
--- a/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs
+++ b/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs
@@ -1,101 +1,99 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 
-namespace SixLabors.ImageSharp.Web.Commands.Converters
+namespace SixLabors.ImageSharp.Web.Commands.Converters;
+
+/// <summary>
+/// Allows the conversion of strings into rgba32 pixel colors.
+/// </summary>
+public sealed class ColorConverter : ICommandConverter<Color>
 {
     /// <summary>
-    /// Allows the conversion of strings into rgba32 pixel colors.
+    /// The web color hexadecimal regex. Matches strings arranged
+    /// in rgb, rgba, rrggbb, or rrggbbaa format to match web syntax.
+    /// </summary>
+    private static readonly Regex HexColorRegex = new("([0-9a-fA-F]{3}){1,2}", RegexOptions.Compiled);
+
+    /// <summary>
+    /// The number color regex.
     /// </summary>
-    public sealed class ColorConverter : ICommandConverter<Color>
+    private static readonly Regex NumberRegex = new(@"\d+", RegexOptions.Compiled);
+
+    /// <summary>
+    /// The color constants table map.
+    /// </summary>
+    private static readonly Lazy<IDictionary<string, Color>> ColorConstantsTable = new(InitializeColorConstantsTable);
+
+    /// <inheritdoc/>
+    public Type Type => typeof(Color);
+
+    /// <inheritdoc/>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public Color ConvertFrom(CommandParser parser, CultureInfo culture, string value, Type propertyType)
     {
-        /// <summary>
-        /// The web color hexadecimal regex. Matches strings arranged
-        /// in rgb, rgba, rrggbb, or rrggbbaa format to match web syntax.
-        /// </summary>
-        private static readonly Regex HexColorRegex = new("([0-9a-fA-F]{3}){1,2}", RegexOptions.Compiled);
-
-        /// <summary>
-        /// The number color regex.
-        /// </summary>
-        private static readonly Regex NumberRegex = new(@"\d+", RegexOptions.Compiled);
-
-        /// <summary>
-        /// The color constants table map.
-        /// </summary>
-        private static readonly Lazy<IDictionary<string, Color>> ColorConstantsTable = new(InitializeColorConstantsTable);
-
-        /// <inheritdoc/>
-        public Type Type => typeof(Color);
-
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Color ConvertFrom(CommandParser parser, CultureInfo culture, string value, Type propertyType)
+        if (string.IsNullOrWhiteSpace(value))
         {
-            if (string.IsNullOrWhiteSpace(value))
-            {
-                return default;
-            }
-
-            // Numeric r,g,b - r,g,b,a
-            char separator = culture.TextInfo.ListSeparator[0];
+            return default;
+        }
 
-            if (value.IndexOf(separator) != -1)
-            {
-                string[] components = value.Split(separator);
+        // Numeric r,g,b - r,g,b,a
+        char separator = culture.TextInfo.ListSeparator[0];
 
-                bool convert = true;
-                foreach (string component in components)
-                {
-                    if (!NumberRegex.IsMatch(component))
-                    {
-                        convert = false;
-                    }
-                }
+        if (value.IndexOf(separator) != -1)
+        {
+            string[] components = value.Split(separator);
 
-                if (convert)
+            bool convert = true;
+            foreach (string component in components)
+            {
+                if (!NumberRegex.IsMatch(component))
                 {
-                    List<byte> rgba = parser.ParseValue<List<byte>>(value, culture);
-
-                    return rgba.Count switch
-                    {
-                        4 => Color.FromRgba(rgba[0], rgba[1], rgba[2], rgba[3]),
-                        3 => Color.FromRgb(rgba[0], rgba[1], rgba[2]),
-                        _ => default,
-                    };
+                    convert = false;
                 }
             }
 
-            // Hex colors rgb, rrggbb, rrggbbaa
-            if (HexColorRegex.IsMatch(value))
+            if (convert)
             {
-                return Color.ParseHex(value);
-            }
+                List<byte> rgba = parser.ParseValue<List<byte>>(value, culture);
 
-            // Named colors
-            IDictionary<string, Color> table = ColorConstantsTable.Value;
-            return table.ContainsKey(value) ? table[value] : default;
+                return rgba.Count switch
+                {
+                    4 => Color.FromRgba(rgba[0], rgba[1], rgba[2], rgba[3]),
+                    3 => Color.FromRgb(rgba[0], rgba[1], rgba[2]),
+                    _ => default,
+                };
+            }
         }
 
-        private static IDictionary<string, Color> InitializeColorConstantsTable()
+        // Hex colors rgb, rrggbb, rrggbbaa
+        if (HexColorRegex.IsMatch(value))
         {
-            IDictionary<string, Color> table = new Dictionary<string, Color>(StringComparer.OrdinalIgnoreCase);
+            return Color.ParseHex(value);
+        }
+
+        // Named colors
+        IDictionary<string, Color> table = ColorConstantsTable.Value;
+        return table.ContainsKey(value) ? table[value] : default;
+    }
 
-            foreach (FieldInfo field in typeof(Color).GetFields(BindingFlags.Public | BindingFlags.Static))
+    private static IDictionary<string, Color> InitializeColorConstantsTable()
+    {
+        IDictionary<string, Color> table = new Dictionary<string, Color>(StringComparer.OrdinalIgnoreCase);
+
+        foreach (FieldInfo field in typeof(Color).GetFields(BindingFlags.Public | BindingFlags.Static))
+        {
+            if (field.FieldType == typeof(Color))
             {
-                if (field.FieldType == typeof(Color))
-                {
-                    table[field.Name] = (Color)field.GetValue(null);
-                }
+                table[field.Name] = (Color)field.GetValue(null);
             }
-
-            return table;
         }
+
+        return table;
     }
 }
diff --git a/src/ImageSharp.Web/Commands/Converters/EnumConverter.cs b/src/ImageSharp.Web/Commands/Converters/EnumConverter.cs
index 69e61e42..764a68a3 100644
--- a/src/ImageSharp.Web/Commands/Converters/EnumConverter.cs
+++ b/src/ImageSharp.Web/Commands/Converters/EnumConverter.cs
@@ -1,70 +1,68 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
 using System.Globalization;
-using System.Linq;
 using System.Runtime.CompilerServices;
 
-namespace SixLabors.ImageSharp.Web.Commands.Converters
+namespace SixLabors.ImageSharp.Web.Commands.Converters;
+
+/// <summary>
+/// The enum converter. Allows conversion to enumerations.
+/// </summary>
+public sealed class EnumConverter : ICommandConverter<object>
 {
-    /// <summary>
-    /// The enum converter. Allows conversion to enumerations.
-    /// </summary>
-    public sealed class EnumConverter : ICommandConverter<object>
-    {
-        /// <inheritdoc/>
-        public Type Type => typeof(Enum);
+    /// <inheritdoc/>
+    public Type Type => typeof(Enum);
 
-        /// <inheritdoc/>
-        /// <remarks>
-        /// Unlike other converters the <see cref="Type"/> property does not
-        /// match the <paramref name="propertyType"/> value.
-        /// This allows us to reuse the same converter for infinite enum types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        public object ConvertFrom(
-            CommandParser parser,
-            CultureInfo culture,
-            string value,
-            Type propertyType)
+    /// <inheritdoc/>
+    /// <remarks>
+    /// Unlike other converters the <see cref="Type"/> property does not
+    /// match the <paramref name="propertyType"/> value.
+    /// This allows us to reuse the same converter for infinite enum types.
+    /// </remarks>
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public object ConvertFrom(
+        CommandParser parser,
+        CultureInfo culture,
+        string value,
+        Type propertyType)
+    {
+        if (string.IsNullOrWhiteSpace(value))
         {
-            if (string.IsNullOrWhiteSpace(value))
-            {
-                return Activator.CreateInstance(propertyType);
-            }
+            return Activator.CreateInstance(propertyType);
+        }
 
-            try
+        try
+        {
+            char separator = culture.TextInfo.ListSeparator[0];
+            if (value.IndexOf(separator) != -1)
             {
-                char separator = culture.TextInfo.ListSeparator[0];
-                if (value.IndexOf(separator) != -1)
+                long convertedValue = 0;
+                foreach (string pill in GetStringArray(value, separator))
                 {
-                    long convertedValue = 0;
-                    foreach (string pill in GetStringArray(value, separator))
-                    {
-                        convertedValue |= Convert.ToInt64((Enum)Enum.Parse(propertyType, pill, true), culture);
-                    }
-
-                    return Enum.ToObject(propertyType, convertedValue);
+                    convertedValue |= Convert.ToInt64((Enum)Enum.Parse(propertyType, pill, true), culture);
                 }
 
-                return Enum.Parse(propertyType, value, true);
+                return Enum.ToObject(propertyType, convertedValue);
             }
-            catch
-            {
-                // Just return the default value
-                return Activator.CreateInstance(propertyType);
-            }
-        }
 
-        /// <summary>
-        /// Splits a string by separator to return an array of string values.
-        /// </summary>
-        /// <param name="input">The input string to split.</param>
-        /// <param name="separator">The separator to split string by.</param>
-        /// <returns>The <see cref="T:String[]"/>.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static string[] GetStringArray(string input, char separator)
-            => input.Split(separator).Select(s => s.Trim()).ToArray();
+            return Enum.Parse(propertyType, value, true);
+        }
+        catch
+        {
+            // Just return the default value
+            return Activator.CreateInstance(propertyType);
+        }
     }
+
+    /// <summary>
+    /// Splits a string by separator to return an array of string values.
+    /// </summary>
+    /// <param name="input">The input string to split.</param>
+    /// <param name="separator">The separator to split string by.</param>
+    /// <returns>The <see cref="T:String[]"/>.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static string[] GetStringArray(string input, char separator)
+        => input.Split(separator).Select(s => s.Trim()).ToArray();
 }
diff --git a/src/ImageSharp.Web/Commands/Converters/ICommandConverter.cs b/src/ImageSharp.Web/Commands/Converters/ICommandConverter.cs
index 936f4404..7b7e750a 100644
--- a/src/ImageSharp.Web/Commands/Converters/ICommandConverter.cs
+++ b/src/ImageSharp.Web/Commands/Converters/ICommandConverter.cs
@@ -1,40 +1,39 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
 using System.Globalization;
 
-namespace SixLabors.ImageSharp.Web.Commands.Converters
+namespace SixLabors.ImageSharp.Web.Commands.Converters;
+
+/// <summary>
+/// Defines a contract for converting the value of a string into a different data type.
+/// Implementations should be stateless by design and also implement <see cref="ICommandConverter{T}"/>.
+/// </summary>
+public interface ICommandConverter
 {
     /// <summary>
-    /// Defines a contract for converting the value of a string into a different data type.
-    /// Implementations should be stateless by design and also implement <see cref="ICommandConverter{T}"/>.
+    /// Gets the type this converter returns.
     /// </summary>
-    public interface ICommandConverter
-    {
-        /// <summary>
-        /// Gets the type this converter returns.
-        /// </summary>
-        Type Type { get; }
-    }
+    Type Type { get; }
+}
 
-    /// <inheritdoc/>
-    /// <typeparam name="T">The type this converter returns.</typeparam>
-    public interface ICommandConverter<T> : ICommandConverter
-    {
-        /// <summary>
-        /// Converts the given string to the type of this converter, using the specified culture information.
-        /// </summary>
-        /// <returns>
-        /// A <see cref="string"/> that represents the converted value.
-        /// </returns>
-        /// <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>
-        /// <param name="value">The <see cref="string"/> to convert. </param>
-        /// <param name="propertyType">The property type that the converter will convert to.</param>
-        /// <exception cref="NotSupportedException">The conversion cannot be performed.</exception>
-        T ConvertFrom(CommandParser parser, CultureInfo culture, string value, Type propertyType);
-    }
+/// <inheritdoc/>
+/// <typeparam name="T">The type this converter returns.</typeparam>
+public interface ICommandConverter<T> : ICommandConverter
+{
+    /// <summary>
+    /// Converts the given string to the type of this converter, using the specified culture information.
+    /// </summary>
+    /// <returns>
+    /// A <see cref="string"/> that represents the converted value.
+    /// </returns>
+    /// <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>
+    /// <param name="value">The <see cref="string"/> to convert. </param>
+    /// <param name="propertyType">The property type that the converter will convert to.</param>
+    /// <exception cref="NotSupportedException">The conversion cannot be performed.</exception>
+    T ConvertFrom(CommandParser parser, CultureInfo culture, string value, Type propertyType);
 }
diff --git a/src/ImageSharp.Web/Commands/Converters/IntegralNumberConverter{T}.cs b/src/ImageSharp.Web/Commands/Converters/IntegralNumberConverter{T}.cs
index 2f5fc307..5c49e141 100644
--- a/src/ImageSharp.Web/Commands/Converters/IntegralNumberConverter{T}.cs
+++ b/src/ImageSharp.Web/Commands/Converters/IntegralNumberConverter{T}.cs
@@ -1,73 +1,72 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
 using System.Globalization;
 
-namespace SixLabors.ImageSharp.Web.Commands.Converters
+namespace SixLabors.ImageSharp.Web.Commands.Converters;
+
+/// <summary>
+/// The generic converter for integral types.
+/// </summary>
+/// <inheritdoc/>
+public sealed class IntegralNumberConverter<T> : ICommandConverter<T>
+    where T : struct, IConvertible, IComparable<T>
 {
-    /// <summary>
-    /// The generic converter for integral types.
-    /// </summary>
     /// <inheritdoc/>
-    public sealed class IntegralNumberConverter<T> : ICommandConverter<T>
-        where T : struct, IConvertible, IComparable<T>
-    {
-        /// <inheritdoc/>
-        public Type Type => typeof(T);
+    public Type Type => typeof(T);
 
-        /// <inheritdoc/>
-        public T ConvertFrom(
-            CommandParser parser,
-            CultureInfo culture,
-            string value,
-            Type propertyType)
+    /// <inheritdoc/>
+    public T ConvertFrom(
+        CommandParser parser,
+        CultureInfo culture,
+        string value,
+        Type propertyType)
+    {
+        if (string.IsNullOrWhiteSpace(value)
+            || Array.IndexOf(TypeConstants.IntegralTypes, propertyType) < 0)
         {
-            if (string.IsNullOrWhiteSpace(value)
-                || Array.IndexOf(TypeConstants.IntegralTypes, propertyType) < 0)
-            {
-                return default;
-            }
-
-            // Round the value to the nearest decimal value
-            decimal rounded = Math.Round((decimal)Convert.ChangeType(value, typeof(decimal), culture), MidpointRounding.AwayFromZero);
+            return default;
+        }
 
-            // Now clamp it to the type ranges
-            if (propertyType == TypeConstants.Sbyte)
-            {
-                rounded = Math.Clamp(rounded, sbyte.MinValue, sbyte.MaxValue);
-            }
-            else if (propertyType == TypeConstants.Byte)
-            {
-                rounded = Math.Clamp(rounded, byte.MinValue, byte.MaxValue);
-            }
-            else if (propertyType == TypeConstants.Short)
-            {
-                rounded = Math.Clamp(rounded, short.MinValue, short.MaxValue);
-            }
-            else if (propertyType == TypeConstants.UShort)
-            {
-                rounded = Math.Clamp(rounded, ushort.MinValue, ushort.MaxValue);
-            }
-            else if (propertyType == TypeConstants.Int)
-            {
-                rounded = Math.Clamp(rounded, int.MinValue, int.MaxValue);
-            }
-            else if (propertyType == TypeConstants.UInt)
-            {
-                rounded = Math.Clamp(rounded, uint.MinValue, uint.MaxValue);
-            }
-            else if (propertyType == TypeConstants.Long)
-            {
-                rounded = Math.Clamp(rounded, long.MinValue, long.MaxValue);
-            }
-            else if (propertyType == TypeConstants.ULong)
-            {
-                rounded = Math.Clamp(rounded, ulong.MinValue, ulong.MaxValue);
-            }
+        // Round the value to the nearest decimal value
+        decimal rounded = Math.Round((decimal)Convert.ChangeType(value, typeof(decimal), culture), MidpointRounding.AwayFromZero);
 
-            // Now it's rounded an clamped we should be able to correctly parse the string.
-            return (T)Convert.ChangeType(rounded.ToString(culture), typeof(T), culture);
+        // Now clamp it to the type ranges
+        if (propertyType == TypeConstants.Sbyte)
+        {
+            rounded = Math.Clamp(rounded, sbyte.MinValue, sbyte.MaxValue);
+        }
+        else if (propertyType == TypeConstants.Byte)
+        {
+            rounded = Math.Clamp(rounded, byte.MinValue, byte.MaxValue);
+        }
+        else if (propertyType == TypeConstants.Short)
+        {
+            rounded = Math.Clamp(rounded, short.MinValue, short.MaxValue);
         }
+        else if (propertyType == TypeConstants.UShort)
+        {
+            rounded = Math.Clamp(rounded, ushort.MinValue, ushort.MaxValue);
+        }
+        else if (propertyType == TypeConstants.Int)
+        {
+            rounded = Math.Clamp(rounded, int.MinValue, int.MaxValue);
+        }
+        else if (propertyType == TypeConstants.UInt)
+        {
+            rounded = Math.Clamp(rounded, uint.MinValue, uint.MaxValue);
+        }
+        else if (propertyType == TypeConstants.Long)
+        {
+            rounded = Math.Clamp(rounded, long.MinValue, long.MaxValue);
+        }
+        else if (propertyType == TypeConstants.ULong)
+        {
+            rounded = Math.Clamp(rounded, ulong.MinValue, ulong.MaxValue);
+        }
+
+        // Now it's rounded an clamped we should be able to correctly parse the string.
+        return (T)Convert.ChangeType(rounded.ToString(culture), typeof(T), culture);
     }
 }
diff --git a/src/ImageSharp.Web/Commands/Converters/ListConverter{T}.cs b/src/ImageSharp.Web/Commands/Converters/ListConverter{T}.cs
index 222c7ecf..4b2fdd3a 100644
--- a/src/ImageSharp.Web/Commands/Converters/ListConverter{T}.cs
+++ b/src/ImageSharp.Web/Commands/Converters/ListConverter{T}.cs
@@ -1,54 +1,51 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Runtime.CompilerServices;
 
-namespace SixLabors.ImageSharp.Web.Commands.Converters
+namespace SixLabors.ImageSharp.Web.Commands.Converters;
+
+/// <summary>
+/// Converts the value of a string to a generic list.
+/// </summary>
+/// <typeparam name="T">The type of result to return.</typeparam>
+public sealed class ListConverter<T> : ICommandConverter<List<T>>
 {
-    /// <summary>
-    /// Converts the value of a string to a generic list.
-    /// </summary>
-    /// <typeparam name="T">The type of result to return.</typeparam>
-    public sealed class ListConverter<T> : ICommandConverter<List<T>>
-    {
-        /// <inheritdoc/>
-        public Type Type => typeof(List<T>);
+    /// <inheritdoc/>
+    public Type Type => typeof(List<T>);
 
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public List<T> ConvertFrom(
-            CommandParser parser,
-            CultureInfo culture,
-            string value,
-            Type propertyType)
+    /// <inheritdoc/>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public List<T> ConvertFrom(
+        CommandParser parser,
+        CultureInfo culture,
+        string value,
+        Type propertyType)
+    {
+        var result = new List<T>();
+        if (string.IsNullOrWhiteSpace(value))
         {
-            var result = new List<T>();
-            if (string.IsNullOrWhiteSpace(value))
-            {
-                return result;
-            }
-
-            foreach (string pill in GetStringArray(value, culture))
-            {
-                T item = parser.ParseValue<T>(pill, culture);
-                if (item != null)
-                {
-                    result.Add(item);
-                }
-            }
-
             return result;
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static string[] GetStringArray(string input, CultureInfo culture)
+        foreach (string pill in GetStringArray(value, culture))
         {
-            char separator = culture.TextInfo.ListSeparator[0];
-            return input.Split(separator).Select(s => s.Trim()).ToArray();
+            T item = parser.ParseValue<T>(pill, culture);
+            if (item != null)
+            {
+                result.Add(item);
+            }
         }
+
+        return result;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static string[] GetStringArray(string input, CultureInfo culture)
+    {
+        char separator = culture.TextInfo.ListSeparator[0];
+        return input.Split(separator).Select(s => s.Trim()).ToArray();
     }
 }
diff --git a/src/ImageSharp.Web/Commands/Converters/SimpleCommandConverter{T}.cs b/src/ImageSharp.Web/Commands/Converters/SimpleCommandConverter{T}.cs
index 63311746..d02359a9 100644
--- a/src/ImageSharp.Web/Commands/Converters/SimpleCommandConverter{T}.cs
+++ b/src/ImageSharp.Web/Commands/Converters/SimpleCommandConverter{T}.cs
@@ -1,44 +1,43 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
 using System.Globalization;
 using System.Runtime.CompilerServices;
 
-namespace SixLabors.ImageSharp.Web.Commands.Converters
+namespace SixLabors.ImageSharp.Web.Commands.Converters;
+
+/// <summary>
+/// The generic converter for simple types that implement <see cref="IConvertible"/>.
+/// </summary>
+/// <typeparam name="T">The type of object to convert to.</typeparam>
+public sealed class SimpleCommandConverter<T> : ICommandConverter<T>
+    where T : IConvertible
 {
-    /// <summary>
-    /// The generic converter for simple types that implement <see cref="IConvertible"/>.
-    /// </summary>
-    /// <typeparam name="T">The type of object to convert to.</typeparam>
-    public sealed class SimpleCommandConverter<T> : ICommandConverter<T>
-        where T : IConvertible
-    {
-        /// <inheritdoc/>
-        public Type Type => typeof(T);
+    /// <inheritdoc/>
+    public Type Type => typeof(T);
 
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public T ConvertFrom(
-            CommandParser parser,
-            CultureInfo culture,
-            string value,
-            Type propertyType)
+    /// <inheritdoc/>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public T ConvertFrom(
+        CommandParser parser,
+        CultureInfo culture,
+        string value,
+        Type propertyType)
+    {
+        if (string.IsNullOrWhiteSpace(value))
         {
-            if (string.IsNullOrWhiteSpace(value))
-            {
-                return default;
-            }
-
-            Type t = typeof(T);
-            Type u = Nullable.GetUnderlyingType(t);
+            return default;
+        }
 
-            if (u != null)
-            {
-                return (T)Convert.ChangeType(value, u, culture);
-            }
+        Type t = typeof(T);
+        Type u = Nullable.GetUnderlyingType(t);
 
-            return (T)Convert.ChangeType(value, t, culture);
+        if (u != null)
+        {
+            return (T)Convert.ChangeType(value, u, culture);
         }
+
+        return (T)Convert.ChangeType(value, t, culture);
     }
 }
diff --git a/src/ImageSharp.Web/Commands/IRequestParser.cs b/src/ImageSharp.Web/Commands/IRequestParser.cs
index e725cf05..4d4d418a 100644
--- a/src/ImageSharp.Web/Commands/IRequestParser.cs
+++ b/src/ImageSharp.Web/Commands/IRequestParser.cs
@@ -1,21 +1,20 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
 
-namespace SixLabors.ImageSharp.Web.Commands
+namespace SixLabors.ImageSharp.Web.Commands;
+
+/// <summary>
+/// Defines a contract for parsing commands from image requests.
+/// </summary>
+public interface IRequestParser
 {
     /// <summary>
-    /// Defines a contract for parsing commands from image requests.
+    /// Returns a collection of commands from the current request.
     /// </summary>
-    public interface IRequestParser
-    {
-        /// <summary>
-        /// Returns a collection of commands from the current request.
-        /// </summary>
-        /// <param name="context">Encapsulates all HTTP-specific information about an individual HTTP request.</param>
-        /// <returns>The <see cref="IDictionary{TKey,TValue}"/>.</returns>
-        CommandCollection ParseRequestCommands(HttpContext context);
-    }
+    /// <param name="context">Encapsulates all HTTP-specific information about an individual HTTP request.</param>
+    /// <returns>The <see cref="IDictionary{TKey,TValue}"/>.</returns>
+    CommandCollection ParseRequestCommands(HttpContext context);
 }
diff --git a/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs b/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs
index 21545848..f4215369 100644
--- a/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs
+++ b/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs
@@ -1,77 +1,74 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 
-namespace SixLabors.ImageSharp.Web.Commands
+namespace SixLabors.ImageSharp.Web.Commands;
+
+/// <summary>
+/// Parses preset name from the request querystring and returns the commands configured for that preset.
+/// </summary>
+public class PresetOnlyQueryCollectionRequestParser : IRequestParser
 {
+    private readonly IDictionary<string, CommandCollection> presets;
+
     /// <summary>
-    /// Parses preset name from the request querystring and returns the commands configured for that preset.
+    /// The command constant for the preset query parameter.
     /// </summary>
-    public class PresetOnlyQueryCollectionRequestParser : IRequestParser
-    {
-        private readonly IDictionary<string, CommandCollection> presets;
+    public const string QueryKey = "preset";
 
-        /// <summary>
-        /// The command constant for the preset query parameter.
-        /// </summary>
-        public const string QueryKey = "preset";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PresetOnlyQueryCollectionRequestParser"/> class.
-        /// </summary>
-        /// <param name="presetOptions">The preset options.</param>
-        public PresetOnlyQueryCollectionRequestParser(IOptions<PresetOnlyQueryCollectionRequestParserOptions> presetOptions) =>
-            this.presets = ParsePresets(presetOptions.Value.Presets);
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PresetOnlyQueryCollectionRequestParser"/> class.
+    /// </summary>
+    /// <param name="presetOptions">The preset options.</param>
+    public PresetOnlyQueryCollectionRequestParser(IOptions<PresetOnlyQueryCollectionRequestParserOptions> presetOptions) =>
+        this.presets = ParsePresets(presetOptions.Value.Presets);
 
-        /// <inheritdoc/>
-        public CommandCollection ParseRequestCommands(HttpContext context)
+    /// <inheritdoc/>
+    public CommandCollection ParseRequestCommands(HttpContext context)
+    {
+        IQueryCollection queryCollection = context.Request.Query;
+        if (queryCollection is null
+            || queryCollection.Count == 0
+            || !queryCollection.ContainsKey(QueryKey))
         {
-            IQueryCollection queryCollection = context.Request.Query;
-            if (queryCollection is null
-                || queryCollection.Count == 0
-                || !queryCollection.ContainsKey(QueryKey))
-            {
-                // We return new here and below to ensure the collection is still mutable via events.
-                return new();
-            }
-
-            StringValues query = queryCollection[QueryKey];
-            string requestedPreset = query[query.Count - 1];
-            if (this.presets.TryGetValue(requestedPreset, out CommandCollection collection))
-            {
-                return collection;
-            }
-
+            // We return new here and below to ensure the collection is still mutable via events.
             return new();
         }
 
-        private static IDictionary<string, CommandCollection> ParsePresets(
-            IDictionary<string, string> unparsedPresets) =>
-            unparsedPresets
-                .Select(keyValue =>
-                    new KeyValuePair<string, CommandCollection>(keyValue.Key, ParsePreset(keyValue.Value)))
-                .ToDictionary(keyValue => keyValue.Key, keyValue => keyValue.Value, StringComparer.OrdinalIgnoreCase);
-
-        private static CommandCollection ParsePreset(string unparsedPresetValue)
+        StringValues query = queryCollection[QueryKey];
+        string requestedPreset = query[query.Count - 1];
+        if (this.presets.TryGetValue(requestedPreset, out CommandCollection collection))
         {
-            // TODO: Investigate skipping the double allocation here.
-            // In .NET 6 we can directly use the QueryStringEnumerable type and enumerate stright to our command collection
-            Dictionary<string, StringValues> parsed = QueryHelpers.ParseQuery(unparsedPresetValue);
-            CommandCollection transformed = new();
-            foreach (KeyValuePair<string, StringValues> pair in parsed)
-            {
-                // Use the indexer for both set and query. This replaces any previously parsed values.
-                transformed[pair.Key] = pair.Value[pair.Value.Count - 1];
-            }
+            return collection;
+        }
+
+        return new();
+    }
 
-            return transformed;
+    private static IDictionary<string, CommandCollection> ParsePresets(
+        IDictionary<string, string> unparsedPresets) =>
+        unparsedPresets
+            .Select(keyValue =>
+                new KeyValuePair<string, CommandCollection>(keyValue.Key, ParsePreset(keyValue.Value)))
+            .ToDictionary(keyValue => keyValue.Key, keyValue => keyValue.Value, StringComparer.OrdinalIgnoreCase);
+
+    private static CommandCollection ParsePreset(string unparsedPresetValue)
+    {
+        // TODO: Investigate skipping the double allocation here.
+        // In .NET 6 we can directly use the QueryStringEnumerable type and enumerate stright to our command collection
+        Dictionary<string, StringValues> parsed = QueryHelpers.ParseQuery(unparsedPresetValue);
+        CommandCollection transformed = new();
+        foreach (KeyValuePair<string, StringValues> pair in parsed)
+        {
+            // Use the indexer for both set and query. This replaces any previously parsed values.
+            transformed[pair.Key] = pair.Value[pair.Value.Count - 1];
         }
+
+        return transformed;
     }
 }
diff --git a/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParserOptions.cs b/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParserOptions.cs
index 85500d60..f12934f3 100644
--- a/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParserOptions.cs
+++ b/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParserOptions.cs
@@ -1,18 +1,16 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.Collections.Generic;
+namespace SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Commands
+/// <summary>
+/// Configuration options for the <see cref="PresetOnlyQueryCollectionRequestParser"/>.
+/// </summary>
+public class PresetOnlyQueryCollectionRequestParserOptions
 {
     /// <summary>
-    /// Configuration options for the <see cref="PresetOnlyQueryCollectionRequestParser"/>.
+    /// Gets or sets the presets, which is a Dictionary of preset names to command query strings.
     /// </summary>
-    public class PresetOnlyQueryCollectionRequestParserOptions
-    {
-        /// <summary>
-        /// Gets or sets the presets, which is a Dictionary of preset names to command query strings.
-        /// </summary>
-        public IDictionary<string, string> Presets { get; set; } = new Dictionary<string, string>();
-    }
+    public IDictionary<string, string> Presets { get; set; } = new Dictionary<string, string>();
 }
diff --git a/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs b/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs
index d54ba8d7..9edf4ea4 100644
--- a/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs
+++ b/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs
@@ -1,35 +1,34 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;
 
-namespace SixLabors.ImageSharp.Web.Commands
+namespace SixLabors.ImageSharp.Web.Commands;
+
+/// <summary>
+/// Parses commands from the request querystring.
+/// </summary>
+public sealed class QueryCollectionRequestParser : IRequestParser
 {
-    /// <summary>
-    /// Parses commands from the request querystring.
-    /// </summary>
-    public sealed class QueryCollectionRequestParser : IRequestParser
+    /// <inheritdoc/>
+    public CommandCollection ParseRequestCommands(HttpContext context)
     {
-        /// <inheritdoc/>
-        public CommandCollection ParseRequestCommands(HttpContext context)
+        IQueryCollection query = context.Request.Query;
+        if (query is null || query.Count == 0)
         {
-            IQueryCollection query = context.Request.Query;
-            if (query is null || query.Count == 0)
-            {
-                // We return new to ensure the collection is still mutable via events.
-                return new();
-            }
-
-            CommandCollection transformed = new();
-            foreach (KeyValuePair<string, StringValues> pair in query)
-            {
-                // Use the indexer for both set and query. This replaces any previously parsed values.
-                transformed[pair.Key] = pair.Value[pair.Value.Count - 1];
-            }
+            // We return new to ensure the collection is still mutable via events.
+            return new();
+        }
 
-            return transformed;
+        CommandCollection transformed = new();
+        foreach (KeyValuePair<string, StringValues> pair in query)
+        {
+            // Use the indexer for both set and query. This replaces any previously parsed values.
+            transformed[pair.Key] = pair.Value[pair.Value.Count - 1];
         }
+
+        return transformed;
     }
 }
diff --git a/src/ImageSharp.Web/Commands/TypeConstants.cs b/src/ImageSharp.Web/Commands/TypeConstants.cs
index 912cbb9e..e7a0d2b6 100644
--- a/src/ImageSharp.Web/Commands/TypeConstants.cs
+++ b/src/ImageSharp.Web/Commands/TypeConstants.cs
@@ -1,68 +1,66 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
+namespace SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Commands
+/// <summary>
+/// Contains reusable type variables.
+/// </summary>
+internal static class TypeConstants
 {
     /// <summary>
-    /// Contains reusable type variables.
+    /// The <see cref="sbyte"/> type.
     /// </summary>
-    internal static class TypeConstants
-    {
-        /// <summary>
-        /// The <see cref="sbyte"/> type.
-        /// </summary>
-        public static readonly Type Sbyte = typeof(sbyte);
+    public static readonly Type Sbyte = typeof(sbyte);
 
-        /// <summary>
-        /// The <see cref="byte"/> type.
-        /// </summary>
-        public static readonly Type Byte = typeof(byte);
+    /// <summary>
+    /// The <see cref="byte"/> type.
+    /// </summary>
+    public static readonly Type Byte = typeof(byte);
 
-        /// <summary>
-        /// The <see cref="short"/> type.
-        /// </summary>
-        public static readonly Type Short = typeof(short);
+    /// <summary>
+    /// The <see cref="short"/> type.
+    /// </summary>
+    public static readonly Type Short = typeof(short);
 
-        /// <summary>
-        /// The <see cref="ushort"/> type.
-        /// </summary>
-        public static readonly Type UShort = typeof(ushort);
+    /// <summary>
+    /// The <see cref="ushort"/> type.
+    /// </summary>
+    public static readonly Type UShort = typeof(ushort);
 
-        /// <summary>
-        /// The <see cref="int"/> type.
-        /// </summary>
-        public static readonly Type Int = typeof(int);
+    /// <summary>
+    /// The <see cref="int"/> type.
+    /// </summary>
+    public static readonly Type Int = typeof(int);
 
-        /// <summary>
-        /// The <see cref="uint"/> type.
-        /// </summary>
-        public static readonly Type UInt = typeof(uint);
+    /// <summary>
+    /// The <see cref="uint"/> type.
+    /// </summary>
+    public static readonly Type UInt = typeof(uint);
 
-        /// <summary>
-        /// The <see cref="long"/> type.
-        /// </summary>
-        public static readonly Type Long = typeof(long);
+    /// <summary>
+    /// The <see cref="long"/> type.
+    /// </summary>
+    public static readonly Type Long = typeof(long);
 
-        /// <summary>
-        /// The <see cref="ulong"/> type.
-        /// </summary>
-        public static readonly Type ULong = typeof(ulong);
+    /// <summary>
+    /// The <see cref="ulong"/> type.
+    /// </summary>
+    public static readonly Type ULong = typeof(ulong);
 
-        /// <summary>
-        /// The collection of integral number types.
-        /// </summary>
-        public static readonly Type[] IntegralTypes =
-        {
-            Sbyte,
-            Byte,
-            Short,
-            UShort,
-            Int,
-            UInt,
-            Long,
-            ULong
-        };
-    }
+    /// <summary>
+    /// The collection of integral number types.
+    /// </summary>
+    public static readonly Type[] IntegralTypes =
+    {
+        Sbyte,
+        Byte,
+        Short,
+        UShort,
+        Int,
+        UInt,
+        Long,
+        ULong
+    };
 }
diff --git a/src/ImageSharp.Web/DependencyInjection/ApplicationBuilderExtensions.cs b/src/ImageSharp.Web/DependencyInjection/ApplicationBuilderExtensions.cs
index 4f221d7b..e3bdaf9c 100644
--- a/src/ImageSharp.Web/DependencyInjection/ApplicationBuilderExtensions.cs
+++ b/src/ImageSharp.Web/DependencyInjection/ApplicationBuilderExtensions.cs
@@ -1,26 +1,26 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
 using Microsoft.AspNetCore.Builder;
 using SixLabors.ImageSharp.Web.Middleware;
 
-namespace SixLabors.ImageSharp.Web.DependencyInjection
+namespace SixLabors.ImageSharp.Web.DependencyInjection;
+
+/// <summary>
+/// Extension methods for <see cref="IApplicationBuilder"/> to simplify middleware registration.
+/// </summary>
+public static class ApplicationBuilderExtensions
 {
     /// <summary>
-    /// Extension methods for <see cref="IApplicationBuilder"/> to simplify middleware registration.
+    /// Registers the ImageSharp middleware.
     /// </summary>
-    public static class ApplicationBuilderExtensions
+    /// <param name="app">The application with the mechanism to configure a request pipeline.</param>
+    /// <returns><see cref="IApplicationBuilder"/>.</returns>
+    public static IApplicationBuilder UseImageSharp(this IApplicationBuilder app)
     {
-        /// <summary>
-        /// Registers the ImageSharp middleware.
-        /// </summary>
-        /// <param name="app">The application with the mechanism to configure a request pipeline.</param>
-        /// <returns><see cref="IApplicationBuilder"/>.</returns>
-        public static IApplicationBuilder UseImageSharp(this IApplicationBuilder app)
-        {
-            Guard.NotNull(app, nameof(app));
+        Guard.NotNull(app, nameof(app));
 
-            return app.UseMiddleware<ImageSharpMiddleware>();
-        }
+        return app.UseMiddleware<ImageSharpMiddleware>();
     }
 }
diff --git a/src/ImageSharp.Web/DependencyInjection/IImageSharpBuilder.cs b/src/ImageSharp.Web/DependencyInjection/IImageSharpBuilder.cs
index 22177e81..34a2701d 100644
--- a/src/ImageSharp.Web/DependencyInjection/IImageSharpBuilder.cs
+++ b/src/ImageSharp.Web/DependencyInjection/IImageSharpBuilder.cs
@@ -1,18 +1,18 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
 using Microsoft.Extensions.DependencyInjection;
 
-namespace SixLabors.ImageSharp.Web.DependencyInjection
+namespace SixLabors.ImageSharp.Web.DependencyInjection;
+
+/// <summary>
+/// Defines a contract for adding ImageSharp services.
+/// </summary>
+public interface IImageSharpBuilder
 {
     /// <summary>
-    /// Defines a contract for adding ImageSharp services.
+    /// Gets the <see cref="IServiceCollection"/> where ImageSharp services are configured.
     /// </summary>
-    public interface IImageSharpBuilder
-    {
-        /// <summary>
-        /// Gets the <see cref="IServiceCollection"/> where ImageSharp services are configured.
-        /// </summary>
-        IServiceCollection Services { get; }
-    }
+    IServiceCollection Services { get; }
 }
diff --git a/src/ImageSharp.Web/DependencyInjection/ImageSharpBuilder.cs b/src/ImageSharp.Web/DependencyInjection/ImageSharpBuilder.cs
index 6bebd32a..ac44dfe8 100644
--- a/src/ImageSharp.Web/DependencyInjection/ImageSharpBuilder.cs
+++ b/src/ImageSharp.Web/DependencyInjection/ImageSharpBuilder.cs
@@ -1,22 +1,22 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
 using Microsoft.Extensions.DependencyInjection;
 
-namespace SixLabors.ImageSharp.Web.DependencyInjection
+namespace SixLabors.ImageSharp.Web.DependencyInjection;
+
+/// <summary>
+/// Allows fine grained configuration of ImageSharp services.
+/// </summary>
+internal class ImageSharpBuilder : IImageSharpBuilder
 {
     /// <summary>
-    /// Allows fine grained configuration of ImageSharp services.
+    /// Initializes a new instance of the <see cref="ImageSharpBuilder"/> class.
     /// </summary>
-    internal class ImageSharpBuilder : IImageSharpBuilder
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageSharpBuilder"/> class.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
-        public ImageSharpBuilder(IServiceCollection services) => this.Services = services;
+    /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
+    public ImageSharpBuilder(IServiceCollection services) => this.Services = services;
 
-        /// <inheritdoc/>
-        public IServiceCollection Services { get; }
-    }
+    /// <inheritdoc/>
+    public IServiceCollection Services { get; }
 }
diff --git a/src/ImageSharp.Web/DependencyInjection/ImageSharpBuilderExtensions.cs b/src/ImageSharp.Web/DependencyInjection/ImageSharpBuilderExtensions.cs
index 536374cc..d696f015 100644
--- a/src/ImageSharp.Web/DependencyInjection/ImageSharpBuilderExtensions.cs
+++ b/src/ImageSharp.Web/DependencyInjection/ImageSharpBuilderExtensions.cs
@@ -1,8 +1,7 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Linq;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -12,372 +11,371 @@
 using SixLabors.ImageSharp.Web.Processors;
 using SixLabors.ImageSharp.Web.Providers;
 
-namespace SixLabors.ImageSharp.Web.DependencyInjection
+namespace SixLabors.ImageSharp.Web.DependencyInjection;
+
+/// <summary>
+/// Extension methods for <see cref="IImageSharpBuilder"/> that allow configuration of services.
+/// </summary>
+public static class ImageSharpBuilderExtensions
 {
     /// <summary>
-    /// Extension methods for <see cref="IImageSharpBuilder"/> that allow configuration of services.
+    /// Sets the given <see cref="IRequestParser"/> adding it to the service collection.
     /// </summary>
-    public static class ImageSharpBuilderExtensions
+    /// <typeparam name="TParser">The type of class implementing <see cref="IRequestParser"/> to add.</typeparam>
+    /// <param name="builder">The core builder.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder SetRequestParser<TParser>(this IImageSharpBuilder builder)
+        where TParser : class, IRequestParser
     {
-        /// <summary>
-        /// Sets the given <see cref="IRequestParser"/> adding it to the service collection.
-        /// </summary>
-        /// <typeparam name="TParser">The type of class implementing <see cref="IRequestParser"/> to add.</typeparam>
-        /// <param name="builder">The core builder.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder SetRequestParser<TParser>(this IImageSharpBuilder builder)
-            where TParser : class, IRequestParser
-        {
-            builder.Services.Replace(ServiceDescriptor.Singleton<IRequestParser, TParser>());
+        builder.Services.Replace(ServiceDescriptor.Singleton<IRequestParser, TParser>());
 
-            return builder;
-        }
+        return builder;
+    }
 
-        /// <summary>
-        /// Sets the given <see cref="IRequestParser"/> adding it to the service collection.
-        /// </summary>
-        /// <param name="builder">The core builder.</param>
-        /// <param name="implementationFactory">The factory method for returning a <see cref="IRequestParser"/>.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder SetRequestParser(this IImageSharpBuilder builder, Func<IServiceProvider, IRequestParser> implementationFactory)
-        {
-            builder.Services.Replace(ServiceDescriptor.Singleton(implementationFactory));
+    /// <summary>
+    /// Sets the given <see cref="IRequestParser"/> adding it to the service collection.
+    /// </summary>
+    /// <param name="builder">The core builder.</param>
+    /// <param name="implementationFactory">The factory method for returning a <see cref="IRequestParser"/>.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder SetRequestParser(this IImageSharpBuilder builder, Func<IServiceProvider, IRequestParser> implementationFactory)
+    {
+        builder.Services.Replace(ServiceDescriptor.Singleton(implementationFactory));
 
-            return builder;
-        }
+        return builder;
+    }
 
-        /// <summary>
-        /// Sets the given <see cref="IImageCache"/> adding it to the service collection.
-        /// </summary>
-        /// <typeparam name="TCache">The type of class implementing <see cref="IImageCache"/> to add.</typeparam>
-        /// <param name="builder">The core builder.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder SetCache<TCache>(this IImageSharpBuilder builder)
-            where TCache : class, IImageCache
-        {
-            builder.Services.Replace(ServiceDescriptor.Singleton<IImageCache, TCache>());
+    /// <summary>
+    /// Sets the given <see cref="IImageCache"/> adding it to the service collection.
+    /// </summary>
+    /// <typeparam name="TCache">The type of class implementing <see cref="IImageCache"/> to add.</typeparam>
+    /// <param name="builder">The core builder.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder SetCache<TCache>(this IImageSharpBuilder builder)
+        where TCache : class, IImageCache
+    {
+        builder.Services.Replace(ServiceDescriptor.Singleton<IImageCache, TCache>());
 
-            return builder;
-        }
+        return builder;
+    }
 
-        /// <summary>
-        /// Sets the given <see cref="IImageCache"/> adding it to the service collection.
-        /// </summary>
-        /// <param name="builder">The core builder.</param>
-        /// <param name="implementationFactory">The factory method for returning a <see cref="IImageCache"/>.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder SetCache(this IImageSharpBuilder builder, Func<IServiceProvider, IImageCache> implementationFactory)
-        {
-            builder.Services.Replace(ServiceDescriptor.Singleton(implementationFactory));
+    /// <summary>
+    /// Sets the given <see cref="IImageCache"/> adding it to the service collection.
+    /// </summary>
+    /// <param name="builder">The core builder.</param>
+    /// <param name="implementationFactory">The factory method for returning a <see cref="IImageCache"/>.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder SetCache(this IImageSharpBuilder builder, Func<IServiceProvider, IImageCache> implementationFactory)
+    {
+        builder.Services.Replace(ServiceDescriptor.Singleton(implementationFactory));
 
-            return builder;
-        }
+        return builder;
+    }
 
-        /// <summary>
-        /// Sets the given <see cref="ICacheKey"/> adding it to the service collection.
-        /// </summary>
-        /// <typeparam name="TCacheKey">The type of class implementing <see cref="ICacheKey"/> to add.</typeparam>
-        /// <param name="builder">The core builder.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder SetCacheKey<TCacheKey>(this IImageSharpBuilder builder)
-            where TCacheKey : class, ICacheKey
-        {
-            builder.Services.Replace(ServiceDescriptor.Singleton<ICacheKey, TCacheKey>());
+    /// <summary>
+    /// Sets the given <see cref="ICacheKey"/> adding it to the service collection.
+    /// </summary>
+    /// <typeparam name="TCacheKey">The type of class implementing <see cref="ICacheKey"/> to add.</typeparam>
+    /// <param name="builder">The core builder.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder SetCacheKey<TCacheKey>(this IImageSharpBuilder builder)
+        where TCacheKey : class, ICacheKey
+    {
+        builder.Services.Replace(ServiceDescriptor.Singleton<ICacheKey, TCacheKey>());
 
-            return builder;
-        }
+        return builder;
+    }
 
-        /// <summary>
-        /// Sets the given <see cref="ICacheKey"/> adding it to the service collection.
-        /// </summary>
-        /// <param name="builder">The core builder.</param>
-        /// <param name="implementationFactory">The factory method for returning a <see cref="ICacheKey"/>.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder SetCacheKey(this IImageSharpBuilder builder, Func<IServiceProvider, ICacheKey> implementationFactory)
-        {
-            builder.Services.Replace(ServiceDescriptor.Singleton(implementationFactory));
+    /// <summary>
+    /// Sets the given <see cref="ICacheKey"/> adding it to the service collection.
+    /// </summary>
+    /// <param name="builder">The core builder.</param>
+    /// <param name="implementationFactory">The factory method for returning a <see cref="ICacheKey"/>.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder SetCacheKey(this IImageSharpBuilder builder, Func<IServiceProvider, ICacheKey> implementationFactory)
+    {
+        builder.Services.Replace(ServiceDescriptor.Singleton(implementationFactory));
 
-            return builder;
-        }
+        return builder;
+    }
 
-        /// <summary>
-        /// Sets the given <see cref="ICacheHash"/> adding it to the service collection.
-        /// </summary>
-        /// <typeparam name="TCacheHash">The type of class implementing <see cref="ICacheHash"/> to add.</typeparam>
-        /// <param name="builder">The core builder.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder SetCacheHash<TCacheHash>(this IImageSharpBuilder builder)
-            where TCacheHash : class, ICacheHash
-        {
-            builder.Services.Replace(ServiceDescriptor.Singleton<ICacheHash, TCacheHash>());
+    /// <summary>
+    /// Sets the given <see cref="ICacheHash"/> adding it to the service collection.
+    /// </summary>
+    /// <typeparam name="TCacheHash">The type of class implementing <see cref="ICacheHash"/> to add.</typeparam>
+    /// <param name="builder">The core builder.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder SetCacheHash<TCacheHash>(this IImageSharpBuilder builder)
+        where TCacheHash : class, ICacheHash
+    {
+        builder.Services.Replace(ServiceDescriptor.Singleton<ICacheHash, TCacheHash>());
 
-            return builder;
-        }
+        return builder;
+    }
 
-        /// <summary>
-        /// Sets the given <see cref="ICacheHash"/> adding it to the service collection.
-        /// </summary>
-        /// <param name="builder">The core builder.</param>
-        /// <param name="implementationFactory">The factory method for returning a <see cref="ICacheHash"/>.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder SetCacheHash(this IImageSharpBuilder builder, Func<IServiceProvider, ICacheHash> implementationFactory)
-        {
-            builder.Services.Replace(ServiceDescriptor.Singleton(implementationFactory));
+    /// <summary>
+    /// Sets the given <see cref="ICacheHash"/> adding it to the service collection.
+    /// </summary>
+    /// <param name="builder">The core builder.</param>
+    /// <param name="implementationFactory">The factory method for returning a <see cref="ICacheHash"/>.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder SetCacheHash(this IImageSharpBuilder builder, Func<IServiceProvider, ICacheHash> implementationFactory)
+    {
+        builder.Services.Replace(ServiceDescriptor.Singleton(implementationFactory));
 
-            return builder;
-        }
+        return builder;
+    }
 
-        /// <summary>
-        /// Adds the given <see cref="IImageProvider"/> to the provider collection within the service collection.
-        /// </summary>
-        /// <typeparam name="TProvider">The type of class implementing <see cref="IImageProvider"/> to add.</typeparam>
-        /// <param name="builder">The core builder.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder AddProvider<TProvider>(this IImageSharpBuilder builder)
-            where TProvider : class, IImageProvider
-        {
-            builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IImageProvider, TProvider>());
+    /// <summary>
+    /// Adds the given <see cref="IImageProvider"/> to the provider collection within the service collection.
+    /// </summary>
+    /// <typeparam name="TProvider">The type of class implementing <see cref="IImageProvider"/> to add.</typeparam>
+    /// <param name="builder">The core builder.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder AddProvider<TProvider>(this IImageSharpBuilder builder)
+        where TProvider : class, IImageProvider
+    {
+        builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IImageProvider, TProvider>());
 
-            return builder;
-        }
+        return builder;
+    }
 
-        /// <summary>
-        /// Adds the given <see cref="IImageProvider"/> to the provider collection within the service collection.
-        /// </summary>
-        /// <typeparam name="TProvider">The type of class implementing <see cref="IImageProvider"/> to add.</typeparam>
-        /// <param name="builder">The core builder.</param>
-        /// <param name="implementationFactory">The factory method for returning a <see cref="IImageProvider"/>.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder AddProvider<TProvider>(this IImageSharpBuilder builder, Func<IServiceProvider, TProvider> implementationFactory)
-            where TProvider : class, IImageProvider
-        {
-            builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IImageProvider>(implementationFactory));
+    /// <summary>
+    /// Adds the given <see cref="IImageProvider"/> to the provider collection within the service collection.
+    /// </summary>
+    /// <typeparam name="TProvider">The type of class implementing <see cref="IImageProvider"/> to add.</typeparam>
+    /// <param name="builder">The core builder.</param>
+    /// <param name="implementationFactory">The factory method for returning a <see cref="IImageProvider"/>.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder AddProvider<TProvider>(this IImageSharpBuilder builder, Func<IServiceProvider, TProvider> implementationFactory)
+        where TProvider : class, IImageProvider
+    {
+        builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IImageProvider>(implementationFactory));
 
-            return builder;
-        }
+        return builder;
+    }
 
-        /// <summary>
-        /// Inserts the given <see cref="IImageProvider"/> at the give index into to the provider collection within the service collection.
-        /// </summary>
-        /// <typeparam name="TProvider">The type of class implementing <see cref="IImageProvider"/> to add.</typeparam>
-        /// <param name="builder">The core builder.</param>
-        /// <param name="index">The zero-based index at which the provider should be inserted.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder InsertProvider<TProvider>(this IImageSharpBuilder builder, int index)
-            where TProvider : class, IImageProvider
-        {
-            var descriptors = builder.Services.Where(x => x.ServiceType == typeof(IImageProvider)).ToList();
-            descriptors.RemoveAll(x => x.GetImplementationType() == typeof(TProvider));
-            descriptors.Insert(index, ServiceDescriptor.Singleton<IImageProvider, TProvider>());
+    /// <summary>
+    /// Inserts the given <see cref="IImageProvider"/> at the give index into to the provider collection within the service collection.
+    /// </summary>
+    /// <typeparam name="TProvider">The type of class implementing <see cref="IImageProvider"/> to add.</typeparam>
+    /// <param name="builder">The core builder.</param>
+    /// <param name="index">The zero-based index at which the provider should be inserted.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder InsertProvider<TProvider>(this IImageSharpBuilder builder, int index)
+        where TProvider : class, IImageProvider
+    {
+        var descriptors = builder.Services.Where(x => x.ServiceType == typeof(IImageProvider)).ToList();
+        descriptors.RemoveAll(x => x.GetImplementationType() == typeof(TProvider));
+        descriptors.Insert(index, ServiceDescriptor.Singleton<IImageProvider, TProvider>());
 
-            builder.ClearProviders();
-            builder.Services.TryAddEnumerable(descriptors);
+        builder.ClearProviders();
+        builder.Services.TryAddEnumerable(descriptors);
 
-            return builder;
-        }
+        return builder;
+    }
 
-        /// <summary>
-        /// Inserts the given <see cref="IImageProvider"/>  at the give index into the provider collection within the service collection.
-        /// </summary>
-        /// <typeparam name="TProvider">The type of class implementing <see cref="IImageProvider"/> to add.</typeparam>
-        /// <param name="builder">The core builder.</param>
-        /// <param name="index">The zero-based index at which the provider should be inserted.</param>
-        /// <param name="implementationFactory">The factory method for returning a <see cref="IImageProvider"/>.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder InsertProvider<TProvider>(this IImageSharpBuilder builder, int index, Func<IServiceProvider, TProvider> implementationFactory)
-            where TProvider : class, IImageProvider
-        {
-            var descriptors = builder.Services.Where(x => x.ServiceType == typeof(IImageProvider)).ToList();
-            descriptors.RemoveAll(x => x.GetImplementationType() == typeof(TProvider));
-            descriptors.Insert(index, ServiceDescriptor.Singleton<IImageProvider>(implementationFactory));
+    /// <summary>
+    /// Inserts the given <see cref="IImageProvider"/>  at the give index into the provider collection within the service collection.
+    /// </summary>
+    /// <typeparam name="TProvider">The type of class implementing <see cref="IImageProvider"/> to add.</typeparam>
+    /// <param name="builder">The core builder.</param>
+    /// <param name="index">The zero-based index at which the provider should be inserted.</param>
+    /// <param name="implementationFactory">The factory method for returning a <see cref="IImageProvider"/>.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder InsertProvider<TProvider>(this IImageSharpBuilder builder, int index, Func<IServiceProvider, TProvider> implementationFactory)
+        where TProvider : class, IImageProvider
+    {
+        var descriptors = builder.Services.Where(x => x.ServiceType == typeof(IImageProvider)).ToList();
+        descriptors.RemoveAll(x => x.GetImplementationType() == typeof(TProvider));
+        descriptors.Insert(index, ServiceDescriptor.Singleton<IImageProvider>(implementationFactory));
 
-            builder.ClearProviders();
-            builder.Services.TryAddEnumerable(descriptors);
+        builder.ClearProviders();
+        builder.Services.TryAddEnumerable(descriptors);
 
-            return builder;
-        }
+        return builder;
+    }
 
-        /// <summary>
-        /// Removes the given <see cref="IImageProvider"/> from the provider collection within the service collection.
-        /// </summary>
-        /// <typeparam name="TProvider">The type of class implementing <see cref="IImageProvider"/> to add.</typeparam>
-        /// <param name="builder">The core builder.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder RemoveProvider<TProvider>(this IImageSharpBuilder builder)
-            where TProvider : class, IImageProvider
+    /// <summary>
+    /// Removes the given <see cref="IImageProvider"/> from the provider collection within the service collection.
+    /// </summary>
+    /// <typeparam name="TProvider">The type of class implementing <see cref="IImageProvider"/> to add.</typeparam>
+    /// <param name="builder">The core builder.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder RemoveProvider<TProvider>(this IImageSharpBuilder builder)
+        where TProvider : class, IImageProvider
+    {
+        ServiceDescriptor descriptor = builder.Services.FirstOrDefault(x => x.ServiceType == typeof(IImageProvider) && x.GetImplementationType() == typeof(TProvider));
+        if (descriptor != null)
         {
-            ServiceDescriptor descriptor = builder.Services.FirstOrDefault(x => x.ServiceType == typeof(IImageProvider) && x.GetImplementationType() == typeof(TProvider));
-            if (descriptor != null)
-            {
-                builder.Services.Remove(descriptor);
-            }
-
-            return builder;
+            builder.Services.Remove(descriptor);
         }
 
-        /// <summary>
-        /// Removes all <see cref="IImageProvider"/> instances from the provider collection within the service collection.
-        /// </summary>
-        /// <param name="builder">The core builder.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder ClearProviders(this IImageSharpBuilder builder)
-        {
-            builder.Services.RemoveAll<IImageProvider>();
+        return builder;
+    }
 
-            return builder;
-        }
+    /// <summary>
+    /// Removes all <see cref="IImageProvider"/> instances from the provider collection within the service collection.
+    /// </summary>
+    /// <param name="builder">The core builder.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder ClearProviders(this IImageSharpBuilder builder)
+    {
+        builder.Services.RemoveAll<IImageProvider>();
 
-        /// <summary>
-        /// Adds the given <see cref="IImageWebProcessor"/> to the processor collection within the service collection.
-        /// </summary>
-        /// <typeparam name="T">The type of class implementing <see cref="IImageWebProcessor"/> to add.</typeparam>
-        /// <param name="builder">The core builder.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder AddProcessor<T>(this IImageSharpBuilder builder)
-            where T : class, IImageWebProcessor
-        {
-            builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IImageWebProcessor, T>());
+        return builder;
+    }
 
-            return builder;
-        }
+    /// <summary>
+    /// Adds the given <see cref="IImageWebProcessor"/> to the processor collection within the service collection.
+    /// </summary>
+    /// <typeparam name="T">The type of class implementing <see cref="IImageWebProcessor"/> to add.</typeparam>
+    /// <param name="builder">The core builder.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder AddProcessor<T>(this IImageSharpBuilder builder)
+        where T : class, IImageWebProcessor
+    {
+        builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IImageWebProcessor, T>());
 
-        /// <summary>
-        /// Adds the given <see cref="IImageWebProcessor"/> to the processor collection within the service collection.
-        /// </summary>
-        /// <typeparam name="TProcessor">The type of class implementing <see cref="IImageWebProcessor"/> to add.</typeparam>
-        /// <param name="builder">The core builder.</param>
-        /// <param name="implementationFactory">The factory method for returning a <see cref="IImageProvider"/>.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder AddProcessor<TProcessor>(this IImageSharpBuilder builder, Func<IServiceProvider, TProcessor> implementationFactory)
-            where TProcessor : class, IImageWebProcessor
-        {
-            builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IImageWebProcessor>(implementationFactory));
+        return builder;
+    }
 
-            return builder;
-        }
+    /// <summary>
+    /// Adds the given <see cref="IImageWebProcessor"/> to the processor collection within the service collection.
+    /// </summary>
+    /// <typeparam name="TProcessor">The type of class implementing <see cref="IImageWebProcessor"/> to add.</typeparam>
+    /// <param name="builder">The core builder.</param>
+    /// <param name="implementationFactory">The factory method for returning a <see cref="IImageProvider"/>.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder AddProcessor<TProcessor>(this IImageSharpBuilder builder, Func<IServiceProvider, TProcessor> implementationFactory)
+        where TProcessor : class, IImageWebProcessor
+    {
+        builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IImageWebProcessor>(implementationFactory));
 
-        /// <summary>
-        /// Removes the given <see cref="IImageWebProcessor"/> from the processor collection within the service collection.
-        /// </summary>
-        /// <typeparam name="TProcessor">The type of class implementing <see cref="IImageWebProcessor"/> to add.</typeparam>
-        /// <param name="builder">The core builder.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder RemoveProcessor<TProcessor>(this IImageSharpBuilder builder)
-            where TProcessor : class, IImageWebProcessor
-        {
-            ServiceDescriptor descriptor = builder.Services.FirstOrDefault(x => x.ServiceType == typeof(IImageWebProcessor) && x.GetImplementationType() == typeof(TProcessor));
-            if (descriptor != null)
-            {
-                builder.Services.Remove(descriptor);
-            }
+        return builder;
+    }
 
-            return builder;
+    /// <summary>
+    /// Removes the given <see cref="IImageWebProcessor"/> from the processor collection within the service collection.
+    /// </summary>
+    /// <typeparam name="TProcessor">The type of class implementing <see cref="IImageWebProcessor"/> to add.</typeparam>
+    /// <param name="builder">The core builder.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder RemoveProcessor<TProcessor>(this IImageSharpBuilder builder)
+        where TProcessor : class, IImageWebProcessor
+    {
+        ServiceDescriptor descriptor = builder.Services.FirstOrDefault(x => x.ServiceType == typeof(IImageWebProcessor) && x.GetImplementationType() == typeof(TProcessor));
+        if (descriptor != null)
+        {
+            builder.Services.Remove(descriptor);
         }
 
-        /// <summary>
-        /// Removes all <see cref="IImageWebProcessor"/> instances from the processor collection within the service collection.
-        /// </summary>
-        /// <param name="builder">The core builder.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder ClearProcessors(this IImageSharpBuilder builder)
-        {
-            builder.Services.RemoveAll<IImageWebProcessor>();
+        return builder;
+    }
 
-            return builder;
-        }
+    /// <summary>
+    /// Removes all <see cref="IImageWebProcessor"/> instances from the processor collection within the service collection.
+    /// </summary>
+    /// <param name="builder">The core builder.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder ClearProcessors(this IImageSharpBuilder builder)
+    {
+        builder.Services.RemoveAll<IImageWebProcessor>();
 
-        /// <summary>
-        /// Adds the given <see cref="ICommandConverter"/> to the converter collection within the service collection.
-        /// </summary>
-        /// <typeparam name="TConverter">The type of class implementing <see cref="ICommandConverter"/> to add.</typeparam>
-        /// <param name="builder">The core builder.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder AddConverter<TConverter>(this IImageSharpBuilder builder)
-            where TConverter : class, ICommandConverter
-        {
-            builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<ICommandConverter, TConverter>());
+        return builder;
+    }
 
-            return builder;
-        }
+    /// <summary>
+    /// Adds the given <see cref="ICommandConverter"/> to the converter collection within the service collection.
+    /// </summary>
+    /// <typeparam name="TConverter">The type of class implementing <see cref="ICommandConverter"/> to add.</typeparam>
+    /// <param name="builder">The core builder.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder AddConverter<TConverter>(this IImageSharpBuilder builder)
+        where TConverter : class, ICommandConverter
+    {
+        builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<ICommandConverter, TConverter>());
 
-        /// <summary>
-        /// Adds the given <see cref="ICommandConverter"/> to the converter collection within the service collection.
-        /// </summary>
-        /// <typeparam name="TConverter">The type of class implementing <see cref="ICommandConverter"/> to add.</typeparam>
-        /// <param name="builder">The core builder.</param>
-        /// <param name="implementationFactory">The factory method for returning a <see cref="ICommandConverter"/>.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder AddConverter<TConverter>(this IImageSharpBuilder builder, Func<IServiceProvider, TConverter> implementationFactory)
-            where TConverter : class, ICommandConverter
-        {
-            builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<ICommandConverter>(implementationFactory));
+        return builder;
+    }
 
-            return builder;
-        }
+    /// <summary>
+    /// Adds the given <see cref="ICommandConverter"/> to the converter collection within the service collection.
+    /// </summary>
+    /// <typeparam name="TConverter">The type of class implementing <see cref="ICommandConverter"/> to add.</typeparam>
+    /// <param name="builder">The core builder.</param>
+    /// <param name="implementationFactory">The factory method for returning a <see cref="ICommandConverter"/>.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder AddConverter<TConverter>(this IImageSharpBuilder builder, Func<IServiceProvider, TConverter> implementationFactory)
+        where TConverter : class, ICommandConverter
+    {
+        builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<ICommandConverter>(implementationFactory));
 
-        /// <summary>
-        /// Removes the given <see cref="ICommandConverter"/> from the converter collection within the service collection.
-        /// </summary>
-        /// <typeparam name="TConverter">The type of class implementing <see cref="ICommandConverter"/> to add.</typeparam>
-        /// <param name="builder">The core builder.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder RemoveConverter<TConverter>(this IImageSharpBuilder builder)
-            where TConverter : class, ICommandConverter
-        {
-            ServiceDescriptor descriptor = builder.Services.FirstOrDefault(x => x.ServiceType == typeof(ICommandConverter) && x.GetImplementationType() == typeof(TConverter));
-            if (descriptor != null)
-            {
-                builder.Services.Remove(descriptor);
-            }
+        return builder;
+    }
 
-            return builder;
+    /// <summary>
+    /// Removes the given <see cref="ICommandConverter"/> from the converter collection within the service collection.
+    /// </summary>
+    /// <typeparam name="TConverter">The type of class implementing <see cref="ICommandConverter"/> to add.</typeparam>
+    /// <param name="builder">The core builder.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder RemoveConverter<TConverter>(this IImageSharpBuilder builder)
+        where TConverter : class, ICommandConverter
+    {
+        ServiceDescriptor descriptor = builder.Services.FirstOrDefault(x => x.ServiceType == typeof(ICommandConverter) && x.GetImplementationType() == typeof(TConverter));
+        if (descriptor != null)
+        {
+            builder.Services.Remove(descriptor);
         }
 
-        /// <summary>
-        /// Removes all <see cref="ICommandConverter"/> instances from the converter collection within the service collection.
-        /// </summary>
-        /// <param name="builder">The core builder.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder ClearConverters(this IImageSharpBuilder builder)
-        {
-            builder.Services.RemoveAll<ICommandConverter>();
+        return builder;
+    }
 
-            return builder;
-        }
+    /// <summary>
+    /// Removes all <see cref="ICommandConverter"/> instances from the converter collection within the service collection.
+    /// </summary>
+    /// <param name="builder">The core builder.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder ClearConverters(this IImageSharpBuilder builder)
+    {
+        builder.Services.RemoveAll<ICommandConverter>();
 
-        /// <summary>
-        /// Registers an action used to configure a particular type of options.
-        /// </summary>
-        /// <typeparam name="TOptions">The options type to be configured.</typeparam>
-        /// <param name="builder">The core builder.</param>
-        /// <param name="config">The configuration being bound.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder Configure<TOptions>(this IImageSharpBuilder builder, IConfiguration config)
-             where TOptions : class
-        {
-            builder.Services.Configure<TOptions>(config);
+        return builder;
+    }
 
-            return builder;
-        }
+    /// <summary>
+    /// Registers an action used to configure a particular type of options.
+    /// </summary>
+    /// <typeparam name="TOptions">The options type to be configured.</typeparam>
+    /// <param name="builder">The core builder.</param>
+    /// <param name="config">The configuration being bound.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder Configure<TOptions>(this IImageSharpBuilder builder, IConfiguration config)
+         where TOptions : class
+    {
+        builder.Services.Configure<TOptions>(config);
 
-        /// <summary>
-        /// Registers an action used to configure a particular type of options.
-        /// </summary>
-        /// <typeparam name="TOptions">The options type to be configured.</typeparam>
-        /// <param name="builder">The core builder.</param>
-        /// <param name="configureOptions">The action used to configure the options.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        public static IImageSharpBuilder Configure<TOptions>(this IImageSharpBuilder builder, Action<TOptions> configureOptions)
-             where TOptions : class
-        {
-            builder.Services.Configure(configureOptions);
+        return builder;
+    }
 
-            return builder;
-        }
+    /// <summary>
+    /// Registers an action used to configure a particular type of options.
+    /// </summary>
+    /// <typeparam name="TOptions">The options type to be configured.</typeparam>
+    /// <param name="builder">The core builder.</param>
+    /// <param name="configureOptions">The action used to configure the options.</param>
+    /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+    public static IImageSharpBuilder Configure<TOptions>(this IImageSharpBuilder builder, Action<TOptions> configureOptions)
+         where TOptions : class
+    {
+        builder.Services.Configure(configureOptions);
 
-        private static Type GetImplementationType(this ServiceDescriptor descriptor)
-            => descriptor.ImplementationType
-            ?? descriptor.ImplementationInstance?.GetType()
-            ?? descriptor.ImplementationFactory?.GetType().GenericTypeArguments[1];
+        return builder;
     }
+
+    private static Type GetImplementationType(this ServiceDescriptor descriptor)
+        => descriptor.ImplementationType
+        ?? descriptor.ImplementationInstance?.GetType()
+        ?? descriptor.ImplementationFactory?.GetType().GenericTypeArguments[1];
 }
diff --git a/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs b/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs
index 2d42ee52..31fcd6ac 100644
--- a/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs
+++ b/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs
@@ -1,10 +1,8 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Options;
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Commands.Converters;
@@ -13,116 +11,115 @@
 using SixLabors.ImageSharp.Web.Providers;
 using SixLabors.ImageSharp.Web.Synchronization;
 
-namespace SixLabors.ImageSharp.Web.DependencyInjection
+namespace SixLabors.ImageSharp.Web.DependencyInjection;
+
+/// <summary>
+/// Extension methods for <see cref="IServiceCollection"/> to simplify middleware service registration.
+/// </summary>
+public static class ServiceCollectionExtensions
 {
     /// <summary>
-    /// Extension methods for <see cref="IServiceCollection"/> to simplify middleware service registration.
+    /// Adds ImageSharp services to the specified <see cref="IServiceCollection" /> with the default options.
     /// </summary>
-    public static class ServiceCollectionExtensions
+    /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
+    /// <returns>An <see cref="IImageSharpBuilder"/> that can be used to further configure the ImageSharp services.</returns>
+    public static IImageSharpBuilder AddImageSharp(this IServiceCollection services)
+        => AddImageSharp(services, _ => { });
+
+    /// <summary>
+    /// Adds ImageSharp services to the specified <see cref="IServiceCollection" /> with the given options.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
+    /// <param name="setupAction">An <see cref="Action{ImageSharpMiddlewareOptions}"/> to configure the provided <see cref="ImageSharpMiddlewareOptions"/>.</param>
+    /// <returns>An <see cref="IImageSharpBuilder"/> that can be used to further configure the ImageSharp services.</returns>
+    public static IImageSharpBuilder AddImageSharp(
+        this IServiceCollection services,
+        Action<ImageSharpMiddlewareOptions> setupAction)
+    {
+        Guard.NotNull(services, nameof(services));
+        Guard.NotNull(setupAction, nameof(setupAction));
+
+        IImageSharpBuilder builder = new ImageSharpBuilder(services);
+
+        AddDefaultServices(builder, setupAction);
+
+        return builder;
+    }
+
+    private static void AddDefaultServices(
+        IImageSharpBuilder builder,
+        Action<ImageSharpMiddlewareOptions> setupAction)
     {
-        /// <summary>
-        /// Adds ImageSharp services to the specified <see cref="IServiceCollection" /> with the default options.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
-        /// <returns>An <see cref="IImageSharpBuilder"/> that can be used to further configure the ImageSharp services.</returns>
-        public static IImageSharpBuilder AddImageSharp(this IServiceCollection services)
-            => AddImageSharp(services, _ => { });
-
-        /// <summary>
-        /// Adds ImageSharp services to the specified <see cref="IServiceCollection" /> with the given options.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
-        /// <param name="setupAction">An <see cref="Action{ImageSharpMiddlewareOptions}"/> to configure the provided <see cref="ImageSharpMiddlewareOptions"/>.</param>
-        /// <returns>An <see cref="IImageSharpBuilder"/> that can be used to further configure the ImageSharp services.</returns>
-        public static IImageSharpBuilder AddImageSharp(
-            this IServiceCollection services,
-            Action<ImageSharpMiddlewareOptions> setupAction)
-        {
-            Guard.NotNull(services, nameof(services));
-            Guard.NotNull(setupAction, nameof(setupAction));
-
-            IImageSharpBuilder builder = new ImageSharpBuilder(services);
-
-            AddDefaultServices(builder, setupAction);
-
-            return builder;
-        }
-
-        private static void AddDefaultServices(
-            IImageSharpBuilder builder,
-            Action<ImageSharpMiddlewareOptions> setupAction)
-        {
-            builder.Services.Configure(setupAction);
-
-            builder.Services.AddSingleton<FormatUtilities>();
-
-            builder.Services.AddSingleton<AsyncKeyReaderWriterLock<string>>();
-
-            builder.SetRequestParser<QueryCollectionRequestParser>();
-
-            builder.Services.AddSingleton<ImageSharpRequestAuthorizationUtilities>();
-
-            builder.SetCache<PhysicalFileSystemCache>();
-
-            builder.SetCacheKey<UriRelativeLowerInvariantCacheKey>();
-
-            builder.SetCacheHash<SHA256CacheHash>();
-
-            builder.AddProvider<PhysicalFileSystemProvider>();
-
-            builder.AddProcessor<ResizeWebProcessor>()
-                   .AddProcessor<FormatWebProcessor>()
-                   .AddProcessor<BackgroundColorWebProcessor>()
-                   .AddProcessor<QualityWebProcessor>()
-                   .AddProcessor<AutoOrientWebProcessor>();
-
-            builder.AddConverter<IntegralNumberConverter<sbyte>>();
-            builder.AddConverter<IntegralNumberConverter<byte>>();
-            builder.AddConverter<IntegralNumberConverter<short>>();
-            builder.AddConverter<IntegralNumberConverter<ushort>>();
-            builder.AddConverter<IntegralNumberConverter<int>>();
-            builder.AddConverter<IntegralNumberConverter<uint>>();
-            builder.AddConverter<IntegralNumberConverter<long>>();
-            builder.AddConverter<IntegralNumberConverter<ulong>>();
-
-            builder.AddConverter<SimpleCommandConverter<decimal>>();
-            builder.AddConverter<SimpleCommandConverter<float>>();
-            builder.AddConverter<SimpleCommandConverter<double>>();
-            builder.AddConverter<SimpleCommandConverter<string>>();
-            builder.AddConverter<SimpleCommandConverter<bool>>();
-
-            builder.AddConverter<ArrayConverter<sbyte>>();
-            builder.AddConverter<ArrayConverter<byte>>();
-            builder.AddConverter<ArrayConverter<short>>();
-            builder.AddConverter<ArrayConverter<ushort>>();
-            builder.AddConverter<ArrayConverter<int>>();
-            builder.AddConverter<ArrayConverter<uint>>();
-            builder.AddConverter<ArrayConverter<long>>();
-            builder.AddConverter<ArrayConverter<ulong>>();
-            builder.AddConverter<ArrayConverter<decimal>>();
-            builder.AddConverter<ArrayConverter<float>>();
-            builder.AddConverter<ArrayConverter<double>>();
-            builder.AddConverter<ArrayConverter<string>>();
-            builder.AddConverter<ArrayConverter<bool>>();
-
-            builder.AddConverter<ListConverter<sbyte>>();
-            builder.AddConverter<ListConverter<byte>>();
-            builder.AddConverter<ListConverter<short>>();
-            builder.AddConverter<ListConverter<ushort>>();
-            builder.AddConverter<ListConverter<int>>();
-            builder.AddConverter<ListConverter<uint>>();
-            builder.AddConverter<ListConverter<long>>();
-            builder.AddConverter<ListConverter<ulong>>();
-            builder.AddConverter<ListConverter<decimal>>();
-            builder.AddConverter<ListConverter<float>>();
-            builder.AddConverter<ListConverter<double>>();
-            builder.AddConverter<ListConverter<string>>();
-            builder.AddConverter<ListConverter<bool>>();
-
-            builder.AddConverter<ColorConverter>();
-            builder.AddConverter<EnumConverter>();
-
-            builder.Services.AddSingleton<CommandParser>();
-        }
+        builder.Services.Configure(setupAction);
+
+        builder.Services.AddSingleton<FormatUtilities>();
+
+        builder.Services.AddSingleton<AsyncKeyReaderWriterLock<string>>();
+
+        builder.SetRequestParser<QueryCollectionRequestParser>();
+
+        builder.Services.AddSingleton<ImageSharpRequestAuthorizationUtilities>();
+
+        builder.SetCache<PhysicalFileSystemCache>();
+
+        builder.SetCacheKey<UriRelativeLowerInvariantCacheKey>();
+
+        builder.SetCacheHash<SHA256CacheHash>();
+
+        builder.AddProvider<PhysicalFileSystemProvider>();
+
+        builder.AddProcessor<ResizeWebProcessor>()
+               .AddProcessor<FormatWebProcessor>()
+               .AddProcessor<BackgroundColorWebProcessor>()
+               .AddProcessor<QualityWebProcessor>()
+               .AddProcessor<AutoOrientWebProcessor>();
+
+        builder.AddConverter<IntegralNumberConverter<sbyte>>();
+        builder.AddConverter<IntegralNumberConverter<byte>>();
+        builder.AddConverter<IntegralNumberConverter<short>>();
+        builder.AddConverter<IntegralNumberConverter<ushort>>();
+        builder.AddConverter<IntegralNumberConverter<int>>();
+        builder.AddConverter<IntegralNumberConverter<uint>>();
+        builder.AddConverter<IntegralNumberConverter<long>>();
+        builder.AddConverter<IntegralNumberConverter<ulong>>();
+
+        builder.AddConverter<SimpleCommandConverter<decimal>>();
+        builder.AddConverter<SimpleCommandConverter<float>>();
+        builder.AddConverter<SimpleCommandConverter<double>>();
+        builder.AddConverter<SimpleCommandConverter<string>>();
+        builder.AddConverter<SimpleCommandConverter<bool>>();
+
+        builder.AddConverter<ArrayConverter<sbyte>>();
+        builder.AddConverter<ArrayConverter<byte>>();
+        builder.AddConverter<ArrayConverter<short>>();
+        builder.AddConverter<ArrayConverter<ushort>>();
+        builder.AddConverter<ArrayConverter<int>>();
+        builder.AddConverter<ArrayConverter<uint>>();
+        builder.AddConverter<ArrayConverter<long>>();
+        builder.AddConverter<ArrayConverter<ulong>>();
+        builder.AddConverter<ArrayConverter<decimal>>();
+        builder.AddConverter<ArrayConverter<float>>();
+        builder.AddConverter<ArrayConverter<double>>();
+        builder.AddConverter<ArrayConverter<string>>();
+        builder.AddConverter<ArrayConverter<bool>>();
+
+        builder.AddConverter<ListConverter<sbyte>>();
+        builder.AddConverter<ListConverter<byte>>();
+        builder.AddConverter<ListConverter<short>>();
+        builder.AddConverter<ListConverter<ushort>>();
+        builder.AddConverter<ListConverter<int>>();
+        builder.AddConverter<ListConverter<uint>>();
+        builder.AddConverter<ListConverter<long>>();
+        builder.AddConverter<ListConverter<ulong>>();
+        builder.AddConverter<ListConverter<decimal>>();
+        builder.AddConverter<ListConverter<float>>();
+        builder.AddConverter<ListConverter<double>>();
+        builder.AddConverter<ListConverter<string>>();
+        builder.AddConverter<ListConverter<bool>>();
+
+        builder.AddConverter<ColorConverter>();
+        builder.AddConverter<EnumConverter>();
+
+        builder.Services.AddSingleton<CommandParser>();
     }
 }
diff --git a/src/ImageSharp.Web/ExifOrientationUtilities.cs b/src/ImageSharp.Web/ExifOrientationUtilities.cs
index 2cc3de2f..15e0d336 100644
--- a/src/ImageSharp.Web/ExifOrientationUtilities.cs
+++ b/src/ImageSharp.Web/ExifOrientationUtilities.cs
@@ -1,240 +1,240 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.Metadata.Profiles.Exif;
 using SixLabors.ImageSharp.Processing;
 
-namespace SixLabors.ImageSharp.Web
+namespace SixLabors.ImageSharp.Web;
+
+/// <summary>
+/// Contains various helper methods for working with EXIF orientation values.
+/// </summary>
+public static class ExifOrientationUtilities
 {
     /// <summary>
-    /// Contains various helper methods for working with EXIF orientation values.
+    /// Transforms the specified vector value depending on the specified <paramref name="orientation" />.
     /// </summary>
-    public static class ExifOrientationUtilities
+    /// <param name="position">The input vector value.</param>
+    /// <param name="min">The minimum bounds of the area of interest.</param>
+    /// <param name="max">The maximum bounds of the area of interest.</param>
+    /// <param name="orientation">The EXIF orientation.</param>
+    /// <returns>
+    /// The transformed vector.
+    /// </returns>
+    public static Vector2 Transform(Vector2 position, Vector2 min, Vector2 max, ushort orientation)
     {
-        /// <summary>
-        /// Transforms the specified vector value depending on the specified <paramref name="orientation" />.
-        /// </summary>
-        /// <param name="position">The input vector value.</param>
-        /// <param name="min">The minimum bounds of the area of interest.</param>
-        /// <param name="max">The maximum bounds of the area of interest.</param>
-        /// <param name="orientation">The EXIF orientation.</param>
-        /// <returns>
-        /// The transformed vector.
-        /// </returns>
-        public static Vector2 Transform(Vector2 position, Vector2 min, Vector2 max, ushort orientation)
+        if (orientation is <= ExifOrientationMode.TopLeft or > ExifOrientationMode.LeftBottom)
         {
-            if (orientation is <= ExifOrientationMode.TopLeft or > ExifOrientationMode.LeftBottom)
-            {
-                // Short circuit orientations that are not transformed below
-                return position;
-            }
-
-            // New XY is calculated based on flipping and rotating the input XY.
-            // Coordinate ranges are normalized to a range of 0-1 so we can pass a
-            // constant integer size to the transform builder.
-            Vector2 scaled = Scale(position, min, max);
-            AffineTransformBuilder builder = new();
-            Size size = new(1, 1);
-            switch (orientation)
-            {
-                case ExifOrientationMode.TopRight:
-                    builder.AppendTranslation(new Vector2(FlipScaled(scaled.X), 0));
-                    break;
-                case ExifOrientationMode.BottomRight:
-                    builder.AppendRotationDegrees(180);
-                    break;
-                case ExifOrientationMode.BottomLeft:
-                    builder.AppendTranslation(new Vector2(0, FlipScaled(scaled.Y)));
-                    break;
-                case ExifOrientationMode.LeftTop:
-                    builder.AppendTranslation(new Vector2(FlipScaled(scaled.X), 0));
-                    builder.AppendRotationDegrees(270);
-                    break;
-                case ExifOrientationMode.RightTop:
-                    builder.AppendRotationDegrees(270);
-                    break;
-                case ExifOrientationMode.RightBottom:
-                    builder.AppendTranslation(new Vector2(FlipScaled(scaled.X), 0));
-                    builder.AppendRotationDegrees(90);
-                    break;
-                case ExifOrientationMode.LeftBottom:
-                    builder.AppendRotationDegrees(90);
-                    break;
-                default:
-                    // Use identity matrix.
-                    break;
-            }
+            // Short circuit orientations that are not transformed below
+            return position;
+        }
 
-            Matrix3x2 matrix = builder.BuildMatrix(size);
-            return DeScale(Vector2.Transform(scaled, matrix), SwapXY(min, orientation), SwapXY(max, orientation));
+        // New XY is calculated based on flipping and rotating the input XY.
+        // Coordinate ranges are normalized to a range of 0-1 so we can pass a
+        // constant integer size to the transform builder.
+        Vector2 scaled = Scale(position, min, max);
+        AffineTransformBuilder builder = new();
+        Size size = new(1, 1);
+        switch (orientation)
+        {
+            case ExifOrientationMode.TopRight:
+                builder.AppendTranslation(new Vector2(FlipScaled(scaled.X), 0));
+                break;
+            case ExifOrientationMode.BottomRight:
+                builder.AppendRotationDegrees(180);
+                break;
+            case ExifOrientationMode.BottomLeft:
+                builder.AppendTranslation(new Vector2(0, FlipScaled(scaled.Y)));
+                break;
+            case ExifOrientationMode.LeftTop:
+                builder.AppendTranslation(new Vector2(FlipScaled(scaled.X), 0));
+                builder.AppendRotationDegrees(270);
+                break;
+            case ExifOrientationMode.RightTop:
+                builder.AppendRotationDegrees(270);
+                break;
+            case ExifOrientationMode.RightBottom:
+                builder.AppendTranslation(new Vector2(FlipScaled(scaled.X), 0));
+                builder.AppendRotationDegrees(90);
+                break;
+            case ExifOrientationMode.LeftBottom:
+                builder.AppendRotationDegrees(90);
+                break;
+            default:
+                // Use identity matrix.
+                break;
         }
 
-        /// <summary>
-        /// Transforms the specified size value depending on the specified <paramref name="orientation" />.
-        /// </summary>
-        /// <param name="size">The input size value.</param>
-        /// <param name="orientation">The EXIF orientation.</param>
-        /// <returns>
-        /// The transformed size.
-        /// </returns>
-        public static Size Transform(Size size, ushort orientation)
-            => IsExifOrientationRotated(orientation)
-            ? new Size(size.Height, size.Width)
-            : size;
+        Matrix3x2 matrix = builder.BuildMatrix(size);
+        return DeScale(Vector2.Transform(scaled, matrix), SwapXY(min, orientation), SwapXY(max, orientation));
+    }
 
-        /// <summary>
-        /// Transforms the specified anchor value depending on the specified <paramref name="orientation" />.
-        /// </summary>
-        /// <param name="anchor">The input anchor value.</param>
-        /// <param name="orientation">The EXIF orientation.</param>
-        /// <returns>
-        /// The transformed anchor.
-        /// </returns>
-        public static AnchorPositionMode Transform(AnchorPositionMode anchor, ushort orientation)
-        /*
-              New anchor position is determined by calculating the direction of the anchor relative to the source image.
-              In the following example, the TopRight anchor becomes BottomRight
-                          T                              L
-              +-----------------------+           +--------------+
-              |                      *|           |              |
-              |                       |           |              |
-            L |           TL          | R         |              |
-              |                       |           |              |
-              |                       |         B |      LB      | T
-              |                       |           |              |
-              +-----------------------+           |              |
-                          B                       |              |
-                                                  |              |
-                                                  |             *|
-                                                  +--------------+
-                                                          R
-          */
-          => orientation switch
+    /// <summary>
+    /// Transforms the specified size value depending on the specified <paramref name="orientation" />.
+    /// </summary>
+    /// <param name="size">The input size value.</param>
+    /// <param name="orientation">The EXIF orientation.</param>
+    /// <returns>
+    /// The transformed size.
+    /// </returns>
+    public static Size Transform(Size size, ushort orientation)
+        => IsExifOrientationRotated(orientation)
+        ? new Size(size.Height, size.Width)
+        : size;
+
+    /// <summary>
+    /// Transforms the specified anchor value depending on the specified <paramref name="orientation" />.
+    /// </summary>
+    /// <param name="anchor">The input anchor value.</param>
+    /// <param name="orientation">The EXIF orientation.</param>
+    /// <returns>
+    /// The transformed anchor.
+    /// </returns>
+    public static AnchorPositionMode Transform(AnchorPositionMode anchor, ushort orientation)
+    /*
+          New anchor position is determined by calculating the direction of the anchor relative to the source image.
+          In the following example, the TopRight anchor becomes BottomRight
+                      T                              L
+          +-----------------------+           +--------------+
+          |                      *|           |              |
+          |                       |           |              |
+        L |           TL          | R         |              |
+          |                       |           |              |
+          |                       |         B |      LB      | T
+          |                       |           |              |
+          +-----------------------+           |              |
+                      B                       |              |
+                                              |              |
+                                              |             *|
+                                              +--------------+
+                                                      R
+      */
+      => orientation switch
+      {
+          ExifOrientationMode.TopRight => anchor switch
+          {
+              AnchorPositionMode.Center => AnchorPositionMode.Center,
+              AnchorPositionMode.Top => AnchorPositionMode.Top,
+              AnchorPositionMode.Bottom => AnchorPositionMode.Bottom,
+              AnchorPositionMode.Left => AnchorPositionMode.Right,
+              AnchorPositionMode.Right => AnchorPositionMode.Left,
+              AnchorPositionMode.TopLeft => AnchorPositionMode.TopRight,
+              AnchorPositionMode.TopRight => AnchorPositionMode.TopLeft,
+              AnchorPositionMode.BottomRight => AnchorPositionMode.BottomLeft,
+              AnchorPositionMode.BottomLeft => AnchorPositionMode.BottomRight,
+              _ => anchor
+          },
+          ExifOrientationMode.BottomRight => anchor switch
+          {
+              AnchorPositionMode.Center => AnchorPositionMode.Center,
+              AnchorPositionMode.Top => AnchorPositionMode.Bottom,
+              AnchorPositionMode.Bottom => AnchorPositionMode.Top,
+              AnchorPositionMode.Left => AnchorPositionMode.Right,
+              AnchorPositionMode.Right => AnchorPositionMode.Left,
+              AnchorPositionMode.TopLeft => AnchorPositionMode.BottomRight,
+              AnchorPositionMode.TopRight => AnchorPositionMode.BottomLeft,
+              AnchorPositionMode.BottomRight => AnchorPositionMode.TopLeft,
+              AnchorPositionMode.BottomLeft => AnchorPositionMode.TopRight,
+              _ => anchor
+          },
+          ExifOrientationMode.BottomLeft => anchor switch
+          {
+              AnchorPositionMode.Center => AnchorPositionMode.Center,
+              AnchorPositionMode.Top => AnchorPositionMode.Bottom,
+              AnchorPositionMode.Bottom => AnchorPositionMode.Top,
+              AnchorPositionMode.Left => AnchorPositionMode.Left,
+              AnchorPositionMode.Right => AnchorPositionMode.Right,
+              AnchorPositionMode.TopLeft => AnchorPositionMode.BottomLeft,
+              AnchorPositionMode.TopRight => AnchorPositionMode.BottomRight,
+              AnchorPositionMode.BottomRight => AnchorPositionMode.TopRight,
+              AnchorPositionMode.BottomLeft => AnchorPositionMode.TopLeft,
+              _ => anchor
+          },
+          ExifOrientationMode.LeftTop => anchor switch
+          {
+              AnchorPositionMode.Center => AnchorPositionMode.Center,
+              AnchorPositionMode.Top => AnchorPositionMode.Left,
+              AnchorPositionMode.Bottom => AnchorPositionMode.Right,
+              AnchorPositionMode.Left => AnchorPositionMode.Top,
+              AnchorPositionMode.Right => AnchorPositionMode.Bottom,
+              AnchorPositionMode.TopLeft => AnchorPositionMode.TopLeft,
+              AnchorPositionMode.TopRight => AnchorPositionMode.BottomLeft,
+              AnchorPositionMode.BottomRight => AnchorPositionMode.BottomRight,
+              AnchorPositionMode.BottomLeft => AnchorPositionMode.TopRight,
+              _ => anchor
+          },
+          ExifOrientationMode.RightTop => anchor switch
+          {
+              AnchorPositionMode.Center => AnchorPositionMode.Center,
+              AnchorPositionMode.Top => AnchorPositionMode.Left,
+              AnchorPositionMode.Bottom => AnchorPositionMode.Right,
+              AnchorPositionMode.Left => AnchorPositionMode.Bottom,
+              AnchorPositionMode.Right => AnchorPositionMode.Top,
+              AnchorPositionMode.TopLeft => AnchorPositionMode.BottomLeft,
+              AnchorPositionMode.TopRight => AnchorPositionMode.TopLeft,
+              AnchorPositionMode.BottomRight => AnchorPositionMode.TopRight,
+              AnchorPositionMode.BottomLeft => AnchorPositionMode.BottomRight,
+              _ => anchor
+          },
+          ExifOrientationMode.RightBottom => anchor switch
           {
-              ExifOrientationMode.TopRight => anchor switch
-              {
-                  AnchorPositionMode.Center => AnchorPositionMode.Center,
-                  AnchorPositionMode.Top => AnchorPositionMode.Top,
-                  AnchorPositionMode.Bottom => AnchorPositionMode.Bottom,
-                  AnchorPositionMode.Left => AnchorPositionMode.Right,
-                  AnchorPositionMode.Right => AnchorPositionMode.Left,
-                  AnchorPositionMode.TopLeft => AnchorPositionMode.TopRight,
-                  AnchorPositionMode.TopRight => AnchorPositionMode.TopLeft,
-                  AnchorPositionMode.BottomRight => AnchorPositionMode.BottomLeft,
-                  AnchorPositionMode.BottomLeft => AnchorPositionMode.BottomRight,
-                  _ => anchor
-              },
-              ExifOrientationMode.BottomRight => anchor switch
-              {
-                  AnchorPositionMode.Center => AnchorPositionMode.Center,
-                  AnchorPositionMode.Top => AnchorPositionMode.Bottom,
-                  AnchorPositionMode.Bottom => AnchorPositionMode.Top,
-                  AnchorPositionMode.Left => AnchorPositionMode.Right,
-                  AnchorPositionMode.Right => AnchorPositionMode.Left,
-                  AnchorPositionMode.TopLeft => AnchorPositionMode.BottomRight,
-                  AnchorPositionMode.TopRight => AnchorPositionMode.BottomLeft,
-                  AnchorPositionMode.BottomRight => AnchorPositionMode.TopLeft,
-                  AnchorPositionMode.BottomLeft => AnchorPositionMode.TopRight,
-                  _ => anchor
-              },
-              ExifOrientationMode.BottomLeft => anchor switch
-              {
-                  AnchorPositionMode.Center => AnchorPositionMode.Center,
-                  AnchorPositionMode.Top => AnchorPositionMode.Bottom,
-                  AnchorPositionMode.Bottom => AnchorPositionMode.Top,
-                  AnchorPositionMode.Left => AnchorPositionMode.Left,
-                  AnchorPositionMode.Right => AnchorPositionMode.Right,
-                  AnchorPositionMode.TopLeft => AnchorPositionMode.BottomLeft,
-                  AnchorPositionMode.TopRight => AnchorPositionMode.BottomRight,
-                  AnchorPositionMode.BottomRight => AnchorPositionMode.TopRight,
-                  AnchorPositionMode.BottomLeft => AnchorPositionMode.TopLeft,
-                  _ => anchor
-              },
-              ExifOrientationMode.LeftTop => anchor switch
-              {
-                  AnchorPositionMode.Center => AnchorPositionMode.Center,
-                  AnchorPositionMode.Top => AnchorPositionMode.Left,
-                  AnchorPositionMode.Bottom => AnchorPositionMode.Right,
-                  AnchorPositionMode.Left => AnchorPositionMode.Top,
-                  AnchorPositionMode.Right => AnchorPositionMode.Bottom,
-                  AnchorPositionMode.TopLeft => AnchorPositionMode.TopLeft,
-                  AnchorPositionMode.TopRight => AnchorPositionMode.BottomLeft,
-                  AnchorPositionMode.BottomRight => AnchorPositionMode.BottomRight,
-                  AnchorPositionMode.BottomLeft => AnchorPositionMode.TopRight,
-                  _ => anchor
-              },
-              ExifOrientationMode.RightTop => anchor switch
-              {
-                  AnchorPositionMode.Center => AnchorPositionMode.Center,
-                  AnchorPositionMode.Top => AnchorPositionMode.Left,
-                  AnchorPositionMode.Bottom => AnchorPositionMode.Right,
-                  AnchorPositionMode.Left => AnchorPositionMode.Bottom,
-                  AnchorPositionMode.Right => AnchorPositionMode.Top,
-                  AnchorPositionMode.TopLeft => AnchorPositionMode.BottomLeft,
-                  AnchorPositionMode.TopRight => AnchorPositionMode.TopLeft,
-                  AnchorPositionMode.BottomRight => AnchorPositionMode.TopRight,
-                  AnchorPositionMode.BottomLeft => AnchorPositionMode.BottomRight,
-                  _ => anchor
-              },
-              ExifOrientationMode.RightBottom => anchor switch
-              {
-                  AnchorPositionMode.Center => AnchorPositionMode.Center,
-                  AnchorPositionMode.Top => AnchorPositionMode.Right,
-                  AnchorPositionMode.Bottom => AnchorPositionMode.Left,
-                  AnchorPositionMode.Left => AnchorPositionMode.Bottom,
-                  AnchorPositionMode.Right => AnchorPositionMode.Top,
-                  AnchorPositionMode.TopLeft => AnchorPositionMode.BottomRight,
-                  AnchorPositionMode.TopRight => AnchorPositionMode.TopRight,
-                  AnchorPositionMode.BottomRight => AnchorPositionMode.TopLeft,
-                  AnchorPositionMode.BottomLeft => AnchorPositionMode.BottomLeft,
-                  _ => anchor
-              },
-              ExifOrientationMode.LeftBottom => anchor switch
-              {
-                  AnchorPositionMode.Center => AnchorPositionMode.Center,
-                  AnchorPositionMode.Top => AnchorPositionMode.Right,
-                  AnchorPositionMode.Bottom => AnchorPositionMode.Left,
-                  AnchorPositionMode.Left => AnchorPositionMode.Top,
-                  AnchorPositionMode.Right => AnchorPositionMode.Bottom,
-                  AnchorPositionMode.TopLeft => AnchorPositionMode.TopRight,
-                  AnchorPositionMode.TopRight => AnchorPositionMode.BottomRight,
-                  AnchorPositionMode.BottomRight => AnchorPositionMode.BottomLeft,
-                  AnchorPositionMode.BottomLeft => AnchorPositionMode.TopLeft,
-                  _ => anchor
-              },
+              AnchorPositionMode.Center => AnchorPositionMode.Center,
+              AnchorPositionMode.Top => AnchorPositionMode.Right,
+              AnchorPositionMode.Bottom => AnchorPositionMode.Left,
+              AnchorPositionMode.Left => AnchorPositionMode.Bottom,
+              AnchorPositionMode.Right => AnchorPositionMode.Top,
+              AnchorPositionMode.TopLeft => AnchorPositionMode.BottomRight,
+              AnchorPositionMode.TopRight => AnchorPositionMode.TopRight,
+              AnchorPositionMode.BottomRight => AnchorPositionMode.TopLeft,
+              AnchorPositionMode.BottomLeft => AnchorPositionMode.BottomLeft,
               _ => anchor
-          };
+          },
+          ExifOrientationMode.LeftBottom => anchor switch
+          {
+              AnchorPositionMode.Center => AnchorPositionMode.Center,
+              AnchorPositionMode.Top => AnchorPositionMode.Right,
+              AnchorPositionMode.Bottom => AnchorPositionMode.Left,
+              AnchorPositionMode.Left => AnchorPositionMode.Top,
+              AnchorPositionMode.Right => AnchorPositionMode.Bottom,
+              AnchorPositionMode.TopLeft => AnchorPositionMode.TopRight,
+              AnchorPositionMode.TopRight => AnchorPositionMode.BottomRight,
+              AnchorPositionMode.BottomRight => AnchorPositionMode.BottomLeft,
+              AnchorPositionMode.BottomLeft => AnchorPositionMode.TopLeft,
+              _ => anchor
+          },
+          _ => anchor
+      };
 
-        /// <summary>
-        /// Returns a value indicating whether an EXIF orientation is rotated (not flipped).
-        /// </summary>
-        /// <param name="orientation">The EXIF orientation.</param>
-        /// <returns><see langword="true"/> if the orientation value indicates rotation; otherwise <see langword="false"/>.</returns>
-        public static bool IsExifOrientationRotated(ushort orientation)
-            => orientation switch
-            {
-                ExifOrientationMode.LeftTop
-                or ExifOrientationMode.RightTop
-                or ExifOrientationMode.RightBottom
-                or ExifOrientationMode.LeftBottom => true,
-                _ => false,
-            };
+    /// <summary>
+    /// Returns a value indicating whether an EXIF orientation is rotated (not flipped).
+    /// </summary>
+    /// <param name="orientation">The EXIF orientation.</param>
+    /// <returns><see langword="true"/> if the orientation value indicates rotation; otherwise <see langword="false"/>.</returns>
+    public static bool IsExifOrientationRotated(ushort orientation)
+        => orientation switch
+        {
+            ExifOrientationMode.LeftTop
+            or ExifOrientationMode.RightTop
+            or ExifOrientationMode.RightBottom
+            or ExifOrientationMode.LeftBottom => true,
+            _ => false,
+        };
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static Vector2 Scale(Vector2 x, Vector2 min, Vector2 max) => (x - min) / (max - min);
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static Vector2 Scale(Vector2 x, Vector2 min, Vector2 max) => (x - min) / (max - min);
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static Vector2 DeScale(Vector2 x, Vector2 min, Vector2 max) => min + (x * (max - min));
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static Vector2 DeScale(Vector2 x, Vector2 min, Vector2 max) => min + (x * (max - min));
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static float FlipScaled(float origin) => (2F * -origin) + 1F;
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static float FlipScaled(float origin) => (2F * -origin) + 1F;
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static Vector2 SwapXY(Vector2 position, ushort orientation)
-            => IsExifOrientationRotated(orientation)
-            ? new Vector2(position.Y, position.X)
-            : position;
-    }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static Vector2 SwapXY(Vector2 position, ushort orientation)
+        => IsExifOrientationRotated(orientation)
+        ? new Vector2(position.Y, position.X)
+        : position;
 }
diff --git a/src/ImageSharp.Web/FormatUtilities.cs b/src/ImageSharp.Web/FormatUtilities.cs
index 2def7f71..174950b8 100644
--- a/src/ImageSharp.Web/FormatUtilities.cs
+++ b/src/ImageSharp.Web/FormatUtilities.cs
@@ -1,9 +1,7 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Options;
@@ -12,103 +10,102 @@
 using SixLabors.ImageSharp.Web.Middleware;
 using SixLabors.ImageSharp.Web.Processors;
 
-namespace SixLabors.ImageSharp.Web
+namespace SixLabors.ImageSharp.Web;
+
+/// <summary>
+/// Contains various helper methods for working with image formats based on the given configuration.
+/// </summary>
+public sealed class FormatUtilities
 {
+    private readonly List<string> extensions = new();
+    private readonly Dictionary<string, string> extensionsByMimeType = new();
+
     /// <summary>
-    /// Contains various helper methods for working with image formats based on the given configuration.
+    /// Initializes a new instance of the <see cref="FormatUtilities" /> class.
     /// </summary>
-    public sealed class FormatUtilities
+    /// <param name="options">The middleware options.</param>
+    public FormatUtilities(IOptions<ImageSharpMiddlewareOptions> options)
     {
-        private readonly List<string> extensions = new();
-        private readonly Dictionary<string, string> extensionsByMimeType = new();
+        Guard.NotNull(options, nameof(options));
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FormatUtilities" /> class.
-        /// </summary>
-        /// <param name="options">The middleware options.</param>
-        public FormatUtilities(IOptions<ImageSharpMiddlewareOptions> options)
+        foreach (IImageFormat imageFormat in options.Value.Configuration.ImageFormats)
         {
-            Guard.NotNull(options, nameof(options));
+            string[] extensions = imageFormat.FileExtensions.ToArray();
 
-            foreach (IImageFormat imageFormat in options.Value.Configuration.ImageFormats)
-            {
-                string[] extensions = imageFormat.FileExtensions.ToArray();
+            this.extensions.AddRange(extensions);
 
-                this.extensions.AddRange(extensions);
-
-                this.extensionsByMimeType[imageFormat.DefaultMimeType] = extensions[0];
-            }
+            this.extensionsByMimeType[imageFormat.DefaultMimeType] = extensions[0];
         }
+    }
 
-        /// <summary>
-        /// Gets the file extension for the given image uri.
-        /// </summary>
-        /// <param name="uri">The full request uri.</param>
-        /// <param name="extension">
-        /// When this method returns, contains the file extension for the image source,
-        /// if the path exists; otherwise, the default value for the type of the path parameter.
-        /// This parameter is passed uninitialized.
-        /// </param>
-        /// <returns>
-        /// <see langword="true" /> if the uri contains an extension; otherwise, <see langword="false" />.
-        /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool TryGetExtensionFromUri(string uri, out string extension)
-        {
-            extension = null;
-            int query = uri.IndexOf('?');
-            ReadOnlySpan<char> path;
+    /// <summary>
+    /// Gets the file extension for the given image uri.
+    /// </summary>
+    /// <param name="uri">The full request uri.</param>
+    /// <param name="extension">
+    /// When this method returns, contains the file extension for the image source,
+    /// if the path exists; otherwise, the default value for the type of the path parameter.
+    /// This parameter is passed uninitialized.
+    /// </param>
+    /// <returns>
+    /// <see langword="true" /> if the uri contains an extension; otherwise, <see langword="false" />.
+    /// </returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public bool TryGetExtensionFromUri(string uri, out string extension)
+    {
+        extension = null;
+        int query = uri.IndexOf('?');
+        ReadOnlySpan<char> path;
 
-            if (query > -1)
+        if (query > -1)
+        {
+            if (uri.Contains(FormatWebProcessor.Format, StringComparison.OrdinalIgnoreCase)
+                && QueryHelpers.ParseQuery(uri.Substring(query)).TryGetValue(FormatWebProcessor.Format, out StringValues ext))
             {
-                if (uri.Contains(FormatWebProcessor.Format, StringComparison.OrdinalIgnoreCase)
-                    && QueryHelpers.ParseQuery(uri.Substring(query)).TryGetValue(FormatWebProcessor.Format, out StringValues ext))
+                // We have a query but is it a valid one?
+                ReadOnlySpan<char> extSpan = ext[0].AsSpan();
+                foreach (string e in this.extensions)
                 {
-                    // We have a query but is it a valid one?
-                    ReadOnlySpan<char> extSpan = ext[0].AsSpan();
-                    foreach (string e in this.extensions)
+                    if (extSpan.Equals(e, StringComparison.OrdinalIgnoreCase))
                     {
-                        if (extSpan.Equals(e, StringComparison.OrdinalIgnoreCase))
-                        {
-                            extension = e;
-                            return true;
-                        }
+                        extension = e;
+                        return true;
                     }
-
-                    return false;
                 }
 
-                path = uri.AsSpan(0, query);
-            }
-            else
-            {
-                path = uri;
+                return false;
             }
 
-            int extensionIndex;
-            if ((extensionIndex = path.LastIndexOf('.')) != -1)
-            {
-                ReadOnlySpan<char> pathExtension = path.Slice(extensionIndex + 1);
+            path = uri.AsSpan(0, query);
+        }
+        else
+        {
+            path = uri;
+        }
 
-                foreach (string e in this.extensions)
+        int extensionIndex;
+        if ((extensionIndex = path.LastIndexOf('.')) != -1)
+        {
+            ReadOnlySpan<char> pathExtension = path.Slice(extensionIndex + 1);
+
+            foreach (string e in this.extensions)
+            {
+                if (pathExtension.Equals(e, StringComparison.OrdinalIgnoreCase))
                 {
-                    if (pathExtension.Equals(e, StringComparison.OrdinalIgnoreCase))
-                    {
-                        extension = e;
-                        return true;
-                    }
+                    extension = e;
+                    return true;
                 }
             }
-
-            return false;
         }
 
-        /// <summary>
-        /// Gets the correct extension for the given content type (mime-type).
-        /// </summary>
-        /// <param name="contentType">The content type (mime-type).</param>
-        /// <returns>The <see cref="string" />.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public string GetExtensionFromContentType(string contentType) => this.extensionsByMimeType[contentType];
+        return false;
     }
+
+    /// <summary>
+    /// Gets the correct extension for the given content type (mime-type).
+    /// </summary>
+    /// <param name="contentType">The content type (mime-type).</param>
+    /// <returns>The <see cref="string" />.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public string GetExtensionFromContentType(string contentType) => this.extensionsByMimeType[contentType];
 }
diff --git a/src/ImageSharp.Web/FormattedImage.cs b/src/ImageSharp.Web/FormattedImage.cs
index 9534c354..4a270918 100644
--- a/src/ImageSharp.Web/FormattedImage.cs
+++ b/src/ImageSharp.Web/FormattedImage.cs
@@ -1,186 +1,183 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.IO;
 using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Metadata.Profiles.Exif;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Web
+namespace SixLabors.ImageSharp.Web;
+
+/// <summary>
+/// A class encapsulating an image with a particular file encoding.
+/// </summary>
+/// <seealso cref="IDisposable"/>
+public sealed class FormattedImage : IDisposable
 {
+    private readonly ImageFormatManager imageFormatsManager;
+    private readonly bool keepOpen;
+    private IImageFormat format;
+    private IImageEncoder encoder;
+
     /// <summary>
-    /// A class encapsulating an image with a particular file encoding.
+    /// Initializes a new instance of the <see cref="FormattedImage"/> class.
     /// </summary>
-    /// <seealso cref="IDisposable"/>
-    public sealed class FormattedImage : IDisposable
+    /// <param name="image">The image.</param>
+    /// <param name="format">The format.</param>
+    public FormattedImage(Image image, IImageFormat format)
+        : this(image, format, true)
     {
-        private readonly ImageFormatManager imageFormatsManager;
-        private readonly bool keepOpen;
-        private IImageFormat format;
-        private IImageEncoder encoder;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FormattedImage"/> class.
-        /// </summary>
-        /// <param name="image">The image.</param>
-        /// <param name="format">The format.</param>
-        public FormattedImage(Image image, IImageFormat format)
-            : this(image, format, true)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FormattedImage"/> class.
-        /// </summary>
-        /// <param name="image">The image.</param>
-        /// <param name="format">The format.</param>
-        /// <param name="keepOpen">Whether to keep the source image open upon disposing the <see cref="FormattedImage"/> object.</param>
-        private FormattedImage(Image image, IImageFormat format, bool keepOpen)
-        {
-            this.Image = image;
-            this.imageFormatsManager = image.GetConfiguration().ImageFormatsManager;
-            this.Format = format;
-            this.keepOpen = keepOpen;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FormattedImage"/> class.
+    /// </summary>
+    /// <param name="image">The image.</param>
+    /// <param name="format">The format.</param>
+    /// <param name="keepOpen">Whether to keep the source image open upon disposing the <see cref="FormattedImage"/> object.</param>
+    private FormattedImage(Image image, IImageFormat format, bool keepOpen)
+    {
+        this.Image = image;
+        this.imageFormatsManager = image.GetConfiguration().ImageFormatsManager;
+        this.Format = format;
+        this.keepOpen = keepOpen;
+    }
 
-        /// <summary>
-        /// Gets the decoded image.
-        /// </summary>
-        public Image Image { get; private set; }
+    /// <summary>
+    /// Gets the decoded image.
+    /// </summary>
+    public Image Image { get; private set; }
 
-        /// <summary>
-        /// Gets or sets the format.
-        /// </summary>
-        public IImageFormat Format
+    /// <summary>
+    /// Gets or sets the format.
+    /// </summary>
+    public IImageFormat Format
+    {
+        get => this.format;
+        set
         {
-            get => this.format;
-            set
+            if (value is null)
             {
-                if (value is null)
-                {
-                    ThrowNull(nameof(value));
-                }
-
-                this.format = value;
-                this.encoder = this.imageFormatsManager.FindEncoder(value);
+                ThrowNull(nameof(value));
             }
+
+            this.format = value;
+            this.encoder = this.imageFormatsManager.FindEncoder(value);
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the encoder.
-        /// </summary>
-        public IImageEncoder Encoder
+    /// <summary>
+    /// Gets or sets the encoder.
+    /// </summary>
+    public IImageEncoder Encoder
+    {
+        get => this.encoder;
+        set
         {
-            get => this.encoder;
-            set
+            if (value is null)
             {
-                if (value is null)
-                {
-                    ThrowNull(nameof(value));
-                }
-
-                // The given type should match the format encoder.
-                IImageEncoder reference = this.imageFormatsManager.FindEncoder(this.Format);
-                if (reference.GetType() != value.GetType())
-                {
-                    ThrowInvalid(nameof(value));
-                }
-
-                this.encoder = value;
+                ThrowNull(nameof(value));
             }
-        }
 
-        /// <summary>
-        /// Create a new instance of the <see cref="FormattedImage"/> class from the given stream.
-        /// </summary>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <param name="configuration">The configuration.</param>
-        /// <param name="source">The source.</param>
-        /// <returns>A <see cref="Task{FormattedImage}"/> representing the asynchronous operation.</returns>
-        internal static async Task<FormattedImage> LoadAsync<TPixel>(Configuration configuration, Stream source)
-            where TPixel : unmanaged, IPixel<TPixel>
-        {
-            (Image<TPixel> image, IImageFormat format) = await Image.LoadWithFormatAsync<TPixel>(configuration, source);
-            return new FormattedImage(image, format, false);
-        }
+            // The given type should match the format encoder.
+            IImageEncoder reference = this.imageFormatsManager.FindEncoder(this.Format);
+            if (reference.GetType() != value.GetType())
+            {
+                ThrowInvalid(nameof(value));
+            }
 
-        /// <summary>
-        /// Create a new instance of the <see cref="FormattedImage"/> class from the given stream.
-        /// </summary>
-        /// <param name="configuration">The configuration.</param>
-        /// <param name="source">The source.</param>
-        /// <returns>A <see cref="Task{FormattedImage}"/> representing the asynchronous operation.</returns>
-        internal static async Task<FormattedImage> LoadAsync(Configuration configuration, Stream source)
-        {
-            (Image image, IImageFormat format) = await Image.LoadWithFormatAsync(configuration, source);
-            return new FormattedImage(image, format, false);
+            this.encoder = value;
         }
+    }
 
-        /// <summary>
-        /// Saves the <see cref="FormattedImage"/> to the specified destination stream.
-        /// </summary>
-        /// <param name="destination">The destination stream.</param>
-        internal void Save(Stream destination) => this.Image.Save(destination, this.encoder);
-
-        /// <summary>
-        /// Gets the EXIF orientation metata for the <see cref="FormattedImage"/>.
-        /// </summary>
-        /// <param name="value">
-        /// When this method returns, contains the value parsed from decoded EXIF metadata; otherwise,
-        /// the default value for the type of the <paramref name="value"/> parameter.
-        /// This parameter is passed uninitialized. Use <see cref="ExifOrientationMode"/> for comparison.
-        /// </param>
-        /// <returns>
-        /// <see langword="true"/> if the <see cref="FormattedImage"/> contains EXIF orientation metadata
-        /// for <see cref="ExifTag.Orientation"/>; otherwise, <see langword="false"/>.
-        /// </returns>
-        public bool TryGetExifOrientation(out ushort value)
+    /// <summary>
+    /// Create a new instance of the <see cref="FormattedImage"/> class from the given stream.
+    /// </summary>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    /// <param name="configuration">The configuration.</param>
+    /// <param name="source">The source.</param>
+    /// <returns>A <see cref="Task{FormattedImage}"/> representing the asynchronous operation.</returns>
+    internal static async Task<FormattedImage> LoadAsync<TPixel>(Configuration configuration, Stream source)
+        where TPixel : unmanaged, IPixel<TPixel>
+    {
+        (Image<TPixel> image, IImageFormat format) = await Image.LoadWithFormatAsync<TPixel>(configuration, source);
+        return new FormattedImage(image, format, false);
+    }
+
+    /// <summary>
+    /// Create a new instance of the <see cref="FormattedImage"/> class from the given stream.
+    /// </summary>
+    /// <param name="configuration">The configuration.</param>
+    /// <param name="source">The source.</param>
+    /// <returns>A <see cref="Task{FormattedImage}"/> representing the asynchronous operation.</returns>
+    internal static async Task<FormattedImage> LoadAsync(Configuration configuration, Stream source)
+    {
+        (Image image, IImageFormat format) = await Image.LoadWithFormatAsync(configuration, source);
+        return new FormattedImage(image, format, false);
+    }
+
+    /// <summary>
+    /// Saves the <see cref="FormattedImage"/> to the specified destination stream.
+    /// </summary>
+    /// <param name="destination">The destination stream.</param>
+    internal void Save(Stream destination) => this.Image.Save(destination, this.encoder);
+
+    /// <summary>
+    /// Gets the EXIF orientation metata for the <see cref="FormattedImage"/>.
+    /// </summary>
+    /// <param name="value">
+    /// When this method returns, contains the value parsed from decoded EXIF metadata; otherwise,
+    /// the default value for the type of the <paramref name="value"/> parameter.
+    /// This parameter is passed uninitialized. Use <see cref="ExifOrientationMode"/> for comparison.
+    /// </param>
+    /// <returns>
+    /// <see langword="true"/> if the <see cref="FormattedImage"/> contains EXIF orientation metadata
+    /// for <see cref="ExifTag.Orientation"/>; otherwise, <see langword="false"/>.
+    /// </returns>
+    public bool TryGetExifOrientation(out ushort value)
+    {
+        value = ExifOrientationMode.Unknown;
+        if (this.Image.Metadata.ExifProfile != null)
         {
-            value = ExifOrientationMode.Unknown;
-            if (this.Image.Metadata.ExifProfile != null)
+            IExifValue<ushort> orientation = this.Image.Metadata.ExifProfile.GetValue(ExifTag.Orientation);
+            if (orientation is null)
             {
-                IExifValue<ushort> orientation = this.Image.Metadata.ExifProfile.GetValue(ExifTag.Orientation);
-                if (orientation is null)
-                {
-                    return false;
-                }
-
-                if (orientation.DataType == ExifDataType.Short)
-                {
-                    value = orientation.Value;
-                }
-                else
-                {
-                    value = Convert.ToUInt16(orientation.Value);
-                }
-
-                return true;
+                return false;
             }
 
-            return false;
-        }
-
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting
-        /// unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            if (!this.keepOpen)
+            if (orientation.DataType == ExifDataType.Short)
             {
-                this.Image?.Dispose();
-                this.Image = null;
+                value = orientation.Value;
             }
+            else
+            {
+                value = Convert.ToUInt16(orientation.Value);
+            }
+
+            return true;
         }
 
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static void ThrowNull(string name) => throw new ArgumentNullException(name);
+        return false;
+    }
 
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static void ThrowInvalid(string name) => throw new ArgumentException(name);
+    /// <summary>
+    /// Performs application-defined tasks associated with freeing, releasing, or resetting
+    /// unmanaged resources.
+    /// </summary>
+    public void Dispose()
+    {
+        if (!this.keepOpen)
+        {
+            this.Image?.Dispose();
+            this.Image = null;
+        }
     }
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private static void ThrowNull(string name) => throw new ArgumentNullException(name);
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private static void ThrowInvalid(string name) => throw new ArgumentException(name);
 }
diff --git a/src/ImageSharp.Web/HMACUtilities.cs b/src/ImageSharp.Web/HMACUtilities.cs
index 7b255703..eb9d497a 100644
--- a/src/ImageSharp.Web/HMACUtilities.cs
+++ b/src/ImageSharp.Web/HMACUtilities.cs
@@ -1,99 +1,98 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
 using System.Buffers;
 using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
 using System.Text;
 using SixLabors.ImageSharp.Web.Caching;
 
-namespace SixLabors.ImageSharp.Web
+namespace SixLabors.ImageSharp.Web;
+
+/// <summary>
+/// Provides methods to compute a Hash-based Message Authentication Code (HMAC).
+/// </summary>
+public static class HMACUtilities
 {
     /// <summary>
-    /// Provides methods to compute a Hash-based Message Authentication Code (HMAC).
+    /// The command used by image requests for transporting Hash-based Message Authentication Code (HMAC) tokens.
+    /// </summary>
+    public const string TokenCommand = "hmac";
+
+    /// <summary>
+    /// Computes a Hash-based Message Authentication Code (HMAC) by using the SHA256 hash function.
     /// </summary>
-    public static class HMACUtilities
+    /// <param name="value">The value to hash</param>
+    /// <param name="secret">
+    /// The secret key for <see cref="HMACSHA256"/> encryption.
+    /// The key can be any length. However, the recommended size is 64 bytes.
+    /// </param>
+    /// <returns>The hashed <see cref="string"/>.</returns>
+    public static unsafe string ComputeHMACSHA256(string value, byte[] secret)
     {
-        /// <summary>
-        /// The command used by image requests for transporting Hash-based Message Authentication Code (HMAC) tokens.
-        /// </summary>
-        public const string TokenCommand = "hmac";
+        // TODO: In .NET 6 we can use single instance versions
+        using var hmac = new HMACSHA256(secret);
+        return CreateHMAC(value, hmac);
+    }
 
-        /// <summary>
-        /// Computes a Hash-based Message Authentication Code (HMAC) by using the SHA256 hash function.
-        /// </summary>
-        /// <param name="value">The value to hash</param>
-        /// <param name="secret">
-        /// The secret key for <see cref="HMACSHA256"/> encryption.
-        /// The key can be any length. However, the recommended size is 64 bytes.
-        /// </param>
-        /// <returns>The hashed <see cref="string"/>.</returns>
-        public static unsafe string ComputeHMACSHA256(string value, byte[] secret)
-        {
-            // TODO: In .NET 6 we can use single instance versions
-            using var hmac = new HMACSHA256(secret);
-            return CreateHMAC(value, hmac);
-        }
+    /// <summary>
+    /// Computes a Hash-based Message Authentication Code (HMAC) by using the SHA384 hash function.
+    /// </summary>
+    /// <param name="value">The value to hash</param>
+    /// <param name="secret">
+    /// The secret key for <see cref="HMACSHA256"/> encryption.
+    /// The key can be any length. However, the recommended size is 128 bytes.
+    /// </param>
+    /// <returns>The hashed <see cref="string"/>.</returns>
+    public static unsafe string ComputeHMACSHA384(string value, byte[] secret)
+    {
+        using var hmac = new HMACSHA384(secret);
+        return CreateHMAC(value, hmac);
+    }
 
-        /// <summary>
-        /// Computes a Hash-based Message Authentication Code (HMAC) by using the SHA384 hash function.
-        /// </summary>
-        /// <param name="value">The value to hash</param>
-        /// <param name="secret">
-        /// The secret key for <see cref="HMACSHA256"/> encryption.
-        /// The key can be any length. However, the recommended size is 128 bytes.
-        /// </param>
-        /// <returns>The hashed <see cref="string"/>.</returns>
-        public static unsafe string ComputeHMACSHA384(string value, byte[] secret)
-        {
-            using var hmac = new HMACSHA384(secret);
-            return CreateHMAC(value, hmac);
-        }
+    /// <summary>
+    /// Computes a Hash-based Message Authentication Code (HMAC) by using the SHA512 hash function.
+    /// </summary>
+    /// <param name="value">The value to hash</param>
+    /// <param name="secret">
+    /// The secret key for <see cref="HMACSHA256"/> encryption.
+    /// The key can be any length. However, the recommended size is 128 bytes.
+    /// </param>
+    /// <returns>The hashed <see cref="string"/>.</returns>
+    public static unsafe string ComputeHMACSHA512(string value, byte[] secret)
+    {
+        using var hmac = new HMACSHA512(secret);
+        return CreateHMAC(value, hmac);
+    }
 
-        /// <summary>
-        /// Computes a Hash-based Message Authentication Code (HMAC) by using the SHA512 hash function.
-        /// </summary>
-        /// <param name="value">The value to hash</param>
-        /// <param name="secret">
-        /// The secret key for <see cref="HMACSHA256"/> encryption.
-        /// The key can be any length. However, the recommended size is 128 bytes.
-        /// </param>
-        /// <returns>The hashed <see cref="string"/>.</returns>
-        public static unsafe string ComputeHMACSHA512(string value, byte[] secret)
-        {
-            using var hmac = new HMACSHA512(secret);
-            return CreateHMAC(value, hmac);
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static unsafe string CreateHMAC(string value, HMAC hmac)
+    {
+        int byteCount = Encoding.ASCII.GetByteCount(value);
+        byte[] buffer = null;
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static unsafe string CreateHMAC(string value, HMAC hmac)
+        try
         {
-            int byteCount = Encoding.ASCII.GetByteCount(value);
-            byte[] buffer = null;
-
-            try
-            {
-                // Allocating a buffer from the pool is ~27% slower than stackalloc so use that for short strings
-                Span<byte> bytes = byteCount <= 128
-                    ? stackalloc byte[byteCount]
-                    : (buffer = ArrayPool<byte>.Shared.Rent(byteCount)).AsSpan(0, byteCount);
+            // Allocating a buffer from the pool is ~27% slower than stackalloc so use that for short strings
+            Span<byte> bytes = byteCount <= 128
+                ? stackalloc byte[byteCount]
+                : (buffer = ArrayPool<byte>.Shared.Rent(byteCount)).AsSpan(0, byteCount);
 
-                Encoding.ASCII.GetBytes(value, bytes);
+            Encoding.ASCII.GetBytes(value, bytes);
 
-                // Safe to always stackalloc here. We max out at 64 bytes.
-                Span<byte> hash = stackalloc byte[hmac.HashSize / 8];
-                hmac.TryComputeHash(bytes, hash, out int _);
+            // Safe to always stackalloc here. We max out at 64 bytes.
+            Span<byte> hash = stackalloc byte[hmac.HashSize / 8];
+            hmac.TryComputeHash(bytes, hash, out int _);
 
-                // Finally encode the hash to make it web safe.
-                return HexEncoder.Encode(hash);
-            }
-            finally
+            // Finally encode the hash to make it web safe.
+            return HexEncoder.Encode(hash);
+        }
+        finally
+        {
+            if (buffer is not null)
             {
-                if (buffer is not null)
-                {
-                    ArrayPool<byte>.Shared.Return(buffer);
-                }
+                ArrayPool<byte>.Shared.Return(buffer);
             }
         }
     }
diff --git a/src/ImageSharp.Web/ImageCacheMetadata.cs b/src/ImageSharp.Web/ImageCacheMetadata.cs
index af2ced1d..0e1ce20d 100644
--- a/src/ImageSharp.Web/ImageCacheMetadata.cs
+++ b/src/ImageSharp.Web/ImageCacheMetadata.cs
@@ -1,215 +1,211 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Runtime.CompilerServices;
 using System.Text;
-using System.Threading.Tasks;
 
-namespace SixLabors.ImageSharp.Web
+namespace SixLabors.ImageSharp.Web;
+
+/// <summary>
+/// Represents the metadata associated with an image file.
+/// </summary>
+public readonly struct ImageCacheMetadata : IEquatable<ImageCacheMetadata>
 {
+    private const string ContentTypeKey = "CT";
+    private const string SourceLastModifiedKey = "SM";
+    private const string CacheLastModifiedKey = "LM";
+    private const string CacheControlKey = "MA";
+    private const string ContentLengthKey = "CL";
+
     /// <summary>
-    /// Represents the metadata associated with an image file.
+    /// Initializes a new instance of the <see cref="ImageCacheMetadata"/> struct.
     /// </summary>
-    public readonly struct ImageCacheMetadata : IEquatable<ImageCacheMetadata>
+    /// <param name="sourceLastWriteTimeUtc">The date and time in coordinated universal time (UTC) since the source file was last modified.</param>
+    /// <param name="cacheLastWriteTimeUtc">The date and time in coordinated universal time (UTC) since the cache file was last modified.</param>
+    /// <param name="contentType">The content type for the source file.</param>
+    /// <param name="cacheControlMaxAge">The maximum amount of time a resource will be considered fresh.</param>
+    /// <param name="contentLength">The length of the image in bytes.</param>
+    public ImageCacheMetadata(
+        DateTime sourceLastWriteTimeUtc,
+        DateTime cacheLastWriteTimeUtc,
+        string contentType,
+        TimeSpan cacheControlMaxAge,
+        long contentLength)
     {
-        private const string ContentTypeKey = "CT";
-        private const string SourceLastModifiedKey = "SM";
-        private const string CacheLastModifiedKey = "LM";
-        private const string CacheControlKey = "MA";
-        private const string ContentLengthKey = "CL";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageCacheMetadata"/> struct.
-        /// </summary>
-        /// <param name="sourceLastWriteTimeUtc">The date and time in coordinated universal time (UTC) since the source file was last modified.</param>
-        /// <param name="cacheLastWriteTimeUtc">The date and time in coordinated universal time (UTC) since the cache file was last modified.</param>
-        /// <param name="contentType">The content type for the source file.</param>
-        /// <param name="cacheControlMaxAge">The maximum amount of time a resource will be considered fresh.</param>
-        /// <param name="contentLength">The length of the image in bytes.</param>
-        public ImageCacheMetadata(
-            DateTime sourceLastWriteTimeUtc,
-            DateTime cacheLastWriteTimeUtc,
-            string contentType,
-            TimeSpan cacheControlMaxAge,
-            long contentLength)
-        {
-            this.SourceLastWriteTimeUtc = sourceLastWriteTimeUtc;
-            this.CacheLastWriteTimeUtc = cacheLastWriteTimeUtc;
-            this.ContentType = contentType;
-            this.CacheControlMaxAge = cacheControlMaxAge;
-            this.ContentLength = contentLength;
-        }
+        this.SourceLastWriteTimeUtc = sourceLastWriteTimeUtc;
+        this.CacheLastWriteTimeUtc = cacheLastWriteTimeUtc;
+        this.ContentType = contentType;
+        this.CacheControlMaxAge = cacheControlMaxAge;
+        this.ContentLength = contentLength;
+    }
 
-        /// <summary>
-        /// Gets the date and time in coordinated universal time (UTC) since the source file was last modified.
-        /// </summary>
-        public DateTime SourceLastWriteTimeUtc { get; }
-
-        /// <summary>
-        /// Gets the date and time in coordinated universal time (UTC) since the cached file was last modified.
-        /// </summary>
-        public DateTime CacheLastWriteTimeUtc { get; }
-
-        /// <summary>
-        /// Gets the content type of the source file.
-        /// </summary>
-        public string ContentType { get; }
-
-        /// <summary>
-        /// Gets the maximum amount of time a resource will be considered fresh.
-        /// </summary>
-        public TimeSpan CacheControlMaxAge { get; }
-
-        /// <summary>
-        /// Gets the length of the image in bytes.
-        /// </summary>
-        public long ContentLength { get; }
-
-        /// <summary>
-        /// Compares two <see cref="ImageCacheMetadata"/> objects for equality.
-        /// </summary>
-        /// <param name="left">The <see cref="ImageCacheMetadata"/> on the left side of the operand.</param>
-        /// <param name="right">The <see cref="ImageCacheMetadata"/> on the right side of the operand.</param>
-        /// <returns>
-        /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool operator ==(in ImageCacheMetadata left, in ImageCacheMetadata right)
-            => left.Equals(right);
-
-        /// <summary>
-        /// Compares two <see cref="ImageCacheMetadata"/> objects for inequality.
-        /// </summary>
-        /// <param name="left">The <see cref="ImageCacheMetadata"/> on the left side of the operand.</param>
-        /// <param name="right">The <see cref="ImageCacheMetadata"/> on the right side of the operand.</param>
-        /// <returns>
-        /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool operator !=(in ImageCacheMetadata left, in ImageCacheMetadata right)
-            => !left.Equals(right);
-
-        /// <summary>
-        /// Returns a new <see cref="ImageCacheMetadata"/> parsed from the given dictionary.
-        /// </summary>
-        /// <param name="dictionary">The dictionary to parse and return the metadata from.</param>
-        /// <returns>The <see cref="ImageCacheMetadata"/>.</returns>
-        public static ImageCacheMetadata FromDictionary(IDictionary<string, string> dictionary)
-        {
-            // DateTime.TryParse(null) ==  DateTime.MinValue so no need for conditional;
-            dictionary.TryGetValue(SourceLastModifiedKey, out string sourceLastWriteTimeUtcString);
-            DateTime.TryParse(sourceLastWriteTimeUtcString, null, DateTimeStyles.RoundtripKind, out DateTime sourceLastWriteTimeUtc);
+    /// <summary>
+    /// Gets the date and time in coordinated universal time (UTC) since the source file was last modified.
+    /// </summary>
+    public DateTime SourceLastWriteTimeUtc { get; }
 
-            dictionary.TryGetValue(CacheLastModifiedKey, out string cacheLastWriteTimeUtcString);
-            DateTime.TryParse(cacheLastWriteTimeUtcString, null, DateTimeStyles.RoundtripKind, out DateTime cacheLastWriteTimeUtc);
+    /// <summary>
+    /// Gets the date and time in coordinated universal time (UTC) since the cached file was last modified.
+    /// </summary>
+    public DateTime CacheLastWriteTimeUtc { get; }
 
-            dictionary.TryGetValue(ContentTypeKey, out string contentType);
+    /// <summary>
+    /// Gets the content type of the source file.
+    /// </summary>
+    public string ContentType { get; }
 
-            // int.TryParse(null) == 0 and we want to return TimeSpan.MinValue not TimeSpan.Zero
-            TimeSpan cacheControlMaxAge = TimeSpan.MinValue;
-            if (dictionary.TryGetValue(CacheControlKey, out string cacheControlMaxAgeString))
-            {
-                int.TryParse(cacheControlMaxAgeString, out int maxAge);
-                cacheControlMaxAge = TimeSpan.FromSeconds(maxAge);
-            }
+    /// <summary>
+    /// Gets the maximum amount of time a resource will be considered fresh.
+    /// </summary>
+    public TimeSpan CacheControlMaxAge { get; }
 
-            dictionary.TryGetValue(ContentLengthKey, out string contentLengthString);
-            long.TryParse(contentLengthString, out long contentLength);
+    /// <summary>
+    /// Gets the length of the image in bytes.
+    /// </summary>
+    public long ContentLength { get; }
 
-            return new ImageCacheMetadata(
-                sourceLastWriteTimeUtc,
-                cacheLastWriteTimeUtc,
-                contentType,
-                cacheControlMaxAge,
-                contentLength);
+    /// <summary>
+    /// Compares two <see cref="ImageCacheMetadata"/> objects for equality.
+    /// </summary>
+    /// <param name="left">The <see cref="ImageCacheMetadata"/> on the left side of the operand.</param>
+    /// <param name="right">The <see cref="ImageCacheMetadata"/> on the right side of the operand.</param>
+    /// <returns>
+    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
+    /// </returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool operator ==(in ImageCacheMetadata left, in ImageCacheMetadata right)
+        => left.Equals(right);
+
+    /// <summary>
+    /// Compares two <see cref="ImageCacheMetadata"/> objects for inequality.
+    /// </summary>
+    /// <param name="left">The <see cref="ImageCacheMetadata"/> on the left side of the operand.</param>
+    /// <param name="right">The <see cref="ImageCacheMetadata"/> on the right side of the operand.</param>
+    /// <returns>
+    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
+    /// </returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool operator !=(in ImageCacheMetadata left, in ImageCacheMetadata right)
+        => !left.Equals(right);
+
+    /// <summary>
+    /// Returns a new <see cref="ImageCacheMetadata"/> parsed from the given dictionary.
+    /// </summary>
+    /// <param name="dictionary">The dictionary to parse and return the metadata from.</param>
+    /// <returns>The <see cref="ImageCacheMetadata"/>.</returns>
+    public static ImageCacheMetadata FromDictionary(IDictionary<string, string> dictionary)
+    {
+        // DateTime.TryParse(null) ==  DateTime.MinValue so no need for conditional;
+        dictionary.TryGetValue(SourceLastModifiedKey, out string sourceLastWriteTimeUtcString);
+        DateTime.TryParse(sourceLastWriteTimeUtcString, null, DateTimeStyles.RoundtripKind, out DateTime sourceLastWriteTimeUtc);
+
+        dictionary.TryGetValue(CacheLastModifiedKey, out string cacheLastWriteTimeUtcString);
+        DateTime.TryParse(cacheLastWriteTimeUtcString, null, DateTimeStyles.RoundtripKind, out DateTime cacheLastWriteTimeUtc);
+
+        dictionary.TryGetValue(ContentTypeKey, out string contentType);
+
+        // int.TryParse(null) == 0 and we want to return TimeSpan.MinValue not TimeSpan.Zero
+        TimeSpan cacheControlMaxAge = TimeSpan.MinValue;
+        if (dictionary.TryGetValue(CacheControlKey, out string cacheControlMaxAgeString))
+        {
+            _ = int.TryParse(cacheControlMaxAgeString, out int maxAge);
+            cacheControlMaxAge = TimeSpan.FromSeconds(maxAge);
         }
 
-        /// <summary>
-        /// Asynchronously reads and returns an <see cref="ImageCacheMetadata"/> from the input stream.
-        /// </summary>
-        /// <param name="stream">The input stream.</param>
-        /// <returns>The <see cref="ImageCacheMetadata"/>.</returns>
-        public static async Task<ImageCacheMetadata> ReadAsync(Stream stream)
+        dictionary.TryGetValue(ContentLengthKey, out string contentLengthString);
+        _ = long.TryParse(contentLengthString, out long contentLength);
+
+        return new ImageCacheMetadata(
+            sourceLastWriteTimeUtc,
+            cacheLastWriteTimeUtc,
+            contentType,
+            cacheControlMaxAge,
+            contentLength);
+    }
+
+    /// <summary>
+    /// Asynchronously reads and returns an <see cref="ImageCacheMetadata"/> from the input stream.
+    /// </summary>
+    /// <param name="stream">The input stream.</param>
+    /// <returns>The <see cref="ImageCacheMetadata"/>.</returns>
+    public static async Task<ImageCacheMetadata> ReadAsync(Stream stream)
+    {
+        Dictionary<string, string> dictionary = new();
+        using (StreamReader reader = new(stream, Encoding.UTF8))
         {
-            var dictionary = new Dictionary<string, string>();
-            using (var reader = new StreamReader(stream, Encoding.UTF8))
+            string line;
+            while ((line = await reader.ReadLineAsync()) != null)
             {
-                string line;
-                while ((line = await reader.ReadLineAsync()) != null)
+                int idx = line.IndexOf(':');
+                if (idx > 0)
                 {
-                    int idx = line.IndexOf(':');
-                    if (idx > 0)
-                    {
-                        string key = line.Substring(0, idx);
-                        dictionary[key] = line.Substring(idx + 1);
-                    }
+                    string key = line[..idx];
+                    dictionary[key] = line[(idx + 1)..];
                 }
             }
-
-            return FromDictionary(dictionary);
         }
 
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool Equals(ImageCacheMetadata other)
-            => this.SourceLastWriteTimeUtc == other.SourceLastWriteTimeUtc
-            && this.CacheLastWriteTimeUtc == other.CacheLastWriteTimeUtc
-            && this.ContentType == other.ContentType
-            && this.CacheControlMaxAge == other.CacheControlMaxAge
-            && this.ContentLength == other.ContentLength;
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-            => obj is ImageCacheMetadata data && this.Equals(data);
-
-        /// <inheritdoc/>
-        public override int GetHashCode() => HashCode.Combine(
-                this.SourceLastWriteTimeUtc,
-                this.CacheLastWriteTimeUtc,
-                this.ContentType,
-                this.CacheControlMaxAge,
-                this.ContentLength);
-
-        /// <summary>
-        /// Returns a new <see cref="Dictionary{String, String}"/> representing the current instance.
-        /// </summary>
-        /// <returns>The <see cref="Dictionary{String, String}"/>.</returns>
-        public Dictionary<string, string> ToDictionary()
-            => new()
-            {
-                { SourceLastModifiedKey, this.SourceLastWriteTimeUtc.ToString("o") },
-                { CacheLastModifiedKey, this.CacheLastWriteTimeUtc.ToString("o") },
-                { ContentTypeKey, this.ContentType },
-                { CacheControlKey, this.CacheControlMaxAge.TotalSeconds.ToString(NumberFormatInfo.InvariantInfo) },
-                { ContentLengthKey, this.ContentLength.ToString(NumberFormatInfo.InvariantInfo) }
-            };
-
-        /// <inheritdoc/>
-        public override string ToString()
-            => FormattableString.Invariant(
-                $"ImageCacheMetaData({this.SourceLastWriteTimeUtc}, {this.CacheLastWriteTimeUtc}, {this.ContentType}, {this.CacheControlMaxAge}, {this.ContentLength})");
-
-        /// <summary>
-        /// Asynchronously writes the metadata to the target stream.
-        /// </summary>
-        /// <param name="stream">The target stream.</param>
-        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        public async Task WriteAsync(Stream stream)
+        return FromDictionary(dictionary);
+    }
+
+    /// <inheritdoc/>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public bool Equals(ImageCacheMetadata other)
+        => this.SourceLastWriteTimeUtc == other.SourceLastWriteTimeUtc
+        && this.CacheLastWriteTimeUtc == other.CacheLastWriteTimeUtc
+        && this.ContentType == other.ContentType
+        && this.CacheControlMaxAge == other.CacheControlMaxAge
+        && this.ContentLength == other.ContentLength;
+
+    /// <inheritdoc/>
+    public override bool Equals(object obj)
+        => obj is ImageCacheMetadata data && this.Equals(data);
+
+    /// <inheritdoc/>
+    public override int GetHashCode() => HashCode.Combine(
+            this.SourceLastWriteTimeUtc,
+            this.CacheLastWriteTimeUtc,
+            this.ContentType,
+            this.CacheControlMaxAge,
+            this.ContentLength);
+
+    /// <summary>
+    /// Returns a new <see cref="Dictionary{String, String}"/> representing the current instance.
+    /// </summary>
+    /// <returns>The <see cref="Dictionary{String, String}"/>.</returns>
+    public Dictionary<string, string> ToDictionary()
+        => new()
         {
-            var dictionary = this.ToDictionary();
+            { SourceLastModifiedKey, this.SourceLastWriteTimeUtc.ToString("o") },
+            { CacheLastModifiedKey, this.CacheLastWriteTimeUtc.ToString("o") },
+            { ContentTypeKey, this.ContentType },
+            { CacheControlKey, this.CacheControlMaxAge.TotalSeconds.ToString(NumberFormatInfo.InvariantInfo) },
+            { ContentLengthKey, this.ContentLength.ToString(NumberFormatInfo.InvariantInfo) }
+        };
+
+    /// <inheritdoc/>
+    public override string ToString()
+        => FormattableString.Invariant(
+            $"ImageCacheMetaData({this.SourceLastWriteTimeUtc}, {this.CacheLastWriteTimeUtc}, {this.ContentType}, {this.CacheControlMaxAge}, {this.ContentLength})");
 
-            using var writer = new StreamWriter(stream, Encoding.UTF8);
-            foreach (KeyValuePair<string, string> keyValuePair in dictionary)
-            {
-                // TODO: string.Create
-                await writer.WriteLineAsync($"{keyValuePair.Key}:{keyValuePair.Value}");
-            }
+    /// <summary>
+    /// Asynchronously writes the metadata to the target stream.
+    /// </summary>
+    /// <param name="stream">The target stream.</param>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    public async Task WriteAsync(Stream stream)
+    {
+        Dictionary<string, string> dictionary = this.ToDictionary();
 
-            await writer.FlushAsync();
+        using StreamWriter writer = new(stream, Encoding.UTF8);
+        foreach (KeyValuePair<string, string> keyValuePair in dictionary)
+        {
+            // TODO: string.Create
+            await writer.WriteLineAsync($"{keyValuePair.Key}:{keyValuePair.Value}");
         }
+
+        await writer.FlushAsync();
     }
 }
diff --git a/src/ImageSharp.Web/ImageMetadata.cs b/src/ImageSharp.Web/ImageMetadata.cs
index 698ab305..9ff37df7 100644
--- a/src/ImageSharp.Web/ImageMetadata.cs
+++ b/src/ImageSharp.Web/ImageMetadata.cs
@@ -1,105 +1,104 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
 using System.Runtime.CompilerServices;
 
-namespace SixLabors.ImageSharp.Web
+namespace SixLabors.ImageSharp.Web;
+
+/// <summary>
+/// Represents the metadata associated with an image file.
+/// </summary>
+public readonly struct ImageMetadata : IEquatable<ImageMetadata>
 {
     /// <summary>
-    /// Represents the metadata associated with an image file.
+    /// Initializes a new instance of the <see cref="ImageMetadata"/> struct.
     /// </summary>
-    public readonly struct ImageMetadata : IEquatable<ImageMetadata>
+    /// <param name="lastWriteTimeUtc">
+    /// The date and time in coordinated universal time (UTC) since the source file was last modified.
+    /// </param>
+    /// <param name="contentLength">The length of the image in bytes.</param>
+    public ImageMetadata(DateTime lastWriteTimeUtc, long contentLength)
+        : this(lastWriteTimeUtc, TimeSpan.MinValue, contentLength)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageMetadata"/> struct.
-        /// </summary>
-        /// <param name="lastWriteTimeUtc">
-        /// The date and time in coordinated universal time (UTC) since the source file was last modified.
-        /// </param>
-        /// <param name="contentLength">The length of the image in bytes.</param>
-        public ImageMetadata(DateTime lastWriteTimeUtc, long contentLength)
-            : this(lastWriteTimeUtc, TimeSpan.MinValue, contentLength)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageMetadata"/> struct.
-        /// </summary>
-        /// <param name="lastWriteTimeUtc">
-        /// The date and time in coordinated universal time (UTC) since the source file was last modified.
-        /// </param>
-        /// <param name="cacheControlMaxAge">
-        /// The maximum amount of time a resource will be considered fresh.
-        /// </param>
-        /// <param name="contentLength">The length of the image in bytes.</param>
-        public ImageMetadata(
-            DateTime lastWriteTimeUtc,
-            TimeSpan cacheControlMaxAge,
-            long contentLength)
-        {
-            this.LastWriteTimeUtc = lastWriteTimeUtc;
-            this.CacheControlMaxAge = cacheControlMaxAge;
-            this.ContentLength = contentLength;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ImageMetadata"/> struct.
+    /// </summary>
+    /// <param name="lastWriteTimeUtc">
+    /// The date and time in coordinated universal time (UTC) since the source file was last modified.
+    /// </param>
+    /// <param name="cacheControlMaxAge">
+    /// The maximum amount of time a resource will be considered fresh.
+    /// </param>
+    /// <param name="contentLength">The length of the image in bytes.</param>
+    public ImageMetadata(
+        DateTime lastWriteTimeUtc,
+        TimeSpan cacheControlMaxAge,
+        long contentLength)
+    {
+        this.LastWriteTimeUtc = lastWriteTimeUtc;
+        this.CacheControlMaxAge = cacheControlMaxAge;
+        this.ContentLength = contentLength;
+    }
 
-        /// <summary>
-        /// Gets the date and time in coordinated universal time (UTC) since the source file was last modified.
-        /// </summary>
-        public DateTime LastWriteTimeUtc { get; }
+    /// <summary>
+    /// Gets the date and time in coordinated universal time (UTC) since the source file was last modified.
+    /// </summary>
+    public DateTime LastWriteTimeUtc { get; }
 
-        /// <summary>
-        /// Gets the maximum amount of time a resource will be considered fresh.
-        /// </summary>
-        public TimeSpan CacheControlMaxAge { get; }
+    /// <summary>
+    /// Gets the maximum amount of time a resource will be considered fresh.
+    /// </summary>
+    public TimeSpan CacheControlMaxAge { get; }
 
-        /// <summary>
-        /// Gets the length of the image in bytes.
-        /// </summary>
-        public long ContentLength { get; }
+    /// <summary>
+    /// Gets the length of the image in bytes.
+    /// </summary>
+    public long ContentLength { get; }
 
-        /// <summary>
-        /// Compares two <see cref="ImageMetadata"/> objects for equality.
-        /// </summary>
-        /// <param name="left">The <see cref="ImageMetadata"/> on the left side of the operand.</param>
-        /// <param name="right">The <see cref="ImageMetadata"/> on the right side of the operand.</param>
-        /// <returns>
-        /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool operator ==(in ImageMetadata left, in ImageMetadata right)
-            => left.Equals(right);
+    /// <summary>
+    /// Compares two <see cref="ImageMetadata"/> objects for equality.
+    /// </summary>
+    /// <param name="left">The <see cref="ImageMetadata"/> on the left side of the operand.</param>
+    /// <param name="right">The <see cref="ImageMetadata"/> on the right side of the operand.</param>
+    /// <returns>
+    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
+    /// </returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool operator ==(in ImageMetadata left, in ImageMetadata right)
+        => left.Equals(right);
 
-        /// <summary>
-        /// Compares two <see cref="ImageMetadata"/> objects for inequality.
-        /// </summary>
-        /// <param name="left">The <see cref="ImageMetadata"/> on the left side of the operand.</param>
-        /// <param name="right">The <see cref="ImageMetadata"/> on the right side of the operand.</param>
-        /// <returns>
-        /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool operator !=(in ImageMetadata left, in ImageMetadata right)
-            => !left.Equals(right);
+    /// <summary>
+    /// Compares two <see cref="ImageMetadata"/> objects for inequality.
+    /// </summary>
+    /// <param name="left">The <see cref="ImageMetadata"/> on the left side of the operand.</param>
+    /// <param name="right">The <see cref="ImageMetadata"/> on the right side of the operand.</param>
+    /// <returns>
+    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
+    /// </returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool operator !=(in ImageMetadata left, in ImageMetadata right)
+        => !left.Equals(right);
 
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool Equals(ImageMetadata other)
-            => this.LastWriteTimeUtc == other.LastWriteTimeUtc
-            && this.CacheControlMaxAge == other.CacheControlMaxAge
-            && this.ContentLength == other.ContentLength;
+    /// <inheritdoc/>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public bool Equals(ImageMetadata other)
+        => this.LastWriteTimeUtc == other.LastWriteTimeUtc
+        && this.CacheControlMaxAge == other.CacheControlMaxAge
+        && this.ContentLength == other.ContentLength;
 
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-            => obj is ImageMetadata data && this.Equals(data);
+    /// <inheritdoc/>
+    public override bool Equals(object obj)
+        => obj is ImageMetadata data && this.Equals(data);
 
-        /// <inheritdoc/>
-        public override int GetHashCode()
-            => HashCode.Combine(this.LastWriteTimeUtc, this.CacheControlMaxAge, this.ContentLength);
+    /// <inheritdoc/>
+    public override int GetHashCode()
+        => HashCode.Combine(this.LastWriteTimeUtc, this.CacheControlMaxAge, this.ContentLength);
 
-        /// <inheritdoc/>
-        public override string ToString()
-            => FormattableString
-            .Invariant($"ImageMetaData({this.LastWriteTimeUtc}, {this.CacheControlMaxAge}, {this.ContentLength})");
-    }
+    /// <inheritdoc/>
+    public override string ToString()
+        => FormattableString
+        .Invariant($"ImageMetaData({this.LastWriteTimeUtc}, {this.CacheControlMaxAge}, {this.ContentLength})");
 }
diff --git a/src/ImageSharp.Web/ImageSharp.Web.csproj b/src/ImageSharp.Web/ImageSharp.Web.csproj
index e7122cab..433ea587 100644
--- a/src/ImageSharp.Web/ImageSharp.Web.csproj
+++ b/src/ImageSharp.Web/ImageSharp.Web.csproj
@@ -6,27 +6,39 @@
     <RootNamespace>SixLabors.ImageSharp.Web</RootNamespace>
     <PackageId>SixLabors.ImageSharp.Web</PackageId>
     <PackageIcon>sixlabors.imagesharp.web.128.png</PackageIcon>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <RepositoryUrl Condition="'$(RepositoryUrl)' == ''">https://github.com/SixLabors/ImageSharp.Web/</RepositoryUrl>
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
     <PackageTags>Image Middleware Resize Crop Gif Jpg Jpeg Bitmap Png WebP Tiff Core Cache ASP</PackageTags>
     <Description>ImageSharp Middleware for serving images via a url based API.</Description>
   </PropertyGroup>
 
+  <!--  This enables the nullable analysis and treats all nullable warnings as error-->
+  <PropertyGroup>
+    <Nullable>enable</Nullable>
+    <WarningsAsErrors>Nullable</WarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!--Bump to V3 prior to tagged release.-->
+    <MinVerMinimumMajorMinor>3.0</MinVerMinimumMajorMinor>
+  </PropertyGroup>
+  
   <Choose>
     <When Condition="$(SIXLABORS_TESTING) == true">
       <PropertyGroup>
-        <TargetFrameworks>net6.0;netcoreapp3.1;</TargetFrameworks>
+        <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;</TargetFrameworks>
+        <TargetFrameworks>net6.0</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
 
   <ItemGroup>
+    <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
     <None Include="..\..\shared-infrastructure\branding\icons\imagesharp.web\sixlabors.imagesharp.web.128.png" Pack="true" PackagePath="" />
   </ItemGroup>
 
diff --git a/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs b/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
index c56ff988..18a5c502 100644
--- a/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
+++ b/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
@@ -1,10 +1,8 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Options;
@@ -12,261 +10,260 @@
 using SixLabors.ImageSharp.Web.Middleware;
 using SixLabors.ImageSharp.Web.Processors;
 
-namespace SixLabors.ImageSharp.Web
+namespace SixLabors.ImageSharp.Web;
+
+/// <summary>
+/// Contains various helper methods for authorizing image requests.
+/// </summary>
+public sealed class ImageSharpRequestAuthorizationUtilities
 {
     /// <summary>
-    /// Contains various helper methods for authorizing image requests.
+    /// The command used by image requests for transporting Hash-based Message Authentication Code (HMAC) tokens.
     /// </summary>
-    public sealed class ImageSharpRequestAuthorizationUtilities
-    {
-        /// <summary>
-        /// The command used by image requests for transporting Hash-based Message Authentication Code (HMAC) tokens.
-        /// </summary>
-        public const string TokenCommand = HMACUtilities.TokenCommand;
-        private static readonly Uri FallbackBaseUri = new("http://localhost/");
-        private readonly HashSet<string> knownCommands;
-        private readonly ImageSharpMiddlewareOptions options;
-        private readonly CommandParser commandParser;
-        private readonly CultureInfo parserCulture;
-        private readonly IRequestParser requestParser;
-        private readonly IServiceProvider serviceProvider;
+    public const string TokenCommand = HMACUtilities.TokenCommand;
+    private static readonly Uri FallbackBaseUri = new("http://localhost/");
+    private readonly HashSet<string> knownCommands;
+    private readonly ImageSharpMiddlewareOptions options;
+    private readonly CommandParser commandParser;
+    private readonly CultureInfo parserCulture;
+    private readonly IRequestParser requestParser;
+    private readonly IServiceProvider serviceProvider;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageSharpRequestAuthorizationUtilities"/> class.
-        /// </summary>
-        /// <param name="options">The middleware configuration options.</param>
-        /// <param name="requestParser">An <see cref="IRequestParser"/> instance used to parse image requests for commands.</param>
-        /// <param name="processors">A collection of <see cref="IImageWebProcessor"/> instances used to process images.</param>
-        /// <param name="commandParser">The command parser.</param>
-        /// <param name="serviceProvider">The service provider.</param>
-        public ImageSharpRequestAuthorizationUtilities(
-            IOptions<ImageSharpMiddlewareOptions> options,
-            IRequestParser requestParser,
-            IEnumerable<IImageWebProcessor> processors,
-            CommandParser commandParser,
-            IServiceProvider serviceProvider)
-        {
-            Guard.NotNull(options, nameof(options));
-            Guard.NotNull(requestParser, nameof(requestParser));
-            Guard.NotNull(processors, nameof(processors));
-            Guard.NotNull(commandParser, nameof(commandParser));
-            Guard.NotNull(serviceProvider, nameof(serviceProvider));
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ImageSharpRequestAuthorizationUtilities"/> class.
+    /// </summary>
+    /// <param name="options">The middleware configuration options.</param>
+    /// <param name="requestParser">An <see cref="IRequestParser"/> instance used to parse image requests for commands.</param>
+    /// <param name="processors">A collection of <see cref="IImageWebProcessor"/> instances used to process images.</param>
+    /// <param name="commandParser">The command parser.</param>
+    /// <param name="serviceProvider">The service provider.</param>
+    public ImageSharpRequestAuthorizationUtilities(
+        IOptions<ImageSharpMiddlewareOptions> options,
+        IRequestParser requestParser,
+        IEnumerable<IImageWebProcessor> processors,
+        CommandParser commandParser,
+        IServiceProvider serviceProvider)
+    {
+        Guard.NotNull(options, nameof(options));
+        Guard.NotNull(requestParser, nameof(requestParser));
+        Guard.NotNull(processors, nameof(processors));
+        Guard.NotNull(commandParser, nameof(commandParser));
+        Guard.NotNull(serviceProvider, nameof(serviceProvider));
 
-            this.options = options.Value;
-            this.requestParser = requestParser;
-            this.commandParser = commandParser;
-            this.parserCulture = this.options.UseInvariantParsingCulture
-                ? CultureInfo.InvariantCulture
-                : CultureInfo.CurrentCulture;
-            this.serviceProvider = serviceProvider;
+        this.options = options.Value;
+        this.requestParser = requestParser;
+        this.commandParser = commandParser;
+        this.parserCulture = this.options.UseInvariantParsingCulture
+            ? CultureInfo.InvariantCulture
+            : CultureInfo.CurrentCulture;
+        this.serviceProvider = serviceProvider;
 
-            HashSet<string> commands = new(StringComparer.OrdinalIgnoreCase);
-            foreach (IImageWebProcessor processor in processors)
+        HashSet<string> commands = new(StringComparer.OrdinalIgnoreCase);
+        foreach (IImageWebProcessor processor in processors)
+        {
+            foreach (string command in processor.Commands)
             {
-                foreach (string command in processor.Commands)
-                {
-                    commands.Add(command);
-                }
+                commands.Add(command);
             }
-
-            this.knownCommands = commands;
         }
 
-        /// <summary>
-        /// Strips any unknown commands from the command collection.
-        /// </summary>
-        /// <param name="commands">The unsanitized command collection.</param>
-        public void StripUnknownCommands(CommandCollection commands)
+        this.knownCommands = commands;
+    }
+
+    /// <summary>
+    /// Strips any unknown commands from the command collection.
+    /// </summary>
+    /// <param name="commands">The unsanitized command collection.</param>
+    public void StripUnknownCommands(CommandCollection commands)
+    {
+        if (commands?.Count > 0)
         {
-            if (commands?.Count > 0)
+            // Strip out any unknown commands, if needed.
+            var keys = new List<string>(commands.Keys);
+            for (int i = keys.Count - 1; i >= 0; i--)
             {
-                // Strip out any unknown commands, if needed.
-                var keys = new List<string>(commands.Keys);
-                for (int i = keys.Count - 1; i >= 0; i--)
+                if (!this.knownCommands.Contains(keys[i]))
                 {
-                    if (!this.knownCommands.Contains(keys[i]))
-                    {
-                        commands.RemoveAt(i);
-                    }
+                    commands.RemoveAt(i);
                 }
             }
         }
+    }
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="uri">The uri to compute the code from.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public string ComputeHMAC(string uri, CommandHandling handling)
-            => this.ComputeHMAC(new Uri(uri, UriKind.RelativeOrAbsolute), handling);
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="uri">The uri to compute the code from.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public string ComputeHMAC(string uri, CommandHandling handling)
+        => this.ComputeHMAC(new Uri(uri, UriKind.RelativeOrAbsolute), handling);
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="uri">The uri to compute the code from.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public Task<string> ComputeHMACAsync(string uri, CommandHandling handling)
-            => this.ComputeHMACAsync(new Uri(uri, UriKind.RelativeOrAbsolute), handling);
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="uri">The uri to compute the code from.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public Task<string> ComputeHMACAsync(string uri, CommandHandling handling)
+        => this.ComputeHMACAsync(new Uri(uri, UriKind.RelativeOrAbsolute), handling);
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="uri">The uri to compute the code from.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public string ComputeHMAC(Uri uri, CommandHandling handling)
-        {
-            ToComponents(
-                uri,
-                out HostString host,
-                out PathString path,
-                out QueryString queryString);
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="uri">The uri to compute the code from.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public string ComputeHMAC(Uri uri, CommandHandling handling)
+    {
+        ToComponents(
+            uri,
+            out HostString host,
+            out PathString path,
+            out QueryString queryString);
 
-            return this.ComputeHMAC(host, path, queryString, handling);
-        }
+        return this.ComputeHMAC(host, path, queryString, handling);
+    }
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="uri">The uri to compute the code from.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public Task<string> ComputeHMACAsync(Uri uri, CommandHandling handling)
-        {
-            ToComponents(
-                uri,
-                out HostString host,
-                out PathString path,
-                out QueryString queryString);
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="uri">The uri to compute the code from.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public Task<string> ComputeHMACAsync(Uri uri, CommandHandling handling)
+    {
+        ToComponents(
+            uri,
+            out HostString host,
+            out PathString path,
+            out QueryString queryString);
 
-            return this.ComputeHMACAsync(host, path, queryString, handling);
-        }
+        return this.ComputeHMACAsync(host, path, queryString, handling);
+    }
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="host">The host header.</param>
-        /// <param name="path">The path or pathbase.</param>
-        /// <param name="queryString">The querystring.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public string ComputeHMAC(HostString host, PathString path, QueryString queryString, CommandHandling handling)
-            => this.ComputeHMAC(host, path, queryString, new(QueryHelpers.ParseQuery(queryString.Value)), handling);
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="host">The host header.</param>
+    /// <param name="path">The path or pathbase.</param>
+    /// <param name="queryString">The querystring.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public string ComputeHMAC(HostString host, PathString path, QueryString queryString, CommandHandling handling)
+        => this.ComputeHMAC(host, path, queryString, new(QueryHelpers.ParseQuery(queryString.Value)), handling);
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="host">The host header.</param>
-        /// <param name="path">The path or pathbase.</param>
-        /// <param name="queryString">The querystring.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public Task<string> ComputeHMACAsync(HostString host, PathString path, QueryString queryString, CommandHandling handling)
-            => this.ComputeHMACAsync(host, path, queryString, new(QueryHelpers.ParseQuery(queryString.Value)), handling);
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="host">The host header.</param>
+    /// <param name="path">The path or pathbase.</param>
+    /// <param name="queryString">The querystring.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public Task<string> ComputeHMACAsync(HostString host, PathString path, QueryString queryString, CommandHandling handling)
+        => this.ComputeHMACAsync(host, path, queryString, new(QueryHelpers.ParseQuery(queryString.Value)), handling);
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="host">The host header.</param>
-        /// <param name="path">The path or pathbase.</param>
-        /// <param name="queryString">The querystring.</param>
-        /// <param name="query">The query collection.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public string ComputeHMAC(HostString host, PathString path, QueryString queryString, QueryCollection query, CommandHandling handling)
-            => this.ComputeHMAC(this.ToHttpContext(host, path, queryString, query), handling);
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="host">The host header.</param>
+    /// <param name="path">The path or pathbase.</param>
+    /// <param name="queryString">The querystring.</param>
+    /// <param name="query">The query collection.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public string ComputeHMAC(HostString host, PathString path, QueryString queryString, QueryCollection query, CommandHandling handling)
+        => this.ComputeHMAC(this.ToHttpContext(host, path, queryString, query), handling);
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="host">The host header.</param>
-        /// <param name="path">The path or pathbase.</param>
-        /// <param name="queryString">The querystring.</param>
-        /// <param name="query">The query collection.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public Task<string> ComputeHMACAsync(HostString host, PathString path, QueryString queryString, QueryCollection query, CommandHandling handling)
-            => this.ComputeHMACAsync(this.ToHttpContext(host, path, queryString, query), handling);
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="host">The host header.</param>
+    /// <param name="path">The path or pathbase.</param>
+    /// <param name="queryString">The querystring.</param>
+    /// <param name="query">The query collection.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public Task<string> ComputeHMACAsync(HostString host, PathString path, QueryString queryString, QueryCollection query, CommandHandling handling)
+        => this.ComputeHMACAsync(this.ToHttpContext(host, path, queryString, query), handling);
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="context">The request HTTP context.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public string ComputeHMAC(HttpContext context, CommandHandling handling)
-            => AsyncHelper.RunSync(() => this.ComputeHMACAsync(context, handling));
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="context">The request HTTP context.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public string ComputeHMAC(HttpContext context, CommandHandling handling)
+        => AsyncHelper.RunSync(() => this.ComputeHMACAsync(context, handling));
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="context">The request HTTP context.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public async Task<string> ComputeHMACAsync(HttpContext context, CommandHandling handling)
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="context">The request HTTP context.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public async Task<string> ComputeHMACAsync(HttpContext context, CommandHandling handling)
+    {
+        byte[] secret = this.options.HMACSecretKey;
+        if (secret is null || secret.Length == 0)
         {
-            byte[] secret = this.options.HMACSecretKey;
-            if (secret is null || secret.Length == 0)
-            {
-                return null;
-            }
-
-            CommandCollection commands = this.requestParser.ParseRequestCommands(context);
-            if (handling == CommandHandling.Sanitize)
-            {
-                this.StripUnknownCommands(commands);
-            }
+            return null;
+        }
 
-            ImageCommandContext imageCommandContext = new(context, commands, this.commandParser, this.parserCulture);
-            return await this.options.OnComputeHMACAsync(imageCommandContext, secret);
+        CommandCollection commands = this.requestParser.ParseRequestCommands(context);
+        if (handling == CommandHandling.Sanitize)
+        {
+            this.StripUnknownCommands(commands);
         }
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <remarks>
-        /// This method is only called by the middleware and only if required.
-        /// As such, standard checks are avoided.
-        /// </remarks>
-        /// <param name="context">Contains information about the current image request and parsed commands.</param>
-        /// <returns>The computed HMAC.</returns>
-        internal Task<string> ComputeHMACAsync(ImageCommandContext context)
-            => this.options.OnComputeHMACAsync(context, this.options.HMACSecretKey);
+        ImageCommandContext imageCommandContext = new(context, commands, this.commandParser, this.parserCulture);
+        return await this.options.OnComputeHMACAsync(imageCommandContext, secret);
+    }
 
-        private static void ToComponents(
-            Uri uri,
-            out HostString host,
-            out PathString path,
-            out QueryString queryString)
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <remarks>
+    /// This method is only called by the middleware and only if required.
+    /// As such, standard checks are avoided.
+    /// </remarks>
+    /// <param name="context">Contains information about the current image request and parsed commands.</param>
+    /// <returns>The computed HMAC.</returns>
+    internal Task<string> ComputeHMACAsync(ImageCommandContext context)
+        => this.options.OnComputeHMACAsync(context, this.options.HMACSecretKey);
+
+    private static void ToComponents(
+        Uri uri,
+        out HostString host,
+        out PathString path,
+        out QueryString queryString)
+    {
+        if (uri.IsAbsoluteUri)
         {
-            if (uri.IsAbsoluteUri)
-            {
-                host = HostString.FromUriComponent(uri);
-                path = PathString.FromUriComponent(uri);
-                queryString = QueryString.FromUriComponent(uri);
-            }
-            else
-            {
-                Uri faux = new(FallbackBaseUri, uri);
-                host = default;
-                path = PathString.FromUriComponent(faux);
-                queryString = QueryString.FromUriComponent(faux);
-            }
+            host = HostString.FromUriComponent(uri);
+            path = PathString.FromUriComponent(uri);
+            queryString = QueryString.FromUriComponent(uri);
         }
-
-        private HttpContext ToHttpContext(HostString host, PathString path, QueryString queryString, QueryCollection query)
+        else
         {
-            DefaultHttpContext context = new() { RequestServices = this.serviceProvider };
-            HttpRequest request = context.Request;
-            request.Method = HttpMethods.Get;
-            request.Host = host;
-            request.Path = path;
-            request.QueryString = queryString;
-            request.Query = query;
-
-            return context;
+            Uri faux = new(FallbackBaseUri, uri);
+            host = default;
+            path = PathString.FromUriComponent(faux);
+            queryString = QueryString.FromUriComponent(faux);
         }
     }
+
+    private HttpContext ToHttpContext(HostString host, PathString path, QueryString queryString, QueryCollection query)
+    {
+        DefaultHttpContext context = new() { RequestServices = this.serviceProvider };
+        HttpRequest request = context.Request;
+        request.Method = HttpMethods.Get;
+        request.Host = host;
+        request.Path = path;
+        request.QueryString = queryString;
+        request.Query = query;
+
+        return context;
+    }
 }
diff --git a/src/ImageSharp.Web/Middleware/ImageCommandContext.cs b/src/ImageSharp.Web/Middleware/ImageCommandContext.cs
index 890f689d..0bb06af9 100644
--- a/src/ImageSharp.Web/Middleware/ImageCommandContext.cs
+++ b/src/ImageSharp.Web/Middleware/ImageCommandContext.cs
@@ -1,54 +1,54 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
 using System.Globalization;
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Middleware
+namespace SixLabors.ImageSharp.Web.Middleware;
+
+/// <summary>
+/// Contains information about the current image request and parsed commands.
+/// </summary>
+public class ImageCommandContext
 {
     /// <summary>
-    /// Contains information about the current image request and parsed commands.
+    /// Initializes a new instance of the <see cref="ImageCommandContext"/> class.
     /// </summary>
-    public class ImageCommandContext
+    /// <param name="context">The current HTTP request context.</param>
+    /// <param name="commands">The dictionary containing the collection of URI derived processing commands.</param>
+    /// <param name="parser">The command parser for parsing URI derived processing commands.</param>
+    /// <param name="culture">The culture used to parse commands.</param>
+    public ImageCommandContext(
+        HttpContext context,
+        CommandCollection commands,
+        CommandParser parser,
+        CultureInfo culture)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageCommandContext"/> class.
-        /// </summary>
-        /// <param name="context">The current HTTP request context.</param>
-        /// <param name="commands">The dictionary containing the collection of URI derived processing commands.</param>
-        /// <param name="parser">The command parser for parsing URI derived processing commands.</param>
-        /// <param name="culture">The culture used to parse commands.</param>
-        public ImageCommandContext(
-            HttpContext context,
-            CommandCollection commands,
-            CommandParser parser,
-            CultureInfo culture)
-        {
-            this.Context = context;
-            this.Commands = commands;
-            this.Parser = parser;
-            this.Culture = culture;
-        }
+        this.Context = context;
+        this.Commands = commands;
+        this.Parser = parser;
+        this.Culture = culture;
+    }
 
-        /// <summary>
-        /// Gets the current HTTP request context.
-        /// </summary>
-        public HttpContext Context { get; }
+    /// <summary>
+    /// Gets the current HTTP request context.
+    /// </summary>
+    public HttpContext Context { get; }
 
-        /// <summary>
-        /// Gets the collection of URI derived processing commands.
-        /// </summary>
-        public CommandCollection Commands { get; }
+    /// <summary>
+    /// Gets the collection of URI derived processing commands.
+    /// </summary>
+    public CommandCollection Commands { get; }
 
-        /// <summary>
-        /// Gets the command parser for parsing URI derived processing commands.
-        /// </summary>
-        public CommandParser Parser { get; }
+    /// <summary>
+    /// Gets the command parser for parsing URI derived processing commands.
+    /// </summary>
+    public CommandParser Parser { get; }
 
-        /// <summary>
-        /// Gets the culture used for parsing commands.
-        /// </summary>
-        public CultureInfo Culture { get; }
-    }
+    /// <summary>
+    /// Gets the culture used for parsing commands.
+    /// </summary>
+    public CultureInfo Culture { get; }
 }
diff --git a/src/ImageSharp.Web/Middleware/ImageContext.cs b/src/ImageSharp.Web/Middleware/ImageContext.cs
index 69224d06..f34058b1 100644
--- a/src/ImageSharp.Web/Middleware/ImageContext.cs
+++ b/src/ImageSharp.Web/Middleware/ImageContext.cs
@@ -1,292 +1,288 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Http.Headers;
 using Microsoft.Net.Http.Headers;
 
-namespace SixLabors.ImageSharp.Web.Middleware
+namespace SixLabors.ImageSharp.Web.Middleware;
+
+/// <summary>
+/// Provides information and methods regarding the current image request.
+/// </summary>
+internal struct ImageContext
 {
+    private readonly ImageSharpMiddlewareOptions options;
+    private readonly HttpContext context;
+    private readonly HttpRequest request;
+    private readonly HttpResponse response;
+    private readonly RequestHeaders requestHeaders;
+    private readonly ResponseHeaders responseHeaders;
+
+    private DateTimeOffset fileLastModified;
+    private long fileLength;
+    private EntityTagHeaderValue fileEtag;
+
+    private PreconditionState ifMatchState;
+    private PreconditionState ifNoneMatchState;
+    private PreconditionState ifModifiedSinceState;
+    private PreconditionState ifUnmodifiedSinceState;
+
     /// <summary>
-    /// Provides information and methods regarding the current image request.
+    /// Initializes a new instance of the <see cref="ImageContext"/> struct.
     /// </summary>
-    internal struct ImageContext
+    /// <param name="context">The current HTTP request context.</param>
+    /// <param name="options">The middleware options.</param>
+    public ImageContext(HttpContext context, ImageSharpMiddlewareOptions options)
     {
-        private readonly ImageSharpMiddlewareOptions options;
-        private readonly HttpContext context;
-        private readonly HttpRequest request;
-        private readonly HttpResponse response;
-        private readonly RequestHeaders requestHeaders;
-        private readonly ResponseHeaders responseHeaders;
-
-        private DateTimeOffset fileLastModified;
-        private long fileLength;
-        private EntityTagHeaderValue fileEtag;
-
-        private PreconditionState ifMatchState;
-        private PreconditionState ifNoneMatchState;
-        private PreconditionState ifModifiedSinceState;
-        private PreconditionState ifUnmodifiedSinceState;
+        this.context = context;
+        this.request = context.Request;
+        this.response = context.Response;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageContext"/> struct.
-        /// </summary>
-        /// <param name="context">The current HTTP request context.</param>
-        /// <param name="options">The middleware options.</param>
-        public ImageContext(HttpContext context, ImageSharpMiddlewareOptions options)
-        {
-            this.context = context;
-            this.request = context.Request;
-            this.response = context.Response;
+        this.requestHeaders = context.Request.GetTypedHeaders();
+        this.responseHeaders = context.Response.GetTypedHeaders();
 
-            this.requestHeaders = context.Request.GetTypedHeaders();
-            this.responseHeaders = context.Response.GetTypedHeaders();
+        this.options = options;
 
-            this.options = options;
+        this.fileLastModified = DateTimeOffset.MinValue;
+        this.fileLength = 0;
+        this.fileEtag = null;
 
-            this.fileLastModified = DateTimeOffset.MinValue;
-            this.fileLength = 0;
-            this.fileEtag = null;
+        this.ifMatchState = PreconditionState.Unspecified;
+        this.ifNoneMatchState = PreconditionState.Unspecified;
+        this.ifModifiedSinceState = PreconditionState.Unspecified;
+        this.ifUnmodifiedSinceState = PreconditionState.Unspecified;
+    }
 
-            this.ifMatchState = PreconditionState.Unspecified;
-            this.ifNoneMatchState = PreconditionState.Unspecified;
-            this.ifModifiedSinceState = PreconditionState.Unspecified;
-            this.ifUnmodifiedSinceState = PreconditionState.Unspecified;
-        }
+    /// <summary>
+    /// Enumerates the possible precondition states.
+    /// </summary>
+    internal enum PreconditionState
+    {
+        /// <summary>
+        /// Unspeciified
+        /// </summary>
+        Unspecified,
 
         /// <summary>
-        /// Enumerates the possible precondition states.
+        /// Not modified
         /// </summary>
-        internal enum PreconditionState
-        {
-            /// <summary>
-            /// Unspeciified
-            /// </summary>
-            Unspecified,
-
-            /// <summary>
-            /// Not modified
-            /// </summary>
-            NotModified,
-
-            /// <summary>
-            /// Should process
-            /// </summary>
-            ShouldProcess,
-
-            /// <summary>
-            /// Precondition Failed
-            /// </summary>
-            PreconditionFailed,
-        }
+        NotModified,
 
         /// <summary>
-        /// Returns the current HTTP image request display url.
+        /// Should process
         /// </summary>
-        /// <returns>
-        /// The combined components of the image request URL in a fully un-escaped form (except
-        /// for the QueryString) suitable only for display.
-        /// </returns>
-        public string GetDisplayUrl() => this.request.GetDisplayUrl();
+        ShouldProcess,
 
         /// <summary>
-        /// Analyzes the headers for the current request.
+        /// Precondition Failed
         /// </summary>
-        /// <param name="lastModified">The point in time when the cached file was last modified.</param>
-        /// <param name="length">The length of the cached file in bytes.</param>
-        public void ComprehendRequestHeaders(DateTimeOffset lastModified, long length)
-        {
-            this.fileLastModified = lastModified;
-            this.fileLength = length;
-            this.ComputeLastModified();
+        PreconditionFailed,
+    }
 
-            this.ComputeIfMatch();
+    /// <summary>
+    /// Returns the current HTTP image request display url.
+    /// </summary>
+    /// <returns>
+    /// The combined components of the image request URL in a fully un-escaped form (except
+    /// for the QueryString) suitable only for display.
+    /// </returns>
+    public string GetDisplayUrl() => this.request.GetDisplayUrl();
 
-            this.ComputeIfModifiedSince();
-        }
+    /// <summary>
+    /// Analyzes the headers for the current request.
+    /// </summary>
+    /// <param name="lastModified">The point in time when the cached file was last modified.</param>
+    /// <param name="length">The length of the cached file in bytes.</param>
+    public void ComprehendRequestHeaders(DateTimeOffset lastModified, long length)
+    {
+        this.fileLastModified = lastModified;
+        this.fileLength = length;
+        this.ComputeLastModified();
 
-        /// <summary>
-        /// Gets the preconditioned state of the request.
-        /// </summary>
-        /// <returns>The <see cref="PreconditionState"/>.</returns>
-        public PreconditionState GetPreconditionState()
-            => GetMaxPreconditionState(
-                this.ifMatchState,
-                this.ifNoneMatchState,
-                this.ifModifiedSinceState,
-                this.ifUnmodifiedSinceState);
+        this.ComputeIfMatch();
 
-        /// <summary>
-        /// Gets a value indicating whether this request is a head request.
-        /// </summary>
-        /// <returns>THe <see cref="bool"/>.</returns>
-        public bool IsHeadRequest()
-            => string.Equals("HEAD", this.request.Method, StringComparison.OrdinalIgnoreCase);
+        this.ComputeIfModifiedSince();
+    }
 
-        /// <summary>
-        /// Set the response status headers.
-        /// </summary>
-        /// <param name="statusCode">The status code.</param>
-        /// <param name="metaData">The image metadata.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        public Task SendStatusAsync(int statusCode, in ImageCacheMetadata metaData)
-            => this.ApplyResponseHeadersAsync(
-                statusCode,
-                metaData.ContentType,
-                metaData.CacheControlMaxAge);
+    /// <summary>
+    /// Gets the preconditioned state of the request.
+    /// </summary>
+    /// <returns>The <see cref="PreconditionState"/>.</returns>
+    public PreconditionState GetPreconditionState()
+        => GetMaxPreconditionState(
+            this.ifMatchState,
+            this.ifNoneMatchState,
+            this.ifModifiedSinceState,
+            this.ifUnmodifiedSinceState);
 
-        /// <summary>
-        /// Set the response content.
-        /// </summary>
-        /// <param name="stream">The output stream.</param>
-        /// <param name="metaData">The image metadata.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        public async Task SendAsync(Stream stream, ImageCacheMetadata metaData)
-        {
-            await this.ApplyResponseHeadersAsync(
-                ResponseConstants.Status200Ok,
-                metaData.ContentType,
-                metaData.CacheControlMaxAge);
+    /// <summary>
+    /// Gets a value indicating whether this request is a head request.
+    /// </summary>
+    /// <returns>THe <see cref="bool"/>.</returns>
+    public bool IsHeadRequest()
+        => string.Equals("HEAD", this.request.Method, StringComparison.OrdinalIgnoreCase);
 
-            if (stream.CanSeek)
-            {
-                stream.Position = 0;
-            }
+    /// <summary>
+    /// Set the response status headers.
+    /// </summary>
+    /// <param name="statusCode">The status code.</param>
+    /// <param name="metaData">The image metadata.</param>
+    /// <returns>The <see cref="Task"/>.</returns>
+    public Task SendStatusAsync(int statusCode, in ImageCacheMetadata metaData)
+        => this.ApplyResponseHeadersAsync(
+            statusCode,
+            metaData.ContentType,
+            metaData.CacheControlMaxAge);
 
-            // We don't need to directly cancel this, if the client disconnects it will fail silently.
-            await stream.CopyToAsync(this.response.Body);
-            if (this.response.Body.CanSeek)
-            {
-                this.response.Body.Position = 0;
-            }
-        }
+    /// <summary>
+    /// Set the response content.
+    /// </summary>
+    /// <param name="stream">The output stream.</param>
+    /// <param name="metaData">The image metadata.</param>
+    /// <returns>The <see cref="Task"/>.</returns>
+    public async Task SendAsync(Stream stream, ImageCacheMetadata metaData)
+    {
+        await this.ApplyResponseHeadersAsync(
+            ResponseConstants.Status200Ok,
+            metaData.ContentType,
+            metaData.CacheControlMaxAge);
 
-        private static PreconditionState GetMaxPreconditionState(params PreconditionState[] states)
+        if (stream.CanSeek)
         {
-            PreconditionState max = PreconditionState.Unspecified;
-            foreach (PreconditionState state in states)
-            {
-                if (state > max)
-                {
-                    max = state;
-                }
-            }
+            stream.Position = 0;
+        }
 
-            return max;
+        // We don't need to directly cancel this, if the client disconnects it will fail silently.
+        await stream.CopyToAsync(this.response.Body);
+        if (this.response.Body.CanSeek)
+        {
+            this.response.Body.Position = 0;
         }
+    }
 
-        private async Task ApplyResponseHeadersAsync(
-            int statusCode,
-            string contentType,
-            TimeSpan maxAge)
+    private static PreconditionState GetMaxPreconditionState(params PreconditionState[] states)
+    {
+        PreconditionState max = PreconditionState.Unspecified;
+        foreach (PreconditionState state in states)
         {
-            this.response.StatusCode = statusCode;
-            if (statusCode < 400)
+            if (state > max)
             {
-                // These headers are returned for 200 and 304
-                // They are not returned for 412
-                if (!string.IsNullOrEmpty(contentType))
-                {
-                    this.response.ContentType = contentType;
-                }
-
-                this.responseHeaders.LastModified = this.fileLastModified;
-                this.responseHeaders.ETag = this.fileEtag;
-                this.responseHeaders.Headers[HeaderNames.AcceptRanges] = "bytes";
+                max = state;
+            }
+        }
 
-                this.responseHeaders.CacheControl = new CacheControlHeaderValue
-                {
-                    Public = true,
-                    MaxAge = maxAge,
-                    MustRevalidate = true
-                };
+        return max;
+    }
 
-                await this.options.OnPrepareResponseAsync.Invoke(this.context);
+    private async Task ApplyResponseHeadersAsync(
+        int statusCode,
+        string contentType,
+        TimeSpan maxAge)
+    {
+        this.response.StatusCode = statusCode;
+        if (statusCode < 400)
+        {
+            // These headers are returned for 200 and 304
+            // They are not returned for 412
+            if (!string.IsNullOrEmpty(contentType))
+            {
+                this.response.ContentType = contentType;
             }
 
-            if (statusCode == ResponseConstants.Status200Ok)
+            this.responseHeaders.LastModified = this.fileLastModified;
+            this.responseHeaders.ETag = this.fileEtag;
+            this.responseHeaders.Headers[HeaderNames.AcceptRanges] = "bytes";
+
+            this.responseHeaders.CacheControl = new CacheControlHeaderValue
             {
-                // This header is only returned here for 200. It is not returned for 304, and 412
-                this.response.ContentLength = this.fileLength;
-            }
+                Public = true,
+                MaxAge = maxAge,
+                MustRevalidate = true
+            };
+
+            await this.options.OnPrepareResponseAsync.Invoke(this.context);
         }
 
-        private void ComputeLastModified()
+        if (statusCode == ResponseConstants.Status200Ok)
         {
-            // Truncate to the second.
-            this.fileLastModified = new DateTimeOffset(
-                this.fileLastModified.Year,
-                this.fileLastModified.Month,
-                this.fileLastModified.Day,
-                this.fileLastModified.Hour,
-                this.fileLastModified.Minute,
-                this.fileLastModified.Second,
-                this.fileLastModified.Offset)
-                .ToUniversalTime();
-
-            long etagHash = this.fileLastModified.ToFileTime() ^ this.fileLength;
-            this.fileEtag = new EntityTagHeaderValue($"{'\"'}{Convert.ToString(etagHash, 16)}{'\"'}");
+            // This header is only returned here for 200. It is not returned for 304, and 412
+            this.response.ContentLength = this.fileLength;
         }
+    }
 
-        private void ComputeIfMatch()
-        {
-            // 14.24 If-Match
-            IList<EntityTagHeaderValue> ifMatch = this.requestHeaders.IfMatch;
+    private void ComputeLastModified()
+    {
+        // Truncate to the second.
+        this.fileLastModified = new DateTimeOffset(
+            this.fileLastModified.Year,
+            this.fileLastModified.Month,
+            this.fileLastModified.Day,
+            this.fileLastModified.Hour,
+            this.fileLastModified.Minute,
+            this.fileLastModified.Second,
+            this.fileLastModified.Offset)
+            .ToUniversalTime();
+
+        long etagHash = this.fileLastModified.ToFileTime() ^ this.fileLength;
+        this.fileEtag = new EntityTagHeaderValue($"{'\"'}{Convert.ToString(etagHash, 16)}{'\"'}");
+    }
 
-            if (ifMatch?.Count > 0)
+    private void ComputeIfMatch()
+    {
+        // 14.24 If-Match
+        IList<EntityTagHeaderValue> ifMatch = this.requestHeaders.IfMatch;
+
+        if (ifMatch?.Count > 0)
+        {
+            this.ifMatchState = PreconditionState.PreconditionFailed;
+            foreach (EntityTagHeaderValue etag in ifMatch)
             {
-                this.ifMatchState = PreconditionState.PreconditionFailed;
-                foreach (EntityTagHeaderValue etag in ifMatch)
+                if (etag.Equals(EntityTagHeaderValue.Any) || etag.Compare(this.fileEtag, true))
                 {
-                    if (etag.Equals(EntityTagHeaderValue.Any) || etag.Compare(this.fileEtag, true))
-                    {
-                        this.ifMatchState = PreconditionState.ShouldProcess;
-                        break;
-                    }
+                    this.ifMatchState = PreconditionState.ShouldProcess;
+                    break;
                 }
             }
+        }
 
-            // 14.26 If-None-Match
-            IList<EntityTagHeaderValue> ifNoneMatch = this.requestHeaders.IfNoneMatch;
+        // 14.26 If-None-Match
+        IList<EntityTagHeaderValue> ifNoneMatch = this.requestHeaders.IfNoneMatch;
 
-            if (ifNoneMatch?.Count > 0)
+        if (ifNoneMatch?.Count > 0)
+        {
+            this.ifNoneMatchState = PreconditionState.ShouldProcess;
+            foreach (EntityTagHeaderValue etag in ifNoneMatch)
             {
-                this.ifNoneMatchState = PreconditionState.ShouldProcess;
-                foreach (EntityTagHeaderValue etag in ifNoneMatch)
+                if (etag.Equals(EntityTagHeaderValue.Any) || etag.Compare(this.fileEtag, true))
                 {
-                    if (etag.Equals(EntityTagHeaderValue.Any) || etag.Compare(this.fileEtag, true))
-                    {
-                        this.ifNoneMatchState = PreconditionState.NotModified;
-                        break;
-                    }
+                    this.ifNoneMatchState = PreconditionState.NotModified;
+                    break;
                 }
             }
         }
+    }
 
-        private void ComputeIfModifiedSince()
-        {
-            DateTimeOffset now = DateTimeOffset.UtcNow;
+    private void ComputeIfModifiedSince()
+    {
+        DateTimeOffset now = DateTimeOffset.UtcNow;
 
-            // 14.25 If-Modified-Since
-            DateTimeOffset? ifModifiedSince = this.requestHeaders.IfModifiedSince;
-            if (ifModifiedSince.HasValue && ifModifiedSince <= now)
-            {
-                bool modified = ifModifiedSince < this.fileLastModified;
-                this.ifModifiedSinceState = modified ? PreconditionState.ShouldProcess : PreconditionState.NotModified;
-            }
+        // 14.25 If-Modified-Since
+        DateTimeOffset? ifModifiedSince = this.requestHeaders.IfModifiedSince;
+        if (ifModifiedSince.HasValue && ifModifiedSince <= now)
+        {
+            bool modified = ifModifiedSince < this.fileLastModified;
+            this.ifModifiedSinceState = modified ? PreconditionState.ShouldProcess : PreconditionState.NotModified;
+        }
 
-            // 14.28 If-Unmodified-Since
-            DateTimeOffset? ifUnmodifiedSince = this.requestHeaders.IfUnmodifiedSince;
-            if (ifUnmodifiedSince.HasValue && ifUnmodifiedSince <= now)
-            {
-                bool unmodified = ifUnmodifiedSince >= this.fileLastModified;
-                this.ifUnmodifiedSinceState = unmodified ? PreconditionState.ShouldProcess : PreconditionState.PreconditionFailed;
-            }
+        // 14.28 If-Unmodified-Since
+        DateTimeOffset? ifUnmodifiedSince = this.requestHeaders.IfUnmodifiedSince;
+        if (ifUnmodifiedSince.HasValue && ifUnmodifiedSince <= now)
+        {
+            bool unmodified = ifUnmodifiedSince >= this.fileLastModified;
+            this.ifUnmodifiedSinceState = unmodified ? PreconditionState.ShouldProcess : PreconditionState.PreconditionFailed;
         }
     }
 }
diff --git a/src/ImageSharp.Web/Middleware/ImageProcessingContext.cs b/src/ImageSharp.Web/Middleware/ImageProcessingContext.cs
index 3fb79105..a03a5508 100644
--- a/src/ImageSharp.Web/Middleware/ImageProcessingContext.cs
+++ b/src/ImageSharp.Web/Middleware/ImageProcessingContext.cs
@@ -1,63 +1,61 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.Collections.Generic;
-using System.IO;
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Middleware
+namespace SixLabors.ImageSharp.Web.Middleware;
+
+/// <summary>
+/// Contains information about the current image request and processed image.
+/// </summary>
+public class ImageProcessingContext
 {
     /// <summary>
-    /// Contains information about the current image request and processed image.
+    /// Initializes a new instance of the <see cref="ImageProcessingContext"/> class.
     /// </summary>
-    public class ImageProcessingContext
+    /// <param name="context">The current HTTP request context.</param>
+    /// <param name="stream">The stream containing the processed image bytes.</param>
+    /// <param name="commands">The parsed collection of processing commands.</param>
+    /// <param name="contentType">The content type for the processed image.</param>
+    /// <param name="extension">The file extension for the processed image.</param>
+    public ImageProcessingContext(
+        HttpContext context,
+        Stream stream,
+        CommandCollection commands,
+        string contentType,
+        string extension)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageProcessingContext"/> class.
-        /// </summary>
-        /// <param name="context">The current HTTP request context.</param>
-        /// <param name="stream">The stream containing the processed image bytes.</param>
-        /// <param name="commands">The parsed collection of processing commands.</param>
-        /// <param name="contentType">The content type for the processed image.</param>
-        /// <param name="extension">The file extension for the processed image.</param>
-        public ImageProcessingContext(
-            HttpContext context,
-            Stream stream,
-            CommandCollection commands,
-            string contentType,
-            string extension)
-        {
-            this.Context = context;
-            this.Stream = stream;
-            this.Commands = commands;
-            this.ContentType = contentType;
-            this.Extension = extension;
-        }
-
-        /// <summary>
-        /// Gets the current HTTP request context.
-        /// </summary>
-        public HttpContext Context { get; }
-
-        /// <summary>
-        /// Gets the stream containing the processed image bytes.
-        /// </summary>
-        public Stream Stream { get; }
-
-        /// <summary>
-        /// Gets the parsed collection of processing commands.
-        /// </summary>
-        public CommandCollection Commands { get; }
-
-        /// <summary>
-        /// Gets the content type for the processed image.
-        /// </summary>
-        public string ContentType { get; }
-
-        /// <summary>
-        /// Gets the file extension for the processed image.
-        /// </summary>
-        public string Extension { get; }
+        this.Context = context;
+        this.Stream = stream;
+        this.Commands = commands;
+        this.ContentType = contentType;
+        this.Extension = extension;
     }
+
+    /// <summary>
+    /// Gets the current HTTP request context.
+    /// </summary>
+    public HttpContext Context { get; }
+
+    /// <summary>
+    /// Gets the stream containing the processed image bytes.
+    /// </summary>
+    public Stream Stream { get; }
+
+    /// <summary>
+    /// Gets the parsed collection of processing commands.
+    /// </summary>
+    public CommandCollection Commands { get; }
+
+    /// <summary>
+    /// Gets the content type for the processed image.
+    /// </summary>
+    public string ContentType { get; }
+
+    /// <summary>
+    /// Gets the file extension for the processed image.
+    /// </summary>
+    public string Extension { get; }
 }
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
index 4b4eea7b..d964f218 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
@@ -1,13 +1,9 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Extensions.Logging;
@@ -22,558 +18,557 @@
 using SixLabors.ImageSharp.Web.Resolvers;
 using SixLabors.ImageSharp.Web.Synchronization;
 
-namespace SixLabors.ImageSharp.Web.Middleware
+namespace SixLabors.ImageSharp.Web.Middleware;
+
+/// <summary>
+/// Middleware for handling the processing of images via image requests.
+/// </summary>
+public class ImageSharpMiddleware
 {
     /// <summary>
-    /// Middleware for handling the processing of images via image requests.
+    /// Used to temporarily store source metadata reads to reduce the overhead of cache lookups.
     /// </summary>
-    public class ImageSharpMiddleware
-    {
-        /// <summary>
-        /// Used to temporarily store source metadata reads to reduce the overhead of cache lookups.
-        /// </summary>
-        private static readonly ConcurrentTLruCache<string, ImageMetadata> SourceMetadataLru
-            = new(1024, TimeSpan.FromSeconds(30));
-
-        /// <summary>
-        /// Used to temporarily store cache resolver reads to reduce the overhead of cache lookups.
-        /// </summary>
-        private static readonly ConcurrentTLruCache<string, (IImageCacheResolver, ImageCacheMetadata)> CacheResolverLru
-            = new(1024, TimeSpan.FromSeconds(30));
-
-        /// <summary>
-        /// Used to temporarily store cached HMAC-s to reduce the overhead of HMAC token generation.
-        /// </summary>
-        private static readonly ConcurrentTLruCache<string, string> HMACTokenLru
-            = new(1024, TimeSpan.FromSeconds(30));
-
-        /// <summary>
-        /// The function processing the Http request.
-        /// </summary>
-        private readonly RequestDelegate next;
-
-        /// <summary>
-        /// The configuration options.
-        /// </summary>
-        private readonly ImageSharpMiddlewareOptions options;
-
-        /// <summary>
-        /// The type used for performing logging.
-        /// </summary>
-        private readonly ILogger logger;
-
-        /// <summary>
-        /// The parser for parsing commands from the current request.
-        /// </summary>
-        private readonly IRequestParser requestParser;
-
-        /// <summary>
-        /// The collection of image providers.
-        /// </summary>
-        private readonly IImageProvider[] providers;
-
-        /// <summary>
-        /// The collection of image processors.
-        /// </summary>
-        private readonly IImageWebProcessor[] processors;
-
-        /// <summary>
-        /// The cache key.
-        /// </summary>
-        private readonly ICacheKey cacheKey;
-
-        /// <summary>
-        /// The image cache.
-        /// </summary>
-        private readonly IImageCache cache;
-
-        /// <summary>
-        /// The hashing implementation to use when generating cached file names.
-        /// </summary>
-        private readonly ICacheHash cacheHash;
-
-        /// <summary>
-        /// Contains various helper methods based on the current configuration.
-        /// </summary>
-        private readonly FormatUtilities formatUtilities;
-
-        /// <summary>
-        /// Used to parse processing commands.
-        /// </summary>
-        private readonly CommandParser commandParser;
-
-        /// <summary>
-        /// The culture to use when parsing processing commands.
-        /// </summary>
-        private readonly CultureInfo parserCulture;
-
-        /// <summary>
-        /// The lock used to prevent concurrent processing of the same exact image request.
-        /// </summary>
-        private readonly AsyncKeyReaderWriterLock<string> asyncKeyLock;
-
-        /// <summary>
-        /// Contains helpers that allow authorization of image requests.
-        /// </summary>
-        private readonly ImageSharpRequestAuthorizationUtilities authorizationUtilities;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageSharpMiddleware"/> class.
-        /// </summary>
-        /// <param name="next">The next middleware in the pipeline.</param>
-        /// <param name="options">The middleware configuration options.</param>
-        /// <param name="loggerFactory">An <see cref="ILoggerFactory"/> instance used to create loggers.</param>
-        /// <param name="requestParser">An <see cref="IRequestParser"/> instance used to parse image requests for commands.</param>
-        /// <param name="resolvers">A collection of <see cref="IImageProvider"/> instances used to resolve images.</param>
-        /// <param name="processors">A collection of <see cref="IImageWebProcessor"/> instances used to process images.</param>
-        /// <param name="cache">An <see cref="IImageCache"/> instance used for caching images.</param>
-        /// <param name="cacheKey">An <see cref="ICacheKey"/> instance used for creating cache keys.</param>
-        /// <param name="cacheHash">An <see cref="ICacheHash"/>instance used for calculating cached file names.</param>
-        /// <param name="commandParser">The command parser.</param>
-        /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
-        /// <param name="asyncKeyLock">The async key lock.</param>
-        /// <param name="requestAuthorizationUtilities">Contains helpers that allow authorization of image requests.</param>
-        public ImageSharpMiddleware(
-            RequestDelegate next,
-            IOptions<ImageSharpMiddlewareOptions> options,
-            ILoggerFactory loggerFactory,
-            IRequestParser requestParser,
-            IEnumerable<IImageProvider> resolvers,
-            IEnumerable<IImageWebProcessor> processors,
-            IImageCache cache,
-            ICacheKey cacheKey,
-            ICacheHash cacheHash,
-            CommandParser commandParser,
-            FormatUtilities formatUtilities,
-            AsyncKeyReaderWriterLock<string> asyncKeyLock,
-            ImageSharpRequestAuthorizationUtilities requestAuthorizationUtilities)
-        {
-            Guard.NotNull(next, nameof(next));
-            Guard.NotNull(options, nameof(options));
-            Guard.NotNull(loggerFactory, nameof(loggerFactory));
-            Guard.NotNull(requestParser, nameof(requestParser));
-            Guard.NotNull(resolvers, nameof(resolvers));
-            Guard.NotNull(processors, nameof(processors));
-            Guard.NotNull(cache, nameof(cache));
-            Guard.NotNull(cacheKey, nameof(cacheKey));
-            Guard.NotNull(cacheHash, nameof(cacheHash));
-            Guard.NotNull(commandParser, nameof(commandParser));
-            Guard.NotNull(formatUtilities, nameof(formatUtilities));
-            Guard.NotNull(asyncKeyLock, nameof(asyncKeyLock));
-            Guard.NotNull(requestAuthorizationUtilities, nameof(requestAuthorizationUtilities));
-
-            this.next = next;
-            this.options = options.Value;
-            this.requestParser = requestParser;
-            this.providers = resolvers as IImageProvider[] ?? resolvers.ToArray();
-            this.processors = processors as IImageWebProcessor[] ?? processors.ToArray();
-            this.cache = cache;
-            this.cacheKey = cacheKey;
-            this.cacheHash = cacheHash;
-            this.commandParser = commandParser;
-            this.parserCulture = this.options.UseInvariantParsingCulture
-                ? CultureInfo.InvariantCulture
-                : CultureInfo.CurrentCulture;
-
-            this.logger = loggerFactory.CreateLogger<ImageSharpMiddleware>();
-            this.formatUtilities = formatUtilities;
-            this.asyncKeyLock = asyncKeyLock;
-            this.authorizationUtilities = requestAuthorizationUtilities;
-        }
+    private static readonly ConcurrentTLruCache<string, ImageMetadata> SourceMetadataLru
+        = new(1024, TimeSpan.FromSeconds(30));
 
-        /// <summary>
-        /// Performs operations upon the current request.
-        /// </summary>
-        /// <param name="httpContext">The current HTTP request context.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        public Task Invoke(HttpContext httpContext) => this.Invoke(httpContext, false);
+    /// <summary>
+    /// Used to temporarily store cache resolver reads to reduce the overhead of cache lookups.
+    /// </summary>
+    private static readonly ConcurrentTLruCache<string, (IImageCacheResolver, ImageCacheMetadata)> CacheResolverLru
+        = new(1024, TimeSpan.FromSeconds(30));
 
-        private async Task Invoke(HttpContext httpContext, bool retry)
-        {
-            // Get the correct provider for the request
-            IImageProvider provider = null;
-            foreach (IImageProvider resolver in this.providers)
-            {
-                if (resolver.Match(httpContext))
-                {
-                    provider = resolver;
-                    break;
-                }
-            }
+    /// <summary>
+    /// Used to temporarily store cached HMAC-s to reduce the overhead of HMAC token generation.
+    /// </summary>
+    private static readonly ConcurrentTLruCache<string, string> HMACTokenLru
+        = new(1024, TimeSpan.FromSeconds(30));
 
-            if (provider?.IsValidRequest(httpContext) != true)
-            {
-                // Nothing to do. call the next delegate/middleware in the pipeline
-                await this.next(httpContext);
-                return;
-            }
+    /// <summary>
+    /// The function processing the Http request.
+    /// </summary>
+    private readonly RequestDelegate next;
 
-            CommandCollection commands = this.requestParser.ParseRequestCommands(httpContext);
+    /// <summary>
+    /// The configuration options.
+    /// </summary>
+    private readonly ImageSharpMiddlewareOptions options;
 
-            // First check for a HMAC token and capture before the command is stripped out.
-            byte[] secret = this.options.HMACSecretKey;
-            bool checkHMAC = false;
-            string token = null;
-            if (secret?.Length > 0)
-            {
-                checkHMAC = true;
-                token = commands.GetValueOrDefault(ImageSharpRequestAuthorizationUtilities.TokenCommand);
-            }
+    /// <summary>
+    /// The type used for performing logging.
+    /// </summary>
+    private readonly ILogger logger;
 
-            this.authorizationUtilities.StripUnknownCommands(commands);
-            ImageCommandContext imageCommandContext = new(httpContext, commands, this.commandParser, this.parserCulture);
+    /// <summary>
+    /// The parser for parsing commands from the current request.
+    /// </summary>
+    private readonly IRequestParser requestParser;
 
-            // At this point we know that this is an image request so should attempt to compute a validating HMAC.
-            string hmac = null;
-            if (checkHMAC && token != null)
-            {
-                // Generate and cache a HMAC to validate against based upon the current valid commands from the request.
-                //
-                // If the command collection differs following the stripping of invalid commands prior to this point then this will mean
-                // the token will not match our validating HMAC, however, this would be indicative of an attack and should be treated as such.
-                //
-                // As a rule all image requests should contain valid commands only.
-                // Key generation uses string.Create under the hood with very low allocation so should be good enough as a cache key.
-                hmac = await HMACTokenLru.GetOrAddAsync(
-                    httpContext.Request.GetEncodedUrl(),
-                    _ => this.authorizationUtilities.ComputeHMACAsync(imageCommandContext));
-            }
+    /// <summary>
+    /// The collection of image providers.
+    /// </summary>
+    private readonly IImageProvider[] providers;
 
-            await this.options.OnParseCommandsAsync.Invoke(imageCommandContext);
+    /// <summary>
+    /// The collection of image processors.
+    /// </summary>
+    private readonly IImageWebProcessor[] processors;
 
-            if (commands.Count == 0 && provider?.ProcessingBehavior != ProcessingBehavior.All)
-            {
-                // Nothing to do. call the next delegate/middleware in the pipeline
-                await this.next(httpContext);
-                return;
-            }
+    /// <summary>
+    /// The cache key.
+    /// </summary>
+    private readonly ICacheKey cacheKey;
 
-            // At this point we know that this is an image request designed for processing via this middleware.
-            // Check for a token if required and reject if invalid.
-            if (checkHMAC)
-            {
-                if (token == null || hmac != token)
-                {
-                    SetBadRequest(httpContext);
-                    return;
-                }
-            }
+    /// <summary>
+    /// The image cache.
+    /// </summary>
+    private readonly IImageCache cache;
 
-            IImageResolver sourceImageResolver = await provider.GetAsync(httpContext);
+    /// <summary>
+    /// The hashing implementation to use when generating cached file names.
+    /// </summary>
+    private readonly ICacheHash cacheHash;
+
+    /// <summary>
+    /// Contains various helper methods based on the current configuration.
+    /// </summary>
+    private readonly FormatUtilities formatUtilities;
+
+    /// <summary>
+    /// Used to parse processing commands.
+    /// </summary>
+    private readonly CommandParser commandParser;
+
+    /// <summary>
+    /// The culture to use when parsing processing commands.
+    /// </summary>
+    private readonly CultureInfo parserCulture;
+
+    /// <summary>
+    /// The lock used to prevent concurrent processing of the same exact image request.
+    /// </summary>
+    private readonly AsyncKeyReaderWriterLock<string> asyncKeyLock;
+
+    /// <summary>
+    /// Contains helpers that allow authorization of image requests.
+    /// </summary>
+    private readonly ImageSharpRequestAuthorizationUtilities authorizationUtilities;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ImageSharpMiddleware"/> class.
+    /// </summary>
+    /// <param name="next">The next middleware in the pipeline.</param>
+    /// <param name="options">The middleware configuration options.</param>
+    /// <param name="loggerFactory">An <see cref="ILoggerFactory"/> instance used to create loggers.</param>
+    /// <param name="requestParser">An <see cref="IRequestParser"/> instance used to parse image requests for commands.</param>
+    /// <param name="resolvers">A collection of <see cref="IImageProvider"/> instances used to resolve images.</param>
+    /// <param name="processors">A collection of <see cref="IImageWebProcessor"/> instances used to process images.</param>
+    /// <param name="cache">An <see cref="IImageCache"/> instance used for caching images.</param>
+    /// <param name="cacheKey">An <see cref="ICacheKey"/> instance used for creating cache keys.</param>
+    /// <param name="cacheHash">An <see cref="ICacheHash"/>instance used for calculating cached file names.</param>
+    /// <param name="commandParser">The command parser.</param>
+    /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
+    /// <param name="asyncKeyLock">The async key lock.</param>
+    /// <param name="requestAuthorizationUtilities">Contains helpers that allow authorization of image requests.</param>
+    public ImageSharpMiddleware(
+        RequestDelegate next,
+        IOptions<ImageSharpMiddlewareOptions> options,
+        ILoggerFactory loggerFactory,
+        IRequestParser requestParser,
+        IEnumerable<IImageProvider> resolvers,
+        IEnumerable<IImageWebProcessor> processors,
+        IImageCache cache,
+        ICacheKey cacheKey,
+        ICacheHash cacheHash,
+        CommandParser commandParser,
+        FormatUtilities formatUtilities,
+        AsyncKeyReaderWriterLock<string> asyncKeyLock,
+        ImageSharpRequestAuthorizationUtilities requestAuthorizationUtilities)
+    {
+        Guard.NotNull(next, nameof(next));
+        Guard.NotNull(options, nameof(options));
+        Guard.NotNull(loggerFactory, nameof(loggerFactory));
+        Guard.NotNull(requestParser, nameof(requestParser));
+        Guard.NotNull(resolvers, nameof(resolvers));
+        Guard.NotNull(processors, nameof(processors));
+        Guard.NotNull(cache, nameof(cache));
+        Guard.NotNull(cacheKey, nameof(cacheKey));
+        Guard.NotNull(cacheHash, nameof(cacheHash));
+        Guard.NotNull(commandParser, nameof(commandParser));
+        Guard.NotNull(formatUtilities, nameof(formatUtilities));
+        Guard.NotNull(asyncKeyLock, nameof(asyncKeyLock));
+        Guard.NotNull(requestAuthorizationUtilities, nameof(requestAuthorizationUtilities));
+
+        this.next = next;
+        this.options = options.Value;
+        this.requestParser = requestParser;
+        this.providers = resolvers as IImageProvider[] ?? resolvers.ToArray();
+        this.processors = processors as IImageWebProcessor[] ?? processors.ToArray();
+        this.cache = cache;
+        this.cacheKey = cacheKey;
+        this.cacheHash = cacheHash;
+        this.commandParser = commandParser;
+        this.parserCulture = this.options.UseInvariantParsingCulture
+            ? CultureInfo.InvariantCulture
+            : CultureInfo.CurrentCulture;
+
+        this.logger = loggerFactory.CreateLogger<ImageSharpMiddleware>();
+        this.formatUtilities = formatUtilities;
+        this.asyncKeyLock = asyncKeyLock;
+        this.authorizationUtilities = requestAuthorizationUtilities;
+    }
+
+    /// <summary>
+    /// Performs operations upon the current request.
+    /// </summary>
+    /// <param name="httpContext">The current HTTP request context.</param>
+    /// <returns>The <see cref="Task"/>.</returns>
+    public Task Invoke(HttpContext httpContext) => this.Invoke(httpContext, false);
 
-            if (sourceImageResolver is null)
+    private async Task Invoke(HttpContext httpContext, bool retry)
+    {
+        // Get the correct provider for the request
+        IImageProvider provider = null;
+        foreach (IImageProvider resolver in this.providers)
+        {
+            if (resolver.Match(httpContext))
             {
-                // Log the error but let the pipeline handle the 404
-                // by calling the next delegate/middleware in the pipeline.
-                this.logger.LogImageResolveFailed(httpContext.Request.GetDisplayUrl());
-                await this.next(httpContext);
-                return;
+                provider = resolver;
+                break;
             }
+        }
 
-            await this.ProcessRequestAsync(
-                httpContext,
-                sourceImageResolver,
-                new ImageContext(httpContext, this.options),
-                commands,
-                retry);
+        if (provider?.IsValidRequest(httpContext) != true)
+        {
+            // Nothing to do. call the next delegate/middleware in the pipeline
+            await this.next(httpContext);
+            return;
         }
 
-        private static void SetBadRequest(HttpContext httpContext)
+        CommandCollection commands = this.requestParser.ParseRequestCommands(httpContext);
+
+        // First check for a HMAC token and capture before the command is stripped out.
+        byte[] secret = this.options.HMACSecretKey;
+        bool checkHMAC = false;
+        string token = null;
+        if (secret?.Length > 0)
         {
-            // We return a 400 rather than a 401 as we do not want to prompt follow up requests.
-            // We don't log the error to avoid attempts at log poisoning.
-            httpContext.Response.Clear();
-            httpContext.Response.StatusCode = StatusCodes.Status400BadRequest;
+            checkHMAC = true;
+            token = commands.GetValueOrDefault(ImageSharpRequestAuthorizationUtilities.TokenCommand);
         }
 
-        private async Task ProcessRequestAsync(
-            HttpContext httpContext,
-            IImageResolver sourceImageResolver,
-            ImageContext imageContext,
-            CommandCollection commands,
-            bool retry)
+        this.authorizationUtilities.StripUnknownCommands(commands);
+        ImageCommandContext imageCommandContext = new(httpContext, commands, this.commandParser, this.parserCulture);
+
+        // At this point we know that this is an image request so should attempt to compute a validating HMAC.
+        string hmac = null;
+        if (checkHMAC && token != null)
         {
-            // Create a hashed cache key
-            string key = this.cacheHash.Create(
-                this.cacheKey.Create(httpContext, commands),
-                this.options.CacheHashLength);
-
-            // Check the cache, if present, not out of date and not requiring an update
-            // we'll simply serve the file from there.
-            ImageWorkerResult readResult = default;
-            using (await this.asyncKeyLock.ReaderLockAsync(key))
-            {
-                readResult = await this.IsNewOrUpdatedAsync(sourceImageResolver, key);
-            }
+            // Generate and cache a HMAC to validate against based upon the current valid commands from the request.
+            //
+            // If the command collection differs following the stripping of invalid commands prior to this point then this will mean
+            // the token will not match our validating HMAC, however, this would be indicative of an attack and should be treated as such.
+            //
+            // As a rule all image requests should contain valid commands only.
+            // Key generation uses string.Create under the hood with very low allocation so should be good enough as a cache key.
+            hmac = await HMACTokenLru.GetOrAddAsync(
+                httpContext.Request.GetEncodedUrl(),
+                _ => this.authorizationUtilities.ComputeHMACAsync(imageCommandContext));
+        }
+
+        await this.options.OnParseCommandsAsync.Invoke(imageCommandContext);
+
+        if (commands.Count == 0 && provider?.ProcessingBehavior != ProcessingBehavior.All)
+        {
+            // Nothing to do. call the next delegate/middleware in the pipeline
+            await this.next(httpContext);
+            return;
+        }
 
-            if (!readResult.IsNewOrUpdated)
+        // At this point we know that this is an image request designed for processing via this middleware.
+        // Check for a token if required and reject if invalid.
+        if (checkHMAC)
+        {
+            if (token == null || hmac != token)
             {
-                await this.SendResponseAsync(httpContext, imageContext, key, readResult.CacheImageMetadata, readResult.Resolver, null, retry);
+                SetBadRequest(httpContext);
                 return;
             }
+        }
 
-            // Not cached, or is updated? Let's get it from the image resolver.
-            ImageMetadata sourceImageMetadata = readResult.SourceImageMetadata;
+        IImageResolver sourceImageResolver = await provider.GetAsync(httpContext);
 
-            // Enter an asynchronous write worker which prevents multiple writes and delays any reads for the same request.
-            // This reduces the overheads of unnecessary processing.
-            RecyclableMemoryStream outStream = null;
-            try
+        if (sourceImageResolver is null)
+        {
+            // Log the error but let the pipeline handle the 404
+            // by calling the next delegate/middleware in the pipeline.
+            this.logger.LogImageResolveFailed(httpContext.Request.GetDisplayUrl());
+            await this.next(httpContext);
+            return;
+        }
+
+        await this.ProcessRequestAsync(
+            httpContext,
+            sourceImageResolver,
+            new ImageContext(httpContext, this.options),
+            commands,
+            retry);
+    }
+
+    private static void SetBadRequest(HttpContext httpContext)
+    {
+        // We return a 400 rather than a 401 as we do not want to prompt follow up requests.
+        // We don't log the error to avoid attempts at log poisoning.
+        httpContext.Response.Clear();
+        httpContext.Response.StatusCode = StatusCodes.Status400BadRequest;
+    }
+
+    private async Task ProcessRequestAsync(
+        HttpContext httpContext,
+        IImageResolver sourceImageResolver,
+        ImageContext imageContext,
+        CommandCollection commands,
+        bool retry)
+    {
+        // Create a hashed cache key
+        string key = this.cacheHash.Create(
+            this.cacheKey.Create(httpContext, commands),
+            this.options.CacheHashLength);
+
+        // Check the cache, if present, not out of date and not requiring an update
+        // we'll simply serve the file from there.
+        ImageWorkerResult readResult = default;
+        using (await this.asyncKeyLock.ReaderLockAsync(key))
+        {
+            readResult = await this.IsNewOrUpdatedAsync(sourceImageResolver, key);
+        }
+
+        if (!readResult.IsNewOrUpdated)
+        {
+            await this.SendResponseAsync(httpContext, imageContext, key, readResult.CacheImageMetadata, readResult.Resolver, null, retry);
+            return;
+        }
+
+        // Not cached, or is updated? Let's get it from the image resolver.
+        ImageMetadata sourceImageMetadata = readResult.SourceImageMetadata;
+
+        // Enter an asynchronous write worker which prevents multiple writes and delays any reads for the same request.
+        // This reduces the overheads of unnecessary processing.
+        RecyclableMemoryStream outStream = null;
+        try
+        {
+            Task<IDisposable> takeLockTask = this.asyncKeyLock.WriterLockAsync(key);
+            bool lockWasAlreadyHeld = takeLockTask.Status != TaskStatus.RanToCompletion;
+            using (await takeLockTask)
             {
-                Task<IDisposable> takeLockTask = this.asyncKeyLock.WriterLockAsync(key);
-                bool lockWasAlreadyHeld = takeLockTask.Status != TaskStatus.RanToCompletion;
-                using (await takeLockTask)
+                // If the lock was already held, then that means there's a chance another worker has already
+                // processed this same request and the value may now be available in the cache, so check
+                // the cache one more time
+                if (lockWasAlreadyHeld)
                 {
-                    // If the lock was already held, then that means there's a chance another worker has already
-                    // processed this same request and the value may now be available in the cache, so check
-                    // the cache one more time
-                    if (lockWasAlreadyHeld)
-                    {
-                        readResult = await this.IsNewOrUpdatedAsync(sourceImageResolver, key);
-                    }
+                    readResult = await this.IsNewOrUpdatedAsync(sourceImageResolver, key);
+                }
 
-                    if (readResult.IsNewOrUpdated)
+                if (readResult.IsNewOrUpdated)
+                {
+                    try
                     {
-                        try
+                        ImageCacheMetadata cachedImageMetadata = default;
+                        outStream = new RecyclableMemoryStream(this.options.MemoryStreamManager);
+                        IImageFormat format;
+
+                        // 14.9.3 CacheControl Max-Age
+                        // Check to see if the source metadata has a CacheControl Max-Age value
+                        // and use it to override the default max age from our options.
+                        TimeSpan maxAge = this.options.BrowserMaxAge;
+                        if (!sourceImageMetadata.CacheControlMaxAge.Equals(TimeSpan.MinValue))
                         {
-                            ImageCacheMetadata cachedImageMetadata = default;
-                            outStream = new RecyclableMemoryStream(this.options.MemoryStreamManager);
-                            IImageFormat format;
-
-                            // 14.9.3 CacheControl Max-Age
-                            // Check to see if the source metadata has a CacheControl Max-Age value
-                            // and use it to override the default max age from our options.
-                            TimeSpan maxAge = this.options.BrowserMaxAge;
-                            if (!sourceImageMetadata.CacheControlMaxAge.Equals(TimeSpan.MinValue))
+                            maxAge = sourceImageMetadata.CacheControlMaxAge;
+                        }
+
+                        using (Stream inStream = await sourceImageResolver.OpenReadAsync())
+                        {
+                            // No commands? We simply copy the stream across.
+                            if (commands.Count == 0)
                             {
-                                maxAge = sourceImageMetadata.CacheControlMaxAge;
+                                await inStream.CopyToAsync(outStream);
+                                outStream.Position = 0;
+                                format = await Image.DetectFormatAsync(this.options.Configuration, outStream);
                             }
-
-                            using (Stream inStream = await sourceImageResolver.OpenReadAsync())
+                            else
                             {
-                                // No commands? We simply copy the stream across.
-                                if (commands.Count == 0)
-                                {
-                                    await inStream.CopyToAsync(outStream);
-                                    outStream.Position = 0;
-                                    format = await Image.DetectFormatAsync(this.options.Configuration, outStream);
-                                }
-                                else
+                                FormattedImage image = null;
+                                try
                                 {
-                                    FormattedImage image = null;
-                                    try
+                                    // Now we can finally process the image.
+                                    // We first sort the processor collection by command order then use that collection to determine whether the decoded image pixel format
+                                    // explicitly requires an alpha component in order to allow correct processing.
+                                    //
+                                    // The non-generic variant will decode to the correct pixel format based upon the encoded image metadata which can yield
+                                    // massive memory savings.
+                                    IReadOnlyList<(int Index, IImageWebProcessor Processor)> sortedProcessors = this.processors.OrderBySupportedCommands(commands);
+                                    bool requiresAlpha = sortedProcessors.RequiresTrueColorPixelFormat(commands, this.commandParser, this.parserCulture);
+
+                                    if (requiresAlpha)
                                     {
-                                        // Now we can finally process the image.
-                                        // We first sort the processor collection by command order then use that collection to determine whether the decoded image pixel format
-                                        // explicitly requires an alpha component in order to allow correct processing.
-                                        //
-                                        // The non-generic variant will decode to the correct pixel format based upon the encoded image metadata which can yield
-                                        // massive memory savings.
-                                        IReadOnlyList<(int Index, IImageWebProcessor Processor)> sortedProcessors = this.processors.OrderBySupportedCommands(commands);
-                                        bool requiresAlpha = sortedProcessors.RequiresTrueColorPixelFormat(commands, this.commandParser, this.parserCulture);
-
-                                        if (requiresAlpha)
-                                        {
-                                            image = await FormattedImage.LoadAsync<Rgba32>(this.options.Configuration, inStream);
-                                        }
-                                        else
-                                        {
-                                            image = await FormattedImage.LoadAsync(this.options.Configuration, inStream);
-                                        }
-
-                                        image.Process(
-                                            this.logger,
-                                            sortedProcessors,
-                                            commands,
-                                            this.commandParser,
-                                            this.parserCulture);
-
-                                        await this.options.OnBeforeSaveAsync.Invoke(image);
-
-                                        image.Save(outStream);
-                                        format = image.Format;
+                                        image = await FormattedImage.LoadAsync<Rgba32>(this.options.Configuration, inStream);
                                     }
-                                    finally
+                                    else
                                     {
-                                        image?.Dispose();
+                                        image = await FormattedImage.LoadAsync(this.options.Configuration, inStream);
                                     }
-                                }
-                            }
 
-                            // Allow for any further optimization of the image.
-                            outStream.Position = 0;
-                            string contentType = format.DefaultMimeType;
-                            string extension = this.formatUtilities.GetExtensionFromContentType(contentType);
-                            await this.options.OnProcessedAsync.Invoke(new ImageProcessingContext(httpContext, outStream, commands, contentType, extension));
-                            outStream.Position = 0;
-
-                            cachedImageMetadata = new ImageCacheMetadata(
-                                sourceImageMetadata.LastWriteTimeUtc,
-                                DateTime.UtcNow,
-                                contentType,
-                                maxAge,
-                                outStream.Length);
-
-                            // Save the image to the cache and send the response to the caller.
-                            await this.cache.SetAsync(key, outStream, cachedImageMetadata);
-                            outStream.Position = 0;
-
-                            // Remove any resolver from the cache so we always resolve next request
-                            // for the same key.
-                            CacheResolverLru.TryRemove(key);
+                                    image.Process(
+                                        this.logger,
+                                        sortedProcessors,
+                                        commands,
+                                        this.commandParser,
+                                        this.parserCulture);
 
-                            readResult = new ImageWorkerResult(cachedImageMetadata, null);
-                        }
-                        catch (Exception ex)
-                        {
-                            // Log the error internally then rethrow.
-                            // We don't call next here, the pipeline will automatically handle it
-                            this.logger.LogImageProcessingFailed(imageContext.GetDisplayUrl(), ex);
-                            throw;
+                                    await this.options.OnBeforeSaveAsync.Invoke(image);
+
+                                    image.Save(outStream);
+                                    format = image.Format;
+                                }
+                                finally
+                                {
+                                    image?.Dispose();
+                                }
+                            }
                         }
+
+                        // Allow for any further optimization of the image.
+                        outStream.Position = 0;
+                        string contentType = format.DefaultMimeType;
+                        string extension = this.formatUtilities.GetExtensionFromContentType(contentType);
+                        await this.options.OnProcessedAsync.Invoke(new ImageProcessingContext(httpContext, outStream, commands, contentType, extension));
+                        outStream.Position = 0;
+
+                        cachedImageMetadata = new ImageCacheMetadata(
+                            sourceImageMetadata.LastWriteTimeUtc,
+                            DateTime.UtcNow,
+                            contentType,
+                            maxAge,
+                            outStream.Length);
+
+                        // Save the image to the cache and send the response to the caller.
+                        await this.cache.SetAsync(key, outStream, cachedImageMetadata);
+                        outStream.Position = 0;
+
+                        // Remove any resolver from the cache so we always resolve next request
+                        // for the same key.
+                        CacheResolverLru.TryRemove(key);
+
+                        readResult = new ImageWorkerResult(cachedImageMetadata, null);
+                    }
+                    catch (Exception ex)
+                    {
+                        // Log the error internally then rethrow.
+                        // We don't call next here, the pipeline will automatically handle it
+                        this.logger.LogImageProcessingFailed(imageContext.GetDisplayUrl(), ex);
+                        throw;
                     }
                 }
-
-                await this.SendResponseAsync(httpContext, imageContext, key, readResult.CacheImageMetadata, readResult.Resolver, outStream, retry);
-            }
-            finally
-            {
-                await this.StreamDisposeAsync(outStream);
             }
-        }
 
-        private ValueTask StreamDisposeAsync(Stream stream)
+            await this.SendResponseAsync(httpContext, imageContext, key, readResult.CacheImageMetadata, readResult.Resolver, outStream, retry);
+        }
+        finally
         {
-            if (stream is null)
-            {
-                return default;
-            }
-
-            return stream.DisposeAsync();
+            await StreamDisposeAsync(outStream);
         }
+    }
 
-        private async Task<ImageWorkerResult> IsNewOrUpdatedAsync(
-            IImageResolver sourceImageResolver,
-            string key)
+    private static ValueTask StreamDisposeAsync(Stream stream)
+    {
+        if (stream is null)
         {
-            // Get the source metadata for processing, storing the result for future checks.
-            ImageMetadata sourceImageMetadata = await
-                SourceMetadataLru.GetOrAddAsync(
-                    key,
-                    _ => sourceImageResolver.GetMetaDataAsync());
-
-            // Check to see if the cache contains this image.
-            // If not, we return early. No further checks necessary.
-            (IImageCacheResolver ImageCacheResolver, ImageCacheMetadata ImageCacheMetadata) cachedImage = await
-                CacheResolverLru.GetOrAddAsync(
-                    key,
-                    async k =>
-                    {
-                        IImageCacheResolver resolver = await this.cache.GetAsync(k);
-                        ImageCacheMetadata metadata = default;
-                        if (resolver != null)
-                        {
-                            metadata = await resolver.GetMetaDataAsync();
-                        }
+            return default;
+        }
 
-                        return (resolver, metadata);
-                    });
+        return stream.DisposeAsync();
+    }
 
-            if (cachedImage.ImageCacheResolver is null)
-            {
-                // Remove the null resolver from the store.
-                CacheResolverLru.TryRemove(key);
+    private async Task<ImageWorkerResult> IsNewOrUpdatedAsync(
+        IImageResolver sourceImageResolver,
+        string key)
+    {
+        // Get the source metadata for processing, storing the result for future checks.
+        ImageMetadata sourceImageMetadata = await
+            SourceMetadataLru.GetOrAddAsync(
+                key,
+                _ => sourceImageResolver.GetMetaDataAsync());
+
+        // Check to see if the cache contains this image.
+        // If not, we return early. No further checks necessary.
+        (IImageCacheResolver ImageCacheResolver, ImageCacheMetadata ImageCacheMetadata) cachedImage = await
+            CacheResolverLru.GetOrAddAsync(
+                key,
+                async k =>
+                {
+                    IImageCacheResolver resolver = await this.cache.GetAsync(k);
+                    ImageCacheMetadata metadata = default;
+                    if (resolver != null)
+                    {
+                        metadata = await resolver.GetMetaDataAsync();
+                    }
 
-                return new ImageWorkerResult(sourceImageMetadata);
-            }
+                    return (resolver, metadata);
+                });
 
-            // Has the cached image expired?
-            // Or has the source image changed since the image was last cached?
-            if (cachedImage.ImageCacheMetadata.ContentLength == 0 // Fix for old cache without length property
-                || cachedImage.ImageCacheMetadata.CacheLastWriteTimeUtc <= (DateTimeOffset.UtcNow - this.options.CacheMaxAge)
-                || cachedImage.ImageCacheMetadata.SourceLastWriteTimeUtc != sourceImageMetadata.LastWriteTimeUtc)
-            {
-                // We want to remove the resolver from the store so that the next check gets the updated file.
-                CacheResolverLru.TryRemove(key);
-                return new ImageWorkerResult(sourceImageMetadata);
-            }
+        if (cachedImage.ImageCacheResolver is null)
+        {
+            // Remove the null resolver from the store.
+            CacheResolverLru.TryRemove(key);
 
-            // The image is cached. Return the cached image so multiple callers can write a response.
-            return new ImageWorkerResult(sourceImageMetadata, cachedImage.ImageCacheMetadata, cachedImage.ImageCacheResolver);
+            return new ImageWorkerResult(sourceImageMetadata);
         }
 
-        private async Task SendResponseAsync(
-            HttpContext httpContext,
-            ImageContext imageContext,
-            string key,
-            ImageCacheMetadata metadata,
-            IImageCacheResolver cacheResolver,
-            Stream stream,
-            bool retry)
+        // Has the cached image expired?
+        // Or has the source image changed since the image was last cached?
+        if (cachedImage.ImageCacheMetadata.ContentLength == 0 // Fix for old cache without length property
+            || cachedImage.ImageCacheMetadata.CacheLastWriteTimeUtc <= (DateTimeOffset.UtcNow - this.options.CacheMaxAge)
+            || cachedImage.ImageCacheMetadata.SourceLastWriteTimeUtc != sourceImageMetadata.LastWriteTimeUtc)
         {
-            imageContext.ComprehendRequestHeaders(metadata.CacheLastWriteTimeUtc, metadata.ContentLength);
+            // We want to remove the resolver from the store so that the next check gets the updated file.
+            CacheResolverLru.TryRemove(key);
+            return new ImageWorkerResult(sourceImageMetadata);
+        }
 
-            switch (imageContext.GetPreconditionState())
-            {
-                case ImageContext.PreconditionState.Unspecified:
-                case ImageContext.PreconditionState.ShouldProcess:
-                    if (imageContext.IsHeadRequest())
-                    {
-                        await imageContext.SendStatusAsync(ResponseConstants.Status200Ok, metadata);
-                        return;
-                    }
+        // The image is cached. Return the cached image so multiple callers can write a response.
+        return new ImageWorkerResult(sourceImageMetadata, cachedImage.ImageCacheMetadata, cachedImage.ImageCacheResolver);
+    }
+
+    private async Task SendResponseAsync(
+        HttpContext httpContext,
+        ImageContext imageContext,
+        string key,
+        ImageCacheMetadata metadata,
+        IImageCacheResolver cacheResolver,
+        Stream stream,
+        bool retry)
+    {
+        imageContext.ComprehendRequestHeaders(metadata.CacheLastWriteTimeUtc, metadata.ContentLength);
+
+        switch (imageContext.GetPreconditionState())
+        {
+            case ImageContext.PreconditionState.Unspecified:
+            case ImageContext.PreconditionState.ShouldProcess:
+                if (imageContext.IsHeadRequest())
+                {
+                    await imageContext.SendStatusAsync(ResponseConstants.Status200Ok, metadata);
+                    return;
+                }
 
-                    this.logger.LogImageServed(imageContext.GetDisplayUrl(), key);
+                this.logger.LogImageServed(imageContext.GetDisplayUrl(), key);
 
-                    // If stream is not null, then send it directly. Otherwise, use the cacheResolver
-                    // to load from the cache.
-                    if (stream != null)
+                // If stream is not null, then send it directly. Otherwise, use the cacheResolver
+                // to load from the cache.
+                if (stream != null)
+                {
+                    await imageContext.SendAsync(stream, metadata);
+                }
+                else
+                {
+                    try
                     {
-                        await imageContext.SendAsync(stream, metadata);
+                        using Stream cacheStream = await cacheResolver.OpenReadAsync();
+                        await imageContext.SendAsync(cacheStream, metadata);
                     }
-                    else
+                    catch (Exception ex)
                     {
-                        try
+                        if (!retry)
                         {
-                            using Stream cacheStream = await cacheResolver.OpenReadAsync();
-                            await imageContext.SendAsync(cacheStream, metadata);
+                            // The image has failed to be returned from the cache.
+                            // This can happen if the cached image has been physically deleted but the item is still in the LRU cache.
+                            // We'll retry running the request again in it's entirety. This ensures any changes to the source are tracked also.
+                            CacheResolverLru.TryRemove(key);
+                            await this.Invoke(httpContext, true);
+                            return;
                         }
-                        catch (Exception ex)
-                        {
-                            if (!retry)
-                            {
-                                // The image has failed to be returned from the cache.
-                                // This can happen if the cached image has been physically deleted but the item is still in the LRU cache.
-                                // We'll retry running the request again in it's entirety. This ensures any changes to the source are tracked also.
-                                CacheResolverLru.TryRemove(key);
-                                await this.Invoke(httpContext, true);
-                                return;
-                            }
 
-                            // We've already tried to run this request before.
-                            // Log the error internally then rethrow.
-                            // We don't call next here, the pipeline will automatically handle it
-                            this.logger.LogImageProcessingFailed(imageContext.GetDisplayUrl(), ex);
-                            throw;
-                        }
+                        // We've already tried to run this request before.
+                        // Log the error internally then rethrow.
+                        // We don't call next here, the pipeline will automatically handle it
+                        this.logger.LogImageProcessingFailed(imageContext.GetDisplayUrl(), ex);
+                        throw;
                     }
+                }
 
-                    return;
+                return;
 
-                case ImageContext.PreconditionState.NotModified:
-                    this.logger.LogImageNotModified(imageContext.GetDisplayUrl());
-                    await imageContext.SendStatusAsync(ResponseConstants.Status304NotModified, metadata);
-                    return;
+            case ImageContext.PreconditionState.NotModified:
+                this.logger.LogImageNotModified(imageContext.GetDisplayUrl());
+                await imageContext.SendStatusAsync(ResponseConstants.Status304NotModified, metadata);
+                return;
 
-                case ImageContext.PreconditionState.PreconditionFailed:
-                    this.logger.LogImagePreconditionFailed(imageContext.GetDisplayUrl());
-                    await imageContext.SendStatusAsync(ResponseConstants.Status412PreconditionFailed, metadata);
-                    return;
-                default:
-                    var exception = new NotImplementedException(imageContext.GetPreconditionState().ToString());
-                    Debug.Fail(exception.ToString());
-                    throw exception;
-            }
+            case ImageContext.PreconditionState.PreconditionFailed:
+                this.logger.LogImagePreconditionFailed(imageContext.GetDisplayUrl());
+                await imageContext.SendStatusAsync(ResponseConstants.Status412PreconditionFailed, metadata);
+                return;
+            default:
+                NotImplementedException exception = new(imageContext.GetPreconditionState().ToString());
+                Debug.Fail(exception.ToString());
+                throw exception;
         }
     }
 }
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
index da717127..ebb294e8 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
@@ -1,165 +1,163 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
 using System.Globalization;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.IO;
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Providers;
 
-namespace SixLabors.ImageSharp.Web.Middleware
+namespace SixLabors.ImageSharp.Web.Middleware;
+
+/// <summary>
+/// Configuration options for the <see cref="ImageSharpMiddleware"/> middleware.
+/// </summary>
+public class ImageSharpMiddlewareOptions
 {
+    private Func<ImageCommandContext, byte[], Task<string>> onComputeHMACAsync = (context, secret) =>
+    {
+        string uri = CaseHandlingUriBuilder.BuildRelative(
+             CaseHandlingUriBuilder.CaseHandling.LowerInvariant,
+             context.Context.Request.PathBase,
+             context.Context.Request.Path,
+             QueryString.Create(context.Commands));
+
+        return Task.FromResult(HMACUtilities.ComputeHMACSHA256(uri, secret));
+    };
+
+    private Func<ImageCommandContext, Task> onParseCommandsAsync = _ => Task.CompletedTask;
+    private Func<FormattedImage, Task> onBeforeSaveAsync = _ => Task.CompletedTask;
+    private Func<ImageProcessingContext, Task> onProcessedAsync = _ => Task.CompletedTask;
+    private Func<HttpContext, Task> onPrepareResponseAsync = _ => Task.CompletedTask;
+
+    /// <summary>
+    /// Gets or sets the base library configuration.
+    /// </summary>
+    public Configuration Configuration { get; set; } = Configuration.Default;
+
+    /// <summary>
+    /// Gets or sets the recyclable memorystream manager used for managing pooled stream
+    /// buffers independently from image buffer pooling.
+    /// </summary>
+    public RecyclableMemoryStreamManager MemoryStreamManager { get; set; } = new RecyclableMemoryStreamManager();
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to use culture-independent (invariant)
+    /// conversion when converting commands.
+    /// If set to <see langword="false"/> the <see cref="CommandParser"/> will use
+    /// the <see cref="CultureInfo.CurrentCulture"/>.
+    /// </summary>
+    public bool UseInvariantParsingCulture { get; set; } = true;
+
     /// <summary>
-    /// Configuration options for the <see cref="ImageSharpMiddleware"/> middleware.
+    /// Gets or sets the duration to store images in the browser cache.
+    /// If an image provider provides a Max-Age for a source image then that will override
+    /// this value.
+    /// <para>
+    /// Defaults to 7 days.
+    /// </para>
     /// </summary>
-    public class ImageSharpMiddlewareOptions
+    public TimeSpan BrowserMaxAge { get; set; } = TimeSpan.FromDays(7);
+
+    /// <summary>
+    /// Gets or sets the duration to store images in the image cache.
+    /// <para>
+    /// Defaults to 365 days.
+    /// </para>
+    /// </summary>
+    public TimeSpan CacheMaxAge { get; set; } = TimeSpan.FromDays(365);
+
+    /// <summary>
+    /// Gets or sets the length of the filename to use (minus the extension) when storing
+    /// images in the image cache. Defaults to 12 characters.
+    /// </summary>
+    public uint CacheHashLength { get; set; } = 12;
+
+    /// <summary>
+    /// Gets or sets the secret key for Hash-based Message Authentication Code (HMAC) encryption.
+    /// </summary>
+    /// <remarks>
+    /// The key can be any length. However, the recommended size is at least 64 bytes. If the length is zero then no authentication is performed.
+    /// </remarks>
+    public byte[] HMACSecretKey { get; set; } = Array.Empty<byte>();
+
+    /// <summary>
+    /// Gets or sets the method used to compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// Defaults to <see cref="HMACUtilities.ComputeHMACSHA256(string, byte[])"/> using an invariant lowercase relative Uri
+    /// generated using <see cref="CaseHandlingUriBuilder.BuildRelative(CaseHandlingUriBuilder.CaseHandling, PathString, PathString, QueryString)"/>.
+    /// </summary>
+    public Func<ImageCommandContext, byte[], Task<string>> OnComputeHMACAsync
     {
-        private Func<ImageCommandContext, byte[], Task<string>> onComputeHMACAsync = (context, secret) =>
-        {
-            string uri = CaseHandlingUriBuilder.BuildRelative(
-                 CaseHandlingUriBuilder.CaseHandling.LowerInvariant,
-                 context.Context.Request.PathBase,
-                 context.Context.Request.Path,
-                 QueryString.Create(context.Commands));
-
-            return Task.FromResult(HMACUtilities.ComputeHMACSHA256(uri, secret));
-        };
-
-        private Func<ImageCommandContext, Task> onParseCommandsAsync = _ => Task.CompletedTask;
-        private Func<FormattedImage, Task> onBeforeSaveAsync = _ => Task.CompletedTask;
-        private Func<ImageProcessingContext, Task> onProcessedAsync = _ => Task.CompletedTask;
-        private Func<HttpContext, Task> onPrepareResponseAsync = _ => Task.CompletedTask;
-
-        /// <summary>
-        /// Gets or sets the base library configuration.
-        /// </summary>
-        public Configuration Configuration { get; set; } = Configuration.Default;
-
-        /// <summary>
-        /// Gets or sets the recyclable memorystream manager used for managing pooled stream
-        /// buffers independently from image buffer pooling.
-        /// </summary>
-        public RecyclableMemoryStreamManager MemoryStreamManager { get; set; } = new RecyclableMemoryStreamManager();
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to use culture-independent (invariant)
-        /// conversion when converting commands.
-        /// If set to <see langword="false"/> the <see cref="CommandParser"/> will use
-        /// the <see cref="CultureInfo.CurrentCulture"/>.
-        /// </summary>
-        public bool UseInvariantParsingCulture { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets the duration to store images in the browser cache.
-        /// If an image provider provides a Max-Age for a source image then that will override
-        /// this value.
-        /// <para>
-        /// Defaults to 7 days.
-        /// </para>
-        /// </summary>
-        public TimeSpan BrowserMaxAge { get; set; } = TimeSpan.FromDays(7);
-
-        /// <summary>
-        /// Gets or sets the duration to store images in the image cache.
-        /// <para>
-        /// Defaults to 365 days.
-        /// </para>
-        /// </summary>
-        public TimeSpan CacheMaxAge { get; set; } = TimeSpan.FromDays(365);
-
-        /// <summary>
-        /// Gets or sets the length of the filename to use (minus the extension) when storing
-        /// images in the image cache. Defaults to 12 characters.
-        /// </summary>
-        public uint CacheHashLength { get; set; } = 12;
-
-        /// <summary>
-        /// Gets or sets the secret key for Hash-based Message Authentication Code (HMAC) encryption.
-        /// </summary>
-        /// <remarks>
-        /// The key can be any length. However, the recommended size is at least 64 bytes. If the length is zero then no authentication is performed.
-        /// </remarks>
-        public byte[] HMACSecretKey { get; set; } = Array.Empty<byte>();
-
-        /// <summary>
-        /// Gets or sets the method used to compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// Defaults to <see cref="HMACUtilities.ComputeHMACSHA256(string, byte[])"/> using an invariant lowercase relative Uri
-        /// generated using <see cref="CaseHandlingUriBuilder.BuildRelative(CaseHandlingUriBuilder.CaseHandling, PathString, PathString, QueryString)"/>.
-        /// </summary>
-        public Func<ImageCommandContext, byte[], Task<string>> OnComputeHMACAsync
-        {
-            get => this.onComputeHMACAsync;
+        get => this.onComputeHMACAsync;
 
-            set
-            {
-                Guard.NotNull(value, nameof(this.onComputeHMACAsync));
-                this.onComputeHMACAsync = value;
-            }
+        set
+        {
+            Guard.NotNull(value, nameof(this.onComputeHMACAsync));
+            this.onComputeHMACAsync = value;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the additional command parsing method that can be used to used to augment commands.
-        /// This is called once the commands have been gathered and before an <see cref="IImageProvider"/> has been assigned.
-        /// </summary>
-        public Func<ImageCommandContext, Task> OnParseCommandsAsync
-        {
-            get => this.onParseCommandsAsync;
+    /// <summary>
+    /// Gets or sets the additional command parsing method that can be used to used to augment commands.
+    /// This is called once the commands have been gathered and before an <see cref="IImageProvider"/> has been assigned.
+    /// </summary>
+    public Func<ImageCommandContext, Task> OnParseCommandsAsync
+    {
+        get => this.onParseCommandsAsync;
 
-            set
-            {
-                Guard.NotNull(value, nameof(this.OnParseCommandsAsync));
-                this.onParseCommandsAsync = value;
-            }
+        set
+        {
+            Guard.NotNull(value, nameof(this.OnParseCommandsAsync));
+            this.onParseCommandsAsync = value;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the additional method that can be used for final manipulation before the image is saved.
-        /// This is called after image has been processed, but before the image has been saved to the output stream for caching.
-        /// This can be used to alter the metadata of the resultant image.
-        /// </summary>
-        public Func<FormattedImage, Task> OnBeforeSaveAsync
-        {
-            get => this.onBeforeSaveAsync;
+    /// <summary>
+    /// Gets or sets the additional method that can be used for final manipulation before the image is saved.
+    /// This is called after image has been processed, but before the image has been saved to the output stream for caching.
+    /// This can be used to alter the metadata of the resultant image.
+    /// </summary>
+    public Func<FormattedImage, Task> OnBeforeSaveAsync
+    {
+        get => this.onBeforeSaveAsync;
 
-            set
-            {
-                Guard.NotNull(value, nameof(this.OnBeforeSaveAsync));
-                this.onBeforeSaveAsync = value;
-            }
+        set
+        {
+            Guard.NotNull(value, nameof(this.OnBeforeSaveAsync));
+            this.onBeforeSaveAsync = value;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the additional processing method.
-        /// This is called after image has been processed, but before the result has been cached.
-        /// This can be used to further optimize the resultant image.
-        /// </summary>
-        public Func<ImageProcessingContext, Task> OnProcessedAsync
-        {
-            get => this.onProcessedAsync;
+    /// <summary>
+    /// Gets or sets the additional processing method.
+    /// This is called after image has been processed, but before the result has been cached.
+    /// This can be used to further optimize the resultant image.
+    /// </summary>
+    public Func<ImageProcessingContext, Task> OnProcessedAsync
+    {
+        get => this.onProcessedAsync;
 
-            set
-            {
-                Guard.NotNull(value, nameof(this.OnProcessedAsync));
-                this.onProcessedAsync = value;
-            }
+        set
+        {
+            Guard.NotNull(value, nameof(this.OnProcessedAsync));
+            this.onProcessedAsync = value;
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the additional response method.
-        /// This is called after the status code and headers have been set, but before the body has been written.
-        /// This can be used to add or change the response headers.
-        /// </summary>
-        public Func<HttpContext, Task> OnPrepareResponseAsync
-        {
-            get => this.onPrepareResponseAsync;
+    /// <summary>
+    /// Gets or sets the additional response method.
+    /// This is called after the status code and headers have been set, but before the body has been written.
+    /// This can be used to add or change the response headers.
+    /// </summary>
+    public Func<HttpContext, Task> OnPrepareResponseAsync
+    {
+        get => this.onPrepareResponseAsync;
 
-            set
-            {
-                Guard.NotNull(value, nameof(this.OnPrepareResponseAsync));
-                this.onPrepareResponseAsync = value;
-            }
+        set
+        {
+            Guard.NotNull(value, nameof(this.OnPrepareResponseAsync));
+            this.onPrepareResponseAsync = value;
         }
     }
 }
diff --git a/src/ImageSharp.Web/Middleware/ImageWorkerResult.cs b/src/ImageSharp.Web/Middleware/ImageWorkerResult.cs
index e7210c20..f15a66a4 100644
--- a/src/ImageSharp.Web/Middleware/ImageWorkerResult.cs
+++ b/src/ImageSharp.Web/Middleware/ImageWorkerResult.cs
@@ -1,45 +1,45 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
 using SixLabors.ImageSharp.Web.Resolvers;
 
-namespace SixLabors.ImageSharp.Web.Middleware
+namespace SixLabors.ImageSharp.Web.Middleware;
+
+/// <summary>
+/// Provides an asynchronous worker result.
+/// </summary>
+internal readonly struct ImageWorkerResult
 {
-    /// <summary>
-    /// Provides an asynchronous worker result.
-    /// </summary>
-    internal readonly struct ImageWorkerResult
+    public ImageWorkerResult(ImageMetadata sourceImageMetadata)
+    {
+        this.IsNewOrUpdated = true;
+        this.SourceImageMetadata = sourceImageMetadata;
+        this.CacheImageMetadata = default;
+        this.Resolver = default;
+    }
+
+    public ImageWorkerResult(ImageMetadata sourceImageMetadata, ImageCacheMetadata cacheImageMetadata, IImageCacheResolver resolver)
     {
-        public ImageWorkerResult(ImageMetadata sourceImageMetadata)
-        {
-            this.IsNewOrUpdated = true;
-            this.SourceImageMetadata = sourceImageMetadata;
-            this.CacheImageMetadata = default;
-            this.Resolver = default;
-        }
-
-        public ImageWorkerResult(ImageMetadata sourceImageMetadata, ImageCacheMetadata cacheImageMetadata, IImageCacheResolver resolver)
-        {
-            this.IsNewOrUpdated = false;
-            this.SourceImageMetadata = sourceImageMetadata;
-            this.CacheImageMetadata = cacheImageMetadata;
-            this.Resolver = resolver;
-        }
-
-        public ImageWorkerResult(ImageCacheMetadata cacheImageMetadata, IImageCacheResolver resolver)
-        {
-            this.IsNewOrUpdated = false;
-            this.SourceImageMetadata = default;
-            this.CacheImageMetadata = cacheImageMetadata;
-            this.Resolver = resolver;
-        }
-
-        public bool IsNewOrUpdated { get; }
-
-        public ImageMetadata SourceImageMetadata { get; }
-
-        public ImageCacheMetadata CacheImageMetadata { get; }
-
-        public IImageCacheResolver Resolver { get; }
+        this.IsNewOrUpdated = false;
+        this.SourceImageMetadata = sourceImageMetadata;
+        this.CacheImageMetadata = cacheImageMetadata;
+        this.Resolver = resolver;
     }
+
+    public ImageWorkerResult(ImageCacheMetadata cacheImageMetadata, IImageCacheResolver resolver)
+    {
+        this.IsNewOrUpdated = false;
+        this.SourceImageMetadata = default;
+        this.CacheImageMetadata = cacheImageMetadata;
+        this.Resolver = resolver;
+    }
+
+    public bool IsNewOrUpdated { get; }
+
+    public ImageMetadata SourceImageMetadata { get; }
+
+    public ImageCacheMetadata CacheImageMetadata { get; }
+
+    public IImageCacheResolver Resolver { get; }
 }
diff --git a/src/ImageSharp.Web/Middleware/LoggerExtensions.cs b/src/ImageSharp.Web/Middleware/LoggerExtensions.cs
index 411e0713..84195f02 100644
--- a/src/ImageSharp.Web/Middleware/LoggerExtensions.cs
+++ b/src/ImageSharp.Web/Middleware/LoggerExtensions.cs
@@ -1,103 +1,102 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
 using Microsoft.Extensions.Logging;
 
-namespace SixLabors.ImageSharp.Web.Middleware
+namespace SixLabors.ImageSharp.Web.Middleware;
+
+/// <summary>
+/// Extensions methods for the <see cref="ILogger"/> interface.
+/// </summary>
+internal static class LoggerExtensions
 {
+    private static readonly Action<ILogger, string, Exception> LogProcessingErrorAction;
+    private static readonly Action<ILogger, string, Exception> LogResolveFailedAction;
+    private static readonly Action<ILogger, string, string, Exception> LogServedAction;
+    private static readonly Action<ILogger, string, Exception> LogPathNotModifiedAction;
+    private static readonly Action<ILogger, string, Exception> LogPreconditionFailedAction;
+
     /// <summary>
-    /// Extensions methods for the <see cref="ILogger"/> interface.
+    /// Initializes static members of the <see cref="LoggerExtensions"/> class.
     /// </summary>
-    internal static class LoggerExtensions
+    static LoggerExtensions()
     {
-        private static readonly Action<ILogger, string, Exception> LogProcessingErrorAction;
-        private static readonly Action<ILogger, string, Exception> LogResolveFailedAction;
-        private static readonly Action<ILogger, string, string, Exception> LogServedAction;
-        private static readonly Action<ILogger, string, Exception> LogPathNotModifiedAction;
-        private static readonly Action<ILogger, string, Exception> LogPreconditionFailedAction;
-
-        /// <summary>
-        /// Initializes static members of the <see cref="LoggerExtensions"/> class.
-        /// </summary>
-        static LoggerExtensions()
-        {
-            LogProcessingErrorAction = LoggerMessage.Define<string>(
-                logLevel: LogLevel.Debug,
-                eventId: 1,
-                formatString: "The image '{Uri}' could not be processed");
+        LogProcessingErrorAction = LoggerMessage.Define<string>(
+            logLevel: LogLevel.Debug,
+            eventId: 1,
+            formatString: "The image '{Uri}' could not be processed");
 
-            LogResolveFailedAction = LoggerMessage.Define<string>(
-                logLevel: LogLevel.Debug,
-                eventId: 2,
-                formatString: "The image '{Uri}' could not be resolved");
+        LogResolveFailedAction = LoggerMessage.Define<string>(
+            logLevel: LogLevel.Debug,
+            eventId: 2,
+            formatString: "The image '{Uri}' could not be resolved");
 
-            LogServedAction = LoggerMessage.Define<string, string>(
-                logLevel: LogLevel.Information,
-                eventId: 3,
-                formatString: "Sending image. Request uri: '{Uri}'. Cached Key: '{Key}'");
+        LogServedAction = LoggerMessage.Define<string, string>(
+            logLevel: LogLevel.Information,
+            eventId: 3,
+            formatString: "Sending image. Request uri: '{Uri}'. Cached Key: '{Key}'");
 
-            LogPathNotModifiedAction = LoggerMessage.Define<string>(
-                logLevel: LogLevel.Information,
-                eventId: 4,
-                formatString: "The image '{Uri}' was not modified");
+        LogPathNotModifiedAction = LoggerMessage.Define<string>(
+            logLevel: LogLevel.Information,
+            eventId: 4,
+            formatString: "The image '{Uri}' was not modified");
 
-            LogPreconditionFailedAction = LoggerMessage.Define<string>(
-                logLevel: LogLevel.Information,
-                eventId: 5,
-                formatString: "Precondition for image '{Uri}' failed");
-        }
+        LogPreconditionFailedAction = LoggerMessage.Define<string>(
+            logLevel: LogLevel.Information,
+            eventId: 5,
+            formatString: "Precondition for image '{Uri}' failed");
+    }
 
-        /// <summary>
-        /// Logs that a given image request could not be processed.
-        /// </summary>
-        /// <param name="logger">The type used to perform logging.</param>
-        /// <param name="uri">The full request uri.</param>
-        /// <param name="exception">The captured exception.</param>
-        public static void LogImageProcessingFailed(this ILogger logger, string uri, Exception exception)
-        {
-            LogProcessingErrorAction(logger, uri, exception);
-        }
+    /// <summary>
+    /// Logs that a given image request could not be processed.
+    /// </summary>
+    /// <param name="logger">The type used to perform logging.</param>
+    /// <param name="uri">The full request uri.</param>
+    /// <param name="exception">The captured exception.</param>
+    public static void LogImageProcessingFailed(this ILogger logger, string uri, Exception exception)
+    {
+        LogProcessingErrorAction(logger, uri, exception);
+    }
 
-        /// <summary>
-        /// Logs that a given image could not be resolved.
-        /// </summary>
-        /// <param name="logger">The type used to perform logging.</param>
-        /// <param name="uri">The full request uri.</param>
-        public static void LogImageResolveFailed(this ILogger logger, string uri)
-        {
-            LogResolveFailedAction(logger, uri, null);
-        }
+    /// <summary>
+    /// Logs that a given image could not be resolved.
+    /// </summary>
+    /// <param name="logger">The type used to perform logging.</param>
+    /// <param name="uri">The full request uri.</param>
+    public static void LogImageResolveFailed(this ILogger logger, string uri)
+    {
+        LogResolveFailedAction(logger, uri, null);
+    }
 
-        /// <summary>
-        /// Logs that a given image request has been served.
-        /// </summary>
-        /// <param name="logger">The type used to perform logging.</param>
-        /// <param name="uri">The full request uri.</param>
-        /// <param name="key">The cached image key.</param>
-        public static void LogImageServed(this ILogger logger, string uri, string key)
-        {
-            LogServedAction(logger, uri, key, null);
-        }
+    /// <summary>
+    /// Logs that a given image request has been served.
+    /// </summary>
+    /// <param name="logger">The type used to perform logging.</param>
+    /// <param name="uri">The full request uri.</param>
+    /// <param name="key">The cached image key.</param>
+    public static void LogImageServed(this ILogger logger, string uri, string key)
+    {
+        LogServedAction(logger, uri, key, null);
+    }
 
-        /// <summary>
-        /// Logs that a given image request has not been modified.
-        /// </summary>
-        /// <param name="logger">The type used to perform logging.</param>
-        /// <param name="uri">The full request uri.</param>
-        public static void LogImageNotModified(this ILogger logger, string uri)
-        {
-            LogPathNotModifiedAction(logger, uri, null);
-        }
+    /// <summary>
+    /// Logs that a given image request has not been modified.
+    /// </summary>
+    /// <param name="logger">The type used to perform logging.</param>
+    /// <param name="uri">The full request uri.</param>
+    public static void LogImageNotModified(this ILogger logger, string uri)
+    {
+        LogPathNotModifiedAction(logger, uri, null);
+    }
 
-        /// <summary>
-        /// Logs that access to a given image request has been denied.
-        /// </summary>
-        /// <param name="logger">The type used to perform logging.</param>
-        /// <param name="uri">The full request uri.</param>
-        public static void LogImagePreconditionFailed(this ILogger logger, string uri)
-        {
-            LogPreconditionFailedAction(logger, uri, null);
-        }
+    /// <summary>
+    /// Logs that access to a given image request has been denied.
+    /// </summary>
+    /// <param name="logger">The type used to perform logging.</param>
+    /// <param name="uri">The full request uri.</param>
+    public static void LogImagePreconditionFailed(this ILogger logger, string uri)
+    {
+        LogPreconditionFailedAction(logger, uri, null);
     }
 }
diff --git a/src/ImageSharp.Web/Middleware/ResponseConstants.cs b/src/ImageSharp.Web/Middleware/ResponseConstants.cs
index 9c4c0645..7d196f83 100644
--- a/src/ImageSharp.Web/Middleware/ResponseConstants.cs
+++ b/src/ImageSharp.Web/Middleware/ResponseConstants.cs
@@ -1,28 +1,27 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Web.Middleware
+namespace SixLabors.ImageSharp.Web.Middleware;
+
+/// <summary>
+/// Contains constants related to HTTP respose codes.
+/// </summary>
+internal static class ResponseConstants
 {
     /// <summary>
-    /// Contains constants related to HTTP respose codes.
+    /// The HTTP 200 OK success status response code indicates that the request has succeeded.
     /// </summary>
-    internal static class ResponseConstants
-    {
-        /// <summary>
-        /// The HTTP 200 OK success status response code indicates that the request has succeeded.
-        /// </summary>
-        internal const int Status200Ok = 200;
+    internal const int Status200Ok = 200;
 
-        /// <summary>
-        /// The HTTP 304 Not Modified client redirection response code indicates that there is no need
-        /// to retransmit the requested resources.
-        /// </summary>
-        internal const int Status304NotModified = 304;
+    /// <summary>
+    /// The HTTP 304 Not Modified client redirection response code indicates that there is no need
+    /// to retransmit the requested resources.
+    /// </summary>
+    internal const int Status304NotModified = 304;
 
-        /// <summary>
-        /// The HTTP 412 Precondition Failed client error response code indicates that access to the target
-        /// resource has been denied.
-        /// </summary>
-        internal const int Status412PreconditionFailed = 412;
-    }
+    /// <summary>
+    /// The HTTP 412 Precondition Failed client error response code indicates that access to the target
+    /// resource has been denied.
+    /// </summary>
+    internal const int Status412PreconditionFailed = 412;
 }
diff --git a/src/ImageSharp.Web/PathUtilities.cs b/src/ImageSharp.Web/PathUtilities.cs
index 717c423a..e3f6ef6b 100644
--- a/src/ImageSharp.Web/PathUtilities.cs
+++ b/src/ImageSharp.Web/PathUtilities.cs
@@ -1,28 +1,26 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.IO;
+namespace SixLabors.ImageSharp.Web;
 
-namespace SixLabors.ImageSharp.Web
+internal static class PathUtilities
 {
-    internal static class PathUtilities
+    /// <summary>
+    /// Ensures the path ends with a trailing slash (directory separator).
+    /// </summary>
+    /// <param name="path">The path.</param>
+    /// <returns>
+    /// The path with a trailing slash.
+    /// </returns>
+    internal static string EnsureTrailingSlash(string path)
     {
-        /// <summary>
-        /// Ensures the path ends with a trailing slash (directory separator).
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>
-        /// The path with a trailing slash.
-        /// </returns>
-        internal static string EnsureTrailingSlash(string path)
+        if (!string.IsNullOrEmpty(path) &&
+            path[path.Length - 1] != Path.DirectorySeparatorChar)
         {
-            if (!string.IsNullOrEmpty(path) &&
-                path[path.Length - 1] != Path.DirectorySeparatorChar)
-            {
-                return path + Path.DirectorySeparatorChar;
-            }
-
-            return path;
+            return path + Path.DirectorySeparatorChar;
         }
+
+        return path;
     }
 }
diff --git a/src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs b/src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs
index 87a0aa36..392d58a5 100644
--- a/src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs
@@ -1,51 +1,50 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.Extensions.Logging;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Processors
+namespace SixLabors.ImageSharp.Web.Processors;
+
+/// <summary>
+/// Allows the auto-orientation to ensure that EXIF defined orientation is
+/// reflected in the final image.
+/// </summary>
+public class AutoOrientWebProcessor : IImageWebProcessor
 {
     /// <summary>
-    /// Allows the auto-orientation to ensure that EXIF defined orientation is
-    /// reflected in the final image.
+    /// The command for changing the orientation according to the EXIF information.
+    /// </summary>
+    public const string AutoOrient = "autoorient";
+
+    /// <summary>
+    /// The reusable collection of commands.
     /// </summary>
-    public class AutoOrientWebProcessor : IImageWebProcessor
+    private static readonly IEnumerable<string> AutoOrientCommands
+        = new[] { AutoOrient };
+
+    /// <inheritdoc/>
+    public IEnumerable<string> Commands { get; } = AutoOrientCommands;
+
+    /// <inheritdoc/>
+    public FormattedImage Process(
+        FormattedImage image,
+        ILogger logger,
+        CommandCollection commands,
+        CommandParser parser,
+        CultureInfo culture)
     {
-        /// <summary>
-        /// The command for changing the orientation according to the EXIF information.
-        /// </summary>
-        public const string AutoOrient = "autoorient";
-
-        /// <summary>
-        /// The reusable collection of commands.
-        /// </summary>
-        private static readonly IEnumerable<string> AutoOrientCommands
-            = new[] { AutoOrient };
-
-        /// <inheritdoc/>
-        public IEnumerable<string> Commands { get; } = AutoOrientCommands;
-
-        /// <inheritdoc/>
-        public FormattedImage Process(
-            FormattedImage image,
-            ILogger logger,
-            CommandCollection commands,
-            CommandParser parser,
-            CultureInfo culture)
+        if (parser.ParseValue<bool>(commands.GetValueOrDefault(AutoOrient), culture))
         {
-            if (parser.ParseValue<bool>(commands.GetValueOrDefault(AutoOrient), culture))
-            {
-                image.Image.Mutate(x => x.AutoOrient());
-            }
-
-            return image;
+            image.Image.Mutate(x => x.AutoOrient());
         }
 
-        /// <inheritdoc/>
-        public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
+        return image;
     }
+
+    /// <inheritdoc/>
+    public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
 }
diff --git a/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs b/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs
index bdb505da..7fd82474 100644
--- a/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs
@@ -1,52 +1,51 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.Extensions.Logging;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Processors
+namespace SixLabors.ImageSharp.Web.Processors;
+
+/// <summary>
+/// Allows setting of the background color.
+/// </summary>
+public class BackgroundColorWebProcessor : IImageWebProcessor
 {
     /// <summary>
-    /// Allows setting of the background color.
+    /// The command for changing the background color.
     /// </summary>
-    public class BackgroundColorWebProcessor : IImageWebProcessor
-    {
-        /// <summary>
-        /// The command for changing the background color.
-        /// </summary>
-        public const string Color = "bgcolor";
-
-        /// <summary>
-        /// The reusable collection of commands.
-        /// </summary>
-        private static readonly IEnumerable<string> ColorCommands
-            = new[] { Color };
-
-        /// <inheritdoc/>
-        public IEnumerable<string> Commands { get; } = ColorCommands;
-
-        /// <inheritdoc/>
-        public FormattedImage Process(
-            FormattedImage image,
-            ILogger logger,
-            CommandCollection commands,
-            CommandParser parser,
-            CultureInfo culture)
-        {
-            Color background = parser.ParseValue<Color>(commands.GetValueOrDefault(Color), culture);
+    public const string Color = "bgcolor";
 
-            if (background != default)
-            {
-                image.Image.Mutate(x => x.BackgroundColor(background));
-            }
+    /// <summary>
+    /// The reusable collection of commands.
+    /// </summary>
+    private static readonly IEnumerable<string> ColorCommands
+        = new[] { Color };
+
+    /// <inheritdoc/>
+    public IEnumerable<string> Commands { get; } = ColorCommands;
+
+    /// <inheritdoc/>
+    public FormattedImage Process(
+        FormattedImage image,
+        ILogger logger,
+        CommandCollection commands,
+        CommandParser parser,
+        CultureInfo culture)
+    {
+        Color background = parser.ParseValue<Color>(commands.GetValueOrDefault(Color), culture);
 
-            return image;
+        if (background != default)
+        {
+            image.Image.Mutate(x => x.BackgroundColor(background));
         }
 
-        /// <inheritdoc/>
-        public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => true;
+        return image;
     }
+
+    /// <inheritdoc/>
+    public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => true;
 }
diff --git a/src/ImageSharp.Web/Processors/FormatWebProcessor.cs b/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
index f984c746..f8665dc4 100644
--- a/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -9,63 +9,62 @@
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Middleware;
 
-namespace SixLabors.ImageSharp.Web.Processors
+namespace SixLabors.ImageSharp.Web.Processors;
+
+/// <summary>
+/// Allows the changing of image formats.
+/// </summary>
+public class FormatWebProcessor : IImageWebProcessor
 {
     /// <summary>
-    /// Allows the changing of image formats.
+    /// The command constant for format.
     /// </summary>
-    public class FormatWebProcessor : IImageWebProcessor
-    {
-        /// <summary>
-        /// The command constant for format.
-        /// </summary>
-        public const string Format = "format";
+    public const string Format = "format";
 
-        /// <summary>
-        /// The reusable collection of commands.
-        /// </summary>
-        private static readonly IEnumerable<string> FormatCommands
-            = new[] { Format };
+    /// <summary>
+    /// The reusable collection of commands.
+    /// </summary>
+    private static readonly IEnumerable<string> FormatCommands
+        = new[] { Format };
 
-        /// <summary>
-        /// The middleware configuration options.
-        /// </summary>
-        private readonly ImageSharpMiddlewareOptions options;
+    /// <summary>
+    /// The middleware configuration options.
+    /// </summary>
+    private readonly ImageSharpMiddlewareOptions options;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FormatWebProcessor"/> class.
-        /// </summary>
-        /// <param name="options">The middleware configuration options.</param>
-        public FormatWebProcessor(IOptions<ImageSharpMiddlewareOptions> options)
-            => this.options = options.Value;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FormatWebProcessor"/> class.
+    /// </summary>
+    /// <param name="options">The middleware configuration options.</param>
+    public FormatWebProcessor(IOptions<ImageSharpMiddlewareOptions> options)
+        => this.options = options.Value;
+
+    /// <inheritdoc/>
+    public IEnumerable<string> Commands { get; } = FormatCommands;
 
-        /// <inheritdoc/>
-        public IEnumerable<string> Commands { get; } = FormatCommands;
+    /// <inheritdoc/>
+    public FormattedImage Process(
+        FormattedImage image,
+        ILogger logger,
+        CommandCollection commands,
+        CommandParser parser,
+        CultureInfo culture)
+    {
+        string extension = commands.GetValueOrDefault(Format);
 
-        /// <inheritdoc/>
-        public FormattedImage Process(
-            FormattedImage image,
-            ILogger logger,
-            CommandCollection commands,
-            CommandParser parser,
-            CultureInfo culture)
+        if (!string.IsNullOrWhiteSpace(extension))
         {
-            string extension = commands.GetValueOrDefault(Format);
+            IImageFormat format = this.options.Configuration.ImageFormatsManager.FindFormatByFileExtension(extension);
 
-            if (!string.IsNullOrWhiteSpace(extension))
+            if (format != null)
             {
-                IImageFormat format = this.options.Configuration.ImageFormatsManager.FindFormatByFileExtension(extension);
-
-                if (format != null)
-                {
-                    image.Format = format;
-                }
+                image.Format = format;
             }
-
-            return image;
         }
 
-        /// <inheritdoc/>
-        public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
+        return image;
     }
+
+    /// <inheritdoc/>
+    public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
 }
diff --git a/src/ImageSharp.Web/Processors/IImageWebProcessor.cs b/src/ImageSharp.Web/Processors/IImageWebProcessor.cs
index b653e12f..6e1f8a85 100644
--- a/src/ImageSharp.Web/Processors/IImageWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/IImageWebProcessor.cs
@@ -1,54 +1,53 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.Extensions.Logging;
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Processors
+namespace SixLabors.ImageSharp.Web.Processors;
+
+/// <summary>
+/// Specifies the contract for processing images using a querystring URI API.
+/// </summary>
+public interface IImageWebProcessor
 {
     /// <summary>
-    /// Specifies the contract for processing images using a querystring URI API.
+    /// Gets the collection of recognized command keys.
     /// </summary>
-    public interface IImageWebProcessor
-    {
-        /// <summary>
-        /// Gets the collection of recognized command keys.
-        /// </summary>
-        IEnumerable<string> Commands { get; }
+    IEnumerable<string> Commands { get; }
 
-        /// <summary>
-        /// Processes the image based on the given commands.
-        /// </summary>
-        /// <param name="image">The image to process.</param>
-        /// <param name="logger">The type used for performing logging.</param>
-        /// <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="FormattedImage"/>.</returns>
-        FormattedImage Process(
-            FormattedImage image,
-            ILogger logger,
-            CommandCollection commands,
-            CommandParser parser,
-            CultureInfo culture);
+    /// <summary>
+    /// Processes the image based on the given commands.
+    /// </summary>
+    /// <param name="image">The image to process.</param>
+    /// <param name="logger">The type used for performing logging.</param>
+    /// <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="FormattedImage"/>.</returns>
+    FormattedImage Process(
+        FormattedImage image,
+        ILogger logger,
+        CommandCollection commands,
+        CommandParser parser,
+        CultureInfo culture);
 
-        /// <summary>
-        /// <para>
-        /// Returns a value indicating whether the image to be processed should be decoded using a 32 bit True Color pixel format - 8 bits per color component
-        /// plus an 8 bit alpha channel <see href="https://en.wikipedia.org/wiki/Color_depth#True_color_(24-bit)"/>.
-        /// </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 a 32 bit True Color pixel format is required.</returns>
-        bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture);
-    }
+    /// <summary>
+    /// <para>
+    /// Returns a value indicating whether the image to be processed should be decoded using a 32 bit True Color pixel format - 8 bits per color component
+    /// plus an 8 bit alpha channel <see href="https://en.wikipedia.org/wiki/Color_depth#True_color_(24-bit)"/>.
+    /// </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 a 32 bit True Color pixel format is required.</returns>
+    bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture);
 }
diff --git a/src/ImageSharp.Web/Processors/QualityWebProcessor.cs b/src/ImageSharp.Web/Processors/QualityWebProcessor.cs
index adee559f..76af983f 100644
--- a/src/ImageSharp.Web/Processors/QualityWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/QualityWebProcessor.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.Extensions.Logging;
 using SixLabors.ImageSharp.Advanced;
@@ -9,81 +9,80 @@
 using SixLabors.ImageSharp.Formats.Webp;
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Processors
+namespace SixLabors.ImageSharp.Web.Processors;
+
+/// <summary>
+/// Allows the setting of quality for the jpeg and webp image format.
+/// </summary>
+public class QualityWebProcessor : IImageWebProcessor
 {
     /// <summary>
-    /// Allows the setting of quality for the jpeg and webp image format.
+    /// The command constant for quality.
     /// </summary>
-    public class QualityWebProcessor : IImageWebProcessor
-    {
-        /// <summary>
-        /// The command constant for quality.
-        /// </summary>
-        public const string Quality = "quality";
+    public const string Quality = "quality";
 
-        /// <summary>
-        /// The reusable collection of commands.
-        /// </summary>
-        private static readonly IEnumerable<string> QualityCommands
-            = new[] { Quality };
+    /// <summary>
+    /// The reusable collection of commands.
+    /// </summary>
+    private static readonly IEnumerable<string> QualityCommands
+        = new[] { Quality };
 
-        /// <inheritdoc/>
-        public IEnumerable<string> Commands { get; } = QualityCommands;
+    /// <inheritdoc/>
+    public IEnumerable<string> Commands { get; } = QualityCommands;
 
-        /// <inheritdoc/>
-        public FormattedImage Process(
-            FormattedImage image,
-            ILogger logger,
-            CommandCollection commands,
-            CommandParser parser,
-            CultureInfo culture)
+    /// <inheritdoc/>
+    public FormattedImage Process(
+        FormattedImage image,
+        ILogger logger,
+        CommandCollection commands,
+        CommandParser parser,
+        CultureInfo culture)
+    {
+        if (commands.Contains(Quality))
         {
-            if (commands.Contains(Quality))
-            {
-                // The encoders clamp any values so no validation is required.
-                int quality = parser.ParseValue<int>(commands.GetValueOrDefault(Quality), culture);
+            // The encoders clamp any values so no validation is required.
+            int quality = parser.ParseValue<int>(commands.GetValueOrDefault(Quality), culture);
 
-                if (image.Format is JpegFormat)
-                {
-                    var reference =
-                        (JpegEncoder)image.Image
-                        .GetConfiguration()
-                        .ImageFormatsManager
-                        .FindEncoder(image.Format);
+            if (image.Format is JpegFormat)
+            {
+                var reference =
+                    (JpegEncoder)image.Image
+                    .GetConfiguration()
+                    .ImageFormatsManager
+                    .FindEncoder(image.Format);
 
-                    if (quality != reference.Quality)
-                    {
-                        image.Encoder = new JpegEncoder() { Quality = quality, ColorType = reference.ColorType };
-                    }
-                }
-                else if (image.Format is WebpFormat)
+                if (quality != reference.Quality)
                 {
-                    var reference =
-                        (WebpEncoder)image.Image
-                        .GetConfiguration()
-                        .ImageFormatsManager
-                        .FindEncoder(image.Format);
-
-                    image.Encoder = new WebpEncoder()
-                    {
-                        FileFormat = quality < 100 ? WebpFileFormatType.Lossy : reference.FileFormat,
-                        Quality = quality,
-                        Method = reference.Method,
-                        UseAlphaCompression = reference.UseAlphaCompression,
-                        EntropyPasses = reference.EntropyPasses,
-                        SpatialNoiseShaping = reference.SpatialNoiseShaping,
-                        FilterStrength = reference.FilterStrength,
-                        TransparentColorMode = reference.TransparentColorMode,
-                        NearLossless = reference.NearLossless,
-                        NearLosslessQuality = reference.NearLosslessQuality,
-                    };
+                    image.Encoder = new JpegEncoder() { Quality = quality, ColorType = reference.ColorType };
                 }
             }
+            else if (image.Format is WebpFormat)
+            {
+                var reference =
+                    (WebpEncoder)image.Image
+                    .GetConfiguration()
+                    .ImageFormatsManager
+                    .FindEncoder(image.Format);
 
-            return image;
+                image.Encoder = new WebpEncoder()
+                {
+                    FileFormat = quality < 100 ? WebpFileFormatType.Lossy : reference.FileFormat,
+                    Quality = quality,
+                    Method = reference.Method,
+                    UseAlphaCompression = reference.UseAlphaCompression,
+                    EntropyPasses = reference.EntropyPasses,
+                    SpatialNoiseShaping = reference.SpatialNoiseShaping,
+                    FilterStrength = reference.FilterStrength,
+                    TransparentColorMode = reference.TransparentColorMode,
+                    NearLossless = reference.NearLossless,
+                    NearLosslessQuality = reference.NearLosslessQuality,
+                };
+            }
         }
 
-        /// <inheritdoc/>
-        public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
+        return image;
     }
+
+    /// <inheritdoc/>
+    public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
 }
diff --git a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
index 3b3a9f76..37a53a67 100644
--- a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.Collections.Generic;
 using System.Globalization;
 using System.Numerics;
 using Microsoft.Extensions.Logging;
@@ -10,240 +10,239 @@
 using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Processors
+namespace SixLabors.ImageSharp.Web.Processors;
+
+/// <summary>
+/// Allows the resizing of images.
+/// </summary>
+public class ResizeWebProcessor : IImageWebProcessor
 {
     /// <summary>
-    /// Allows the resizing of images.
+    /// The command constant for the resize width.
     /// </summary>
-    public class ResizeWebProcessor : IImageWebProcessor
-    {
-        /// <summary>
-        /// The command constant for the resize width.
-        /// </summary>
-        public const string Width = "width";
-
-        /// <summary>
-        /// The command constant for the resize height.
-        /// </summary>
-        public const string Height = "height";
-
-        /// <summary>
-        /// The command constant for the resize focal point coordinates.
-        /// </summary>
-        public const string Xy = "rxy";
-
-        /// <summary>
-        /// The command constant for the resize mode.
-        /// </summary>
-        public const string Mode = "rmode";
-
-        /// <summary>
-        /// The command constant for the resize sampler.
-        /// </summary>
-        public const string Sampler = "rsampler";
-
-        /// <summary>
-        /// The command constant for the resize anchor position.
-        /// </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>
-        public const string Orient = "orient";
-
-        /// <summary>
-        /// The command constant for the resize compand mode.
-        /// </summary>
-        public const string Compand = "compand";
-
-        private static readonly IEnumerable<string> ResizeCommands
-            = new[]
-            {
-                Width,
-                Height,
-                Xy,
-                Mode,
-                Sampler,
-                Anchor,
-                Color,
-                Orient,
-                Compand
-            };
+    public const string Width = "width";
 
-        /// <inheritdoc/>
-        public IEnumerable<string> Commands { get; } = ResizeCommands;
+    /// <summary>
+    /// The command constant for the resize height.
+    /// </summary>
+    public const string Height = "height";
 
-        /// <inheritdoc/>
-        public FormattedImage Process(
-            FormattedImage image,
-            ILogger logger,
-            CommandCollection commands,
-            CommandParser parser,
-            CultureInfo culture)
-        {
-            ResizeOptions options = GetResizeOptions(image, commands, parser, culture);
+    /// <summary>
+    /// The command constant for the resize focal point coordinates.
+    /// </summary>
+    public const string Xy = "rxy";
 
-            if (options != null)
-            {
-                image.Image.Mutate(x => x.Resize(options));
-            }
+    /// <summary>
+    /// The command constant for the resize mode.
+    /// </summary>
+    public const string Mode = "rmode";
 
-            return image;
-        }
+    /// <summary>
+    /// The command constant for the resize sampler.
+    /// </summary>
+    public const string Sampler = "rsampler";
 
-        /// <summary>
-        /// Parses the command collection returning the resize options.
-        /// </summary>
-        /// <param name="image">The image to process.</param>
-        /// <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="ResizeOptions"/>.</returns>
-        internal static ResizeOptions GetResizeOptions(
-            FormattedImage image,
-            CommandCollection commands,
-            CommandParser parser,
-            CultureInfo culture)
-        {
-            if (!commands.Contains(Width) && !commands.Contains(Height))
-            {
-                return null;
-            }
+    /// <summary>
+    /// The command constant for the resize anchor position.
+    /// </summary>
+    public const string Anchor = "ranchor";
 
-            ushort orientation = GetExifOrientation(image, commands, parser, culture);
+    /// <summary>
+    /// The command constant for the resize padding background color.
+    /// </summary>
+    public const string Color = "rcolor";
 
-            Size size = ParseSize(orientation, commands, parser, culture);
+    /// <summary>
+    /// The command constant for the resize orientation handling mode.
+    /// </summary>
+    public const string Orient = "orient";
 
-            if (size.Width <= 0 && size.Height <= 0)
-            {
-                return null;
-            }
+    /// <summary>
+    /// The command constant for the resize compand mode.
+    /// </summary>
+    public const string Compand = "compand";
 
-            return new()
-            {
-                Size = size,
-                CenterCoordinates = GetCenter(orientation, commands, parser, culture),
-                Position = GetAnchor(orientation, commands, parser, culture),
-                Mode = GetMode(commands, parser, culture),
-                Compand = GetCompandMode(commands, parser, culture),
-                Sampler = GetSampler(commands),
-                PadColor = parser.ParseValue<Color>(commands.GetValueOrDefault(Color), culture)
-            };
-        }
+    private static readonly IEnumerable<string> ResizeCommands
+        = new[]
+        {
+            Width,
+            Height,
+            Xy,
+            Mode,
+            Sampler,
+            Anchor,
+            Color,
+            Orient,
+            Compand
+        };
+
+    /// <inheritdoc/>
+    public IEnumerable<string> Commands { get; } = ResizeCommands;
+
+    /// <inheritdoc/>
+    public FormattedImage Process(
+        FormattedImage image,
+        ILogger logger,
+        CommandCollection commands,
+        CommandParser parser,
+        CultureInfo culture)
+    {
+        ResizeOptions options = GetResizeOptions(image, commands, parser, culture);
 
-        /// <inheritdoc/>
-        public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture)
+        if (options != null)
         {
-            ResizeMode mode = parser.ParseValue<ResizeMode>(commands.GetValueOrDefault(Mode), culture);
-            return mode is ResizeMode.Pad or ResizeMode.BoxPad;
+            image.Image.Mutate(x => x.Resize(options));
         }
 
-        private static Size ParseSize(
-            ushort orientation,
-            CommandCollection commands,
-            CommandParser parser,
-            CultureInfo culture)
+        return image;
+    }
+
+    /// <summary>
+    /// Parses the command collection returning the resize options.
+    /// </summary>
+    /// <param name="image">The image to process.</param>
+    /// <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="ResizeOptions"/>.</returns>
+    internal static ResizeOptions GetResizeOptions(
+        FormattedImage image,
+        CommandCollection commands,
+        CommandParser parser,
+        CultureInfo culture)
+    {
+        if (!commands.Contains(Width) && !commands.Contains(Height))
         {
-            // The command parser will reject negative numbers as it clamps values to ranges.
-            int width = (int)parser.ParseValue<uint>(commands.GetValueOrDefault(Width), culture);
-            int height = (int)parser.ParseValue<uint>(commands.GetValueOrDefault(Height), culture);
+            return null;
+        }
 
-            return ExifOrientationUtilities.Transform(new Size(width, height), orientation);
+        ushort orientation = GetExifOrientation(image, commands, parser, culture);
+
+        Size size = ParseSize(orientation, commands, parser, culture);
+
+        if (size.Width <= 0 && size.Height <= 0)
+        {
+            return null;
         }
 
-        private static PointF? GetCenter(
-            ushort orientation,
-            CommandCollection commands,
-            CommandParser parser,
-            CultureInfo culture)
+        return new()
         {
-            float[] coordinates = parser.ParseValue<float[]>(commands.GetValueOrDefault(Xy), culture);
+            Size = size,
+            CenterCoordinates = GetCenter(orientation, commands, parser, culture),
+            Position = GetAnchor(orientation, commands, parser, culture),
+            Mode = GetMode(commands, parser, culture),
+            Compand = GetCompandMode(commands, parser, culture),
+            Sampler = GetSampler(commands),
+            PadColor = parser.ParseValue<Color>(commands.GetValueOrDefault(Color), culture)
+        };
+    }
 
-            if (coordinates.Length != 2)
-            {
-                return null;
-            }
+    /// <inheritdoc/>
+    public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture)
+    {
+        ResizeMode mode = parser.ParseValue<ResizeMode>(commands.GetValueOrDefault(Mode), culture);
+        return mode is ResizeMode.Pad or ResizeMode.BoxPad;
+    }
 
-            Vector2 center = new(coordinates[0], coordinates[1]);
-            return ExifOrientationUtilities.Transform(center, Vector2.Zero, Vector2.One, orientation);
-        }
+    private static Size ParseSize(
+        ushort orientation,
+        CommandCollection commands,
+        CommandParser parser,
+        CultureInfo culture)
+    {
+        // The command parser will reject negative numbers as it clamps values to ranges.
+        int width = (int)parser.ParseValue<uint>(commands.GetValueOrDefault(Width), culture);
+        int height = (int)parser.ParseValue<uint>(commands.GetValueOrDefault(Height), culture);
+
+        return ExifOrientationUtilities.Transform(new Size(width, height), orientation);
+    }
+
+    private static PointF? GetCenter(
+        ushort orientation,
+        CommandCollection commands,
+        CommandParser parser,
+        CultureInfo culture)
+    {
+        float[] coordinates = parser.ParseValue<float[]>(commands.GetValueOrDefault(Xy), culture);
 
-        private static ResizeMode GetMode(
-            CommandCollection commands,
-            CommandParser parser,
-            CultureInfo culture)
-            => parser.ParseValue<ResizeMode>(commands.GetValueOrDefault(Mode), culture);
-
-        private static AnchorPositionMode GetAnchor(
-            ushort orientation,
-            CommandCollection commands,
-            CommandParser parser,
-            CultureInfo culture)
+        if (coordinates.Length != 2)
         {
-            AnchorPositionMode anchor = parser.ParseValue<AnchorPositionMode>(commands.GetValueOrDefault(Anchor), culture);
-            return ExifOrientationUtilities.Transform(anchor, orientation);
+            return null;
         }
 
-        private static bool GetCompandMode(
-            CommandCollection commands,
-            CommandParser parser,
-            CultureInfo culture)
-            => parser.ParseValue<bool>(commands.GetValueOrDefault(Compand), culture);
+        Vector2 center = new(coordinates[0], coordinates[1]);
+        return ExifOrientationUtilities.Transform(center, Vector2.Zero, Vector2.One, orientation);
+    }
 
-        private static IResampler GetSampler(CommandCollection commands)
-        {
-            string sampler = commands.GetValueOrDefault(Sampler);
+    private static ResizeMode GetMode(
+        CommandCollection commands,
+        CommandParser parser,
+        CultureInfo culture)
+        => parser.ParseValue<ResizeMode>(commands.GetValueOrDefault(Mode), culture);
+
+    private static AnchorPositionMode GetAnchor(
+        ushort orientation,
+        CommandCollection commands,
+        CommandParser parser,
+        CultureInfo culture)
+    {
+        AnchorPositionMode anchor = parser.ParseValue<AnchorPositionMode>(commands.GetValueOrDefault(Anchor), culture);
+        return ExifOrientationUtilities.Transform(anchor, orientation);
+    }
 
-            if (sampler != null)
-            {
-                // No need to do a case test here. Parsed commands are automatically converted to lowercase.
-                return sampler switch
-                {
-                    "nearest" or "nearestneighbor" => KnownResamplers.NearestNeighbor,
-                    "box" => KnownResamplers.Box,
-                    "mitchell" or "mitchellnetravali" => KnownResamplers.MitchellNetravali,
-                    "catmull" or "catmullrom" => KnownResamplers.CatmullRom,
-                    "lanczos2" => KnownResamplers.Lanczos2,
-                    "lanczos3" => KnownResamplers.Lanczos3,
-                    "lanczos5" => KnownResamplers.Lanczos5,
-                    "lanczos8" => KnownResamplers.Lanczos8,
-                    "welch" => KnownResamplers.Welch,
-                    "robidoux" => KnownResamplers.Robidoux,
-                    "robidouxsharp" => KnownResamplers.RobidouxSharp,
-                    "spline" => KnownResamplers.Spline,
-                    "triangle" => KnownResamplers.Triangle,
-                    "hermite" => KnownResamplers.Hermite,
-                    _ => KnownResamplers.Bicubic,
-                };
-            }
-
-            return KnownResamplers.Bicubic;
-        }
+    private static bool GetCompandMode(
+        CommandCollection commands,
+        CommandParser parser,
+        CultureInfo culture)
+        => parser.ParseValue<bool>(commands.GetValueOrDefault(Compand), culture);
+
+    private static IResampler GetSampler(CommandCollection commands)
+    {
+        string sampler = commands.GetValueOrDefault(Sampler);
 
-        private static ushort GetExifOrientation(FormattedImage image, CommandCollection commands, CommandParser parser, CultureInfo culture)
+        if (sampler != null)
         {
-            // Browsers now implement 'image-orientation: from-image' by default.
-            // https://developer.mozilla.org/en-US/docs/web/css/image-orientation
-            // This makes orientation handling confusing for users who expect images to be resized in accordance
-            // to what they observe rather than pure (and correct) methods.
-            //
-            // To accomodate this we parse the dimensions to use based upon decoded EXIF orientation values.
-            // We default to 'true' for EXIF orientation handling. By passing 'false' it can be turned off.
-            if (commands.Contains(Orient) && !parser.ParseValue<bool>(commands.GetValueOrDefault(Orient), culture))
+            // No need to do a case test here. Parsed commands are automatically converted to lowercase.
+            return sampler switch
             {
-                return ExifOrientationMode.Unknown;
-            }
+                "nearest" or "nearestneighbor" => KnownResamplers.NearestNeighbor,
+                "box" => KnownResamplers.Box,
+                "mitchell" or "mitchellnetravali" => KnownResamplers.MitchellNetravali,
+                "catmull" or "catmullrom" => KnownResamplers.CatmullRom,
+                "lanczos2" => KnownResamplers.Lanczos2,
+                "lanczos3" => KnownResamplers.Lanczos3,
+                "lanczos5" => KnownResamplers.Lanczos5,
+                "lanczos8" => KnownResamplers.Lanczos8,
+                "welch" => KnownResamplers.Welch,
+                "robidoux" => KnownResamplers.Robidoux,
+                "robidouxsharp" => KnownResamplers.RobidouxSharp,
+                "spline" => KnownResamplers.Spline,
+                "triangle" => KnownResamplers.Triangle,
+                "hermite" => KnownResamplers.Hermite,
+                _ => KnownResamplers.Bicubic,
+            };
+        }
+
+        return KnownResamplers.Bicubic;
+    }
 
-            image.TryGetExifOrientation(out ushort orientation);
-            return orientation;
+    private static ushort GetExifOrientation(FormattedImage image, CommandCollection commands, CommandParser parser, CultureInfo culture)
+    {
+        // Browsers now implement 'image-orientation: from-image' by default.
+        // https://developer.mozilla.org/en-US/docs/web/css/image-orientation
+        // This makes orientation handling confusing for users who expect images to be resized in accordance
+        // to what they observe rather than pure (and correct) methods.
+        //
+        // To accomodate this we parse the dimensions to use based upon decoded EXIF orientation values.
+        // We default to 'true' for EXIF orientation handling. By passing 'false' it can be turned off.
+        if (commands.Contains(Orient) && !parser.ParseValue<bool>(commands.GetValueOrDefault(Orient), culture))
+        {
+            return ExifOrientationMode.Unknown;
         }
+
+        image.TryGetExifOrientation(out ushort orientation);
+        return orientation;
     }
 }
diff --git a/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs b/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs
index 414e2de0..4c568b0a 100644
--- a/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs
+++ b/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs
@@ -1,120 +1,118 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.Extensions.Logging;
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Processors
+namespace SixLabors.ImageSharp.Web.Processors;
+
+/// <summary>
+/// Extends the image API to allow processing via a URI API.
+/// </summary>
+internal static class WebProcessingExtensions
 {
     /// <summary>
-    /// Extends the image API to allow processing via a URI API.
+    /// Loops through the available processors and updates the image if any match.
     /// </summary>
-    internal static class WebProcessingExtensions
+    /// <param name="source">The image to resize.</param>
+    /// <param name="logger">The type used for performing logging.</param>
+    /// <param name="processors">The collection of available processors.</param>
+    /// <param name="commands">The parsed collection of 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="FormattedImage"/>.</returns>
+    public static FormattedImage Process(
+        this FormattedImage source,
+        ILogger logger,
+        IReadOnlyList<(int Index, IImageWebProcessor Processor)> processors,
+        CommandCollection commands,
+        CommandParser parser,
+        CultureInfo culture)
     {
-        /// <summary>
-        /// Loops through the available processors and updates the image if any match.
-        /// </summary>
-        /// <param name="source">The image to resize.</param>
-        /// <param name="logger">The type used for performing logging.</param>
-        /// <param name="processors">The collection of available processors.</param>
-        /// <param name="commands">The parsed collection of 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="FormattedImage"/>.</returns>
-        public static FormattedImage Process(
-            this FormattedImage source,
-            ILogger logger,
-            IReadOnlyList<(int Index, IImageWebProcessor Processor)> processors,
-            CommandCollection commands,
-            CommandParser parser,
-            CultureInfo culture)
+        foreach ((int Index, IImageWebProcessor Processor) processor in processors)
         {
-            foreach ((int Index, IImageWebProcessor Processor) processor in processors)
-            {
-                source = processor.Processor.Process(source, logger, commands, parser, culture);
-            }
-
-            return source;
+            source = processor.Processor.Process(source, logger, commands, parser, culture);
         }
 
-        /// <summary>
-        /// Sorts the processors according to the first supported command and removes processors without supported commands.
-        /// </summary>
-        /// <param name="processors">The collection of available processors.</param>
-        /// <param name="commands">The parsed collection of processing commands.</param>
-        /// <returns>
-        /// The sorted processors that supports any of the specified commands.
-        /// </returns>
-        public static IReadOnlyList<(int Index, IImageWebProcessor Processor)> OrderBySupportedCommands(this IEnumerable<IImageWebProcessor> processors, CommandCollection commands)
+        return source;
+    }
+
+    /// <summary>
+    /// Sorts the processors according to the first supported command and removes processors without supported commands.
+    /// </summary>
+    /// <param name="processors">The collection of available processors.</param>
+    /// <param name="commands">The parsed collection of processing commands.</param>
+    /// <returns>
+    /// The sorted processors that supports any of the specified commands.
+    /// </returns>
+    public static IReadOnlyList<(int Index, IImageWebProcessor Processor)> OrderBySupportedCommands(this IEnumerable<IImageWebProcessor> processors, CommandCollection commands)
+    {
+        List<(int Index, IImageWebProcessor Processor)> indexedProcessors = new();
+        foreach (IImageWebProcessor processor in processors)
         {
-            List<(int Index, IImageWebProcessor Processor)> indexedProcessors = new();
-            foreach (IImageWebProcessor processor in processors)
+            // Get index of first supported command
+            int index = commands.FindIndex(c => processor.IsSupportedCommand(c));
+            if (index != -1)
             {
-                // Get index of first supported command
-                int index = commands.FindIndex(c => processor.IsSupportedCommand(c));
-                if (index != -1)
-                {
-                    indexedProcessors.Add((index, processor));
-                }
+                indexedProcessors.Add((index, processor));
             }
-
-            indexedProcessors.Sort((x, y) => x.Index.CompareTo(y.Index));
-            return indexedProcessors;
         }
 
-        /// <summary>
-        /// Determines whether the specified command is supported by the processor
-        /// </summary>
-        /// <param name="processor">The processor.</param>
-        /// <param name="command">The command.</param>
-        /// <returns>
-        ///   <c>true</c> if the specified command is supported by the processor; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool IsSupportedCommand(this IImageWebProcessor processor, string command)
+        indexedProcessors.Sort((x, y) => x.Index.CompareTo(y.Index));
+        return indexedProcessors;
+    }
+
+    /// <summary>
+    /// Determines whether the specified command is supported by the processor
+    /// </summary>
+    /// <param name="processor">The processor.</param>
+    /// <param name="command">The command.</param>
+    /// <returns>
+    ///   <c>true</c> if the specified command is supported by the processor; otherwise, <c>false</c>.
+    /// </returns>
+    public static bool IsSupportedCommand(this IImageWebProcessor processor, string command)
+    {
+        foreach (string processorCommand in processor.Commands)
         {
-            foreach (string processorCommand in processor.Commands)
+            if (processorCommand.Equals(command, StringComparison.OrdinalIgnoreCase))
             {
-                if (processorCommand.Equals(command, StringComparison.OrdinalIgnoreCase))
-                {
-                    return true;
-                }
+                return true;
             }
-
-            return false;
         }
 
-        /// <summary>
-        /// <para>
-        /// Returns a value indicating whether the image to be processed should be decoded using a 32 bit True Color pixel format - 8 bits per color component
-        /// plus an 8 bit alpha channel <see href="https://en.wikipedia.org/wiki/Color_depth#True_color_(24-bit)"/>.
-        /// </para>
-        /// <para>This method is used to determine whether optimizations can be enabled to reduce memory consumption during processing.</para>
-        /// </summary>
-        /// <param name="processors">The collection of ordered processors.</param>
-        /// <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 a 32 bit True Color pixel format is required.</returns>
-        public static bool RequiresTrueColorPixelFormat(
-            this IReadOnlyList<(int Index, IImageWebProcessor Processor)> processors,
-            CommandCollection commands,
-            CommandParser parser,
-            CultureInfo culture)
-        {
-            bool requiresAlpha = false;
-            foreach ((int Index, IImageWebProcessor Processor) processor in processors)
-            {
-                requiresAlpha |= processor.Processor.RequiresTrueColorPixelFormat(commands, parser, culture);
-            }
+        return false;
+    }
 
-            return requiresAlpha;
+    /// <summary>
+    /// <para>
+    /// Returns a value indicating whether the image to be processed should be decoded using a 32 bit True Color pixel format - 8 bits per color component
+    /// plus an 8 bit alpha channel <see href="https://en.wikipedia.org/wiki/Color_depth#True_color_(24-bit)"/>.
+    /// </para>
+    /// <para>This method is used to determine whether optimizations can be enabled to reduce memory consumption during processing.</para>
+    /// </summary>
+    /// <param name="processors">The collection of ordered processors.</param>
+    /// <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 a 32 bit True Color pixel format is required.</returns>
+    public static bool RequiresTrueColorPixelFormat(
+        this IReadOnlyList<(int Index, IImageWebProcessor Processor)> processors,
+        CommandCollection commands,
+        CommandParser parser,
+        CultureInfo culture)
+    {
+        bool requiresAlpha = false;
+        foreach ((int Index, IImageWebProcessor Processor) processor in processors)
+        {
+            requiresAlpha |= processor.Processor.RequiresTrueColorPixelFormat(commands, parser, culture);
         }
+
+        return requiresAlpha;
     }
 }
diff --git a/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs b/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs
index 920a4e68..c7dc3a5b 100644
--- a/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs
+++ b/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs
@@ -1,67 +1,64 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Net;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Extensions.FileProviders;
 using SixLabors.ImageSharp.Web.Resolvers;
 
-namespace SixLabors.ImageSharp.Web.Providers
+namespace SixLabors.ImageSharp.Web.Providers;
+
+/// <summary>
+/// Returns images from an <see cref="IFileProvider"/> abstraction.
+/// </summary>
+public abstract class FileProviderImageProvider : IImageProvider
 {
     /// <summary>
-    /// Returns images from an <see cref="IFileProvider"/> abstraction.
+    /// The file provider abstraction.
     /// </summary>
-    public abstract class FileProviderImageProvider : IImageProvider
-    {
-        /// <summary>
-        /// The file provider abstraction.
-        /// </summary>
-        private readonly IFileProvider fileProvider;
+    private readonly IFileProvider fileProvider;
 
-        /// <summary>
-        /// Contains various format helper methods based on the current configuration.
-        /// </summary>
-        private readonly FormatUtilities formatUtilities;
+    /// <summary>
+    /// Contains various format helper methods based on the current configuration.
+    /// </summary>
+    private readonly FormatUtilities formatUtilities;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FileProviderImageProvider"/> class.
-        /// </summary>
-        /// <param name="fileProvider">The file provider.</param>
-        /// <param name="processingBehavior">The processing behavior.</param>
-        /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
-        protected FileProviderImageProvider(IFileProvider fileProvider, ProcessingBehavior processingBehavior, FormatUtilities formatUtilities)
-        {
-            Guard.NotNull(fileProvider, nameof(fileProvider));
-            Guard.NotNull(formatUtilities, nameof(formatUtilities));
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FileProviderImageProvider"/> class.
+    /// </summary>
+    /// <param name="fileProvider">The file provider.</param>
+    /// <param name="processingBehavior">The processing behavior.</param>
+    /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
+    protected FileProviderImageProvider(IFileProvider fileProvider, ProcessingBehavior processingBehavior, FormatUtilities formatUtilities)
+    {
+        Guard.NotNull(fileProvider, nameof(fileProvider));
+        Guard.NotNull(formatUtilities, nameof(formatUtilities));
 
-            this.fileProvider = fileProvider;
-            this.formatUtilities = formatUtilities;
-            this.ProcessingBehavior = processingBehavior;
-        }
+        this.fileProvider = fileProvider;
+        this.formatUtilities = formatUtilities;
+        this.ProcessingBehavior = processingBehavior;
+    }
 
-        /// <inheritdoc/>
-        public ProcessingBehavior ProcessingBehavior { get; }
+    /// <inheritdoc/>
+    public ProcessingBehavior ProcessingBehavior { get; }
 
-        /// <inheritdoc/>
-        public virtual Func<HttpContext, bool> Match { get; set; } = _ => true;
+    /// <inheritdoc/>
+    public virtual Func<HttpContext, bool> Match { get; set; } = _ => true;
 
-        /// <inheritdoc/>
-        public virtual bool IsValidRequest(HttpContext context)
-            => this.formatUtilities.TryGetExtensionFromUri(context.Request.GetDisplayUrl(), out _);
+    /// <inheritdoc/>
+    public virtual bool IsValidRequest(HttpContext context)
+        => this.formatUtilities.TryGetExtensionFromUri(context.Request.GetDisplayUrl(), out _);
 
-        /// <inheritdoc/>
-        public Task<IImageResolver> GetAsync(HttpContext context)
+    /// <inheritdoc/>
+    public Task<IImageResolver> GetAsync(HttpContext context)
+    {
+        IFileInfo fileInfo = this.fileProvider.GetFileInfo(context.Request.Path.Value);
+        if (!fileInfo.Exists)
         {
-            IFileInfo fileInfo = this.fileProvider.GetFileInfo(context.Request.Path.Value);
-            if (!fileInfo.Exists)
-            {
-                return Task.FromResult<IImageResolver>(null);
-            }
-
-            return Task.FromResult<IImageResolver>(new FileProviderImageResolver(fileInfo));
+            return Task.FromResult<IImageResolver>(null);
         }
+
+        return Task.FromResult<IImageResolver>(new FileProviderImageResolver(fileInfo));
     }
 }
diff --git a/src/ImageSharp.Web/Providers/IImageProvider.cs b/src/ImageSharp.Web/Providers/IImageProvider.cs
index cfbda20f..a25e7525 100644
--- a/src/ImageSharp.Web/Providers/IImageProvider.cs
+++ b/src/ImageSharp.Web/Providers/IImageProvider.cs
@@ -1,42 +1,40 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Resolvers;
 
-namespace SixLabors.ImageSharp.Web.Providers
+namespace SixLabors.ImageSharp.Web.Providers;
+
+/// <summary>
+/// Specifies the contract for returning images from different locations.
+/// </summary>
+public interface IImageProvider
 {
     /// <summary>
-    /// Specifies the contract for returning images from different locations.
+    /// Gets the processing behavior.
     /// </summary>
-    public interface IImageProvider
-    {
-        /// <summary>
-        /// Gets the processing behavior.
-        /// </summary>
-        ProcessingBehavior ProcessingBehavior { get; }
+    ProcessingBehavior ProcessingBehavior { get; }
 
-        /// <summary>
-        /// Gets or sets the method used by the resolver to identify itself as the correct resolver to use.
-        /// </summary>
-        Func<HttpContext, bool> Match { get; set; }
+    /// <summary>
+    /// Gets or sets the method used by the resolver to identify itself as the correct resolver to use.
+    /// </summary>
+    Func<HttpContext, bool> Match { get; set; }
 
-        /// <summary>
-        /// Gets a value indicating whether the current request passes sanitizing rules.
-        /// </summary>
-        /// <param name="context">The current HTTP request context.</param>
-        /// <returns>
-        /// <returns>The <see cref="bool"/></returns>
-        /// </returns>
-        bool IsValidRequest(HttpContext context);
+    /// <summary>
+    /// Gets a value indicating whether the current request passes sanitizing rules.
+    /// </summary>
+    /// <param name="context">The current HTTP request context.</param>
+    /// <returns>
+    /// <returns>The <see cref="bool"/></returns>
+    /// </returns>
+    bool IsValidRequest(HttpContext context);
 
-        /// <summary>
-        /// Gets the image resolver associated with the context.
-        /// </summary>
-        /// <param name="context">The current HTTP request context.</param>
-        /// <returns>The <see cref="IImageResolver"/>.</returns>
-        Task<IImageResolver> GetAsync(HttpContext context);
-    }
+    /// <summary>
+    /// Gets the image resolver associated with the context.
+    /// </summary>
+    /// <param name="context">The current HTTP request context.</param>
+    /// <returns>The <see cref="IImageResolver"/>.</returns>
+    Task<IImageResolver> GetAsync(HttpContext context);
 }
diff --git a/src/ImageSharp.Web/Providers/PhysicalFileSystemProvider.cs b/src/ImageSharp.Web/Providers/PhysicalFileSystemProvider.cs
index 9b09fa88..dddfe2f2 100644
--- a/src/ImageSharp.Web/Providers/PhysicalFileSystemProvider.cs
+++ b/src/ImageSharp.Web/Providers/PhysicalFileSystemProvider.cs
@@ -1,64 +1,62 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.IO;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Options;
 
-namespace SixLabors.ImageSharp.Web.Providers
+namespace SixLabors.ImageSharp.Web.Providers;
+
+/// <summary>
+/// Returns images stored in the local physical file system.
+/// </summary>
+public sealed class PhysicalFileSystemProvider : FileProviderImageProvider
 {
     /// <summary>
-    /// Returns images stored in the local physical file system.
+    /// Initializes a new instance of the <see cref="PhysicalFileSystemProvider"/> class.
     /// </summary>
-    public sealed class PhysicalFileSystemProvider : FileProviderImageProvider
+    /// <param name="options">The provider configuration options.</param>
+    /// <param name="environment">The environment used by this middleware.</param>
+    /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
+    public PhysicalFileSystemProvider(
+        IOptions<PhysicalFileSystemProviderOptions> options,
+        IWebHostEnvironment environment,
+        FormatUtilities formatUtilities)
+        : base(GetProvider(options, environment), options.Value.ProcessingBehavior, formatUtilities)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PhysicalFileSystemProvider"/> class.
-        /// </summary>
-        /// <param name="options">The provider configuration options.</param>
-        /// <param name="environment">The environment used by this middleware.</param>
-        /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
-        public PhysicalFileSystemProvider(
-            IOptions<PhysicalFileSystemProviderOptions> options,
-            IWebHostEnvironment environment,
-            FormatUtilities formatUtilities)
-            : base(GetProvider(options, environment), options.Value.ProcessingBehavior, formatUtilities)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Determine the provider root path
-        /// </summary>
-        /// <param name="options">The provider options.</param>
-        /// <param name="webRootPath">The web root path.</param>
-        /// <param name="contentRootPath">The content root path.</param>
-        /// <returns><see cref="string"/> representing the fully qualified provider root path.</returns>
-        internal static string GetProviderRoot(PhysicalFileSystemProviderOptions options, string webRootPath, string contentRootPath)
+    /// <summary>
+    /// Determine the provider root path
+    /// </summary>
+    /// <param name="options">The provider options.</param>
+    /// <param name="webRootPath">The web root path.</param>
+    /// <param name="contentRootPath">The content root path.</param>
+    /// <returns><see cref="string"/> representing the fully qualified provider root path.</returns>
+    internal static string GetProviderRoot(PhysicalFileSystemProviderOptions options, string webRootPath, string contentRootPath)
+    {
+        string providerRootPath = options.ProviderRootPath ?? webRootPath;
+        if (string.IsNullOrEmpty(providerRootPath))
         {
-            string providerRootPath = options.ProviderRootPath ?? webRootPath;
-            if (string.IsNullOrEmpty(providerRootPath))
-            {
-                throw new InvalidOperationException("The provider root path cannot be determined, make sure it's explicitly configured or the webroot is set.");
-            }
-
-            if (!Path.IsPathFullyQualified(providerRootPath))
-            {
-                // Ensure this is an absolute path (resolved to the content root path)
-                providerRootPath = Path.GetFullPath(providerRootPath, contentRootPath);
-            }
-
-            return PathUtilities.EnsureTrailingSlash(providerRootPath);
+            throw new InvalidOperationException("The provider root path cannot be determined, make sure it's explicitly configured or the webroot is set.");
         }
 
-        private static PhysicalFileProvider GetProvider(
-            IOptions<PhysicalFileSystemProviderOptions> options,
-            IWebHostEnvironment environment)
+        if (!Path.IsPathFullyQualified(providerRootPath))
         {
-            Guard.NotNull(options, nameof(options));
-            Guard.NotNull(environment, nameof(environment));
-            return new(GetProviderRoot(options.Value, environment.WebRootPath, environment.ContentRootPath));
+            // Ensure this is an absolute path (resolved to the content root path)
+            providerRootPath = Path.GetFullPath(providerRootPath, contentRootPath);
         }
+
+        return PathUtilities.EnsureTrailingSlash(providerRootPath);
+    }
+
+    private static PhysicalFileProvider GetProvider(
+        IOptions<PhysicalFileSystemProviderOptions> options,
+        IWebHostEnvironment environment)
+    {
+        Guard.NotNull(options, nameof(options));
+        Guard.NotNull(environment, nameof(environment));
+        return new(GetProviderRoot(options.Value, environment.WebRootPath, environment.ContentRootPath));
     }
 }
diff --git a/src/ImageSharp.Web/Providers/PhysicalFileSystemProviderOptions.cs b/src/ImageSharp.Web/Providers/PhysicalFileSystemProviderOptions.cs
index 1dede718..f7b6f42e 100644
--- a/src/ImageSharp.Web/Providers/PhysicalFileSystemProviderOptions.cs
+++ b/src/ImageSharp.Web/Providers/PhysicalFileSystemProviderOptions.cs
@@ -1,30 +1,30 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-namespace SixLabors.ImageSharp.Web.Providers
+namespace SixLabors.ImageSharp.Web.Providers;
+
+/// <summary>
+/// Configuration options for the <see cref="PhysicalFileSystemProvider" />.
+/// </summary>
+public class PhysicalFileSystemProviderOptions
 {
     /// <summary>
-    /// Configuration options for the <see cref="PhysicalFileSystemProvider" />.
+    /// Gets or sets the optional provider root folder path.
+    /// <para>
+    /// This value can be <see langword="null"/>, a fully qualified absolute path,
+    /// or a path relative to the directory that contains the application
+    /// content files.
+    /// </para>
+    /// <para>
+    /// If not set, this will default to the directory that contains the web-servable
+    /// application content files; commonly 'wwwroot'.
+    /// </para>
     /// </summary>
-    public class PhysicalFileSystemProviderOptions
-    {
-        /// <summary>
-        /// Gets or sets the optional provider root folder path.
-        /// <para>
-        /// This value can be <see langword="null"/>, a fully qualified absolute path,
-        /// or a path relative to the directory that contains the application
-        /// content files.
-        /// </para>
-        /// <para>
-        /// If not set, this will default to the directory that contains the web-servable
-        /// application content files; commonly 'wwwroot'.
-        /// </para>
-        /// </summary>
-        public string ProviderRootPath { get; set; }
+    public string ProviderRootPath { get; set; }
 
-        /// <summary>
-        /// Gets or sets the processing behavior. Defaults to <see cref="ProcessingBehavior.CommandOnly"/>.
-        /// </summary>
-        public ProcessingBehavior ProcessingBehavior { get; set; } = ProcessingBehavior.CommandOnly;
-    }
+    /// <summary>
+    /// Gets or sets the processing behavior. Defaults to <see cref="ProcessingBehavior.CommandOnly"/>.
+    /// </summary>
+    public ProcessingBehavior ProcessingBehavior { get; set; } = ProcessingBehavior.CommandOnly;
 }
diff --git a/src/ImageSharp.Web/Providers/ProcessingBehavior.cs b/src/ImageSharp.Web/Providers/ProcessingBehavior.cs
index f351fc9c..e9c490f7 100644
--- a/src/ImageSharp.Web/Providers/ProcessingBehavior.cs
+++ b/src/ImageSharp.Web/Providers/ProcessingBehavior.cs
@@ -1,21 +1,20 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Web.Providers
+namespace SixLabors.ImageSharp.Web.Providers;
+
+/// <summary>
+/// Enumerates the possible processing behaviors.
+/// </summary>
+public enum ProcessingBehavior
 {
     /// <summary>
-    /// Enumerates the possible processing behaviors.
+    /// The image will be processed only when commands are supplied.
     /// </summary>
-    public enum ProcessingBehavior
-    {
-        /// <summary>
-        /// The image will be processed only when commands are supplied.
-        /// </summary>
-        CommandOnly,
+    CommandOnly,
 
-        /// <summary>
-        /// The image will always be processed.
-        /// </summary>
-        All
-    }
+    /// <summary>
+    /// The image will always be processed.
+    /// </summary>
+    All
 }
diff --git a/src/ImageSharp.Web/Providers/WebRootImageProvider.cs b/src/ImageSharp.Web/Providers/WebRootImageProvider.cs
index ea598c88..5c928dc3 100644
--- a/src/ImageSharp.Web/Providers/WebRootImageProvider.cs
+++ b/src/ImageSharp.Web/Providers/WebRootImageProvider.cs
@@ -1,25 +1,25 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
 using Microsoft.AspNetCore.Hosting;
 
-namespace SixLabors.ImageSharp.Web.Providers
+namespace SixLabors.ImageSharp.Web.Providers;
+
+/// <summary>
+/// Returns images from the web root file provider.
+/// </summary>
+public sealed class WebRootImageProvider : FileProviderImageProvider
 {
     /// <summary>
-    /// Returns images from the web root file provider.
+    /// Initializes a new instance of the <see cref="WebRootImageProvider"/> class.
     /// </summary>
-    public sealed class WebRootImageProvider : FileProviderImageProvider
+    /// <param name="environment">The web hosting environment.</param>
+    /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
+    public WebRootImageProvider(
+        IWebHostEnvironment environment,
+        FormatUtilities formatUtilities)
+        : base(environment.WebRootFileProvider, ProcessingBehavior.CommandOnly, formatUtilities)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WebRootImageProvider"/> class.
-        /// </summary>
-        /// <param name="environment">The web hosting environment.</param>
-        /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
-        public WebRootImageProvider(
-            IWebHostEnvironment environment,
-            FormatUtilities formatUtilities)
-            : base(environment.WebRootFileProvider, ProcessingBehavior.CommandOnly, formatUtilities)
-        {
-        }
     }
 }
diff --git a/src/ImageSharp.Web/Resolvers/FileProviderImageResolver.cs b/src/ImageSharp.Web/Resolvers/FileProviderImageResolver.cs
index 1d047cf3..af0c6bb0 100644
--- a/src/ImageSharp.Web/Resolvers/FileProviderImageResolver.cs
+++ b/src/ImageSharp.Web/Resolvers/FileProviderImageResolver.cs
@@ -1,29 +1,27 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.IO;
-using System.Threading.Tasks;
 using Microsoft.Extensions.FileProviders;
 
-namespace SixLabors.ImageSharp.Web.Resolvers
+namespace SixLabors.ImageSharp.Web.Resolvers;
+
+/// <summary>
+/// Provides means to manage image buffers from an <see cref="IFileInfo"/> instance.
+/// </summary>
+public sealed class FileProviderImageResolver : IImageResolver
 {
+    private readonly IFileInfo fileInfo;
+
     /// <summary>
-    /// Provides means to manage image buffers from an <see cref="IFileInfo"/> instance.
+    /// Initializes a new instance of the <see cref="FileProviderImageResolver"/> class.
     /// </summary>
-    public sealed class FileProviderImageResolver : IImageResolver
-    {
-        private readonly IFileInfo fileInfo;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FileProviderImageResolver"/> class.
-        /// </summary>
-        /// <param name="fileInfo">The file info.</param>
-        public FileProviderImageResolver(IFileInfo fileInfo) => this.fileInfo = fileInfo;
+    /// <param name="fileInfo">The file info.</param>
+    public FileProviderImageResolver(IFileInfo fileInfo) => this.fileInfo = fileInfo;
 
-        /// <inheritdoc/>
-        public Task<ImageMetadata> GetMetaDataAsync() => Task.FromResult(new ImageMetadata(this.fileInfo.LastModified.UtcDateTime, this.fileInfo.Length));
+    /// <inheritdoc/>
+    public Task<ImageMetadata> GetMetaDataAsync() => Task.FromResult(new ImageMetadata(this.fileInfo.LastModified.UtcDateTime, this.fileInfo.Length));
 
-        /// <inheritdoc/>
-        public Task<Stream> OpenReadAsync() => Task.FromResult(this.fileInfo.CreateReadStream());
-    }
+    /// <inheritdoc/>
+    public Task<Stream> OpenReadAsync() => Task.FromResult(this.fileInfo.CreateReadStream());
 }
diff --git a/src/ImageSharp.Web/Resolvers/IImageCacheResolver.cs b/src/ImageSharp.Web/Resolvers/IImageCacheResolver.cs
index ff5f8771..2d2b784a 100644
--- a/src/ImageSharp.Web/Resolvers/IImageCacheResolver.cs
+++ b/src/ImageSharp.Web/Resolvers/IImageCacheResolver.cs
@@ -1,26 +1,23 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.IO;
-using System.Threading.Tasks;
+namespace SixLabors.ImageSharp.Web.Resolvers;
 
-namespace SixLabors.ImageSharp.Web.Resolvers
+/// <summary>
+/// Specifies the contract for resolving image buffers from different cached locations.
+/// </summary>
+public interface IImageCacheResolver
 {
     /// <summary>
-    /// Specifies the contract for resolving image buffers from different cached locations.
+    /// Asynchronously gets metadata associated with this image.
     /// </summary>
-    public interface IImageCacheResolver
-    {
-        /// <summary>
-        /// Asynchronously gets metadata associated with this image.
-        /// </summary>
-        /// <returns>The <see cref="ImageCacheMetadata"/>.</returns>
-        Task<ImageCacheMetadata> GetMetaDataAsync();
+    /// <returns>The <see cref="ImageCacheMetadata"/>.</returns>
+    Task<ImageCacheMetadata> GetMetaDataAsync();
 
-        /// <summary>
-        /// Asynchronously gets the input image stream.
-        /// </summary>
-        /// <returns>The <see cref="Task{Stream}"/>.</returns>
-        Task<Stream> OpenReadAsync();
-    }
+    /// <summary>
+    /// Asynchronously gets the input image stream.
+    /// </summary>
+    /// <returns>The <see cref="Task{Stream}"/>.</returns>
+    Task<Stream> OpenReadAsync();
 }
diff --git a/src/ImageSharp.Web/Resolvers/IImageResolver.cs b/src/ImageSharp.Web/Resolvers/IImageResolver.cs
index 7ae813b3..935702b9 100644
--- a/src/ImageSharp.Web/Resolvers/IImageResolver.cs
+++ b/src/ImageSharp.Web/Resolvers/IImageResolver.cs
@@ -1,26 +1,23 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.IO;
-using System.Threading.Tasks;
+namespace SixLabors.ImageSharp.Web.Resolvers;
 
-namespace SixLabors.ImageSharp.Web.Resolvers
+/// <summary>
+/// Specifies the contract for resolving image buffers from different locations.
+/// </summary>
+public interface IImageResolver
 {
     /// <summary>
-    /// Specifies the contract for resolving image buffers from different locations.
+    /// Asynchronously gets metadata associated with this image.
     /// </summary>
-    public interface IImageResolver
-    {
-        /// <summary>
-        /// Asynchronously gets metadata associated with this image.
-        /// </summary>
-        /// <returns>The <see cref="ImageMetadata"/>.</returns>
-        Task<ImageMetadata> GetMetaDataAsync();
+    /// <returns>The <see cref="ImageMetadata"/>.</returns>
+    Task<ImageMetadata> GetMetaDataAsync();
 
-        /// <summary>
-        /// Asynchronously gets the input image stream.
-        /// </summary>
-        /// <returns>The <see cref="Task{Stream}"/>.</returns>
-        Task<Stream> OpenReadAsync();
-    }
+    /// <summary>
+    /// Asynchronously gets the input image stream.
+    /// </summary>
+    /// <returns>The <see cref="Task{Stream}"/>.</returns>
+    Task<Stream> OpenReadAsync();
 }
diff --git a/src/ImageSharp.Web/Resolvers/PhysicalFileSystemCacheResolver.cs b/src/ImageSharp.Web/Resolvers/PhysicalFileSystemCacheResolver.cs
index 80557900..6494079b 100644
--- a/src/ImageSharp.Web/Resolvers/PhysicalFileSystemCacheResolver.cs
+++ b/src/ImageSharp.Web/Resolvers/PhysicalFileSystemCacheResolver.cs
@@ -1,70 +1,68 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System.IO;
 using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 using SixLabors.ImageSharp.Web.Caching;
 
-namespace SixLabors.ImageSharp.Web.Resolvers
+namespace SixLabors.ImageSharp.Web.Resolvers;
+
+/// <summary>
+/// Provides means to manage image buffers within the <see cref="PhysicalFileSystemCache"/>.
+/// </summary>
+public class PhysicalFileSystemCacheResolver : IImageCacheResolver
 {
+    private readonly FileInfo metaFileInfo;
+    private readonly FormatUtilities formatUtilities;
+    private ImageCacheMetadata metadata;
+
     /// <summary>
-    /// Provides means to manage image buffers within the <see cref="PhysicalFileSystemCache"/>.
+    /// Initializes a new instance of the <see cref="PhysicalFileSystemCacheResolver"/> class.
     /// </summary>
-    public class PhysicalFileSystemCacheResolver : IImageCacheResolver
+    /// <param name="metaFileInfo">The cached metadata file info.</param>
+    /// <param name="formatUtilities">
+    /// Contains various format helper methods based on the current configuration.
+    /// </param>
+    public PhysicalFileSystemCacheResolver(FileInfo metaFileInfo, FormatUtilities formatUtilities)
     {
-        private readonly FileInfo metaFileInfo;
-        private readonly FormatUtilities formatUtilities;
-        private ImageCacheMetadata metadata;
+        this.metaFileInfo = metaFileInfo;
+        this.formatUtilities = formatUtilities;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PhysicalFileSystemCacheResolver"/> class.
-        /// </summary>
-        /// <param name="metaFileInfo">The cached metadata file info.</param>
-        /// <param name="formatUtilities">
-        /// Contains various format helper methods based on the current configuration.
-        /// </param>
-        public PhysicalFileSystemCacheResolver(FileInfo metaFileInfo, FormatUtilities formatUtilities)
+    /// <inheritdoc/>
+    public async Task<ImageCacheMetadata> GetMetaDataAsync()
+    {
+        if (this.metadata == default)
         {
-            this.metaFileInfo = metaFileInfo;
-            this.formatUtilities = formatUtilities;
+            using FileStream stream = OpenFileStream(this.metaFileInfo.FullName);
+            this.metadata = await ImageCacheMetadata.ReadAsync(stream);
         }
 
-        /// <inheritdoc/>
-        public async Task<ImageCacheMetadata> GetMetaDataAsync()
-        {
-            if (this.metadata == default)
-            {
-                using FileStream stream = OpenFileStream(this.metaFileInfo.FullName);
-                this.metadata = await ImageCacheMetadata.ReadAsync(stream);
-            }
-
-            return this.metadata;
-        }
+        return this.metadata;
+    }
 
-        /// <inheritdoc/>
-        public Task<Stream> OpenReadAsync()
-        {
-            string path = Path.ChangeExtension(
-                this.metaFileInfo.FullName,
-                this.formatUtilities.GetExtensionFromContentType(this.metadata.ContentType));
+    /// <inheritdoc/>
+    public Task<Stream> OpenReadAsync()
+    {
+        string path = Path.ChangeExtension(
+            this.metaFileInfo.FullName,
+            this.formatUtilities.GetExtensionFromContentType(this.metadata.ContentType));
 
-            return Task.FromResult<Stream>(OpenFileStream(path));
-        }
+        return Task.FromResult<Stream>(OpenFileStream(path));
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static FileStream OpenFileStream(string path)
-        {
-            // We are setting buffer size to 1 to prevent FileStream from allocating it's internal buffer
-            // 0 causes constructor to throw
-            const int bufferSize = 1;
-            return new FileStream(
-                path,
-                FileMode.Open,
-                FileAccess.Read,
-                FileShare.ReadWrite,
-                bufferSize,
-                FileOptions.Asynchronous | FileOptions.SequentialScan);
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static FileStream OpenFileStream(string path)
+    {
+        // We are setting buffer size to 1 to prevent FileStream from allocating it's internal buffer
+        // 0 causes constructor to throw
+        const int bufferSize = 1;
+        return new FileStream(
+            path,
+            FileMode.Open,
+            FileAccess.Read,
+            FileShare.ReadWrite,
+            bufferSize,
+            FileOptions.Asynchronous | FileOptions.SequentialScan);
     }
 }
diff --git a/src/ImageSharp.Web/Synchronization/AsyncKeyLock.cs b/src/ImageSharp.Web/Synchronization/AsyncKeyLock.cs
index 9b02512c..13cd5b95 100644
--- a/src/ImageSharp.Web/Synchronization/AsyncKeyLock.cs
+++ b/src/ImageSharp.Web/Synchronization/AsyncKeyLock.cs
@@ -1,85 +1,80 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
 using System.Collections.Concurrent;
-using System.Threading.Tasks;
 
-#nullable enable
+namespace SixLabors.ImageSharp.Web.Synchronization;
 
-namespace SixLabors.ImageSharp.Web.Synchronization
+/// <summary>
+/// Extension of the <see cref="AsyncLock"/> that enables fine-grained locking on a given key.
+/// Concurrent lock requests using different keys can execute simultaneously, while requests to lock
+/// using the same key will be forced to wait. This object is thread-safe and internally uses a pooling
+/// mechanism to minimize allocation of new locks.
+/// </summary>
+/// <typeparam name="TKey">The type of the key.</typeparam>
+public sealed class AsyncKeyLock<TKey> : IDisposable
+    where TKey : notnull
 {
+    private readonly RefCountedConcurrentDictionary<TKey, AsyncLock> activeLocks;
+    private readonly ConcurrentBag<AsyncLock> pool;
+    private readonly int maxPoolSize;
+
     /// <summary>
-    /// Extension of the <see cref="AsyncLock"/> that enables fine-grained locking on a given key.
-    /// Concurrent lock requests using different keys can execute simultaneously, while requests to lock
-    /// using the same key will be forced to wait. This object is thread-safe and internally uses a pooling
-    /// mechanism to minimize allocation of new locks.
+    /// Initializes a new instance of the <see cref="AsyncKeyLock{TKey}"/> class.
     /// </summary>
-    /// <typeparam name="TKey">The type of the key.</typeparam>
-    public class AsyncKeyLock<TKey> : IDisposable
-        where TKey : notnull
+    /// <param name="maxPoolSize">The maximum number of locks that should be pooled for reuse.</param>
+    public AsyncKeyLock(int maxPoolSize = 64)
     {
-        private readonly RefCountedConcurrentDictionary<TKey, AsyncLock> activeLocks;
-        private readonly ConcurrentBag<AsyncLock> pool;
-        private readonly int maxPoolSize;
+        this.pool = new ConcurrentBag<AsyncLock>();
+        this.activeLocks = new RefCountedConcurrentDictionary<TKey, AsyncLock>(this.CreateLeasedLock, this.ReturnLeasedLock);
+        this.maxPoolSize = maxPoolSize;
+    }
+
+    /// <summary>
+    /// Locks the current thread asynchronously.
+    /// </summary>
+    /// <param name="key">The key identifying the specific object to lock against.</param>
+    /// <returns>
+    /// The <see cref="IDisposable"/> that will release the lock.
+    /// </returns>
+    public Task<IDisposable> LockAsync(TKey key)
+        => this.activeLocks.Get(key).LockAsync();
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AsyncKeyLock{TKey}"/> class.
-        /// </summary>
-        /// <param name="maxPoolSize">The maximum number of locks that should be pooled for reuse.</param>
-        public AsyncKeyLock(int maxPoolSize = 64)
+    /// <summary>
+    /// Releases all resources used by the current instance of the <see cref="AsyncKeyLock{TKey}"/> class.
+    /// </summary>
+    public void Dispose()
+    {
+        // Dispose of all the locks in the pool
+        while (this.pool.TryTake(out AsyncLock? asyncLock))
         {
-            this.pool = new ConcurrentBag<AsyncLock>();
-            this.activeLocks = new RefCountedConcurrentDictionary<TKey, AsyncLock>(this.CreateLeasedLock, this.ReturnLeasedLock);
-            this.maxPoolSize = maxPoolSize;
+            asyncLock.Dispose();
         }
 
-        /// <summary>
-        /// Locks the current thread asynchronously.
-        /// </summary>
-        /// <param name="key">The key identifying the specific object to lock against.</param>
-        /// <returns>
-        /// The <see cref="IDisposable"/> that will release the lock.
-        /// </returns>
-        public Task<IDisposable> LockAsync(TKey key)
-            => this.activeLocks.Get(key).LockAsync();
+        // activeLocks SHOULD be empty at this point so we don't need to try and clear it out.
+        // If it's not empty, then this object is being disposed of prematurely!
+    }
 
-        /// <summary>
-        /// Releases all resources used by the current instance of the <see cref="AsyncKeyLock{TKey}"/> class.
-        /// </summary>
-        public void Dispose()
+    private AsyncLock CreateLeasedLock(TKey key)
+    {
+        if (!this.pool.TryTake(out AsyncLock? asyncLock))
         {
-            // Dispose of all the locks in the pool
-            while (this.pool.TryTake(out AsyncLock? asyncLock))
-            {
-                asyncLock.Dispose();
-            }
-
-            // activeLocks SHOULD be empty at this point so we don't need to try and clear it out.
-            // If it's not empty, then this object is being disposed of prematurely!
+            asyncLock = new AsyncLock();
         }
 
-        private AsyncLock CreateLeasedLock(TKey key)
-        {
-            if (!this.pool.TryTake(out AsyncLock? asyncLock))
-            {
-                asyncLock = new AsyncLock();
-            }
+        asyncLock.OnRelease = () => this.activeLocks.Release(key);
+        return asyncLock;
+    }
 
-            asyncLock.OnRelease = () => this.activeLocks.Release(key);
-            return asyncLock;
+    private void ReturnLeasedLock(AsyncLock asyncLock)
+    {
+        if (this.pool.Count < this.maxPoolSize)
+        {
+            this.pool.Add(asyncLock);
         }
-
-        private void ReturnLeasedLock(AsyncLock asyncLock)
+        else
         {
-            if (this.pool.Count < this.maxPoolSize)
-            {
-                this.pool.Add(asyncLock);
-            }
-            else
-            {
-                asyncLock.Dispose();
-            }
+            asyncLock.Dispose();
         }
     }
 }
diff --git a/src/ImageSharp.Web/Synchronization/AsyncKeyReaderWriterLock.cs b/src/ImageSharp.Web/Synchronization/AsyncKeyReaderWriterLock.cs
index d43c89c3..94557389 100644
--- a/src/ImageSharp.Web/Synchronization/AsyncKeyReaderWriterLock.cs
+++ b/src/ImageSharp.Web/Synchronization/AsyncKeyReaderWriterLock.cs
@@ -1,76 +1,71 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
 using System.Collections.Concurrent;
-using System.Threading.Tasks;
 
-#nullable enable
+namespace SixLabors.ImageSharp.Web.Synchronization;
 
-namespace SixLabors.ImageSharp.Web.Synchronization
+/// <summary>
+/// Extension of the <see cref="AsyncReaderWriterLock"/> that enables fine-grained locking on a given key.
+/// Concurrent write lock requests using different keys can execute simultaneously, while requests to lock
+/// using the same key will be forced to wait. This object is thread-safe and internally uses a pooling
+/// mechanism to minimize allocation of new locks.
+/// </summary>
+/// <typeparam name="TKey">The type of the key.</typeparam>
+public class AsyncKeyReaderWriterLock<TKey>
+    where TKey : notnull
 {
+    private readonly RefCountedConcurrentDictionary<TKey, AsyncReaderWriterLock> activeLocks;
+    private readonly ConcurrentBag<AsyncReaderWriterLock> pool;
+    private readonly int maxPoolSize;
+
     /// <summary>
-    /// Extension of the <see cref="AsyncReaderWriterLock"/> that enables fine-grained locking on a given key.
-    /// Concurrent write lock requests using different keys can execute simultaneously, while requests to lock
-    /// using the same key will be forced to wait. This object is thread-safe and internally uses a pooling
-    /// mechanism to minimize allocation of new locks.
+    /// Initializes a new instance of the <see cref="AsyncKeyReaderWriterLock{TKey}"/> class.
     /// </summary>
-    /// <typeparam name="TKey">The type of the key.</typeparam>
-    public class AsyncKeyReaderWriterLock<TKey>
-        where TKey : notnull
+    /// <param name="maxPoolSize">The maximum number of locks that should be pooled for reuse.</param>
+    public AsyncKeyReaderWriterLock(int maxPoolSize = 64)
     {
-        private readonly RefCountedConcurrentDictionary<TKey, AsyncReaderWriterLock> activeLocks;
-        private readonly ConcurrentBag<AsyncReaderWriterLock> pool;
-        private readonly int maxPoolSize;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AsyncKeyReaderWriterLock{TKey}"/> class.
-        /// </summary>
-        /// <param name="maxPoolSize">The maximum number of locks that should be pooled for reuse.</param>
-        public AsyncKeyReaderWriterLock(int maxPoolSize = 64)
-        {
-            this.pool = new ConcurrentBag<AsyncReaderWriterLock>();
-            this.activeLocks = new RefCountedConcurrentDictionary<TKey, AsyncReaderWriterLock>(this.CreateLeasedLock, this.ReturnLeasedLock);
-            this.maxPoolSize = maxPoolSize;
-        }
+        this.pool = new ConcurrentBag<AsyncReaderWriterLock>();
+        this.activeLocks = new RefCountedConcurrentDictionary<TKey, AsyncReaderWriterLock>(this.CreateLeasedLock, this.ReturnLeasedLock);
+        this.maxPoolSize = maxPoolSize;
+    }
 
-        /// <summary>
-        /// Locks the current thread in read mode asynchronously.
-        /// </summary>
-        /// <param name="key">The key identifying the specific object to lock against.</param>
-        /// <returns>
-        /// The <see cref="IDisposable"/> that will release the lock.
-        /// </returns>
-        public Task<IDisposable> ReaderLockAsync(TKey key)
-            => this.activeLocks.Get(key).ReaderLockAsync();
+    /// <summary>
+    /// Locks the current thread in read mode asynchronously.
+    /// </summary>
+    /// <param name="key">The key identifying the specific object to lock against.</param>
+    /// <returns>
+    /// The <see cref="IDisposable"/> that will release the lock.
+    /// </returns>
+    public Task<IDisposable> ReaderLockAsync(TKey key)
+        => this.activeLocks.Get(key).ReaderLockAsync();
 
-        /// <summary>
-        /// Locks the current thread in write mode asynchronously.
-        /// </summary>
-        /// <param name="key">The key identifying the specific object to lock against.</param>
-        /// <returns>
-        /// The <see cref="IDisposable"/> that will release the lock.
-        /// </returns>
-        public Task<IDisposable> WriterLockAsync(TKey key)
-            => this.activeLocks.Get(key).WriterLockAsync();
+    /// <summary>
+    /// Locks the current thread in write mode asynchronously.
+    /// </summary>
+    /// <param name="key">The key identifying the specific object to lock against.</param>
+    /// <returns>
+    /// The <see cref="IDisposable"/> that will release the lock.
+    /// </returns>
+    public Task<IDisposable> WriterLockAsync(TKey key)
+        => this.activeLocks.Get(key).WriterLockAsync();
 
-        private AsyncReaderWriterLock CreateLeasedLock(TKey key)
+    private AsyncReaderWriterLock CreateLeasedLock(TKey key)
+    {
+        if (!this.pool.TryTake(out AsyncReaderWriterLock? asyncLock))
         {
-            if (!this.pool.TryTake(out AsyncReaderWriterLock? asyncLock))
-            {
-                asyncLock = new AsyncReaderWriterLock();
-            }
-
-            asyncLock.OnRelease = () => this.activeLocks.Release(key);
-            return asyncLock;
+            asyncLock = new AsyncReaderWriterLock();
         }
 
-        private void ReturnLeasedLock(AsyncReaderWriterLock asyncLock)
+        asyncLock.OnRelease = () => this.activeLocks.Release(key);
+        return asyncLock;
+    }
+
+    private void ReturnLeasedLock(AsyncReaderWriterLock asyncLock)
+    {
+        if (this.pool.Count < this.maxPoolSize)
         {
-            if (this.pool.Count < this.maxPoolSize)
-            {
-                this.pool.Add(asyncLock);
-            }
+            this.pool.Add(asyncLock);
         }
     }
 }
diff --git a/src/ImageSharp.Web/Synchronization/AsyncLock.cs b/src/ImageSharp.Web/Synchronization/AsyncLock.cs
index 3c5c3c81..6eec0517 100644
--- a/src/ImageSharp.Web/Synchronization/AsyncLock.cs
+++ b/src/ImageSharp.Web/Synchronization/AsyncLock.cs
@@ -1,92 +1,83 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using System.Threading;
-using System.Threading.Tasks;
+namespace SixLabors.ImageSharp.Web.Synchronization;
 
-#nullable enable
-
-namespace SixLabors.ImageSharp.Web.Synchronization
+/// <summary>
+/// An asynchronous locker that uses an IDisposable pattern for releasing the lock.
+/// </summary>
+public sealed class AsyncLock : IDisposable
 {
+    private readonly SemaphoreSlim semaphore;
+    private readonly IDisposable releaser;
+    private readonly Task<IDisposable> releaserTask;
+
     /// <summary>
-    /// An asynchronous locker that uses an IDisposable pattern for releasing the lock.
+    /// Initializes a new instance of the <see cref="AsyncLock"/> class.
     /// </summary>
-    public class AsyncLock : IDisposable
+    public AsyncLock()
     {
-        private readonly SemaphoreSlim semaphore;
-#pragma warning disable IDE0069 // Disposable fields should be disposed
-        private readonly IDisposable releaser;
-#pragma warning restore IDE0069 // Disposable fields should be disposed
-        private readonly Task<IDisposable> releaserTask;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AsyncLock"/> class.
-        /// </summary>
-        public AsyncLock()
-        {
-            this.semaphore = new SemaphoreSlim(1, 1);
-            this.releaser = new Releaser(this);
-            this.releaserTask = Task.FromResult(this.releaser);
-        }
+        this.semaphore = new SemaphoreSlim(1, 1);
+        this.releaser = new Releaser(this);
+        this.releaserTask = Task.FromResult(this.releaser);
+    }
 
-        /// <summary>
-        /// Gets or sets the callback that should be invoked whenever this lock is released.
-        /// </summary>
-        public Action? OnRelease { get; set; }
+    /// <summary>
+    /// Gets or sets the callback that should be invoked whenever this lock is released.
+    /// </summary>
+    public Action? OnRelease { get; set; }
 
-        /// <summary>
-        /// Asynchronously obtains the lock. Dispose the returned <see cref="IDisposable"/> to release the lock.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="IDisposable"/> that will release the lock.
-        /// </returns>
-        public Task<IDisposable> LockAsync()
-        {
-            Task wait = this.semaphore.WaitAsync();
+    /// <summary>
+    /// Asynchronously obtains the lock. Dispose the returned <see cref="IDisposable"/> to release the lock.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="IDisposable"/> that will release the lock.
+    /// </returns>
+    public Task<IDisposable> LockAsync()
+    {
+        Task wait = this.semaphore.WaitAsync();
 
-            // No-allocation fast path when the semaphore wait completed synchronously
-            return (wait.Status == TaskStatus.RanToCompletion)
-                ? this.releaserTask
-                : AwaitThenReturn(wait, this.releaser);
+        // No-allocation fast path when the semaphore wait completed synchronously
+        return (wait.Status == TaskStatus.RanToCompletion)
+            ? this.releaserTask
+            : AwaitThenReturn(wait, this.releaser);
 
-            static async Task<IDisposable> AwaitThenReturn(Task t, IDisposable r)
-            {
-                await t;
-                return r;
-            }
+        static async Task<IDisposable> AwaitThenReturn(Task t, IDisposable r)
+        {
+            await t;
+            return r;
         }
+    }
 
-        private void Release()
+    private void Release()
+    {
+        try
         {
-            try
-            {
-                this.semaphore.Release();
-            }
-            finally
-            {
-                this.OnRelease?.Invoke();
-            }
+            this.semaphore.Release();
         }
+        finally
+        {
+            this.OnRelease?.Invoke();
+        }
+    }
 
-        /// <summary>
-        /// Releases all resources used by the current instance of the <see cref="AsyncLock"/> class.
-        /// </summary>
-        public void Dispose() => this.semaphore.Dispose();
+    /// <summary>
+    /// Releases all resources used by the current instance of the <see cref="AsyncLock"/> class.
+    /// </summary>
+    public void Dispose() => this.semaphore.Dispose();
 
-        /// <summary>
-        /// Utility class that releases an <see cref="AsyncLock"/> on disposal.
-        /// </summary>
-        private sealed class Releaser : IDisposable
-        {
-            private readonly AsyncLock toRelease;
+    /// <summary>
+    /// Utility class that releases an <see cref="AsyncLock"/> on disposal.
+    /// </summary>
+    private sealed class Releaser : IDisposable
+    {
+        private readonly AsyncLock toRelease;
 
-            internal Releaser(AsyncLock toRelease) => this.toRelease = toRelease;
+        internal Releaser(AsyncLock toRelease) => this.toRelease = toRelease;
 
-            /// <summary>
-            /// Releases the <see cref="AsyncLock"/> associated with this <see cref="Releaser"/>.
-            /// </summary>
-            public void Dispose() => this.toRelease?.Release();
-        }
+        /// <summary>
+        /// Releases the <see cref="AsyncLock"/> associated with this <see cref="Releaser"/>.
+        /// </summary>
+        public void Dispose() => this.toRelease?.Release();
     }
 }
diff --git a/src/ImageSharp.Web/Synchronization/AsyncReaderWriterLock.cs b/src/ImageSharp.Web/Synchronization/AsyncReaderWriterLock.cs
index b48a4df2..26cce3b4 100644
--- a/src/ImageSharp.Web/Synchronization/AsyncReaderWriterLock.cs
+++ b/src/ImageSharp.Web/Synchronization/AsyncReaderWriterLock.cs
@@ -1,217 +1,206 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
+// Licensed under the Six Labors Split License.
+
+namespace SixLabors.ImageSharp.Web.Synchronization;
+
+/// <summary>
+/// An asynchronous locker that provides read and write locking policies.
+/// <para>
+/// This is based on the following blog post:
+/// https://devblogs.microsoft.com/pfxteam/building-async-coordination-primitives-part-7-asyncreaderwriterlock/
+/// </para>
+/// </summary>
+#pragma warning disable CA1001 // Types that own disposable fields should be disposable
+public class AsyncReaderWriterLock
+#pragma warning restore CA1001 // Types that own disposable fields should be disposable
+{
+    private readonly object stateLock;
+    private readonly IDisposable writerReleaser;
+    private readonly IDisposable readerReleaser;
+    private readonly Task<IDisposable> writerReleaserTask;
+    private readonly Task<IDisposable> readerReleaserTask;
+    private readonly Queue<TaskCompletionSource<IDisposable>> waitingWriters;
+    private TaskCompletionSource<IDisposable>? waitingReaders;
+    private int readersWaiting;
 
-#nullable enable
+    /// <summary>
+    /// Tracks the current status of the lock:
+    /// 0 == lock is unheld
+    /// -1 == lock is held by a single writer
+    /// >0 == lock is held by this number of concurrent readers
+    /// </summary>
+    private int status;
 
-namespace SixLabors.ImageSharp.Web.Synchronization
-{
     /// <summary>
-    /// An asynchronous locker that provides read and write locking policies.
-    /// <para>
-    /// This is based on the following blog post:
-    /// https://devblogs.microsoft.com/pfxteam/building-async-coordination-primitives-part-7-asyncreaderwriterlock/
-    /// </para>
+    /// Initializes a new instance of the <see cref="AsyncReaderWriterLock"/> class.
     /// </summary>
-    public class AsyncReaderWriterLock
+    public AsyncReaderWriterLock()
     {
-        private readonly object stateLock;
-        private readonly IDisposable writerReleaser;
-        private readonly IDisposable readerReleaser;
-        private readonly Task<IDisposable> writerReleaserTask;
-        private readonly Task<IDisposable> readerReleaserTask;
-        private readonly Queue<TaskCompletionSource<IDisposable>> waitingWriters;
-        private TaskCompletionSource<IDisposable>? waitingReaders;
-        private int readersWaiting;
+        this.stateLock = new object();
+        this.writerReleaser = new Releaser(this, true);
+        this.readerReleaser = new Releaser(this, false);
+        this.writerReleaserTask = Task.FromResult(this.writerReleaser);
+        this.readerReleaserTask = Task.FromResult(this.readerReleaser);
+        this.waitingWriters = new Queue<TaskCompletionSource<IDisposable>>();
+        this.waitingReaders = null;
+        this.readersWaiting = 0;
+        this.status = 0;
+    }
 
-        /// <summary>
-        /// Tracks the current status of the lock:
-        /// 0 == lock is unheld
-        /// -1 == lock is held by a single writer
-        /// >0 == lock is held by this number of concurrent readers
-        /// </summary>
-        private int status;
+    /// <summary>
+    /// Gets or sets the callback that should be invoked whenever this lock is released.
+    /// </summary>
+    public Action? OnRelease { get; set; }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AsyncReaderWriterLock"/> class.
-        /// </summary>
-        public AsyncReaderWriterLock()
+    /// <summary>
+    /// Asynchronously obtains the lock in shared reader mode. Dispose the returned <see cref="IDisposable"/>
+    /// to release the lock.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="IDisposable"/> that will release the lock.
+    /// </returns>
+    public Task<IDisposable> ReaderLockAsync()
+    {
+        lock (this.stateLock)
         {
-            this.stateLock = new object();
-            this.writerReleaser = new Releaser(this, true);
-            this.readerReleaser = new Releaser(this, false);
-            this.writerReleaserTask = Task.FromResult(this.writerReleaser);
-            this.readerReleaserTask = Task.FromResult(this.readerReleaser);
-            this.waitingWriters = new Queue<TaskCompletionSource<IDisposable>>();
-            this.waitingReaders = null;
-            this.readersWaiting = 0;
-            this.status = 0;
-        }
+            if (this.status >= 0 && this.waitingWriters.Count == 0)
+            {
+                // Lock is not held by a writer and no writers are waiting, so allow this reader to obtain
+                // the lock immediately and return the pre-allocated reader releaser.
+                ++this.status;
+                return this.readerReleaserTask;
+            }
 
-        /// <summary>
-        /// Gets or sets the callback that should be invoked whenever this lock is released.
-        /// </summary>
-        public Action? OnRelease { get; set; }
+            // This reader has to wait to obtain the lock.  Lazy instantiate the waitingReader tcs
+            // and return the task.
+            ++this.readersWaiting;
 
-        /// <summary>
-        /// Asynchronously obtains the lock in shared reader mode. Dispose the returned <see cref="IDisposable"/>
-        /// to release the lock.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="IDisposable"/> that will release the lock.
-        /// </returns>
-        public Task<IDisposable> ReaderLockAsync()
+            this.waitingReaders ??= new TaskCompletionSource<IDisposable>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+            return this.waitingReaders.Task;
+        }
+    }
+
+    /// <summary>
+    /// Asynchronously obtains the lock in exclusive writer mode. Dispose the returned <see cref="IDisposable"/>
+    /// to release the lock.
+    /// </summary>
+    /// <returns>
+    /// The <see cref="IDisposable"/> that will release the lock.
+    /// </returns>
+    public Task<IDisposable> WriterLockAsync()
+    {
+        lock (this.stateLock)
         {
-            lock (this.stateLock)
+            if (this.status == 0)
             {
-                if (this.status >= 0 && this.waitingWriters.Count == 0)
-                {
-                    // Lock is not held by a writer and no writers are waiting, so allow this reader to obtain
-                    // the lock immediately and return the pre-allocated reader releaser.
-                    ++this.status;
-                    return this.readerReleaserTask;
-                }
-                else
-                {
-                    // This reader has to wait to obtain the lock.  Lazy instantiate the waitingReader tcs
-                    // and return the task.
-                    ++this.readersWaiting;
+                // Lock is currently unheld, so allow this writer to obtain the lock immediately and return the
+                // pre-allocated writer releaser.
+                this.status = -1;
+                return this.writerReleaserTask;
+            }
 
-                    if (this.waitingReaders == null)
-                    {
-                        this.waitingReaders = new TaskCompletionSource<IDisposable>(TaskCreationOptions.RunContinuationsAsynchronously);
-                    }
+            // This writer has to wait to obtain the lock. Create a new tcs for this writer, add it to the
+            // queue of waiting writers, and return the task.
+            TaskCompletionSource<IDisposable> waiter = new(TaskCreationOptions.RunContinuationsAsynchronously);
+            this.waitingWriters.Enqueue(waiter);
 
-                    return this.waitingReaders.Task;
-                }
-            }
+            return waiter.Task;
         }
+    }
 
-        /// <summary>
-        /// Asynchronously obtains the lock in exclusive writer mode. Dispose the returned <see cref="IDisposable"/>
-        /// to release the lock.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="IDisposable"/> that will release the lock.
-        /// </returns>
-        public Task<IDisposable> WriterLockAsync()
+    private void ReaderRelease()
+    {
+        try
         {
+            TaskCompletionSource<IDisposable>? nextLockHolder = null;
+
             lock (this.stateLock)
             {
-                if (this.status == 0)
+                --this.status;
+                if (this.status == 0 && this.waitingWriters.Count > 0)
                 {
-                    // Lock is currently unheld, so allow this writer to obtain the lock immediately and return the
-                    // pre-allocated writer releaser.
+                    // The lock is now unheld, and there's a writer waiting, so give the lock to the first writer in the queue.
                     this.status = -1;
-                    return this.writerReleaserTask;
-                }
-                else
-                {
-                    // This writer has to wait to obtain the lock. Create a new tcs for this writer, add it to the
-                    // queue of waiting writers, and return the task.
-                    var waiter = new TaskCompletionSource<IDisposable>(TaskCreationOptions.RunContinuationsAsynchronously);
-                    this.waitingWriters.Enqueue(waiter);
-                    return waiter.Task;
+                    nextLockHolder = this.waitingWriters.Dequeue();
                 }
             }
+
+            nextLockHolder?.SetResult(this.writerReleaser);
         }
+        finally
+        {
+            this.OnRelease?.Invoke();
+        }
+    }
 
-        private void ReaderRelease()
+    private void WriterRelease()
+    {
+        try
         {
-            try
-            {
-                TaskCompletionSource<IDisposable>? nextLockHolder = null;
+            TaskCompletionSource<IDisposable>? nextLockHolder;
+            IDisposable releaser;
 
-                lock (this.stateLock)
+            lock (this.stateLock)
+            {
+                if (this.waitingWriters.Count > 0)
                 {
-                    --this.status;
-                    if (this.status == 0 && this.waitingWriters.Count > 0)
-                    {
-                        // The lock is now unheld, and there's a writer waiting, so give the lock to the first writer in the queue.
-                        this.status = -1;
-                        nextLockHolder = this.waitingWriters.Dequeue();
-                    }
+                    // There's another writer waiting, so pass the lock on to the next writer.
+                    nextLockHolder = this.waitingWriters.Dequeue();
+                    releaser = this.writerReleaser;
+                }
+                else if (this.readersWaiting > 0)
+                {
+                    // There are readers waiting. Wake them all up at the same time since they can all concurrently
+                    // hold the reader lock.
+                    nextLockHolder = this.waitingReaders;
+                    releaser = this.readerReleaser;
+                    this.status = this.readersWaiting;
+                    this.readersWaiting = 0;
+                    this.waitingReaders = null;
+                }
+                else
+                {
+                    // Nobody is waiting, so the lock is now unheld.
+                    this.status = 0;
+                    return;
                 }
-
-                nextLockHolder?.SetResult(this.writerReleaser);
-            }
-            finally
-            {
-                this.OnRelease?.Invoke();
             }
-        }
 
-        private void WriterRelease()
+            nextLockHolder?.SetResult(releaser);
+        }
+        finally
         {
-            try
-            {
-                TaskCompletionSource<IDisposable>? nextLockHolder;
-                IDisposable releaser;
+            this.OnRelease?.Invoke();
+        }
+    }
 
-                lock (this.stateLock)
-                {
-                    if (this.waitingWriters.Count > 0)
-                    {
-                        // There's another writer waiting, so pass the lock on to the next writer.
-                        nextLockHolder = this.waitingWriters.Dequeue();
-                        releaser = this.writerReleaser;
-                    }
-                    else if (this.readersWaiting > 0)
-                    {
-                        // There are readers waiting. Wake them all up at the same time since they can all concurrently
-                        // hold the reader lock.
-                        nextLockHolder = this.waitingReaders;
-                        releaser = this.readerReleaser;
-                        this.status = this.readersWaiting;
-                        this.readersWaiting = 0;
-                        this.waitingReaders = null;
-                    }
-                    else
-                    {
-                        // Nobody is waiting, so the lock is now unheld.
-                        this.status = 0;
-                        return;
-                    }
-                }
+    /// <summary>
+    /// Utility class that releases an <see cref="AsyncReaderWriterLock"/> on disposal.
+    /// </summary>
+    private sealed class Releaser : IDisposable
+    {
+        private readonly AsyncReaderWriterLock toRelease;
+        private readonly bool writer;
 
-                nextLockHolder?.SetResult(releaser);
-            }
-            finally
-            {
-                this.OnRelease?.Invoke();
-            }
+        internal Releaser(AsyncReaderWriterLock toRelease, bool writer)
+        {
+            this.toRelease = toRelease;
+            this.writer = writer;
         }
 
         /// <summary>
-        /// Utility class that releases an <see cref="AsyncReaderWriterLock"/> on disposal.
+        /// Releases the <see cref="AsyncReaderWriterLock"/> associated with this <see cref="Releaser"/>.
         /// </summary>
-        private sealed class Releaser : IDisposable
+        public void Dispose()
         {
-            private readonly AsyncReaderWriterLock toRelease;
-            private readonly bool writer;
-
-            internal Releaser(AsyncReaderWriterLock toRelease, bool writer)
+            if (this.writer)
             {
-                this.toRelease = toRelease;
-                this.writer = writer;
+                this.toRelease.WriterRelease();
             }
-
-            /// <summary>
-            /// Releases the <see cref="AsyncReaderWriterLock"/> associated with this <see cref="Releaser"/>.
-            /// </summary>
-            public void Dispose()
+            else
             {
-                if (this.writer)
-                {
-                    this.toRelease.WriterRelease();
-                }
-                else
-                {
-                    this.toRelease.ReaderRelease();
-                }
+                this.toRelease.ReaderRelease();
             }
         }
     }
diff --git a/src/ImageSharp.Web/Synchronization/RefCountedConcurrentDictionary.cs b/src/ImageSharp.Web/Synchronization/RefCountedConcurrentDictionary.cs
index b4b8bded..c9c34cab 100644
--- a/src/ImageSharp.Web/Synchronization/RefCountedConcurrentDictionary.cs
+++ b/src/ImageSharp.Web/Synchronization/RefCountedConcurrentDictionary.cs
@@ -1,244 +1,239 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
 using System.Collections;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 
-#nullable enable
-
-namespace SixLabors.ImageSharp.Web.Synchronization
+namespace SixLabors.ImageSharp.Web.Synchronization;
+
+/// <summary>
+/// Represents a thread-safe collection of reference-counted key/value pairs that can be accessed by multiple
+/// threads concurrently. Values that don't yet exist are automatically created using a caller supplied
+/// value factory method, and when their final refcount is released they are removed from the dictionary.
+/// </summary>
+/// <typeparam name="TKey">The type of the key.</typeparam>
+/// <typeparam name="TValue">The value for the dictionary.</typeparam>
+public class RefCountedConcurrentDictionary<TKey, TValue>
+    where TKey : notnull
+    where TValue : class
 {
+    private readonly ConcurrentDictionary<TKey, RefCountedValue> dictionary;
+    private readonly Func<TKey, TValue> valueFactory;
+    private readonly Action<TValue>? valueReleaser;
+
     /// <summary>
-    /// Represents a thread-safe collection of reference-counted key/value pairs that can be accessed by multiple
-    /// threads concurrently. Values that don't yet exist are automatically created using a caller supplied
-    /// value factory method, and when their final refcount is released they are removed from the dictionary.
+    /// Initializes a new instance of the <see cref="RefCountedConcurrentDictionary{TKey, TValue}"/> class that is empty,
+    /// has the default concurrency level, has the default initial capacity, and uses the default comparer for the key type.
     /// </summary>
-    /// <typeparam name="TKey">The type of the key.</typeparam>
-    /// <typeparam name="TValue">The value for the dictionary.</typeparam>
-    public class RefCountedConcurrentDictionary<TKey, TValue>
-        where TKey : notnull
-        where TValue : class
+    /// <param name="valueFactory">Factory method that generates a new <typeparamref name="TValue"/> for a given <typeparamref name="TKey"/>.</param>
+    /// <param name="valueReleaser">Optional callback that is used to cleanup <typeparamref name="TValue"/>s after their final ref count is released.</param>
+    public RefCountedConcurrentDictionary(Func<TKey, TValue> valueFactory, Action<TValue>? valueReleaser = null)
+        : this(new ConcurrentDictionary<TKey, RefCountedValue>(), valueFactory, valueReleaser)
     {
-        private readonly ConcurrentDictionary<TKey, RefCountedValue> dictionary;
-        private readonly Func<TKey, TValue> valueFactory;
-        private readonly Action<TValue>? valueReleaser;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RefCountedConcurrentDictionary{TKey, TValue}"/> class that is empty,
-        /// has the default concurrency level, has the default initial capacity, and uses the default comparer for the key type.
-        /// </summary>
-        /// <param name="valueFactory">Factory method that generates a new <typeparamref name="TValue"/> for a given <typeparamref name="TKey"/>.</param>
-        /// <param name="valueReleaser">Optional callback that is used to cleanup <typeparamref name="TValue"/>s after their final ref count is released.</param>
-        public RefCountedConcurrentDictionary(Func<TKey, TValue> valueFactory, Action<TValue>? valueReleaser = null)
-            : this(new ConcurrentDictionary<TKey, RefCountedValue>(), valueFactory, valueReleaser)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RefCountedConcurrentDictionary{TKey, TValue}"/> class that is empty,
-        /// has the default concurrency level and capacity,, and uses the specified  <see cref="IEqualityComparer{TKey}"/>.
-        /// </summary>
-        /// <param name="comparer">The <see cref="IEqualityComparer{TKey}"/> implementation to use when comparing keys.</param>
-        /// <param name="valueFactory">Factory method that generates a new <typeparamref name="TValue"/> for a given <typeparamref name="TKey"/>.</param>
-        /// <param name="valueReleaser">Optional callback that is used to cleanup <typeparamref name="TValue"/>s after their final ref count is released.</param>
-        public RefCountedConcurrentDictionary(IEqualityComparer<TKey> comparer, Func<TKey, TValue> valueFactory, Action<TValue>? valueReleaser)
-            : this(new ConcurrentDictionary<TKey, RefCountedValue>(comparer), valueFactory, valueReleaser)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RefCountedConcurrentDictionary{TKey, TValue}"/> class that is empty,
+    /// has the default concurrency level and capacity,, and uses the specified  <see cref="IEqualityComparer{TKey}"/>.
+    /// </summary>
+    /// <param name="comparer">The <see cref="IEqualityComparer{TKey}"/> implementation to use when comparing keys.</param>
+    /// <param name="valueFactory">Factory method that generates a new <typeparamref name="TValue"/> for a given <typeparamref name="TKey"/>.</param>
+    /// <param name="valueReleaser">Optional callback that is used to cleanup <typeparamref name="TValue"/>s after their final ref count is released.</param>
+    public RefCountedConcurrentDictionary(IEqualityComparer<TKey> comparer, Func<TKey, TValue> valueFactory, Action<TValue>? valueReleaser)
+        : this(new ConcurrentDictionary<TKey, RefCountedValue>(comparer), valueFactory, valueReleaser)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RefCountedConcurrentDictionary{TKey, TValue}"/> class that is empty,
-        /// has the specified concurrency level and capacity, and uses the default comparer for the key type.
-        /// </summary>
-        /// <param name="concurrencyLevel">The estimated number of threads that will access the <see cref="RefCountedConcurrentDictionary{TKey, TValue}"/> concurrently</param>
-        /// <param name="capacity">The initial number of elements that the <see cref="RefCountedConcurrentDictionary{TKey, TValue}"/> can contain.</param>
-        /// <param name="valueFactory">Factory method that generates a new <typeparamref name="TValue"/> for a given <typeparamref name="TKey"/>.</param>
-        /// <param name="valueReleaser">Optional callback that is used to cleanup <typeparamref name="TValue"/>s after their final ref count is released.</param>
-        public RefCountedConcurrentDictionary(int concurrencyLevel, int capacity, Func<TKey, TValue> valueFactory, Action<TValue>? valueReleaser = null)
-            : this(new ConcurrentDictionary<TKey, RefCountedValue>(concurrencyLevel, capacity), valueFactory, valueReleaser)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RefCountedConcurrentDictionary{TKey, TValue}"/> class that is empty,
+    /// has the specified concurrency level and capacity, and uses the default comparer for the key type.
+    /// </summary>
+    /// <param name="concurrencyLevel">The estimated number of threads that will access the <see cref="RefCountedConcurrentDictionary{TKey, TValue}"/> concurrently</param>
+    /// <param name="capacity">The initial number of elements that the <see cref="RefCountedConcurrentDictionary{TKey, TValue}"/> can contain.</param>
+    /// <param name="valueFactory">Factory method that generates a new <typeparamref name="TValue"/> for a given <typeparamref name="TKey"/>.</param>
+    /// <param name="valueReleaser">Optional callback that is used to cleanup <typeparamref name="TValue"/>s after their final ref count is released.</param>
+    public RefCountedConcurrentDictionary(int concurrencyLevel, int capacity, Func<TKey, TValue> valueFactory, Action<TValue>? valueReleaser = null)
+        : this(new ConcurrentDictionary<TKey, RefCountedValue>(concurrencyLevel, capacity), valueFactory, valueReleaser)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RefCountedConcurrentDictionary{TKey, TValue}"/> class that is empty,
-        /// has the specified concurrency level, has the specified initial capacity, and uses the specified
-        /// <see cref="IEqualityComparer{TKey}"/>.
-        /// </summary>
-        /// <param name="concurrencyLevel">The estimated number of threads that will access the <see cref="RefCountedConcurrentDictionary{TKey, TValue}"/> concurrently</param>
-        /// <param name="capacity">The initial number of elements that the <see cref="RefCountedConcurrentDictionary{TKey, TValue}"/> can contain.</param>
-        /// <param name="comparer">The <see cref="IEqualityComparer{TKey}"/> implementation to use when comparing keys.</param>
-        /// <param name="valueFactory">Factory method that generates a new <typeparamref name="TValue"/> for a given <typeparamref name="TKey"/>.</param>
-        /// <param name="valueReleaser">Optional callback that is used to cleanup <typeparamref name="TValue"/>s after their final ref count is released.</param>
-        public RefCountedConcurrentDictionary(int concurrencyLevel, int capacity, IEqualityComparer<TKey> comparer, Func<TKey, TValue> valueFactory, Action<TValue>? valueReleaser)
-            : this(new ConcurrentDictionary<TKey, RefCountedValue>(concurrencyLevel, capacity, comparer), valueFactory, valueReleaser)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RefCountedConcurrentDictionary{TKey, TValue}"/> class that is empty,
+    /// has the specified concurrency level, has the specified initial capacity, and uses the specified
+    /// <see cref="IEqualityComparer{TKey}"/>.
+    /// </summary>
+    /// <param name="concurrencyLevel">The estimated number of threads that will access the <see cref="RefCountedConcurrentDictionary{TKey, TValue}"/> concurrently</param>
+    /// <param name="capacity">The initial number of elements that the <see cref="RefCountedConcurrentDictionary{TKey, TValue}"/> can contain.</param>
+    /// <param name="comparer">The <see cref="IEqualityComparer{TKey}"/> implementation to use when comparing keys.</param>
+    /// <param name="valueFactory">Factory method that generates a new <typeparamref name="TValue"/> for a given <typeparamref name="TKey"/>.</param>
+    /// <param name="valueReleaser">Optional callback that is used to cleanup <typeparamref name="TValue"/>s after their final ref count is released.</param>
+    public RefCountedConcurrentDictionary(int concurrencyLevel, int capacity, IEqualityComparer<TKey> comparer, Func<TKey, TValue> valueFactory, Action<TValue>? valueReleaser)
+        : this(new ConcurrentDictionary<TKey, RefCountedValue>(concurrencyLevel, capacity, comparer), valueFactory, valueReleaser)
+    {
+    }
 
-        private RefCountedConcurrentDictionary(ConcurrentDictionary<TKey, RefCountedValue> dictionary, Func<TKey, TValue> valueFactory, Action<TValue>? valueReleaser)
-        {
-            Guard.NotNull(valueFactory, nameof(valueFactory));
+    private RefCountedConcurrentDictionary(ConcurrentDictionary<TKey, RefCountedValue> dictionary, Func<TKey, TValue> valueFactory, Action<TValue>? valueReleaser)
+    {
+        Guard.NotNull(valueFactory, nameof(valueFactory));
 
-            this.dictionary = dictionary;
-            this.valueFactory = valueFactory;
-            this.valueReleaser = valueReleaser;
-        }
+        this.dictionary = dictionary;
+        this.valueFactory = valueFactory;
+        this.valueReleaser = valueReleaser;
+    }
 
-        /// <summary>
-        /// Obtains a reference to the value corresponding to the specified key. If no such value exists in the
-        /// dictionary, then a new value is generated using the value factory method supplied in the constructor.
-        /// To prevent leaks, this reference MUST be released via <see cref="Release(TKey)"/>.
-        /// </summary>
-        /// <param name="key">The key of the element to add ref.</param>
-        /// <returns>The referenced object.</returns>
-        public TValue Get(TKey key)
+    /// <summary>
+    /// Obtains a reference to the value corresponding to the specified key. If no such value exists in the
+    /// dictionary, then a new value is generated using the value factory method supplied in the constructor.
+    /// To prevent leaks, this reference MUST be released via <see cref="Release(TKey)"/>.
+    /// </summary>
+    /// <param name="key">The key of the element to add ref.</param>
+    /// <returns>The referenced object.</returns>
+    public TValue Get(TKey key)
+    {
+        while (true)
         {
-            while (true)
+            if (this.dictionary.TryGetValue(key, out RefCountedValue? refCountedValue))
             {
-                if (this.dictionary.TryGetValue(key, out RefCountedValue? refCountedValue))
+                // Increment ref count
+                if (this.dictionary.TryUpdate(key, new RefCountedValue(refCountedValue.Value, refCountedValue.RefCount + 1), refCountedValue))
                 {
-                    // Increment ref count
-                    if (this.dictionary.TryUpdate(key, new RefCountedValue(refCountedValue.Value, refCountedValue.RefCount + 1), refCountedValue))
-                    {
-                        return refCountedValue.Value;
-                    }
+                    return refCountedValue.Value;
+                }
+            }
+            else
+            {
+                // Add new value to dictionary
+                TValue value = this.valueFactory(key);
+
+                if (this.dictionary.TryAdd(key, new RefCountedValue(value, 1)))
+                {
+                    return value;
                 }
                 else
                 {
-                    // Add new value to dictionary
-                    TValue value = this.valueFactory(key);
-
-                    if (this.dictionary.TryAdd(key, new RefCountedValue(value, 1)))
-                    {
-                        return value;
-                    }
-                    else
-                    {
-                        this.valueReleaser?.Invoke(value);
-                    }
+                    this.valueReleaser?.Invoke(value);
                 }
             }
         }
+    }
 
-        /// <summary>
-        /// Releases a reference to the value corresponding to the specified key. If this reference was the last
-        /// remaining reference to the value, then the value is removed from the dictionary, and the optional value
-        /// releaser callback is invoked.
-        /// </summary>
-        /// <param name="key">THe key of the element to release.</param>
-        public void Release(TKey key)
+    /// <summary>
+    /// Releases a reference to the value corresponding to the specified key. If this reference was the last
+    /// remaining reference to the value, then the value is removed from the dictionary, and the optional value
+    /// releaser callback is invoked.
+    /// </summary>
+    /// <param name="key">THe key of the element to release.</param>
+    public void Release(TKey key)
+    {
+        while (true)
         {
-            while (true)
+            if (!this.dictionary.TryGetValue(key, out RefCountedValue? refCountedValue))
             {
-                if (!this.dictionary.TryGetValue(key, out RefCountedValue? refCountedValue))
-                {
-                    // This is BAD. It indicates a ref counting problem where someone is either double-releasing,
-                    // or they're releasing a key that they never obtained in the first place!!
-                    throw new InvalidOperationException($"Tried to release value that doesn't exist in the dictionary ({key})!");
-                }
+                // This is BAD. It indicates a ref counting problem where someone is either double-releasing,
+                // or they're releasing a key that they never obtained in the first place!!
+                throw new InvalidOperationException($"Tried to release value that doesn't exist in the dictionary ({key})!");
+            }
 
-                // If we're releasing the last reference, then try to remove the value from the dictionary.
-                // Otherwise, try to decrement the reference count.
-                if (refCountedValue.RefCount == 1)
+            // If we're releasing the last reference, then try to remove the value from the dictionary.
+            // Otherwise, try to decrement the reference count.
+            if (refCountedValue.RefCount == 1)
+            {
+                // Remove from dictionary.  We use the ICollection<>.Remove() method instead of the ConcurrentDictionary.TryRemove()
+                // because this specific API will only succeed if the value hasn't been changed by another thread.
+                if (((ICollection<KeyValuePair<TKey, RefCountedValue>>)this.dictionary).Remove(new KeyValuePair<TKey, RefCountedValue>(key, refCountedValue)))
                 {
-                    // Remove from dictionary.  We use the ICollection<>.Remove() method instead of the ConcurrentDictionary.TryRemove()
-                    // because this specific API will only succeed if the value hasn't been changed by another thread.
-                    if (((ICollection<KeyValuePair<TKey, RefCountedValue>>)this.dictionary).Remove(new KeyValuePair<TKey, RefCountedValue>(key, refCountedValue)))
-                    {
-                        this.valueReleaser?.Invoke(refCountedValue.Value);
-                        return;
-                    }
+                    this.valueReleaser?.Invoke(refCountedValue.Value);
+                    return;
                 }
-                else
+            }
+            else
+            {
+                // Decrement ref count
+                if (this.dictionary.TryUpdate(key, new RefCountedValue(refCountedValue.Value, refCountedValue.RefCount - 1), refCountedValue))
                 {
-                    // Decrement ref count
-                    if (this.dictionary.TryUpdate(key, new RefCountedValue(refCountedValue.Value, refCountedValue.RefCount - 1), refCountedValue))
-                    {
-                        return;
-                    }
+                    return;
                 }
             }
         }
+    }
 
-        /// <summary>
-        /// Get an enumeration over the contents of the dictionary for testing/debugging purposes
-        /// </summary>
-        internal IEnumerable<(TKey Key, TValue Value, int RefCount)> DebugGetContents() => new RefCountedDictionaryEnumerable(this);
+    /// <summary>
+    /// Get an enumeration over the contents of the dictionary for testing/debugging purposes
+    /// </summary>
+    internal IEnumerable<(TKey Key, TValue Value, int RefCount)> DebugGetContents() => new RefCountedDictionaryEnumerable(this);
 
-        /// <summary>
-        /// Internal class used for testing/debugging purposes
-        /// </summary>
-        private class RefCountedDictionaryEnumerable : IEnumerable<(TKey Key, TValue Value, int RefCount)>
-        {
-            private readonly RefCountedConcurrentDictionary<TKey, TValue> dictionary;
+    /// <summary>
+    /// Internal class used for testing/debugging purposes
+    /// </summary>
+    private class RefCountedDictionaryEnumerable : IEnumerable<(TKey Key, TValue Value, int RefCount)>
+    {
+        private readonly RefCountedConcurrentDictionary<TKey, TValue> dictionary;
 
-            internal RefCountedDictionaryEnumerable(RefCountedConcurrentDictionary<TKey, TValue> dictionary)
-                => this.dictionary = dictionary;
+        internal RefCountedDictionaryEnumerable(RefCountedConcurrentDictionary<TKey, TValue> dictionary)
+            => this.dictionary = dictionary;
 
-            public IEnumerator<(TKey Key, TValue Value, int RefCount)> GetEnumerator()
-                => new RefCountedDictionaryEnumerator(this.dictionary);
+        public IEnumerator<(TKey Key, TValue Value, int RefCount)> GetEnumerator()
+            => new RefCountedDictionaryEnumerator(this.dictionary);
 
-            IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
-        }
+        IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+    }
 
-        /// <summary>
-        /// Internal class used for testing/debugging purposes
-        /// </summary>
-        private class RefCountedDictionaryEnumerator : IEnumerator<(TKey Key, TValue Value, int RefCount)>
-        {
-            private readonly IEnumerator<KeyValuePair<TKey, RefCountedValue>> enumerator;
+    /// <summary>
+    /// Internal class used for testing/debugging purposes
+    /// </summary>
+    private class RefCountedDictionaryEnumerator : IEnumerator<(TKey Key, TValue Value, int RefCount)>
+    {
+        private readonly IEnumerator<KeyValuePair<TKey, RefCountedValue>> enumerator;
 
-            public RefCountedDictionaryEnumerator(RefCountedConcurrentDictionary<TKey, TValue> dictionary)
-                => this.enumerator = dictionary.dictionary.GetEnumerator();
+        public RefCountedDictionaryEnumerator(RefCountedConcurrentDictionary<TKey, TValue> dictionary)
+            => this.enumerator = dictionary.dictionary.GetEnumerator();
 
-            public (TKey Key, TValue Value, int RefCount) Current
+        public (TKey Key, TValue Value, int RefCount) Current
+        {
+            get
             {
-                get
-                {
-                    KeyValuePair<TKey, RefCountedValue> keyValuePair = this.enumerator.Current;
-                    return (keyValuePair.Key, keyValuePair.Value.Value, keyValuePair.Value.RefCount);
-                }
+                KeyValuePair<TKey, RefCountedValue> keyValuePair = this.enumerator.Current;
+                return (keyValuePair.Key, keyValuePair.Value.Value, keyValuePair.Value.RefCount);
             }
+        }
 
-            object IEnumerator.Current => this.Current;
+        object IEnumerator.Current => this.Current;
 
-            public void Dispose() => this.enumerator.Dispose();
+        public void Dispose() => this.enumerator.Dispose();
 
-            public bool MoveNext() => this.enumerator.MoveNext();
+        public bool MoveNext() => this.enumerator.MoveNext();
 
-            public void Reset() => this.enumerator.Reset();
-        }
+        public void Reset() => this.enumerator.Reset();
+    }
 
-        /// <summary>
-        /// Simple immutable tuple that combines a <typeparamref name="TValue"/> instance with a ref count integer.
-        /// </summary>
-        private class RefCountedValue : IEquatable<RefCountedValue>
-        {
+    /// <summary>
+    /// Simple immutable tuple that combines a <typeparamref name="TValue"/> instance with a ref count integer.
+    /// </summary>
+    private class RefCountedValue : IEquatable<RefCountedValue>
+    {
 #pragma warning disable SA1401 // Fields should be private
-            public readonly TValue Value;
-            public readonly int RefCount;
+        public readonly TValue Value;
+        public readonly int RefCount;
 #pragma warning restore SA1401 // Fields should be private
 
-            public RefCountedValue(TValue value, int refCount)
-            {
-                this.Value = value;
-                this.RefCount = refCount;
-            }
+        public RefCountedValue(TValue value, int refCount)
+        {
+            this.Value = value;
+            this.RefCount = refCount;
+        }
 
-            public bool Equals(
+        public bool Equals(
 #if NET5_0_OR_GREATER
-                RefCountedValue? other)
+            RefCountedValue? other)
 #else
-                [System.Diagnostics.CodeAnalysis.AllowNull] RefCountedValue other)
+            [System.Diagnostics.CodeAnalysis.AllowNull] RefCountedValue other)
 #endif
-                => (other != null) && (this.RefCount == other.RefCount) && EqualityComparer<TValue>.Default.Equals(this.Value, other.Value);
+            => (other != null) && (this.RefCount == other.RefCount) && EqualityComparer<TValue>.Default.Equals(this.Value, other.Value);
 
-            public override bool Equals(object? obj)
-                => (obj is RefCountedValue other) && this.Equals(other);
+        public override bool Equals(object? obj)
+            => (obj is RefCountedValue other) && this.Equals(other);
 
-            public override int GetHashCode()
-                => HashCode.Combine(this.RefCount, this.Value);
-        }
+        public override int GetHashCode()
+            => HashCode.Combine(this.RefCount, this.Value);
     }
 }
diff --git a/tests/ImageSharp.Web.Benchmarks/Caching/CacheHashBaseline.cs b/tests/ImageSharp.Web.Benchmarks/Caching/CacheHashBaseline.cs
index f54b2172..f91b3239 100644
--- a/tests/ImageSharp.Web.Benchmarks/Caching/CacheHashBaseline.cs
+++ b/tests/ImageSharp.Web.Benchmarks/Caching/CacheHashBaseline.cs
@@ -1,38 +1,37 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using System.Security.Cryptography;
 using System.Text;
 using SixLabors.ImageSharp.Web.Caching;
 
-namespace SixLabors.ImageSharp.Web.Benchmarks.Caching
+namespace SixLabors.ImageSharp.Web.Benchmarks.Caching;
+
+/// <summary>
+/// A baseline naive SHA256 hashing implementation
+/// </summary>
+public class CacheHashBaseline : ICacheHash
 {
-    /// <summary>
-    /// A baseline naive SHA256 hashing implementation
-    /// </summary>
-    public class CacheHashBaseline : ICacheHash
+    /// <inheritdoc/>
+    public string Create(string value, uint length)
     {
-        /// <inheritdoc/>
-        public string Create(string value, uint length)
+        // Don't use in benchmark.
+        // if (length.CompareTo(2) < 0 || length.CompareTo(64) > 0)
+        // {
+        //    throw new ArgumentOutOfRangeException(nameof(length), $"Value must be greater than or equal to {2} and less than or equal to {64}.");
+        // }
+        using (var hashAlgorithm = SHA256.Create())
         {
-            // Don't use in benchmark.
-            // if (length.CompareTo(2) < 0 || length.CompareTo(64) > 0)
-            // {
-            //    throw new ArgumentOutOfRangeException(nameof(length), $"Value must be greater than or equal to {2} and less than or equal to {64}.");
-            // }
-            using (var hashAlgorithm = SHA256.Create())
+            // Concatenate the hash bytes into one long string.
+            int len = (int)length;
+            byte[] hash = hashAlgorithm.ComputeHash(Encoding.ASCII.GetBytes(value));
+            var sb = new StringBuilder(len);
+            for (int i = 0; i < len / 2; i++)
             {
-                // Concatenate the hash bytes into one long string.
-                int len = (int)length;
-                byte[] hash = hashAlgorithm.ComputeHash(Encoding.ASCII.GetBytes(value));
-                var sb = new StringBuilder(len);
-                for (int i = 0; i < len / 2; i++)
-                {
-                    sb.Append(hash[i].ToString("X2"));
-                }
-
-                return sb.ToString();
+                sb.Append(hash[i].ToString("X2"));
             }
+
+            return sb.ToString();
         }
     }
 }
diff --git a/tests/ImageSharp.Web.Benchmarks/Caching/CacheHashBenchmarks.cs b/tests/ImageSharp.Web.Benchmarks/Caching/CacheHashBenchmarks.cs
index 5c409674..3e816a73 100644
--- a/tests/ImageSharp.Web.Benchmarks/Caching/CacheHashBenchmarks.cs
+++ b/tests/ImageSharp.Web.Benchmarks/Caching/CacheHashBenchmarks.cs
@@ -1,39 +1,38 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using BenchmarkDotNet.Attributes;
 using Microsoft.Extensions.Options;
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Middleware;
 
-namespace SixLabors.ImageSharp.Web.Benchmarks.Caching
+namespace SixLabors.ImageSharp.Web.Benchmarks.Caching;
+
+[Config(typeof(MemoryConfig))]
+public class CacheHashBenchmarks
 {
-    [Config(typeof(MemoryConfig))]
-    public class CacheHashBenchmarks
-    {
-        private const string URL = "http://testwebsite.com/image-12345.jpeg?width=400";
-        private static readonly IOptions<ImageSharpMiddlewareOptions> MWOptions = Options.Create(new ImageSharpMiddlewareOptions());
-        private static readonly SHA256CacheHash Sha256Hasher = new SHA256CacheHash(MWOptions);
-        private static readonly CacheHashBaseline NaiveSha256Hasher = new CacheHashBaseline();
-
-        [Benchmark(Baseline = true, Description = "Baseline Sha256Hasher")]
-        public string HashUsingBaselineHash() => NaiveSha256Hasher.Create(URL, 12);
-
-        [Benchmark(Description = "Sha256Hasher")]
-        public string HashUsingSha256() => Sha256Hasher.Create(URL, 12);
-
-        /*
-        BenchmarkDotNet=v0.12.0, OS=Windows 10.0.18363
-        Intel Core i7-8650U CPU 1.90GHz (Kaby Lake R), 1 CPU, 8 logical and 4 physical cores
-        .NET Core SDK=3.1.401
-          [Host]     : .NET Core 3.1.7 (CoreCLR 4.700.20.36602, CoreFX 4.700.20.37001), X64 RyuJIT
-          DefaultJob : .NET Core 3.1.7 (CoreCLR 4.700.20.36602, CoreFX 4.700.20.37001), X64 RyuJIT
-
-
-        |                  Method |       Mean |   Error |  StdDev | Ratio |  Gen 0 | Gen 1 | Gen 2 | Allocated |
-        |------------------------ |-----------:|--------:|--------:|------:|-------:|------:|------:|----------:|
-        | 'Baseline Sha256Hasher' | 1,065.7 ns | 8.95 ns | 8.37 ns |  1.00 | 0.1564 |     - |     - |     656 B |
-        |            Sha256Hasher |   786.7 ns | 9.77 ns | 9.14 ns |  0.74 | 0.0420 |     - |     - |     176 B |
-        */
-    }
+    private const string URL = "http://testwebsite.com/image-12345.jpeg?width=400";
+    private static readonly IOptions<ImageSharpMiddlewareOptions> MWOptions = Options.Create(new ImageSharpMiddlewareOptions());
+    private static readonly SHA256CacheHash Sha256Hasher = new SHA256CacheHash(MWOptions);
+    private static readonly CacheHashBaseline NaiveSha256Hasher = new CacheHashBaseline();
+
+    [Benchmark(Baseline = true, Description = "Baseline Sha256Hasher")]
+    public string HashUsingBaselineHash() => NaiveSha256Hasher.Create(URL, 12);
+
+    [Benchmark(Description = "Sha256Hasher")]
+    public string HashUsingSha256() => Sha256Hasher.Create(URL, 12);
+
+    /*
+    BenchmarkDotNet=v0.12.0, OS=Windows 10.0.18363
+    Intel Core i7-8650U CPU 1.90GHz (Kaby Lake R), 1 CPU, 8 logical and 4 physical cores
+    .NET Core SDK=3.1.401
+      [Host]     : .NET Core 3.1.7 (CoreCLR 4.700.20.36602, CoreFX 4.700.20.37001), X64 RyuJIT
+      DefaultJob : .NET Core 3.1.7 (CoreCLR 4.700.20.36602, CoreFX 4.700.20.37001), X64 RyuJIT
+
+
+    |                  Method |       Mean |   Error |  StdDev | Ratio |  Gen 0 | Gen 1 | Gen 2 | Allocated |
+    |------------------------ |-----------:|--------:|--------:|------:|-------:|------:|------:|----------:|
+    | 'Baseline Sha256Hasher' | 1,065.7 ns | 8.95 ns | 8.37 ns |  1.00 | 0.1564 |     - |     - |     656 B |
+    |            Sha256Hasher |   786.7 ns | 9.77 ns | 9.14 ns |  0.74 | 0.0420 |     - |     - |     176 B |
+    */
 }
diff --git a/tests/ImageSharp.Web.Benchmarks/Caching/CacheKeyBenchmarks.cs b/tests/ImageSharp.Web.Benchmarks/Caching/CacheKeyBenchmarks.cs
index 8884d01a..b04d5fb6 100644
--- a/tests/ImageSharp.Web.Benchmarks/Caching/CacheKeyBenchmarks.cs
+++ b/tests/ImageSharp.Web.Benchmarks/Caching/CacheKeyBenchmarks.cs
@@ -1,71 +1,69 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
 using BenchmarkDotNet.Attributes;
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Benchmarks.Caching
+namespace SixLabors.ImageSharp.Web.Benchmarks.Caching;
+
+[Config(typeof(MemoryConfig))]
+public class CacheKeyBenchmarks
 {
-    [Config(typeof(MemoryConfig))]
-    public class CacheKeyBenchmarks
+    private static readonly HttpContext Context = CreateContext();
+    private static readonly CommandCollection Commands = new()
     {
-        private static readonly HttpContext Context = CreateContext();
-        private static readonly CommandCollection Commands = new()
-        {
-            { "width", "400" }
-        };
+        { "width", "400" }
+    };
 
-        private static readonly ICacheKey LegacyV1CacheKey = new LegacyV1CacheKey();
-        private static readonly ICacheKey UriRelativeCacheKey = new UriRelativeCacheKey();
-        private static readonly ICacheKey UriAbsoluteCacheKey = new UriAbsoluteCacheKey();
-        private static readonly ICacheKey UriRelativeLowerInvariantCacheKey = new UriRelativeLowerInvariantCacheKey();
-        private static readonly ICacheKey UriAbsoluteLowerInvariantCacheKey = new UriAbsoluteLowerInvariantCacheKey();
+    private static readonly ICacheKey LegacyV1CacheKey = new LegacyV1CacheKey();
+    private static readonly ICacheKey UriRelativeCacheKey = new UriRelativeCacheKey();
+    private static readonly ICacheKey UriAbsoluteCacheKey = new UriAbsoluteCacheKey();
+    private static readonly ICacheKey UriRelativeLowerInvariantCacheKey = new UriRelativeLowerInvariantCacheKey();
+    private static readonly ICacheKey UriAbsoluteLowerInvariantCacheKey = new UriAbsoluteLowerInvariantCacheKey();
 
-        [Benchmark(Baseline = true, Description = nameof(LegacyV1CacheKey))]
-        public string CreateUsingBaseline() => LegacyV1CacheKey.Create(Context, Commands);
+    [Benchmark(Baseline = true, Description = nameof(LegacyV1CacheKey))]
+    public string CreateUsingBaseline() => LegacyV1CacheKey.Create(Context, Commands);
 
-        [Benchmark(Description = nameof(UriRelativeCacheKey))]
-        public string CreateUsingUriRelativeCacheKey() => UriRelativeCacheKey.Create(Context, Commands);
+    [Benchmark(Description = nameof(UriRelativeCacheKey))]
+    public string CreateUsingUriRelativeCacheKey() => UriRelativeCacheKey.Create(Context, Commands);
 
-        [Benchmark(Description = nameof(UriRelativeLowerInvariantCacheKey))]
-        public string CreateUsingUriRelativeLowerInvariantCacheKey() => UriRelativeCacheKey.Create(Context, Commands);
+    [Benchmark(Description = nameof(UriRelativeLowerInvariantCacheKey))]
+    public string CreateUsingUriRelativeLowerInvariantCacheKey() => UriRelativeCacheKey.Create(Context, Commands);
 
-        [Benchmark(Description = nameof(UriAbsoluteCacheKey))]
-        public string CreateUsingUriAbsoluteCacheKey() => UriAbsoluteCacheKey.Create(Context, Commands);
+    [Benchmark(Description = nameof(UriAbsoluteCacheKey))]
+    public string CreateUsingUriAbsoluteCacheKey() => UriAbsoluteCacheKey.Create(Context, Commands);
 
-        [Benchmark(Description = nameof(UriAbsoluteLowerInvariantCacheKey))]
-        public string CreateUsingUriAbsoluteLowerInvariantCacheKey() => UriAbsoluteCacheKey.Create(Context, Commands);
+    [Benchmark(Description = nameof(UriAbsoluteLowerInvariantCacheKey))]
+    public string CreateUsingUriAbsoluteLowerInvariantCacheKey() => UriAbsoluteCacheKey.Create(Context, Commands);
 
-        /*
-        BenchmarkDotNet=v0.13.1, OS=Windows 10.0.22000
-        Intel Core i7-8650U CPU 1.90GHz (Kaby Lake R), 1 CPU, 8 logical and 4 physical cores
-        .NET SDK=6.0.101
-          [Host]     : .NET Core 3.1.22 (CoreCLR 4.700.21.56803, CoreFX 4.700.21.57101), X64 RyuJIT
-          DefaultJob : .NET Core 3.1.22 (CoreCLR 4.700.21.56803, CoreFX 4.700.21.57101), X64 RyuJIT
+    /*
+    BenchmarkDotNet=v0.13.1, OS=Windows 10.0.22000
+    Intel Core i7-8650U CPU 1.90GHz (Kaby Lake R), 1 CPU, 8 logical and 4 physical cores
+    .NET SDK=6.0.101
+      [Host]     : .NET Core 3.1.22 (CoreCLR 4.700.21.56803, CoreFX 4.700.21.57101), X64 RyuJIT
+      DefaultJob : .NET Core 3.1.22 (CoreCLR 4.700.21.56803, CoreFX 4.700.21.57101), X64 RyuJIT
 
 
-        |                             Method |     Mean |    Error |   StdDev | Ratio | RatioSD |  Gen 0 | Allocated |
-        |----------------------------------- |---------:|---------:|---------:|------:|--------:|-------:|----------:|
-        |                   LegacyV1CacheKey | 666.8 ns | 13.22 ns | 14.14 ns |  1.00 |    0.00 | 0.1659 |     696 B |
-        |                UriRelativeCacheKey | 358.0 ns |  1.98 ns |  1.65 ns |  0.54 |    0.01 | 0.0706 |     296 B |
-        | UriRelativeLowerInvariantCacheKey | 363.1 ns |  7.20 ns | 11.21 ns |  0.55 |    0.02 | 0.0706 |     296 B |
-        |                UriAbsoluteCacheKey | 490.3 ns |  5.14 ns |  4.80 ns |  0.74 |    0.02 | 0.0763 |     320 B |
-        | UriAbsoluteLowerInvariantCacheKey | 475.4 ns |  4.18 ns |  3.71 ns |  0.71 |    0.02 | 0.0763 |     320 B |
-        */
+    |                             Method |     Mean |    Error |   StdDev | Ratio | RatioSD |  Gen 0 | Allocated |
+    |----------------------------------- |---------:|---------:|---------:|------:|--------:|-------:|----------:|
+    |                   LegacyV1CacheKey | 666.8 ns | 13.22 ns | 14.14 ns |  1.00 |    0.00 | 0.1659 |     696 B |
+    |                UriRelativeCacheKey | 358.0 ns |  1.98 ns |  1.65 ns |  0.54 |    0.01 | 0.0706 |     296 B |
+    | UriRelativeLowerInvariantCacheKey | 363.1 ns |  7.20 ns | 11.21 ns |  0.55 |    0.02 | 0.0706 |     296 B |
+    |                UriAbsoluteCacheKey | 490.3 ns |  5.14 ns |  4.80 ns |  0.74 |    0.02 | 0.0763 |     320 B |
+    | UriAbsoluteLowerInvariantCacheKey | 475.4 ns |  4.18 ns |  3.71 ns |  0.71 |    0.02 | 0.0763 |     320 B |
+    */
 
-        private static HttpContext CreateContext()
-        {
-            var httpContext = new DefaultHttpContext();
-            httpContext.Request.Scheme = Uri.UriSchemeHttp;
-            httpContext.Request.Host = new HostString("testwebsite.com");
-            httpContext.Request.PathBase = "/images";
-            httpContext.Request.Path = "/image-12345.jpeg";
-            httpContext.Request.QueryString = new QueryString("?should-be=ignored");
+    private static HttpContext CreateContext()
+    {
+        var httpContext = new DefaultHttpContext();
+        httpContext.Request.Scheme = Uri.UriSchemeHttp;
+        httpContext.Request.Host = new HostString("testwebsite.com");
+        httpContext.Request.PathBase = "/images";
+        httpContext.Request.Path = "/image-12345.jpeg";
+        httpContext.Request.QueryString = new QueryString("?should-be=ignored");
 
-            return httpContext;
-        }
+        return httpContext;
     }
 }
diff --git a/tests/ImageSharp.Web.Benchmarks/Caching/StringJoinBenchmarks.cs b/tests/ImageSharp.Web.Benchmarks/Caching/StringJoinBenchmarks.cs
index abf851fb..775d705d 100644
--- a/tests/ImageSharp.Web.Benchmarks/Caching/StringJoinBenchmarks.cs
+++ b/tests/ImageSharp.Web.Benchmarks/Caching/StringJoinBenchmarks.cs
@@ -1,61 +1,59 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
 using System.Text;
 using BenchmarkDotNet.Attributes;
 using SixLabors.ImageSharp.Web.Caching;
 
-namespace SixLabors.ImageSharp.Web.Benchmarks.Caching
+namespace SixLabors.ImageSharp.Web.Benchmarks.Caching;
+
+[Config(typeof(MemoryConfig))]
+public class StringJoinBenchmarks
 {
-    [Config(typeof(MemoryConfig))]
-    public class StringJoinBenchmarks
-    {
-        private const string Key = "abcdefghijkl";
+    private const string Key = "abcdefghijkl";
 
-        [Params(0, 8, 12)]
-        public int CacheFolderDepth { get; set; }
+    [Params(0, 8, 12)]
+    public int CacheFolderDepth { get; set; }
 
-        [Benchmark(Baseline = true, Description = "String.Join")]
-        public string JoinUsingString()
-            => $"{string.Join("/", Key.Substring(0, this.CacheFolderDepth).ToCharArray())}/{Key}";
+    [Benchmark(Baseline = true, Description = "String.Join")]
+    public string JoinUsingString()
+        => $"{string.Join("/", Key.Substring(0, this.CacheFolderDepth).ToCharArray())}/{Key}";
+
+    [Benchmark(Description = "StringBuilder.Append")]
+    public string JoinUsingStringBuilder()
+    {
+        ReadOnlySpan<char> keySpan = Key;
+        const char separator = '/';
 
-        [Benchmark(Description = "StringBuilder.Append")]
-        public string JoinUsingStringBuilder()
+        // Each key substring char + separator + key
+        var sb = new StringBuilder((this.CacheFolderDepth * 2) + Key.Length);
+        ReadOnlySpan<char> paths = keySpan.Slice(0, this.CacheFolderDepth);
+        for (int i = 0; i < paths.Length; i++)
         {
-            ReadOnlySpan<char> keySpan = Key;
-            const char separator = '/';
-
-            // Each key substring char + separator + key
-            var sb = new StringBuilder((this.CacheFolderDepth * 2) + Key.Length);
-            ReadOnlySpan<char> paths = keySpan.Slice(0, this.CacheFolderDepth);
-            for (int i = 0; i < paths.Length; i++)
-            {
-                sb.Append(paths[i]);
-                sb.Append(separator);
-            }
-
-            sb.Append(Key);
-            return sb.ToString();
+            sb.Append(paths[i]);
+            sb.Append(separator);
         }
 
-        [Benchmark(Description = "String.Create")]
-        public string JoinUsingStringCreate()
-            => PhysicalFileSystemCache.ToFilePath(Key, this.CacheFolderDepth);
+        sb.Append(Key);
+        return sb.ToString();
+    }
 
-        /*
-        BenchmarkDotNet=v0.12.0, OS=Windows 10.0.18363
-        Intel Core i7-8650U CPU 1.90GHz (Kaby Lake R), 1 CPU, 8 logical and 4 physical cores
-        .NET Core SDK=3.1.401
-          [Host]     : .NET Core 3.1.7 (CoreCLR 4.700.20.36602, CoreFX 4.700.20.37001), X64 RyuJIT
-          DefaultJob : .NET Core 3.1.7 (CoreCLR 4.700.20.36602, CoreFX 4.700.20.37001), X64 RyuJIT
+    [Benchmark(Description = "String.Create")]
+    public string JoinUsingStringCreate()
+        => PhysicalFileSystemCache.ToFilePath(Key, this.CacheFolderDepth);
 
+    /*
+    BenchmarkDotNet=v0.12.0, OS=Windows 10.0.18363
+    Intel Core i7-8650U CPU 1.90GHz (Kaby Lake R), 1 CPU, 8 logical and 4 physical cores
+    .NET Core SDK=3.1.401
+      [Host]     : .NET Core 3.1.7 (CoreCLR 4.700.20.36602, CoreFX 4.700.20.37001), X64 RyuJIT
+      DefaultJob : .NET Core 3.1.7 (CoreCLR 4.700.20.36602, CoreFX 4.700.20.37001), X64 RyuJIT
 
-        |               Method |      Mean |    Error |   StdDev | Ratio |  Gen 0 | Gen 1 | Gen 2 | Allocated |
-        |--------------------- |----------:|---------:|---------:|------:|-------:|------:|------:|----------:|
-        |          String.Join | 285.17 ns | 5.006 ns | 4.180 ns |  1.00 | 0.1278 |     - |     - |     536 B |
-        | StringBuilder.Append |  96.72 ns | 0.549 ns | 0.487 ns |  0.34 | 0.0573 |     - |     - |     240 B |
-        |        String.Create |  42.03 ns | 0.186 ns | 0.165 ns |  0.15 | 0.0440 |     - |     - |     184 B |
-        */
-    }
+
+    |               Method |      Mean |    Error |   StdDev | Ratio |  Gen 0 | Gen 1 | Gen 2 | Allocated |
+    |--------------------- |----------:|---------:|---------:|------:|-------:|------:|------:|----------:|
+    |          String.Join | 285.17 ns | 5.006 ns | 4.180 ns |  1.00 | 0.1278 |     - |     - |     536 B |
+    | StringBuilder.Append |  96.72 ns | 0.549 ns | 0.487 ns |  0.34 | 0.0573 |     - |     - |     240 B |
+    |        String.Create |  42.03 ns | 0.186 ns | 0.165 ns |  0.15 | 0.0440 |     - |     - |     184 B |
+    */
 }
diff --git a/tests/ImageSharp.Web.Benchmarks/Caching/ToHexBenchmarks.cs b/tests/ImageSharp.Web.Benchmarks/Caching/ToHexBenchmarks.cs
index 0ba67063..ec6ec7b2 100644
--- a/tests/ImageSharp.Web.Benchmarks/Caching/ToHexBenchmarks.cs
+++ b/tests/ImageSharp.Web.Benchmarks/Caching/ToHexBenchmarks.cs
@@ -1,86 +1,84 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
 using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
 using System.Text;
 using BenchmarkDotNet.Attributes;
 using SixLabors.ImageSharp.Web.Caching;
 
-namespace SixLabors.ImageSharp.Web.Benchmarks.Caching
+namespace SixLabors.ImageSharp.Web.Benchmarks.Caching;
+
+[Config(typeof(MemoryConfig))]
+public class ToHexBenchmarks
 {
-    [Config(typeof(MemoryConfig))]
-    public class ToHexBenchmarks
-    {
-        private static readonly byte[] Bytes = Hash();
+    private static readonly byte[] Bytes = Hash();
 
-        [Benchmark(Baseline = true, Description = "StringBuilder ToHex")]
-        public string StringBuilderToHex()
+    [Benchmark(Baseline = true, Description = "StringBuilder ToHex")]
+    public string StringBuilderToHex()
+    {
+        const int len = 12;
+        var sb = new StringBuilder(len);
+        for (int i = 0; i < len / 2; i++)
         {
-            const int len = 12;
-            var sb = new StringBuilder(len);
-            for (int i = 0; i < len / 2; i++)
-            {
-                sb.Append(Bytes[i].ToString("x2"));
-            }
-
-            return sb.ToString();
+            sb.Append(Bytes[i].ToString("x2"));
         }
 
-        [Benchmark(Description = "Custom ToHex")]
-        public string CustomToHex()
-        {
-            int length = Bytes.Length;
-            char[] c = new char[length * 2];
-            ref char charRef = ref c[0];
-            ref byte bytesRef = ref Bytes[0];
-            const int padHi = 0x37 + 0x20;
-            const int padLo = 0x30;
+        return sb.ToString();
+    }
 
-            byte b;
-            for (int bx = 0, cx = 0; bx < length; ++bx, ++cx)
-            {
-                byte bref = Unsafe.Add(ref bytesRef, bx);
-                b = (byte)(bref >> 4);
-                Unsafe.Add(ref charRef, cx) = (char)(b > 9 ? b + padHi : b + padLo);
+    [Benchmark(Description = "Custom ToHex")]
+    public string CustomToHex()
+    {
+        int length = Bytes.Length;
+        char[] c = new char[length * 2];
+        ref char charRef = ref c[0];
+        ref byte bytesRef = ref Bytes[0];
+        const int padHi = 0x37 + 0x20;
+        const int padLo = 0x30;
 
-                b = (byte)(bref & 0x0F);
-                Unsafe.Add(ref charRef, ++cx) = (char)(b > 9 ? b + padHi : b + padLo);
-            }
+        byte b;
+        for (int bx = 0, cx = 0; bx < length; ++bx, ++cx)
+        {
+            byte bref = Unsafe.Add(ref bytesRef, bx);
+            b = (byte)(bref >> 4);
+            Unsafe.Add(ref charRef, cx) = (char)(b > 9 ? b + padHi : b + padLo);
 
-            return new string(c);
+            b = (byte)(bref & 0x0F);
+            Unsafe.Add(ref charRef, ++cx) = (char)(b > 9 ? b + padHi : b + padLo);
         }
 
-        [Benchmark(Description = "HexEncoder.Encode with LUT")]
-        public string CustomToHexUnsafe() => HexEncoder.Encode(new Span<byte>(Bytes).Slice(0, 6));
+        return new string(c);
+    }
+
+    [Benchmark(Description = "HexEncoder.Encode with LUT")]
+    public string CustomToHexUnsafe() => HexEncoder.Encode(new Span<byte>(Bytes).Slice(0, 6));
 
-        private static byte[] Hash()
+    private static byte[] Hash()
+    {
+        using (var hashAlgorithm = SHA256.Create())
         {
-            using (var hashAlgorithm = SHA256.Create())
-            {
-                // Concatenate the hash bytes into one long string.
-                string value = "http://testwebsite.com/image-12345.jpeg?width=400";
-                int byteCount = Encoding.ASCII.GetByteCount(value);
-                byte[] buffer = new byte[byteCount];
-                Encoding.ASCII.GetBytes(value, 0, value.Length, buffer, 0);
-                return hashAlgorithm.ComputeHash(buffer, 0, byteCount);
-            }
+            // Concatenate the hash bytes into one long string.
+            string value = "http://testwebsite.com/image-12345.jpeg?width=400";
+            int byteCount = Encoding.ASCII.GetByteCount(value);
+            byte[] buffer = new byte[byteCount];
+            Encoding.ASCII.GetBytes(value, 0, value.Length, buffer, 0);
+            return hashAlgorithm.ComputeHash(buffer, 0, byteCount);
         }
+    }
 
-        /*
-        BenchmarkDotNet=v0.12.0, OS=Windows 10.0.18363
-        Intel Core i7-8650U CPU 1.90GHz (Kaby Lake R), 1 CPU, 8 logical and 4 physical cores
-        .NET Core SDK=3.1.401
-          [Host]     : .NET Core 3.1.7 (CoreCLR 4.700.20.36602, CoreFX 4.700.20.37001), X64 RyuJIT
-          DefaultJob : .NET Core 3.1.7 (CoreCLR 4.700.20.36602, CoreFX 4.700.20.37001), X64 RyuJIT
+    /*
+    BenchmarkDotNet=v0.12.0, OS=Windows 10.0.18363
+    Intel Core i7-8650U CPU 1.90GHz (Kaby Lake R), 1 CPU, 8 logical and 4 physical cores
+    .NET Core SDK=3.1.401
+      [Host]     : .NET Core 3.1.7 (CoreCLR 4.700.20.36602, CoreFX 4.700.20.37001), X64 RyuJIT
+      DefaultJob : .NET Core 3.1.7 (CoreCLR 4.700.20.36602, CoreFX 4.700.20.37001), X64 RyuJIT
 
 
-        |                       Method |      Mean |    Error |   StdDev | Ratio |  Gen 0 | Gen 1 | Gen 2 | Allocated |
-        |----------------------------- |----------:|---------:|---------:|------:|-------:|------:|------:|----------:|
-        |        'StringBuilder ToHex' | 201.78 ns | 0.900 ns | 0.752 ns |  1.00 | 0.0801 |     - |     - |     336 B |
-        |               'Custom ToHex' |  83.37 ns | 0.856 ns | 0.801 ns |  0.41 | 0.0726 |     - |     - |     304 B |
-        | 'HexEncoder.Encode with LUT' |  23.17 ns | 0.235 ns | 0.196 ns |  0.11 | 0.0114 |     - |     - |      48 B |
-        */
-    }
+    |                       Method |      Mean |    Error |   StdDev | Ratio |  Gen 0 | Gen 1 | Gen 2 | Allocated |
+    |----------------------------- |----------:|---------:|---------:|------:|-------:|------:|------:|----------:|
+    |        'StringBuilder ToHex' | 201.78 ns | 0.900 ns | 0.752 ns |  1.00 | 0.0801 |     - |     - |     336 B |
+    |               'Custom ToHex' |  83.37 ns | 0.856 ns | 0.801 ns |  0.41 | 0.0726 |     - |     - |     304 B |
+    | 'HexEncoder.Encode with LUT' |  23.17 ns | 0.235 ns | 0.196 ns |  0.11 | 0.0114 |     - |     - |      48 B |
+    */
 }
diff --git a/tests/ImageSharp.Web.Benchmarks/ImageSharp.Web.Benchmarks.csproj b/tests/ImageSharp.Web.Benchmarks/ImageSharp.Web.Benchmarks.csproj
index fb27e45a..e1db5d1a 100644
--- a/tests/ImageSharp.Web.Benchmarks/ImageSharp.Web.Benchmarks.csproj
+++ b/tests/ImageSharp.Web.Benchmarks/ImageSharp.Web.Benchmarks.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>ImageSharp.Web.Benchmarks</AssemblyName>
     <RootNamespace>SixLabors.ImageSharp.Web.Benchmarks</RootNamespace>
     <GenerateProgramFile>false</GenerateProgramFile>
@@ -10,6 +9,19 @@
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 
+  <Choose>
+    <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
+      <PropertyGroup>
+        <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <TargetFrameworks>net6.0</TargetFrameworks>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet"/>
   </ItemGroup>
diff --git a/tests/ImageSharp.Web.Benchmarks/MemoryConfig.cs b/tests/ImageSharp.Web.Benchmarks/MemoryConfig.cs
index f3db7e66..c12265e5 100644
--- a/tests/ImageSharp.Web.Benchmarks/MemoryConfig.cs
+++ b/tests/ImageSharp.Web.Benchmarks/MemoryConfig.cs
@@ -1,13 +1,12 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Diagnosers;
 
-namespace SixLabors.ImageSharp.Web.Benchmarks
+namespace SixLabors.ImageSharp.Web.Benchmarks;
+
+public class MemoryConfig : ManualConfig
 {
-    public class MemoryConfig : ManualConfig
-    {
-        public MemoryConfig() => this.AddDiagnoser(MemoryDiagnoser.Default);
-    }
+    public MemoryConfig() => this.AddDiagnoser(MemoryDiagnoser.Default);
 }
diff --git a/tests/ImageSharp.Web.Benchmarks/Program.cs b/tests/ImageSharp.Web.Benchmarks/Program.cs
index 7c34791f..3a1a9094 100644
--- a/tests/ImageSharp.Web.Benchmarks/Program.cs
+++ b/tests/ImageSharp.Web.Benchmarks/Program.cs
@@ -1,16 +1,15 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using System.Reflection;
 using BenchmarkDotNet.Running;
 
-namespace SixLabors.ImageSharp.Web.Benchmarks
+namespace SixLabors.ImageSharp.Web.Benchmarks;
+
+public class Program
 {
-    public class Program
+    public static void Main(string[] args)
     {
-        public static void Main(string[] args)
-        {
-            new BenchmarkSwitcher(typeof(Program).GetTypeInfo().Assembly).Run(args);
-        }
+        new BenchmarkSwitcher(typeof(Program).GetTypeInfo().Assembly).Run(args);
     }
 }
diff --git a/tests/ImageSharp.Web.Benchmarks/Synchronization/AsyncLockBenchmarks.cs b/tests/ImageSharp.Web.Benchmarks/Synchronization/AsyncLockBenchmarks.cs
index 494558d6..8c015601 100644
--- a/tests/ImageSharp.Web.Benchmarks/Synchronization/AsyncLockBenchmarks.cs
+++ b/tests/ImageSharp.Web.Benchmarks/Synchronization/AsyncLockBenchmarks.cs
@@ -1,57 +1,56 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using BenchmarkDotNet.Attributes;
 using SixLabors.ImageSharp.Web.Synchronization;
 
-namespace SixLabors.ImageSharp.Web.Benchmarks.Synchronization
+namespace SixLabors.ImageSharp.Web.Benchmarks.Synchronization;
+
+/// <summary>
+/// Each of these tests obtains a lock (which completes synchronously as nobody else is holding the lock)
+/// and then releases that lock.
+/// </summary>
+[Config(typeof(MemoryConfig))]
+public class AsyncLockBenchmarks
 {
-    /// <summary>
-    /// Each of these tests obtains a lock (which completes synchronously as nobody else is holding the lock)
-    /// and then releases that lock.
-    /// </summary>
-    [Config(typeof(MemoryConfig))]
-    public class AsyncLockBenchmarks
-    {
-        private readonly AsyncLock asyncLock = new();
-        private readonly AsyncReaderWriterLock asyncReaderWriterLock = new();
-        private readonly AsyncKeyLock<string> asyncKeyLock = new();
-        private readonly AsyncKeyReaderWriterLock<string> asyncKeyReaderWriterLock = new();
-
-        [Benchmark]
-        public void AsyncLock() => this.asyncLock.LockAsync().Result.Dispose();
-
-        [Benchmark]
-        public void AsyncReaderWriterLock_Reader() => this.asyncReaderWriterLock.ReaderLockAsync().Result.Dispose();
-
-        [Benchmark]
-        public void AsyncReaderWriterLock_Writer() => this.asyncReaderWriterLock.WriterLockAsync().Result.Dispose();
-
-        [Benchmark]
-        public void AsyncKeyLock() => this.asyncKeyLock.LockAsync("key").Result.Dispose();
-
-        [Benchmark]
-        public void AsyncKeyReaderWriterLock_Reader() => this.asyncKeyReaderWriterLock.ReaderLockAsync("key").Result.Dispose();
-
-        [Benchmark]
-        public void AsyncKeyReaderWriterLock_Writer() => this.asyncKeyReaderWriterLock.WriterLockAsync("key").Result.Dispose();
-
-        /*
-        BenchmarkDotNet=v0.13.1, OS=Windows 10.0.19043.1348 (21H1/May2021Update)
-        Intel Core i9-9900K CPU 3.60GHz (Coffee Lake), 1 CPU, 16 logical and 8 physical cores
-        .NET SDK=6.0.100
-            [Host]     : .NET Core 3.1.21 (CoreCLR 4.700.21.51404, CoreFX 4.700.21.51508), X64 RyuJIT
-            DefaultJob : .NET Core 3.1.21 (CoreCLR 4.700.21.51404, CoreFX 4.700.21.51508), X64 RyuJIT
-
-
-        |                          Method |      Mean |    Error |   StdDev |  Gen 0 | Allocated |
-        |-------------------------------- |----------:|---------:|---------:|-------:|----------:|
-        |                       AsyncLock |  34.93 ns | 0.144 ns | 0.135 ns |      - |         - |
-        |    AsyncReaderWriterLock_Reader |  28.45 ns | 0.117 ns | 0.109 ns |      - |         - |
-        |    AsyncReaderWriterLock_Writer |  28.66 ns | 0.125 ns | 0.117 ns |      - |         - |
-        |                    AsyncKeyLock | 276.48 ns | 5.379 ns | 5.031 ns | 0.0210 |     176 B |
-        | AsyncKeyReaderWriterLock_Reader | 261.96 ns | 1.522 ns | 1.423 ns | 0.0210 |     176 B |
-        | AsyncKeyReaderWriterLock_Writer | 266.35 ns | 1.661 ns | 1.554 ns | 0.0210 |     176 B |
-        */
-    }
+    private readonly AsyncLock asyncLock = new();
+    private readonly AsyncReaderWriterLock asyncReaderWriterLock = new();
+    private readonly AsyncKeyLock<string> asyncKeyLock = new();
+    private readonly AsyncKeyReaderWriterLock<string> asyncKeyReaderWriterLock = new();
+
+    [Benchmark]
+    public void AsyncLock() => this.asyncLock.LockAsync().Result.Dispose();
+
+    [Benchmark]
+    public void AsyncReaderWriterLock_Reader() => this.asyncReaderWriterLock.ReaderLockAsync().Result.Dispose();
+
+    [Benchmark]
+    public void AsyncReaderWriterLock_Writer() => this.asyncReaderWriterLock.WriterLockAsync().Result.Dispose();
+
+    [Benchmark]
+    public void AsyncKeyLock() => this.asyncKeyLock.LockAsync("key").Result.Dispose();
+
+    [Benchmark]
+    public void AsyncKeyReaderWriterLock_Reader() => this.asyncKeyReaderWriterLock.ReaderLockAsync("key").Result.Dispose();
+
+    [Benchmark]
+    public void AsyncKeyReaderWriterLock_Writer() => this.asyncKeyReaderWriterLock.WriterLockAsync("key").Result.Dispose();
+
+    /*
+    BenchmarkDotNet=v0.13.1, OS=Windows 10.0.19043.1348 (21H1/May2021Update)
+    Intel Core i9-9900K CPU 3.60GHz (Coffee Lake), 1 CPU, 16 logical and 8 physical cores
+    .NET SDK=6.0.100
+        [Host]     : .NET Core 3.1.21 (CoreCLR 4.700.21.51404, CoreFX 4.700.21.51508), X64 RyuJIT
+        DefaultJob : .NET Core 3.1.21 (CoreCLR 4.700.21.51404, CoreFX 4.700.21.51508), X64 RyuJIT
+
+
+    |                          Method |      Mean |    Error |   StdDev |  Gen 0 | Allocated |
+    |-------------------------------- |----------:|---------:|---------:|-------:|----------:|
+    |                       AsyncLock |  34.93 ns | 0.144 ns | 0.135 ns |      - |         - |
+    |    AsyncReaderWriterLock_Reader |  28.45 ns | 0.117 ns | 0.109 ns |      - |         - |
+    |    AsyncReaderWriterLock_Writer |  28.66 ns | 0.125 ns | 0.117 ns |      - |         - |
+    |                    AsyncKeyLock | 276.48 ns | 5.379 ns | 5.031 ns | 0.0210 |     176 B |
+    | AsyncKeyReaderWriterLock_Reader | 261.96 ns | 1.522 ns | 1.423 ns | 0.0210 |     176 B |
+    | AsyncKeyReaderWriterLock_Writer | 266.35 ns | 1.661 ns | 1.554 ns | 0.0210 |     176 B |
+    */
 }
diff --git a/tests/ImageSharp.Web.Benchmarks/Synchronization/RefCountedConcurrentDictionaryBenchmarks.cs b/tests/ImageSharp.Web.Benchmarks/Synchronization/RefCountedConcurrentDictionaryBenchmarks.cs
index 3d92a54b..d42719b6 100644
--- a/tests/ImageSharp.Web.Benchmarks/Synchronization/RefCountedConcurrentDictionaryBenchmarks.cs
+++ b/tests/ImageSharp.Web.Benchmarks/Synchronization/RefCountedConcurrentDictionaryBenchmarks.cs
@@ -1,79 +1,78 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using System.Collections.Concurrent;
 using BenchmarkDotNet.Attributes;
 using SixLabors.ImageSharp.Web.Synchronization;
 
-namespace SixLabors.ImageSharp.Web.Benchmarks.Synchronization
+namespace SixLabors.ImageSharp.Web.Benchmarks.Synchronization;
+
+[Config(typeof(MemoryConfig))]
+public class RefCountedConcurrentDictionaryBenchmarks
 {
-    [Config(typeof(MemoryConfig))]
-    public class RefCountedConcurrentDictionaryBenchmarks
-    {
-        private readonly object testObj;
-        private readonly RefCountedConcurrentDictionary<string, object> refCountedDictionary;
+    private readonly object testObj;
+    private readonly RefCountedConcurrentDictionary<string, object> refCountedDictionary;
 
-        private readonly ConcurrentDictionary<string, object> dictionary;
+    private readonly ConcurrentDictionary<string, object> dictionary;
 
-        public RefCountedConcurrentDictionaryBenchmarks()
-        {
-            this.testObj = new object();
-            this.refCountedDictionary = new RefCountedConcurrentDictionary<string, object>((_) => this.testObj, null);
+    public RefCountedConcurrentDictionaryBenchmarks()
+    {
+        this.testObj = new object();
+        this.refCountedDictionary = new RefCountedConcurrentDictionary<string, object>((_) => this.testObj, null);
 
-            this.dictionary = new ConcurrentDictionary<string, object>();
+        this.dictionary = new ConcurrentDictionary<string, object>();
 
-            this.refCountedDictionary.Get("foo");
-            this.dictionary.TryAdd("foo", this.testObj);
-        }
+        this.refCountedDictionary.Get("foo");
+        this.dictionary.TryAdd("foo", this.testObj);
+    }
 
-        [Benchmark]
-        public void RefCountedConcurrentDictionary_ExistingKey()
-        {
-            this.refCountedDictionary.Get("foo");
-            this.refCountedDictionary.Release("foo");
-        }
+    [Benchmark]
+    public void RefCountedConcurrentDictionary_ExistingKey()
+    {
+        this.refCountedDictionary.Get("foo");
+        this.refCountedDictionary.Release("foo");
+    }
 
-        [Benchmark]
-        public void RefCountedConcurrentDictionary_ExistingKey_JustGet()
-        {
-            this.refCountedDictionary.Get("foo");
-        }
+    [Benchmark]
+    public void RefCountedConcurrentDictionary_ExistingKey_JustGet()
+    {
+        this.refCountedDictionary.Get("foo");
+    }
 
-        [Benchmark]
-        public void ConcurrentDictionary_ExistingKey_JustGet()
-        {
-            this.dictionary.GetOrAdd("foo", this.testObj);
-        }
+    [Benchmark]
+    public void ConcurrentDictionary_ExistingKey_JustGet()
+    {
+        this.dictionary.GetOrAdd("foo", this.testObj);
+    }
 
-        [Benchmark]
-        public void RefCountedConcurrentDictionary_NewKey()
-        {
-            this.refCountedDictionary.Get("bar");
-            this.refCountedDictionary.Release("bar");
-        }
+    [Benchmark]
+    public void RefCountedConcurrentDictionary_NewKey()
+    {
+        this.refCountedDictionary.Get("bar");
+        this.refCountedDictionary.Release("bar");
+    }
 
-        [Benchmark]
-        public void ConcurrentDictionary_NewKey()
-        {
-            this.dictionary.GetOrAdd("bar", this.testObj);
-            this.dictionary.TryRemove("bar", out _);
-        }
+    [Benchmark]
+    public void ConcurrentDictionary_NewKey()
+    {
+        this.dictionary.GetOrAdd("bar", this.testObj);
+        this.dictionary.TryRemove("bar", out _);
+    }
 
-        /*
-        BenchmarkDotNet=v0.13.1, OS=Windows 10.0.19043.1348 (21H1/May2021Update)
-        Intel Core i9-9900K CPU 3.60GHz (Coffee Lake), 1 CPU, 16 logical and 8 physical cores
-        .NET SDK=6.0.100
-          [Host]     : .NET Core 3.1.21 (CoreCLR 4.700.21.51404, CoreFX 4.700.21.51508), X64 RyuJIT
-          DefaultJob : .NET Core 3.1.21 (CoreCLR 4.700.21.51404, CoreFX 4.700.21.51508), X64 RyuJIT
+    /*
+    BenchmarkDotNet=v0.13.1, OS=Windows 10.0.19043.1348 (21H1/May2021Update)
+    Intel Core i9-9900K CPU 3.60GHz (Coffee Lake), 1 CPU, 16 logical and 8 physical cores
+    .NET SDK=6.0.100
+      [Host]     : .NET Core 3.1.21 (CoreCLR 4.700.21.51404, CoreFX 4.700.21.51508), X64 RyuJIT
+      DefaultJob : .NET Core 3.1.21 (CoreCLR 4.700.21.51404, CoreFX 4.700.21.51508), X64 RyuJIT
 
 
-        |                                             Method |      Mean |    Error |   StdDev |  Gen 0 | Allocated |
-        |--------------------------------------------------- |----------:|---------:|---------:|-------:|----------:|
-        |         RefCountedConcurrentDictionary_ExistingKey | 138.65 ns | 1.077 ns | 1.007 ns | 0.0076 |      64 B |
-        | RefCountedConcurrentDictionary_ExistingKey_JustGet |  68.00 ns | 0.372 ns | 0.310 ns | 0.0038 |      32 B |
-        |           ConcurrentDictionary_ExistingKey_JustGet |  16.54 ns | 0.117 ns | 0.104 ns |      - |         - |
-        |              RefCountedConcurrentDictionary_NewKey | 131.50 ns | 0.253 ns | 0.237 ns | 0.0095 |      80 B |
-        |                        ConcurrentDictionary_NewKey |  83.55 ns | 0.375 ns | 0.351 ns | 0.0057 |      48 B |
-        */
-    }
+    |                                             Method |      Mean |    Error |   StdDev |  Gen 0 | Allocated |
+    |--------------------------------------------------- |----------:|---------:|---------:|-------:|----------:|
+    |         RefCountedConcurrentDictionary_ExistingKey | 138.65 ns | 1.077 ns | 1.007 ns | 0.0076 |      64 B |
+    | RefCountedConcurrentDictionary_ExistingKey_JustGet |  68.00 ns | 0.372 ns | 0.310 ns | 0.0038 |      32 B |
+    |           ConcurrentDictionary_ExistingKey_JustGet |  16.54 ns | 0.117 ns | 0.104 ns |      - |         - |
+    |              RefCountedConcurrentDictionary_NewKey | 131.50 ns | 0.253 ns | 0.237 ns | 0.0095 |      80 B |
+    |                        ConcurrentDictionary_NewKey |  83.55 ns | 0.375 ns | 0.351 ns | 0.0057 |      48 B |
+    */
 }
diff --git a/tests/ImageSharp.Web.Tests/Caching/CacheHashTests.cs b/tests/ImageSharp.Web.Tests/Caching/CacheHashTests.cs
index e6900d54..ea2f4d25 100644
--- a/tests/ImageSharp.Web.Tests/Caching/CacheHashTests.cs
+++ b/tests/ImageSharp.Web.Tests/Caching/CacheHashTests.cs
@@ -1,69 +1,67 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using System.Text;
 using Microsoft.Extensions.Options;
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Middleware;
-using Xunit;
 using MSOptions = Microsoft.Extensions.Options.Options;
 
-namespace SixLabors.ImageSharp.Web.Tests.Caching
+namespace SixLabors.ImageSharp.Web.Tests.Caching;
+
+public class CacheHashTests
 {
-    public class CacheHashTests
+    private static readonly IOptions<ImageSharpMiddlewareOptions> Options = MSOptions.Create(new ImageSharpMiddlewareOptions());
+    private static readonly ICacheHash CacheHash = new SHA256CacheHash(Options);
+
+    [Fact]
+    public void CacheHashProducesIdenticalResults()
     {
-        private static readonly IOptions<ImageSharpMiddlewareOptions> Options = MSOptions.Create(new ImageSharpMiddlewareOptions());
-        private static readonly ICacheHash CacheHash = new SHA256CacheHash(Options);
+        const string Input = "http://testwebsite.com/image-12345.jpeg?width=400";
+        string expected = CacheHash.Create(Input, 8);
+        string actual = CacheHash.Create(Input, 8);
 
-        [Fact]
-        public void CacheHashProducesIdenticalResults()
-        {
-            const string Input = "http://testwebsite.com/image-12345.jpeg?width=400";
-            string expected = CacheHash.Create(Input, 8);
-            string actual = CacheHash.Create(Input, 8);
+        Assert.Equal(expected, actual);
+    }
 
-            Assert.Equal(expected, actual);
-        }
+    [Fact]
+    public void CacheHashProducesDifferentResults()
+    {
+        const string Input = "http://testwebsite.com/image-12345.jpeg?width=400";
+        const string Input2 = "http://testwebsite.com/image-23456.jpeg?width=400";
+        string expected = CacheHash.Create(Input, 8);
+        string actual = CacheHash.Create(Input2, 8);
 
-        [Fact]
-        public void CacheHashProducesDifferentResults()
-        {
-            const string Input = "http://testwebsite.com/image-12345.jpeg?width=400";
-            const string Input2 = "http://testwebsite.com/image-23456.jpeg?width=400";
-            string expected = CacheHash.Create(Input, 8);
-            string actual = CacheHash.Create(Input2, 8);
+        Assert.NotEqual(expected, actual);
+    }
 
-            Assert.NotEqual(expected, actual);
-        }
+    [Fact]
+    public void CacheHashLengthIsIdentical()
+    {
+        const int Length = 12;
+        const string Input = "http://testwebsite.com/image-12345.jpeg?width=400";
+        const string Input2 = "http://testwebsite.com/image-12345.jpeg";
+        string input3 = CreateLongString();
 
-        [Fact]
-        public void CacheHashLengthIsIdentical()
-        {
-            const int Length = 12;
-            const string Input = "http://testwebsite.com/image-12345.jpeg?width=400";
-            const string Input2 = "http://testwebsite.com/image-12345.jpeg";
-            string input3 = CreateLongString();
+        int expected = CacheHash.Create(Input, Length).Length;
+        int actual = CacheHash.Create(Input2, Length).Length;
+        int actual2 = CacheHash.Create(input3, Length).Length;
 
-            int expected = CacheHash.Create(Input, Length).Length;
-            int actual = CacheHash.Create(Input2, Length).Length;
-            int actual2 = CacheHash.Create(input3, Length).Length;
+        Assert.Equal(expected, actual);
+        Assert.Equal(Length, actual);
+        Assert.Equal(Length, actual2);
+    }
 
-            Assert.Equal(expected, actual);
-            Assert.Equal(Length, actual);
-            Assert.Equal(Length, actual2);
-        }
+    private static string CreateLongString()
+    {
+        const int Length = 2048;
+        var sb = new StringBuilder(Length);
 
-        private static string CreateLongString()
+        for (int i = 0; i < Length; i++)
         {
-            const int Length = 2048;
-            var sb = new StringBuilder(Length);
-
-            for (int i = 0; i < Length; i++)
-            {
-                sb.Append(i.ToString());
-            }
-
-            return sb.ToString();
+            sb.Append(i.ToString());
         }
+
+        return sb.ToString();
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Caching/CacheKeyTests.cs b/tests/ImageSharp.Web.Tests/Caching/CacheKeyTests.cs
index 1e5a8b3d..90317b67 100644
--- a/tests/ImageSharp.Web.Tests/Caching/CacheKeyTests.cs
+++ b/tests/ImageSharp.Web.Tests/Caching/CacheKeyTests.cs
@@ -1,107 +1,104 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Commands;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Caching
+namespace SixLabors.ImageSharp.Web.Tests.Caching;
+
+public class CacheKeyTests
 {
-    public class CacheKeyTests
+    private static readonly ICacheKey LegacyV1CacheKey = new LegacyV1CacheKey();
+    private static readonly ICacheKey UriRelativeCacheKey = new UriRelativeCacheKey();
+    private static readonly ICacheKey UriAbsoluteCacheKey = new UriAbsoluteCacheKey();
+    private static readonly ICacheKey UriRelativeLowerInvariantCacheKey = new UriRelativeLowerInvariantCacheKey();
+    private static readonly ICacheKey UriAbsoluteLowerInvariantCacheKey = new UriAbsoluteLowerInvariantCacheKey();
+
+    [Fact]
+    public void UriRelativeCacheKey_Is_Relative()
     {
-        private static readonly ICacheKey LegacyV1CacheKey = new LegacyV1CacheKey();
-        private static readonly ICacheKey UriRelativeCacheKey = new UriRelativeCacheKey();
-        private static readonly ICacheKey UriAbsoluteCacheKey = new UriAbsoluteCacheKey();
-        private static readonly ICacheKey UriRelativeLowerInvariantCacheKey = new UriRelativeLowerInvariantCacheKey();
-        private static readonly ICacheKey UriAbsoluteLowerInvariantCacheKey = new UriAbsoluteLowerInvariantCacheKey();
-
-        [Fact]
-        public void UriRelativeCacheKey_Is_Relative()
+        HttpContext context = CreateHttpContext();
+        var commands = new CommandCollection()
         {
-            HttpContext context = CreateHttpContext();
-            var commands = new CommandCollection()
-            {
-                { "Width", "400" }
-            };
+            { "Width", "400" }
+        };
 
-            const string expected = "/Images/Image-12345.jpeg?width=400";
-            string actual = UriRelativeCacheKey.Create(context, commands);
+        const string expected = "/Images/Image-12345.jpeg?width=400";
+        string actual = UriRelativeCacheKey.Create(context, commands);
 
-            Assert.Equal(expected, actual);
-        }
+        Assert.Equal(expected, actual);
+    }
 
-        [Fact]
-        public void UriRelativeLowerInvariantCacheKey_Is_RelativeAndLowercase()
+    [Fact]
+    public void UriRelativeLowerInvariantCacheKey_Is_RelativeAndLowercase()
+    {
+        HttpContext context = CreateHttpContext();
+        var commands = new CommandCollection()
         {
-            HttpContext context = CreateHttpContext();
-            var commands = new CommandCollection()
-            {
-                { "Width", "400" }
-            };
+            { "Width", "400" }
+        };
 
-            const string expected = "/images/image-12345.jpeg?width=400";
-            string actual = UriRelativeLowerInvariantCacheKey.Create(context, commands);
+        const string expected = "/images/image-12345.jpeg?width=400";
+        string actual = UriRelativeLowerInvariantCacheKey.Create(context, commands);
 
-            Assert.Equal(expected, actual);
-        }
+        Assert.Equal(expected, actual);
+    }
 
-        [Fact]
-        public void UriAbsoluteCacheKey_Is_Absolute()
+    [Fact]
+    public void UriAbsoluteCacheKey_Is_Absolute()
+    {
+        HttpContext context = CreateHttpContext();
+        var commands = new CommandCollection()
         {
-            HttpContext context = CreateHttpContext();
-            var commands = new CommandCollection()
-            {
-                { "Width", "400" }
-            };
+            { "Width", "400" }
+        };
 
-            const string expected = "Testwebsite.com/Images/Image-12345.jpeg?width=400";
-            string actual = UriAbsoluteCacheKey.Create(context, commands);
+        const string expected = "Testwebsite.com/Images/Image-12345.jpeg?width=400";
+        string actual = UriAbsoluteCacheKey.Create(context, commands);
 
-            Assert.Equal(expected, actual);
-        }
+        Assert.Equal(expected, actual);
+    }
 
-        [Fact]
-        public void UriAbsoluteLowerInvariantCacheKey_Is_AbsoluteAndLowercase()
+    [Fact]
+    public void UriAbsoluteLowerInvariantCacheKey_Is_AbsoluteAndLowercase()
+    {
+        HttpContext context = CreateHttpContext();
+        var commands = new CommandCollection()
         {
-            HttpContext context = CreateHttpContext();
-            var commands = new CommandCollection()
-            {
-                { "Width", "400" }
-            };
+            { "Width", "400" }
+        };
 
-            const string expected = "testwebsite.com/images/image-12345.jpeg?width=400";
-            string actual = UriAbsoluteLowerInvariantCacheKey.Create(context, commands);
+        const string expected = "testwebsite.com/images/image-12345.jpeg?width=400";
+        string actual = UriAbsoluteLowerInvariantCacheKey.Create(context, commands);
 
-            Assert.Equal(expected, actual);
-        }
+        Assert.Equal(expected, actual);
+    }
 
-        [Fact]
-        public void LegacyV1CacheKey_Matches_V1_Behavior()
+    [Fact]
+    public void LegacyV1CacheKey_Matches_V1_Behavior()
+    {
+        HttpContext context = CreateHttpContext();
+        var commands = new CommandCollection()
         {
-            HttpContext context = CreateHttpContext();
-            var commands = new CommandCollection()
-            {
-                { "Width", "400" }
-            };
+            { "Width", "400" }
+        };
 
-            const string expected = "testwebsite.com/images//image-12345.jpeg?width=400";
-            string actual = LegacyV1CacheKey.Create(context, commands);
+        const string expected = "testwebsite.com/images//image-12345.jpeg?width=400";
+        string actual = LegacyV1CacheKey.Create(context, commands);
 
-            Assert.Equal(expected, actual);
-        }
+        Assert.Equal(expected, actual);
+    }
 
-        private static HttpContext CreateHttpContext()
-        {
-            var httpContext = new DefaultHttpContext();
-            httpContext.Request.Scheme = Uri.UriSchemeHttp;
-            httpContext.Request.Host = new HostString("Testwebsite.com");
-            httpContext.Request.PathBase = "/Images";
-            httpContext.Request.Path = "/Image-12345.jpeg";
-            httpContext.Request.QueryString = new QueryString("?Should-Be=Ignored");
-
-            return httpContext;
-        }
+    private static HttpContext CreateHttpContext()
+    {
+        var httpContext = new DefaultHttpContext();
+        httpContext.Request.Scheme = Uri.UriSchemeHttp;
+        httpContext.Request.Host = new HostString("Testwebsite.com");
+        httpContext.Request.PathBase = "/Images";
+        httpContext.Request.Path = "/Image-12345.jpeg";
+        httpContext.Request.QueryString = new QueryString("?Should-Be=Ignored");
+
+        return httpContext;
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Caching/HexEncoderTests.cs b/tests/ImageSharp.Web.Tests/Caching/HexEncoderTests.cs
index 8dc8a8cf..21eb5203 100644
--- a/tests/ImageSharp.Web.Tests/Caching/HexEncoderTests.cs
+++ b/tests/ImageSharp.Web.Tests/Caching/HexEncoderTests.cs
@@ -1,42 +1,40 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using System.Security.Cryptography;
 using System.Text;
 using SixLabors.ImageSharp.Web.Caching;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Caching
+namespace SixLabors.ImageSharp.Web.Tests.Caching;
+
+public class HexEncoderTests
 {
-    public class HexEncoderTests
+    [Fact]
+    public void HexEncoderOutputIsCorrect()
     {
-        [Fact]
-        public void HexEncoderOutputIsCorrect()
+        byte[] hash = Hash();
+        var sb = new StringBuilder(hash.Length * 2);
+        for (int i = 0; i < hash.Length; i++)
         {
-            byte[] hash = Hash();
-            var sb = new StringBuilder(hash.Length * 2);
-            for (int i = 0; i < hash.Length; i++)
-            {
-                sb.Append(hash[i].ToString("x2"));
-            }
+            sb.Append(hash[i].ToString("x2"));
+        }
 
-            string expected = sb.ToString();
-            string actual = HexEncoder.Encode(hash);
+        string expected = sb.ToString();
+        string actual = HexEncoder.Encode(hash);
 
-            Assert.Equal(expected, actual);
-        }
+        Assert.Equal(expected, actual);
+    }
 
-        private static byte[] Hash()
+    private static byte[] Hash()
+    {
+        using (var hashAlgorithm = SHA256.Create())
         {
-            using (var hashAlgorithm = SHA256.Create())
-            {
-                // Concatenate the hash bytes into one long string.
-                const string Value = "http://testwebsite.com/image-12345.jpeg?width=400";
-                int byteCount = Encoding.ASCII.GetByteCount(Value);
-                byte[] buffer = new byte[byteCount];
-                Encoding.ASCII.GetBytes(Value, 0, Value.Length, buffer, 0);
-                return hashAlgorithm.ComputeHash(buffer, 0, byteCount);
-            }
+            // Concatenate the hash bytes into one long string.
+            const string Value = "http://testwebsite.com/image-12345.jpeg?width=400";
+            int byteCount = Encoding.ASCII.GetByteCount(Value);
+            byte[] buffer = new byte[byteCount];
+            Encoding.ASCII.GetBytes(Value, 0, Value.Length, buffer, 0);
+            return hashAlgorithm.ComputeHash(buffer, 0, byteCount);
         }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Caching/ImageCacheMetadataTests.cs b/tests/ImageSharp.Web.Tests/Caching/ImageCacheMetadataTests.cs
index ba9f9b58..93358615 100644
--- a/tests/ImageSharp.Web.Tests/Caching/ImageCacheMetadataTests.cs
+++ b/tests/ImageSharp.Web.Tests/Caching/ImageCacheMetadataTests.cs
@@ -1,67 +1,64 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using Xunit;
 using Xunit.Abstractions;
 
-namespace SixLabors.ImageSharp.Web.Tests.Caching
+namespace SixLabors.ImageSharp.Web.Tests.Caching;
+
+public class ImageCacheMetaDataTests
 {
-    public class ImageCacheMetaDataTests
-    {
-        private static readonly DateTime SourceLastWriteTimeUtc = new DateTime(1980, 11, 3);
-        private static readonly DateTime CacheLastWriteTimeUtc = new DateTime(1980, 11, 4);
-        private static readonly TimeSpan MaxAge = TimeSpan.FromDays(7);
-        private const string ContentType = "image/jpeg";
-        private const long ContentLength = 1234;
+    private static readonly DateTime SourceLastWriteTimeUtc = new DateTime(1980, 11, 3);
+    private static readonly DateTime CacheLastWriteTimeUtc = new DateTime(1980, 11, 4);
+    private static readonly TimeSpan MaxAge = TimeSpan.FromDays(7);
+    private const string ContentType = "image/jpeg";
+    private const long ContentLength = 1234;
 
-        public ImageCacheMetaDataTests(ITestOutputHelper output) => this.Output = output;
+    public ImageCacheMetaDataTests(ITestOutputHelper output) => this.Output = output;
 
-        protected ITestOutputHelper Output { get; }
+    protected ITestOutputHelper Output { get; }
 
-        [Fact]
-        public void ConstructorAssignsProperties()
-        {
-            var meta = new ImageCacheMetadata(
-                SourceLastWriteTimeUtc,
-                CacheLastWriteTimeUtc,
-                ContentType,
-                MaxAge,
-                ContentLength);
+    [Fact]
+    public void ConstructorAssignsProperties()
+    {
+        var meta = new ImageCacheMetadata(
+            SourceLastWriteTimeUtc,
+            CacheLastWriteTimeUtc,
+            ContentType,
+            MaxAge,
+            ContentLength);
 
-            Assert.Equal(SourceLastWriteTimeUtc, meta.SourceLastWriteTimeUtc);
-            Assert.Equal(CacheLastWriteTimeUtc, meta.CacheLastWriteTimeUtc);
-            Assert.Equal(ContentType, meta.ContentType);
-            Assert.Equal(MaxAge, meta.CacheControlMaxAge);
-            Assert.Equal(ContentLength, meta.ContentLength);
-        }
+        Assert.Equal(SourceLastWriteTimeUtc, meta.SourceLastWriteTimeUtc);
+        Assert.Equal(CacheLastWriteTimeUtc, meta.CacheLastWriteTimeUtc);
+        Assert.Equal(ContentType, meta.ContentType);
+        Assert.Equal(MaxAge, meta.CacheControlMaxAge);
+        Assert.Equal(ContentLength, meta.ContentLength);
+    }
 
-        [Fact]
-        public void EqualityChecksAreCorrect()
-        {
-            var meta = new ImageCacheMetadata(
-                SourceLastWriteTimeUtc,
-                CacheLastWriteTimeUtc,
-                ContentType,
-                MaxAge,
-                ContentLength);
-            var meta2 = new ImageCacheMetadata(
-                meta.SourceLastWriteTimeUtc,
-                meta.CacheLastWriteTimeUtc,
-                meta.ContentType,
-                meta.CacheControlMaxAge,
-                meta.ContentLength);
+    [Fact]
+    public void EqualityChecksAreCorrect()
+    {
+        var meta = new ImageCacheMetadata(
+            SourceLastWriteTimeUtc,
+            CacheLastWriteTimeUtc,
+            ContentType,
+            MaxAge,
+            ContentLength);
+        var meta2 = new ImageCacheMetadata(
+            meta.SourceLastWriteTimeUtc,
+            meta.CacheLastWriteTimeUtc,
+            meta.ContentType,
+            meta.CacheControlMaxAge,
+            meta.ContentLength);
 
-            Assert.Equal(meta, meta2);
+        Assert.Equal(meta, meta2);
 
-            var meta3 = new ImageCacheMetadata(
-                SourceLastWriteTimeUtc,
-                CacheLastWriteTimeUtc,
-                "image/png",
-                MaxAge,
-                ContentLength);
+        var meta3 = new ImageCacheMetadata(
+            SourceLastWriteTimeUtc,
+            CacheLastWriteTimeUtc,
+            "image/png",
+            MaxAge,
+            ContentLength);
 
-            Assert.NotEqual(meta, meta3);
-        }
+        Assert.NotEqual(meta, meta3);
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Caching/ImageMetaDataTests.cs b/tests/ImageSharp.Web.Tests/Caching/ImageMetaDataTests.cs
index 5f736534..dad80db1 100644
--- a/tests/ImageSharp.Web.Tests/Caching/ImageMetaDataTests.cs
+++ b/tests/ImageSharp.Web.Tests/Caching/ImageMetaDataTests.cs
@@ -1,40 +1,37 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using Xunit;
 using Xunit.Abstractions;
 
-namespace SixLabors.ImageSharp.Web.Tests.Caching
+namespace SixLabors.ImageSharp.Web.Tests.Caching;
+
+public class ImageMetaDataTests
 {
-    public class ImageMetaDataTests
+    private static readonly DateTime LastWriteTimeUtc = new DateTime(1980, 11, 4);
+    private static readonly TimeSpan MaxAge = TimeSpan.FromDays(7);
+    private const long ContentLength = 1234;
+
+    public ImageMetaDataTests(ITestOutputHelper output) => this.Output = output;
+
+    protected ITestOutputHelper Output { get; }
+
+    [Fact]
+    public void ConstructorAssignsProperties()
     {
-        private static readonly DateTime LastWriteTimeUtc = new DateTime(1980, 11, 4);
-        private static readonly TimeSpan MaxAge = TimeSpan.FromDays(7);
-        private const long ContentLength = 1234;
-
-        public ImageMetaDataTests(ITestOutputHelper output) => this.Output = output;
-
-        protected ITestOutputHelper Output { get; }
-
-        [Fact]
-        public void ConstructorAssignsProperties()
-        {
-            var meta = new ImageMetadata(LastWriteTimeUtc, MaxAge, ContentLength);
-            Assert.Equal(LastWriteTimeUtc, meta.LastWriteTimeUtc);
-            Assert.Equal(MaxAge, meta.CacheControlMaxAge);
-            Assert.Equal(ContentLength, meta.ContentLength);
-        }
-
-        [Fact]
-        public void EqualityChecksAreCorrect()
-        {
-            var meta = new ImageMetadata(LastWriteTimeUtc, MaxAge, ContentLength);
-            var meta2 = new ImageMetadata(meta.LastWriteTimeUtc, meta.CacheControlMaxAge, meta.ContentLength);
-            Assert.Equal(meta, meta2);
-
-            var meta3 = new ImageMetadata(meta.LastWriteTimeUtc, TimeSpan.FromDays(1), 4321);
-            Assert.NotEqual(meta, meta3);
-        }
+        var meta = new ImageMetadata(LastWriteTimeUtc, MaxAge, ContentLength);
+        Assert.Equal(LastWriteTimeUtc, meta.LastWriteTimeUtc);
+        Assert.Equal(MaxAge, meta.CacheControlMaxAge);
+        Assert.Equal(ContentLength, meta.ContentLength);
+    }
+
+    [Fact]
+    public void EqualityChecksAreCorrect()
+    {
+        var meta = new ImageMetadata(LastWriteTimeUtc, MaxAge, ContentLength);
+        var meta2 = new ImageMetadata(meta.LastWriteTimeUtc, meta.CacheControlMaxAge, meta.ContentLength);
+        Assert.Equal(meta, meta2);
+
+        var meta3 = new ImageMetadata(meta.LastWriteTimeUtc, TimeSpan.FromDays(1), 4321);
+        Assert.NotEqual(meta, meta3);
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Caching/PhysicialFileSystemCacheTests.cs b/tests/ImageSharp.Web.Tests/Caching/PhysicialFileSystemCacheTests.cs
index cbd7656f..966d2336 100644
--- a/tests/ImageSharp.Web.Tests/Caching/PhysicialFileSystemCacheTests.cs
+++ b/tests/ImageSharp.Web.Tests/Caching/PhysicialFileSystemCacheTests.cs
@@ -1,67 +1,64 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
 using SixLabors.ImageSharp.Web.Caching;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Caching
+namespace SixLabors.ImageSharp.Web.Tests.Caching;
+
+public class PhysicialFileSystemCacheTests
 {
-    public class PhysicialFileSystemCacheTests
+    [Theory]
+    [InlineData("abcdefghijkl", 0, "abcdefghijkl")]
+    [InlineData("abcdefghijkl", 4, "a/b/c/d/efghijkl")]
+    [InlineData("abcdefghijkl", 8, "a/b/c/d/e/f/g/h/ijkl")]
+    [InlineData("abcdefghijkl", 12, "a/b/c/d/e/f/g/h/i/j/k/l/abcdefghijkl")]
+    [InlineData("abcdefghijkl", 16, "a/b/c/d/e/f/g/h/i/j/k/l/abcdefghijkl")]
+    public void FilePathMatchesReference(string key, int cacheFolderDepth, string expected)
     {
-        [Theory]
-        [InlineData("abcdefghijkl", 0, "abcdefghijkl")]
-        [InlineData("abcdefghijkl", 4, "a/b/c/d/efghijkl")]
-        [InlineData("abcdefghijkl", 8, "a/b/c/d/e/f/g/h/ijkl")]
-        [InlineData("abcdefghijkl", 12, "a/b/c/d/e/f/g/h/i/j/k/l/abcdefghijkl")]
-        [InlineData("abcdefghijkl", 16, "a/b/c/d/e/f/g/h/i/j/k/l/abcdefghijkl")]
-        public void FilePathMatchesReference(string key, int cacheFolderDepth, string expected)
-        {
-            string actual = PhysicalFileSystemCache.ToFilePath(key, cacheFolderDepth);
+        string actual = PhysicalFileSystemCache.ToFilePath(key, cacheFolderDepth);
 
-            Assert.Equal(expected, actual);
-        }
+        Assert.Equal(expected, actual);
+    }
 
-        [Theory]
+    [Theory]
 #if OS_LINUX
-        [InlineData("cacheFolder", "/Users/username", null, null, "/Users/username/cacheFolder/")]
-        [InlineData("cacheFolder", null, "/Users/WebRoot", null, "/Users/WebRoot/cacheFolder/")]
-        [InlineData("cacheFolder", "../Temp", null, "/Users/this/a/root", "/Users/this/a/Temp/cacheFolder/")]
+    [InlineData("cacheFolder", "/Users/username", null, null, "/Users/username/cacheFolder/")]
+    [InlineData("cacheFolder", null, "/Users/WebRoot", null, "/Users/WebRoot/cacheFolder/")]
+    [InlineData("cacheFolder", "../Temp", null, "/Users/this/a/root", "/Users/this/a/Temp/cacheFolder/")]
 #elif OS_OSX
-        [InlineData("cacheFolder", "/Users/username", null, null, "/Users/username/cacheFolder/")]
-        [InlineData("cacheFolder", null, "/Users/WebRoot", null, "/Users/WebRoot/cacheFolder/")]
-        [InlineData("cacheFolder", "../Temp", null, "/Users/this/a/root", "/Users/this/a/Temp/cacheFolder/")]
+    [InlineData("cacheFolder", "/Users/username", null, null, "/Users/username/cacheFolder/")]
+    [InlineData("cacheFolder", null, "/Users/WebRoot", null, "/Users/WebRoot/cacheFolder/")]
+    [InlineData("cacheFolder", "../Temp", null, "/Users/this/a/root", "/Users/this/a/Temp/cacheFolder/")]
 #elif OS_WINDOWS
-        [InlineData("cacheFolder", "C:\\Temp", null, null, "C:\\Temp\\cacheFolder\\")]
-        [InlineData("cacheFolder", null, "C:\\WebRoot", null, "C:\\WebRoot\\cacheFolder\\")]
-        [InlineData("cacheFolder", "..\\Temp", null, "C:\\this\\a\\root", "C:\\this\\a\\Temp\\cacheFolder\\")]
+    [InlineData("cacheFolder", "C:\\Temp", null, null, "C:\\Temp\\cacheFolder\\")]
+    [InlineData("cacheFolder", null, "C:\\WebRoot", null, "C:\\WebRoot\\cacheFolder\\")]
+    [InlineData("cacheFolder", "..\\Temp", null, "C:\\this\\a\\root", "C:\\this\\a\\Temp\\cacheFolder\\")]
 #endif
-        public void GetCacheRoot(string cacheFolder, string cacheRootPath, string webRootPath, string contentRootPath, string expected)
+    public void GetCacheRoot(string cacheFolder, string cacheRootPath, string webRootPath, string contentRootPath, string expected)
+    {
+        var cacheOptions = new PhysicalFileSystemCacheOptions
         {
-            var cacheOptions = new PhysicalFileSystemCacheOptions
-            {
-                CacheFolder = cacheFolder,
-                CacheRootPath = cacheRootPath
-            };
+            CacheFolder = cacheFolder,
+            CacheRootPath = cacheRootPath
+        };
 
-            string actual = PhysicalFileSystemCache.GetCacheRoot(cacheOptions, webRootPath, contentRootPath);
+        string actual = PhysicalFileSystemCache.GetCacheRoot(cacheOptions, webRootPath, contentRootPath);
 
-            Assert.Equal(expected, actual);
-        }
+        Assert.Equal(expected, actual);
+    }
 
-        [Theory]
-        [InlineData("cacheFolder", null, null, "C:\\root\\")]
-        [InlineData("cacheFolder", "", null, "C:\\root\\")]
-        [InlineData("cacheFolder", null, "", "C:\\root\\")]
-        public void GetCacheRootThrows(string cacheFolder, string cacheRootPath, string webRootPath, string contentRootPath)
+    [Theory]
+    [InlineData("cacheFolder", null, null, "C:\\root\\")]
+    [InlineData("cacheFolder", "", null, "C:\\root\\")]
+    [InlineData("cacheFolder", null, "", "C:\\root\\")]
+    public void GetCacheRootThrows(string cacheFolder, string cacheRootPath, string webRootPath, string contentRootPath)
+    {
+        var cacheOptions = new PhysicalFileSystemCacheOptions
         {
-            var cacheOptions = new PhysicalFileSystemCacheOptions
-            {
-                CacheFolder = cacheFolder,
-                CacheRootPath = cacheRootPath
-            };
+            CacheFolder = cacheFolder,
+            CacheRootPath = cacheRootPath
+        };
 
-            Assert.Throws<InvalidOperationException>(() => PhysicalFileSystemCache.GetCacheRoot(cacheOptions, webRootPath, contentRootPath));
-        }
+        Assert.Throws<InvalidOperationException>(() => PhysicalFileSystemCache.GetCacheRoot(cacheOptions, webRootPath, contentRootPath));
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Commands/CommandCollectionTests.cs b/tests/ImageSharp.Web.Tests/Commands/CommandCollectionTests.cs
index 31f40543..1001610b 100644
--- a/tests/ImageSharp.Web.Tests/Commands/CommandCollectionTests.cs
+++ b/tests/ImageSharp.Web.Tests/Commands/CommandCollectionTests.cs
@@ -1,216 +1,212 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using System.Collections.Generic;
 using SixLabors.ImageSharp.Web.Commands;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Commands
+namespace SixLabors.ImageSharp.Web.Tests.Commands;
+
+public class CommandCollectionTests
 {
-    public class CommandCollectionTests
+    [Fact]
+    public void CanAddCommands()
     {
-        [Fact]
-        public void CanAddCommands()
-        {
-            CommandCollection collection = new();
-            collection.Add(new("a", "b"));
-            Assert.Single(collection);
-        }
-
-        [Fact]
-        public void CannotAddDuplicateCommands()
-        {
-            CommandCollection collection = new();
-            collection.Add(new("a", "b"));
-            Assert.Throws<ArgumentException>(() => collection.Add(new("a", "b")));
-            Assert.Single(collection);
-        }
-
-        [Fact]
-        public void CanReadCommands()
-        {
-            const string key = "a";
-            const string value = "b";
-            CommandCollection collection = new();
-            collection.Add(new(key, value));
+        CommandCollection collection = new();
+        collection.Add(new("a", "b"));
+        Assert.Single(collection);
+    }
 
-            Assert.Equal(value, collection[key]);
-        }
+    [Fact]
+    public void CannotAddDuplicateCommands()
+    {
+        CommandCollection collection = new();
+        collection.Add(new("a", "b"));
+        Assert.Throws<ArgumentException>(() => collection.Add(new("a", "b")));
+        Assert.Single(collection);
+    }
 
-        [Fact]
-        public void CanInsertCommands()
-        {
-            KeyValuePair<string, string> kv1 = new("a", "b");
-            KeyValuePair<string, string> kv2 = new("c", "d");
+    [Fact]
+    public void CanReadCommands()
+    {
+        const string key = "a";
+        const string value = "b";
+        CommandCollection collection = new();
+        collection.Add(new(key, value));
 
-            CommandCollection collection = new();
-            collection.Add(kv1);
-            Assert.Single(collection);
+        Assert.Equal(value, collection[key]);
+    }
 
-            collection.Insert(0, kv2);
-            Assert.Equal(2, collection.Count);
+    [Fact]
+    public void CanInsertCommands()
+    {
+        KeyValuePair<string, string> kv1 = new("a", "b");
+        KeyValuePair<string, string> kv2 = new("c", "d");
 
-            Assert.Equal(kv1.Value, collection[kv1.Key]);
-            Assert.Equal(kv2.Value, collection[kv2.Key]);
+        CommandCollection collection = new();
+        collection.Add(kv1);
+        Assert.Single(collection);
 
-            Assert.Equal(1, collection.IndexOf(kv1));
-            Assert.Equal(0, collection.IndexOf(kv2));
-        }
+        collection.Insert(0, kv2);
+        Assert.Equal(2, collection.Count);
 
-        [Fact]
-        public void CannotInsertDuplicateCommands()
-        {
-            CommandCollection collection = new();
-            collection.Add(new("a", "b"));
-            Assert.Throws<ArgumentException>(() => collection.Insert(0, new("a", "b")));
-            Assert.Single(collection);
-        }
+        Assert.Equal(kv1.Value, collection[kv1.Key]);
+        Assert.Equal(kv2.Value, collection[kv2.Key]);
 
-        [Fact]
-        public void CanInsertCommandsViaKey()
-        {
-            KeyValuePair<string, string> kv1 = new("a", "b");
-            KeyValuePair<string, string> kv2 = new("c", "d");
+        Assert.Equal(1, collection.IndexOf(kv1));
+        Assert.Equal(0, collection.IndexOf(kv2));
+    }
 
-            CommandCollection collection = new();
-            collection.Add(kv1);
-            Assert.Single(collection);
+    [Fact]
+    public void CannotInsertDuplicateCommands()
+    {
+        CommandCollection collection = new();
+        collection.Add(new("a", "b"));
+        Assert.Throws<ArgumentException>(() => collection.Insert(0, new("a", "b")));
+        Assert.Single(collection);
+    }
 
-            collection.Insert(0, kv2.Key, kv2.Value);
-            Assert.Equal(2, collection.Count);
+    [Fact]
+    public void CanInsertCommandsViaKey()
+    {
+        KeyValuePair<string, string> kv1 = new("a", "b");
+        KeyValuePair<string, string> kv2 = new("c", "d");
 
-            Assert.Equal(kv1.Value, collection[kv1.Key]);
-            Assert.Equal(kv2.Value, collection[kv2.Key]);
+        CommandCollection collection = new();
+        collection.Add(kv1);
+        Assert.Single(collection);
 
-            Assert.Equal(1, collection.IndexOf(kv1));
-            Assert.Equal(0, collection.IndexOf(kv2));
-        }
+        collection.Insert(0, kv2.Key, kv2.Value);
+        Assert.Equal(2, collection.Count);
 
-        [Fact]
-        public void CannotInsertDuplicateCommandsViaKey()
-        {
-            CommandCollection collection = new();
-            collection.Add(new("a", "b"));
-            Assert.Throws<ArgumentException>(() => collection.Insert(0, "a", "b"));
-            Assert.Single(collection);
-        }
+        Assert.Equal(kv1.Value, collection[kv1.Key]);
+        Assert.Equal(kv2.Value, collection[kv2.Key]);
 
-        [Fact]
-        public void CanSetCommandsViaIndex()
-        {
-            KeyValuePair<string, string> kv1 = new("a", "b");
-            KeyValuePair<string, string> kv2 = new("c", "d");
-            CommandCollection collection = new();
+        Assert.Equal(1, collection.IndexOf(kv1));
+        Assert.Equal(0, collection.IndexOf(kv2));
+    }
 
-            collection.Add(kv1);
-            Assert.Single(collection);
-            Assert.Equal(0, collection.IndexOf(kv1));
-            Assert.Equal(kv1.Value, collection[kv1.Key]);
+    [Fact]
+    public void CannotInsertDuplicateCommandsViaKey()
+    {
+        CommandCollection collection = new();
+        collection.Add(new("a", "b"));
+        Assert.Throws<ArgumentException>(() => collection.Insert(0, "a", "b"));
+        Assert.Single(collection);
+    }
 
-            collection[0] = kv2;
-            Assert.Single(collection);
-            Assert.Equal(0, collection.IndexOf(kv2));
-            Assert.Equal(kv2.Value, collection[kv2.Key]);
-        }
+    [Fact]
+    public void CanSetCommandsViaIndex()
+    {
+        KeyValuePair<string, string> kv1 = new("a", "b");
+        KeyValuePair<string, string> kv2 = new("c", "d");
+        CommandCollection collection = new();
+
+        collection.Add(kv1);
+        Assert.Single(collection);
+        Assert.Equal(0, collection.IndexOf(kv1));
+        Assert.Equal(kv1.Value, collection[kv1.Key]);
+
+        collection[0] = kv2;
+        Assert.Single(collection);
+        Assert.Equal(0, collection.IndexOf(kv2));
+        Assert.Equal(kv2.Value, collection[kv2.Key]);
+    }
 
-        [Fact]
-        public void CanSetCommandsViaKey()
-        {
-            KeyValuePair<string, string> kv1 = new("a", "b");
-            KeyValuePair<string, string> kv2 = new("a", "d");
-            CommandCollection collection = new();
+    [Fact]
+    public void CanSetCommandsViaKey()
+    {
+        KeyValuePair<string, string> kv1 = new("a", "b");
+        KeyValuePair<string, string> kv2 = new("a", "d");
+        CommandCollection collection = new();
+
+        collection.Add(kv1);
+        Assert.Single(collection);
+        Assert.Equal(0, collection.IndexOf(kv1));
+        Assert.Equal(kv1.Value, collection[kv1.Key]);
+
+        collection[kv1.Key] = kv2.Value;
+        Assert.Single(collection);
+        Assert.Equal(0, collection.IndexOf(kv2));
+        Assert.Equal(kv2.Value, collection[kv2.Key]);
+    }
 
-            collection.Add(kv1);
-            Assert.Single(collection);
-            Assert.Equal(0, collection.IndexOf(kv1));
-            Assert.Equal(kv1.Value, collection[kv1.Key]);
+    [Fact]
+    public void CanRemoveCommands()
+    {
+        KeyValuePair<string, string> kv1 = new("a", "b");
+        KeyValuePair<string, string> kv2 = new("c", "d");
+        CommandCollection collection = new();
 
-            collection[kv1.Key] = kv2.Value;
-            Assert.Single(collection);
-            Assert.Equal(0, collection.IndexOf(kv2));
-            Assert.Equal(kv2.Value, collection[kv2.Key]);
-        }
+        collection.Add(kv1);
+        collection.Add(kv2);
 
-        [Fact]
-        public void CanRemoveCommands()
-        {
-            KeyValuePair<string, string> kv1 = new("a", "b");
-            KeyValuePair<string, string> kv2 = new("c", "d");
-            CommandCollection collection = new();
+        Assert.Equal(2, collection.Count);
 
-            collection.Add(kv1);
-            collection.Add(kv2);
+        collection.Remove(kv1);
 
-            Assert.Equal(2, collection.Count);
+        Assert.Single(collection);
+        Assert.Equal(kv2.Value, collection[kv2.Key]);
+    }
 
-            collection.Remove(kv1);
+    [Fact]
+    public void CanRemoveCommandsViaKey()
+    {
+        KeyValuePair<string, string> kv1 = new("a", "b");
+        KeyValuePair<string, string> kv2 = new("c", "d");
+        CommandCollection collection = new();
 
-            Assert.Single(collection);
-            Assert.Equal(kv2.Value, collection[kv2.Key]);
-        }
+        collection.Add(kv1);
+        collection.Add(kv2);
 
-        [Fact]
-        public void CanRemoveCommandsViaKey()
-        {
-            KeyValuePair<string, string> kv1 = new("a", "b");
-            KeyValuePair<string, string> kv2 = new("c", "d");
-            CommandCollection collection = new();
+        Assert.Equal(2, collection.Count);
 
-            collection.Add(kv1);
-            collection.Add(kv2);
+        collection.Remove(kv1.Key);
 
-            Assert.Equal(2, collection.Count);
+        Assert.Single(collection);
+        Assert.Equal(kv2.Value, collection[kv2.Key]);
+    }
 
-            collection.Remove(kv1.Key);
+    [Fact]
+    public void CanClearCommands()
+    {
+        KeyValuePair<string, string> kv1 = new("a", "b");
+        KeyValuePair<string, string> kv2 = new("c", "d");
+        CommandCollection collection = new();
 
-            Assert.Single(collection);
-            Assert.Equal(kv2.Value, collection[kv2.Key]);
-        }
+        collection.Add(kv1);
+        collection.Add(kv2);
 
-        [Fact]
-        public void CanClearCommands()
-        {
-            KeyValuePair<string, string> kv1 = new("a", "b");
-            KeyValuePair<string, string> kv2 = new("c", "d");
-            CommandCollection collection = new();
+        Assert.Equal(2, collection.Count);
 
-            collection.Add(kv1);
-            collection.Add(kv2);
+        collection.Clear();
 
-            Assert.Equal(2, collection.Count);
+        Assert.Empty(collection);
+    }
 
-            collection.Clear();
+    [Fact]
+    public void KeysAreOrdered()
+    {
+        string[] keys = new[] { "a", "b", "c", "d" };
 
-            Assert.Empty(collection);
+        CommandCollection collection = new();
+        foreach (string key in keys)
+        {
+            collection.Insert(0, new(key, null));
         }
 
-        [Fact]
-        public void KeysAreOrdered()
+        int index = 0;
+        int offset = keys.Length - 1;
+        foreach (string key in collection.Keys)
         {
-            string[] keys = new[] { "a", "b", "c", "d" };
-
-            CommandCollection collection = new();
-            foreach (string key in keys)
-            {
-                collection.Insert(0, new(key, null));
-            }
-
-            int index = 0;
-            int offset = keys.Length - 1;
-            foreach (string key in collection.Keys)
-            {
-                Assert.Equal(index++, collection.IndexOf(key));
-                Assert.Equal(keys[offset--], key);
-            }
+            Assert.Equal(index++, collection.IndexOf(key));
+            Assert.Equal(keys[offset--], key);
         }
-
-        [Fact]
-        public void GetByInvalidKeyThrowsCorrectly()
-            => Assert.Throws<KeyNotFoundException>(() =>
-            {
-                CommandCollection collection = new();
-                return collection["a"];
-            });
     }
+
+    [Fact]
+    public void GetByInvalidKeyThrowsCorrectly()
+        => Assert.Throws<KeyNotFoundException>(() =>
+        {
+            CommandCollection collection = new();
+            return collection["a"];
+        });
 }
diff --git a/tests/ImageSharp.Web.Tests/Commands/CommandParserTests.cs b/tests/ImageSharp.Web.Tests/Commands/CommandParserTests.cs
index cc723975..a8b7ed70 100644
--- a/tests/ImageSharp.Web.Tests/Commands/CommandParserTests.cs
+++ b/tests/ImageSharp.Web.Tests/Commands/CommandParserTests.cs
@@ -1,249 +1,245 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Commands.Converters;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Commands
-{
-    public class CommandParserTests
-    {
-        private static readonly CultureInfo Inv = CultureInfo.InvariantCulture;
-        private static readonly CultureInfo Dk = new CultureInfo("da-DK");
+namespace SixLabors.ImageSharp.Web.Tests.Commands;
 
-        private const double Pi = 3.14159265358979;
-        private static readonly string PiStringInv = Pi.ToString(CultureInfo.InvariantCulture);
-        private static readonly string PiStringDk = Pi.ToString(Dk);
-        private static readonly double RoundedPi = Math.Round(Pi, MidpointRounding.AwayFromZero);
-
-        public static TheoryData<object, string, CultureInfo> IntegralValuesInv { get; }
-            = new TheoryData<object, string, CultureInfo>
-        {
-            { (sbyte)1, "1", Inv },
-            { (byte)1, "1", Inv },
-            { (short)1, "1", Inv },
-            { (ushort)1, "1", Inv },
-            { 1, "1", Inv },
-            { 1U, "1", Inv },
-            { 1L, "1", Inv },
-            { 1UL, "1", Inv },
-            { 1F, "1", Inv },
-            { 1D, "1", Inv },
-            { 1M, "1", Inv },
-        };
+public class CommandParserTests
+{
+    private static readonly CultureInfo Inv = CultureInfo.InvariantCulture;
+    private static readonly CultureInfo Dk = new CultureInfo("da-DK");
 
-        public static TheoryData<object, string, CultureInfo> IntegralValuesDk { get; }
-            = new TheoryData<object, string, CultureInfo>
-        {
-                    { (sbyte)1, "1", Dk },
-                    { (byte)1, "1", Dk },
-                    { (short)1, "1", Dk },
-                    { (ushort)1, "1", Dk },
-                    { 1, "1", Dk },
-                    { 1U, "1", Dk },
-                    { 1L, "1", Dk },
-                    { 1UL, "1", Dk },
-                    { 1F, "1", Dk },
-                    { 1D, "1", Dk },
-                    { 1M, "1", Dk },
-        };
+    private const double Pi = 3.14159265358979;
+    private static readonly string PiStringInv = Pi.ToString(CultureInfo.InvariantCulture);
+    private static readonly string PiStringDk = Pi.ToString(Dk);
+    private static readonly double RoundedPi = Math.Round(Pi, MidpointRounding.AwayFromZero);
 
-        public static TheoryData<object, string, CultureInfo> RealValuesInv { get; }
-            = new TheoryData<object, string, CultureInfo>
-        {
-            { (sbyte)RoundedPi, PiStringInv, Inv },
-            { (byte)RoundedPi, PiStringInv, Inv },
-            { (short)RoundedPi, PiStringInv, Inv },
-            { (ushort)RoundedPi, PiStringInv, Inv },
-            { (int)RoundedPi, PiStringInv, Inv },
-            { (uint)RoundedPi, PiStringInv, Inv },
-            { (long)RoundedPi, PiStringInv, Inv },
-            { (ulong)RoundedPi, PiStringInv, Inv },
-            { (float)Pi, PiStringInv, Inv },
-            { (double)Pi, PiStringInv, Inv },
-            { (decimal)Pi, PiStringInv, Inv },
-        };
+    public static TheoryData<object, string, CultureInfo> IntegralValuesInv { get; }
+        = new TheoryData<object, string, CultureInfo>
+    {
+        { (sbyte)1, "1", Inv },
+        { (byte)1, "1", Inv },
+        { (short)1, "1", Inv },
+        { (ushort)1, "1", Inv },
+        { 1, "1", Inv },
+        { 1U, "1", Inv },
+        { 1L, "1", Inv },
+        { 1UL, "1", Inv },
+        { 1F, "1", Inv },
+        { 1D, "1", Inv },
+        { 1M, "1", Inv },
+    };
+
+    public static TheoryData<object, string, CultureInfo> IntegralValuesDk { get; }
+        = new TheoryData<object, string, CultureInfo>
+    {
+                { (sbyte)1, "1", Dk },
+                { (byte)1, "1", Dk },
+                { (short)1, "1", Dk },
+                { (ushort)1, "1", Dk },
+                { 1, "1", Dk },
+                { 1U, "1", Dk },
+                { 1L, "1", Dk },
+                { 1UL, "1", Dk },
+                { 1F, "1", Dk },
+                { 1D, "1", Dk },
+                { 1M, "1", Dk },
+    };
+
+    public static TheoryData<object, string, CultureInfo> RealValuesInv { get; }
+        = new TheoryData<object, string, CultureInfo>
+    {
+        { (sbyte)RoundedPi, PiStringInv, Inv },
+        { (byte)RoundedPi, PiStringInv, Inv },
+        { (short)RoundedPi, PiStringInv, Inv },
+        { (ushort)RoundedPi, PiStringInv, Inv },
+        { (int)RoundedPi, PiStringInv, Inv },
+        { (uint)RoundedPi, PiStringInv, Inv },
+        { (long)RoundedPi, PiStringInv, Inv },
+        { (ulong)RoundedPi, PiStringInv, Inv },
+        { (float)Pi, PiStringInv, Inv },
+        { (double)Pi, PiStringInv, Inv },
+        { (decimal)Pi, PiStringInv, Inv },
+    };
+
+    public static TheoryData<object, string, CultureInfo> RealValuesDanish { get; }
+        = new TheoryData<object, string, CultureInfo>
+    {
+        { (sbyte)RoundedPi, PiStringDk, Dk },
+        { (byte)RoundedPi, PiStringDk, Dk },
+        { (short)RoundedPi, PiStringDk, Dk },
+        { (ushort)RoundedPi, PiStringDk, Dk },
+        { (int)RoundedPi, PiStringDk, Dk },
+        { (uint)RoundedPi, PiStringDk, Dk },
+        { (long)RoundedPi, PiStringDk, Dk },
+        { (ulong)RoundedPi, PiStringDk, Dk },
+        { (float)Pi, PiStringDk, Dk },
+        { (double)Pi, PiStringDk, Dk },
+        { (decimal)Pi, PiStringDk, Dk },
+    };
+
+    public static TheoryData<ResizeMode, string, CultureInfo> EnumValues { get; }
+        = new TheoryData<ResizeMode, string, CultureInfo>
+    {
+        { ResizeMode.Max, "max", Inv },
+        { ResizeMode.Crop, "this is not, an enum value", Inv }, // Unknown returns default
+    };
 
-        public static TheoryData<object, string, CultureInfo> RealValuesDanish { get; }
-            = new TheoryData<object, string, CultureInfo>
-        {
-            { (sbyte)RoundedPi, PiStringDk, Dk },
-            { (byte)RoundedPi, PiStringDk, Dk },
-            { (short)RoundedPi, PiStringDk, Dk },
-            { (ushort)RoundedPi, PiStringDk, Dk },
-            { (int)RoundedPi, PiStringDk, Dk },
-            { (uint)RoundedPi, PiStringDk, Dk },
-            { (long)RoundedPi, PiStringDk, Dk },
-            { (ulong)RoundedPi, PiStringDk, Dk },
-            { (float)Pi, PiStringDk, Dk },
-            { (double)Pi, PiStringDk, Dk },
-            { (decimal)Pi, PiStringDk, Dk },
-        };
+    public static TheoryData<int[], string, CultureInfo> IntegralArrays { get; }
+        = new TheoryData<int[], string, CultureInfo>
+    {
+        { new[] { 1, 2, 3, 4 }, ToNumericList(Inv, 1, 2, 3, 4), Inv },
+    };
 
-        public static TheoryData<ResizeMode, string, CultureInfo> EnumValues { get; }
-            = new TheoryData<ResizeMode, string, CultureInfo>
-        {
-            { ResizeMode.Max, "max", Inv },
-            { ResizeMode.Crop, "this is not, an enum value", Inv }, // Unknown returns default
-        };
+    public static TheoryData<float[], string, CultureInfo> RealArraysInv { get; }
+        = new TheoryData<float[], string, CultureInfo>
+    {
+        { new[] { 1.667F, 2.667F, 3.667F, 4.667F }, ToNumericList(Inv, 1.667F, 2.667F, 3.667F, 4.667F), Inv },
+    };
 
-        public static TheoryData<int[], string, CultureInfo> IntegralArrays { get; }
-            = new TheoryData<int[], string, CultureInfo>
-        {
-            { new[] { 1, 2, 3, 4 }, ToNumericList(Inv, 1, 2, 3, 4), Inv },
-        };
+    public static TheoryData<float[], string, CultureInfo> RealArraysDk { get; }
+        = new TheoryData<float[], string, CultureInfo>
+    {
+        { new[] { 1.667F, 2.667F, 3.667F, 4.667F }, ToNumericList(Dk, 1.667F, 2.667F, 3.667F, 4.667F), Dk },
+    };
 
-        public static TheoryData<float[], string, CultureInfo> RealArraysInv { get; }
-            = new TheoryData<float[], string, CultureInfo>
-        {
-            { new[] { 1.667F, 2.667F, 3.667F, 4.667F }, ToNumericList(Inv, 1.667F, 2.667F, 3.667F, 4.667F), Inv },
-        };
+    public static TheoryData<object, string, CultureInfo> IntegralLists { get; }
+        = new TheoryData<object, string, CultureInfo>
+    {
+        { new List<int> { 1, 2, 3, 4 }, ToNumericList(Inv, 1, 2, 3, 4), Inv },
+    };
 
-        public static TheoryData<float[], string, CultureInfo> RealArraysDk { get; }
-            = new TheoryData<float[], string, CultureInfo>
-        {
-            { new[] { 1.667F, 2.667F, 3.667F, 4.667F }, ToNumericList(Dk, 1.667F, 2.667F, 3.667F, 4.667F), Dk },
-        };
+    public static TheoryData<List<float>, string, CultureInfo> RealLists { get; }
+        = new TheoryData<List<float>, string, CultureInfo>
+    {
+        { new List<float> { 1.667F, 2.667F, 3.667F, 4.667F }, "1.667,2.667,3.667,4.667", Inv },
+    };
 
-        public static TheoryData<object, string, CultureInfo> IntegralLists { get; }
-            = new TheoryData<object, string, CultureInfo>
-        {
-            { new List<int> { 1, 2, 3, 4 }, ToNumericList(Inv, 1, 2, 3, 4), Inv },
-        };
+    public static TheoryData<Color, string, CultureInfo> ColorValuesInv { get; }
+        = new TheoryData<Color, string, CultureInfo>
+    {
+        { default, string.Empty, Inv },
+        { Color.White, ToNumericList<byte>(Inv, 255, 255, 255), Inv },
+        { Color.Transparent, ToNumericList<byte>(Inv, 0, 0, 0, 0),  Inv },
+        { Color.Orange, "orange", Inv },
+        { Color.RoyalBlue, "4169E1FF", Inv },
+        { Color.Lime, "00FF00FF", Inv },
+        { Color.YellowGreen, "9ACD32FF", Inv },
+    };
+
+    public static TheoryData<Color, string, CultureInfo> ColorValuesDk { get; }
+        = new TheoryData<Color, string, CultureInfo>
+    {
+        { default, string.Empty, Dk },
+        { Color.White, ToNumericList<byte>(Dk, 255, 255, 255), Dk },
+        { Color.Transparent, ToNumericList<byte>(Dk, 0, 0, 0, 0), Dk },
+        { Color.Orange, "orange", Dk },
+        { Color.RoyalBlue, "4169E1FF", Dk },
+        { Color.Lime, "00FF00FF", Dk },
+        { Color.YellowGreen, "9ACD32FF", Dk },
+    };
+
+    private static readonly CommandParser Parser = GetCommandParser();
+
+    [Theory]
+    [MemberData(nameof(IntegralValuesInv))]
+    [MemberData(nameof(IntegralValuesDk))]
+    [MemberData(nameof(RealValuesInv))]
+    [MemberData(nameof(RealValuesDanish))]
+    [MemberData(nameof(EnumValues))]
+    [MemberData(nameof(IntegralArrays))]
+    [MemberData(nameof(RealArraysInv))]
+    [MemberData(nameof(RealArraysDk))]
+    [MemberData(nameof(IntegralLists))]
+    [MemberData(nameof(RealLists))]
+    [MemberData(nameof(ColorValuesInv))]
+    [MemberData(nameof(ColorValuesDk))]
+    public void CommandParserCanConvert<T>(T expected, string param, CultureInfo culture)
+    {
+        T sb = Parser.ParseValue<T>(param, culture);
+        Assert.IsType<T>(sb);
+        Assert.Equal(expected, sb);
+    }
 
-        public static TheoryData<List<float>, string, CultureInfo> RealLists { get; }
-            = new TheoryData<List<float>, string, CultureInfo>
-        {
-            { new List<float> { 1.667F, 2.667F, 3.667F, 4.667F }, "1.667,2.667,3.667,4.667", Inv },
-        };
+    [Fact]
+    public void CommandParseThrowsCorrectly()
+    {
+        var emptyParser = new CommandParser(Array.Empty<ICommandConverter>());
 
-        public static TheoryData<Color, string, CultureInfo> ColorValuesInv { get; }
-            = new TheoryData<Color, string, CultureInfo>
-        {
-            { default, string.Empty, Inv },
-            { Color.White, ToNumericList<byte>(Inv, 255, 255, 255), Inv },
-            { Color.Transparent, ToNumericList<byte>(Inv, 0, 0, 0, 0),  Inv },
-            { Color.Orange, "orange", Inv },
-            { Color.RoyalBlue, "4169E1FF", Inv },
-            { Color.Lime, "00FF00FF", Inv },
-            { Color.YellowGreen, "9ACD32FF", Inv },
-        };
+        Assert.Throws<NotSupportedException>(
+            () => emptyParser.ParseValue<bool>("true", CultureInfo.InvariantCulture));
+    }
 
-        public static TheoryData<Color, string, CultureInfo> ColorValuesDk { get; }
-            = new TheoryData<Color, string, CultureInfo>
-        {
-            { default, string.Empty, Dk },
-            { Color.White, ToNumericList<byte>(Dk, 255, 255, 255), Dk },
-            { Color.Transparent, ToNumericList<byte>(Dk, 0, 0, 0, 0), Dk },
-            { Color.Orange, "orange", Dk },
-            { Color.RoyalBlue, "4169E1FF", Dk },
-            { Color.Lime, "00FF00FF", Dk },
-            { Color.YellowGreen, "9ACD32FF", Dk },
+    private static CommandParser GetCommandParser()
+    {
+        var converters = new List<ICommandConverter>
+        {
+            new IntegralNumberConverter<sbyte>(),
+            new IntegralNumberConverter<byte>(),
+            new IntegralNumberConverter<short>(),
+            new IntegralNumberConverter<ushort>(),
+            new IntegralNumberConverter<int>(),
+            new IntegralNumberConverter<uint>(),
+            new IntegralNumberConverter<long>(),
+            new IntegralNumberConverter<ulong>(),
+
+            new SimpleCommandConverter<decimal>(),
+            new SimpleCommandConverter<float>(),
+            new SimpleCommandConverter<double>(),
+            new SimpleCommandConverter<string>(),
+            new SimpleCommandConverter<bool>(),
+
+            new ColorConverter(),
+            new EnumConverter(),
+
+            new ArrayConverter<sbyte>(),
+            new ArrayConverter<byte>(),
+            new ArrayConverter<short>(),
+            new ArrayConverter<ushort>(),
+            new ArrayConverter<int>(),
+            new ArrayConverter<uint>(),
+            new ArrayConverter<long>(),
+            new ArrayConverter<ulong>(),
+            new ArrayConverter<decimal>(),
+            new ArrayConverter<float>(),
+            new ArrayConverter<double>(),
+            new ArrayConverter<string>(),
+            new ArrayConverter<bool>(),
+
+            new ListConverter<sbyte>(),
+            new ListConverter<byte>(),
+            new ListConverter<short>(),
+            new ListConverter<ushort>(),
+            new ListConverter<int>(),
+            new ListConverter<uint>(),
+            new ListConverter<long>(),
+            new ListConverter<ulong>(),
+            new ListConverter<decimal>(),
+            new ListConverter<float>(),
+            new ListConverter<double>(),
+            new ListConverter<string>(),
+            new ListConverter<bool>()
         };
 
-        private static readonly CommandParser Parser = GetCommandParser();
-
-        [Theory]
-        [MemberData(nameof(IntegralValuesInv))]
-        [MemberData(nameof(IntegralValuesDk))]
-        [MemberData(nameof(RealValuesInv))]
-        [MemberData(nameof(RealValuesDanish))]
-        [MemberData(nameof(EnumValues))]
-        [MemberData(nameof(IntegralArrays))]
-        [MemberData(nameof(RealArraysInv))]
-        [MemberData(nameof(RealArraysDk))]
-        [MemberData(nameof(IntegralLists))]
-        [MemberData(nameof(RealLists))]
-        [MemberData(nameof(ColorValuesInv))]
-        [MemberData(nameof(ColorValuesDk))]
-        public void CommandParserCanConvert<T>(T expected, string param, CultureInfo culture)
-        {
-            T sb = Parser.ParseValue<T>(param, culture);
-            Assert.IsType<T>(sb);
-            Assert.Equal(expected, sb);
-        }
-
-        [Fact]
-        public void CommandParseThrowsCorrectly()
-        {
-            var emptyParser = new CommandParser(Array.Empty<ICommandConverter>());
+        return new CommandParser(converters);
+    }
 
-            Assert.Throws<NotSupportedException>(
-                () => emptyParser.ParseValue<bool>("true", CultureInfo.InvariantCulture));
-        }
+    private static string ToNumericList<T>(CultureInfo culture, params T[] values)
+        where T : IConvertible
+    {
+        var sb = new StringBuilder();
+        var ls = culture.TextInfo.ListSeparator[0];
 
-        private static CommandParser GetCommandParser()
+        for (int i = 0; i < values.Length; i++)
         {
-            var converters = new List<ICommandConverter>
-            {
-                new IntegralNumberConverter<sbyte>(),
-                new IntegralNumberConverter<byte>(),
-                new IntegralNumberConverter<short>(),
-                new IntegralNumberConverter<ushort>(),
-                new IntegralNumberConverter<int>(),
-                new IntegralNumberConverter<uint>(),
-                new IntegralNumberConverter<long>(),
-                new IntegralNumberConverter<ulong>(),
-
-                new SimpleCommandConverter<decimal>(),
-                new SimpleCommandConverter<float>(),
-                new SimpleCommandConverter<double>(),
-                new SimpleCommandConverter<string>(),
-                new SimpleCommandConverter<bool>(),
-
-                new ColorConverter(),
-                new EnumConverter(),
-
-                new ArrayConverter<sbyte>(),
-                new ArrayConverter<byte>(),
-                new ArrayConverter<short>(),
-                new ArrayConverter<ushort>(),
-                new ArrayConverter<int>(),
-                new ArrayConverter<uint>(),
-                new ArrayConverter<long>(),
-                new ArrayConverter<ulong>(),
-                new ArrayConverter<decimal>(),
-                new ArrayConverter<float>(),
-                new ArrayConverter<double>(),
-                new ArrayConverter<string>(),
-                new ArrayConverter<bool>(),
-
-                new ListConverter<sbyte>(),
-                new ListConverter<byte>(),
-                new ListConverter<short>(),
-                new ListConverter<ushort>(),
-                new ListConverter<int>(),
-                new ListConverter<uint>(),
-                new ListConverter<long>(),
-                new ListConverter<ulong>(),
-                new ListConverter<decimal>(),
-                new ListConverter<float>(),
-                new ListConverter<double>(),
-                new ListConverter<string>(),
-                new ListConverter<bool>()
-            };
-
-            return new CommandParser(converters);
+            sb.AppendFormat(values[i].ToString(culture) + ls);
         }
 
-        private static string ToNumericList<T>(CultureInfo culture, params T[] values)
-            where T : IConvertible
-        {
-            var sb = new StringBuilder();
-            var ls = culture.TextInfo.ListSeparator[0];
-
-            for (int i = 0; i < values.Length; i++)
-            {
-                sb.AppendFormat(values[i].ToString(culture) + ls);
-            }
-
-            return sb.ToString().TrimEnd(ls);
-        }
+        return sb.ToString().TrimEnd(ls);
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Commands/PresetOnlyQueryCollectionRequestParserTests.cs b/tests/ImageSharp.Web.Tests/Commands/PresetOnlyQueryCollectionRequestParserTests.cs
index 8b669c19..39446044 100644
--- a/tests/ImageSharp.Web.Tests/Commands/PresetOnlyQueryCollectionRequestParserTests.cs
+++ b/tests/ImageSharp.Web.Tests/Commands/PresetOnlyQueryCollectionRequestParserTests.cs
@@ -1,99 +1,95 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 using SixLabors.ImageSharp.Web.Commands;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Commands
+namespace SixLabors.ImageSharp.Web.Tests.Commands;
+
+public class PresetOnlyQueryCollectionRequestParserTests
 {
-    public class PresetOnlyQueryCollectionRequestParserTests
+    [Fact]
+    public void PresetOnlyQueryCollectionRequestParserExtractsCommands()
     {
-        [Fact]
-        public void PresetOnlyQueryCollectionRequestParserExtractsCommands()
+        IDictionary<string, string> expected = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
         {
-            IDictionary<string, string> expected = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
-            {
-                { "width", "400" },
-                { "height", "200" }
-            };
+            { "width", "400" },
+            { "height", "200" }
+        };
 
-            HttpContext context = CreateHttpContext("?preset=Preset1");
-            CommandCollection actual = new PresetOnlyQueryCollectionRequestParser(Options.Create(new PresetOnlyQueryCollectionRequestParserOptions
+        HttpContext context = CreateHttpContext("?preset=Preset1");
+        CommandCollection actual = new PresetOnlyQueryCollectionRequestParser(Options.Create(new PresetOnlyQueryCollectionRequestParserOptions
+        {
+            Presets = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
             {
-                Presets = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
-                {
-                    { "Preset1", "width=400&height=200" }
-                }
-            })).ParseRequestCommands(context);
+                { "Preset1", "width=400&height=200" }
+            }
+        })).ParseRequestCommands(context);
 
-            Assert.Equal(expected, actual);
-        }
+        Assert.Equal(expected, actual);
+    }
 
-        [Fact]
-        public void PresetOnlyQueryCollectionRequestParserExtractsCommandsWithOtherCasing()
+    [Fact]
+    public void PresetOnlyQueryCollectionRequestParserExtractsCommandsWithOtherCasing()
+    {
+        IDictionary<string, string> expected = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
         {
-            IDictionary<string, string> expected = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
-            {
-                { "width", "400" },
-                { "height", "200" }
-            };
+            { "width", "400" },
+            { "height", "200" }
+        };
 
-            HttpContext context = CreateHttpContext("?PRESET=PRESET1");
-            CommandCollection actual = new PresetOnlyQueryCollectionRequestParser(Options.Create(new PresetOnlyQueryCollectionRequestParserOptions
+        HttpContext context = CreateHttpContext("?PRESET=PRESET1");
+        CommandCollection actual = new PresetOnlyQueryCollectionRequestParser(Options.Create(new PresetOnlyQueryCollectionRequestParserOptions
+        {
+            Presets = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
             {
-                Presets = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
-                {
-                    { "Preset1", "width=400&height=200" }
-                }
-            })).ParseRequestCommands(context);
+                { "Preset1", "width=400&height=200" }
+            }
+        })).ParseRequestCommands(context);
 
-            Assert.Equal(expected, actual);
-        }
+        Assert.Equal(expected, actual);
+    }
 
-        [Fact]
-        public void PresetOnlyQueryCollectionRequestParserCommandsWithoutPresetParam()
-        {
-            IDictionary<string, string> expected = new Dictionary<string, string>();
+    [Fact]
+    public void PresetOnlyQueryCollectionRequestParserCommandsWithoutPresetParam()
+    {
+        IDictionary<string, string> expected = new Dictionary<string, string>();
 
-            HttpContext context = CreateHttpContext("?test=test");
-            CommandCollection actual = new PresetOnlyQueryCollectionRequestParser(Options.Create(new PresetOnlyQueryCollectionRequestParserOptions
+        HttpContext context = CreateHttpContext("?test=test");
+        CommandCollection actual = new PresetOnlyQueryCollectionRequestParser(Options.Create(new PresetOnlyQueryCollectionRequestParserOptions
+        {
+            Presets = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
             {
-                Presets = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
-                {
-                    { "Preset1", "width=400&height=200" }
-                }
-            })).ParseRequestCommands(context);
+                { "Preset1", "width=400&height=200" }
+            }
+        })).ParseRequestCommands(context);
 
-            Assert.Equal(expected, actual);
-        }
+        Assert.Equal(expected, actual);
+    }
 
-        [Fact]
-        public void PresetOnlyQueryCollectionRequestParserCommandsWithoutMatchingPreset()
-        {
-            IDictionary<string, string> expected = new Dictionary<string, string>();
+    [Fact]
+    public void PresetOnlyQueryCollectionRequestParserCommandsWithoutMatchingPreset()
+    {
+        IDictionary<string, string> expected = new Dictionary<string, string>();
 
-            HttpContext context = CreateHttpContext("?preset=Preset2");
-            CommandCollection actual = new PresetOnlyQueryCollectionRequestParser(Options.Create(new PresetOnlyQueryCollectionRequestParserOptions
+        HttpContext context = CreateHttpContext("?preset=Preset2");
+        CommandCollection actual = new PresetOnlyQueryCollectionRequestParser(Options.Create(new PresetOnlyQueryCollectionRequestParserOptions
+        {
+            Presets = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
             {
-                Presets = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
-                {
-                    { "Preset1", "width=400&height=200" }
-                }
-            })).ParseRequestCommands(context);
+                { "Preset1", "width=400&height=200" }
+            }
+        })).ParseRequestCommands(context);
 
-            Assert.Equal(expected, actual);
-        }
+        Assert.Equal(expected, actual);
+    }
 
-        private static HttpContext CreateHttpContext(string query)
-        {
-            var httpContext = new DefaultHttpContext();
-            httpContext.Request.Path = "/testwebsite.com/image-12345.jpeg";
-            httpContext.Request.QueryString = new QueryString(query);
-            return httpContext;
-        }
+    private static HttpContext CreateHttpContext(string query)
+    {
+        var httpContext = new DefaultHttpContext();
+        httpContext.Request.Path = "/testwebsite.com/image-12345.jpeg";
+        httpContext.Request.QueryString = new QueryString(query);
+        return httpContext;
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Commands/QueryCollectionUriParserTests.cs b/tests/ImageSharp.Web.Tests/Commands/QueryCollectionUriParserTests.cs
index 009b7931..1b01577d 100644
--- a/tests/ImageSharp.Web.Tests/Commands/QueryCollectionUriParserTests.cs
+++ b/tests/ImageSharp.Web.Tests/Commands/QueryCollectionUriParserTests.cs
@@ -1,37 +1,35 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Commands;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Commands
+namespace SixLabors.ImageSharp.Web.Tests.Commands;
+
+public class QueryCollectionUriParserTests
 {
-    public class QueryCollectionUriParserTests
+    [Fact]
+    public void QueryCollectionParserExtractsCommands()
     {
-        [Fact]
-        public void QueryCollectionParserExtractsCommands()
+        CommandCollection expected = new()
         {
-            CommandCollection expected = new()
-            {
-                { new("width", "400") },
-                { new("height", "200") }
-            };
+            { new("width", "400") },
+            { new("height", "200") }
+        };
 
-            HttpContext context = CreateHttpContext();
-            CommandCollection actual = new QueryCollectionRequestParser().ParseRequestCommands(context);
+        HttpContext context = CreateHttpContext();
+        CommandCollection actual = new QueryCollectionRequestParser().ParseRequestCommands(context);
 
-            Assert.Equal(expected, actual);
-        }
+        Assert.Equal(expected, actual);
+    }
 
-        private static HttpContext CreateHttpContext()
-        {
-            var httpContext = new DefaultHttpContext();
-            httpContext.Request.Path = "/testwebsite.com/image-12345.jpeg";
+    private static HttpContext CreateHttpContext()
+    {
+        var httpContext = new DefaultHttpContext();
+        httpContext.Request.Path = "/testwebsite.com/image-12345.jpeg";
 
-            // Duplicate height param to test replacements
-            httpContext.Request.QueryString = new QueryString("?width=400&height=100&height=200");
-            return httpContext;
-        }
+        // Duplicate height param to test replacements
+        httpContext.Request.QueryString = new QueryString("?width=400&height=100&height=200");
+        return httpContext;
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/DependencyInjection/MockCacheHash.cs b/tests/ImageSharp.Web.Tests/DependencyInjection/MockCacheHash.cs
index 359fab93..56657f77 100644
--- a/tests/ImageSharp.Web.Tests/DependencyInjection/MockCacheHash.cs
+++ b/tests/ImageSharp.Web.Tests/DependencyInjection/MockCacheHash.cs
@@ -1,12 +1,11 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Web.Caching;
 
-namespace SixLabors.ImageSharp.Web.Tests.DependencyInjection
+namespace SixLabors.ImageSharp.Web.Tests.DependencyInjection;
+
+public class MockCacheHash : ICacheHash
 {
-    public class MockCacheHash : ICacheHash
-    {
-        public string Create(string value, uint length) => null;
-    }
+    public string Create(string value, uint length) => null;
 }
diff --git a/tests/ImageSharp.Web.Tests/DependencyInjection/MockCacheKey.cs b/tests/ImageSharp.Web.Tests/DependencyInjection/MockCacheKey.cs
index a896e42a..3a19b217 100644
--- a/tests/ImageSharp.Web.Tests/DependencyInjection/MockCacheKey.cs
+++ b/tests/ImageSharp.Web.Tests/DependencyInjection/MockCacheKey.cs
@@ -1,14 +1,13 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Tests.DependencyInjection
+namespace SixLabors.ImageSharp.Web.Tests.DependencyInjection;
+
+public class MockCacheKey : ICacheKey
 {
-    public class MockCacheKey : ICacheKey
-    {
-        public string Create(HttpContext context, CommandCollection commands) => null;
-    }
+    public string Create(HttpContext context, CommandCollection commands) => null;
 }
diff --git a/tests/ImageSharp.Web.Tests/DependencyInjection/MockCommandConverter.cs b/tests/ImageSharp.Web.Tests/DependencyInjection/MockCommandConverter.cs
index 01650bc1..2bc47c0a 100644
--- a/tests/ImageSharp.Web.Tests/DependencyInjection/MockCommandConverter.cs
+++ b/tests/ImageSharp.Web.Tests/DependencyInjection/MockCommandConverter.cs
@@ -1,22 +1,20 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
 using System.Globalization;
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Commands.Converters;
 
-namespace SixLabors.ImageSharp.Web.Tests.DependencyInjection
+namespace SixLabors.ImageSharp.Web.Tests.DependencyInjection;
+
+public class MockCommandConverter : ICommandConverter<object>
 {
-    public class MockCommandConverter : ICommandConverter<object>
-    {
-        public Type Type => typeof(MockCommandConverter);
+    public Type Type => typeof(MockCommandConverter);
 
-        public object ConvertFrom(
-            CommandParser parser,
-            CultureInfo culture,
-            string value,
-            Type propertyType)
-            => null;
-    }
+    public object ConvertFrom(
+        CommandParser parser,
+        CultureInfo culture,
+        string value,
+        Type propertyType)
+        => null;
 }
diff --git a/tests/ImageSharp.Web.Tests/DependencyInjection/MockImageCache.cs b/tests/ImageSharp.Web.Tests/DependencyInjection/MockImageCache.cs
index bab51d7f..abfc656b 100644
--- a/tests/ImageSharp.Web.Tests/DependencyInjection/MockImageCache.cs
+++ b/tests/ImageSharp.Web.Tests/DependencyInjection/MockImageCache.cs
@@ -1,17 +1,14 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System.IO;
-using System.Threading.Tasks;
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Resolvers;
 
-namespace SixLabors.ImageSharp.Web.Tests.DependencyInjection
+namespace SixLabors.ImageSharp.Web.Tests.DependencyInjection;
+
+public class MockImageCache : IImageCache
 {
-    public class MockImageCache : IImageCache
-    {
-        public Task<IImageCacheResolver> GetAsync(string key) => Task.FromResult<IImageCacheResolver>(null);
+    public Task<IImageCacheResolver> GetAsync(string key) => Task.FromResult<IImageCacheResolver>(null);
 
-        public Task SetAsync(string key, Stream stream, ImageCacheMetadata metadata) => Task.CompletedTask;
-    }
+    public Task SetAsync(string key, Stream stream, ImageCacheMetadata metadata) => Task.CompletedTask;
 }
diff --git a/tests/ImageSharp.Web.Tests/DependencyInjection/MockImageProvider.cs b/tests/ImageSharp.Web.Tests/DependencyInjection/MockImageProvider.cs
index 8adf8453..602f10f5 100644
--- a/tests/ImageSharp.Web.Tests/DependencyInjection/MockImageProvider.cs
+++ b/tests/ImageSharp.Web.Tests/DependencyInjection/MockImageProvider.cs
@@ -1,22 +1,19 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Providers;
 using SixLabors.ImageSharp.Web.Resolvers;
 
-namespace SixLabors.ImageSharp.Web.Tests.DependencyInjection
+namespace SixLabors.ImageSharp.Web.Tests.DependencyInjection;
+
+public class MockImageProvider : IImageProvider
 {
-    public class MockImageProvider : IImageProvider
-    {
-        public ProcessingBehavior ProcessingBehavior { get; set; } = ProcessingBehavior.All;
+    public ProcessingBehavior ProcessingBehavior { get; set; } = ProcessingBehavior.All;
 
-        public Func<HttpContext, bool> Match { get; set; } = _ => true;
+    public Func<HttpContext, bool> Match { get; set; } = _ => true;
 
-        public Task<IImageResolver> GetAsync(HttpContext context) => Task.FromResult<IImageResolver>(null);
+    public Task<IImageResolver> GetAsync(HttpContext context) => Task.FromResult<IImageResolver>(null);
 
-        public bool IsValidRequest(HttpContext context) => true;
-    }
+    public bool IsValidRequest(HttpContext context) => true;
 }
diff --git a/tests/ImageSharp.Web.Tests/DependencyInjection/MockRequestParser.cs b/tests/ImageSharp.Web.Tests/DependencyInjection/MockRequestParser.cs
index c4fe6bab..d9c2ad24 100644
--- a/tests/ImageSharp.Web.Tests/DependencyInjection/MockRequestParser.cs
+++ b/tests/ImageSharp.Web.Tests/DependencyInjection/MockRequestParser.cs
@@ -1,13 +1,12 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Commands;
 
-namespace SixLabors.ImageSharp.Web.Tests.DependencyInjection
+namespace SixLabors.ImageSharp.Web.Tests.DependencyInjection;
+
+public class MockRequestParser : IRequestParser
 {
-    public class MockRequestParser : IRequestParser
-    {
-        public CommandCollection ParseRequestCommands(HttpContext context) => null;
-    }
+    public CommandCollection ParseRequestCommands(HttpContext context) => null;
 }
diff --git a/tests/ImageSharp.Web.Tests/DependencyInjection/MockWebProcessor.cs b/tests/ImageSharp.Web.Tests/DependencyInjection/MockWebProcessor.cs
index 555b2c36..e2328def 100644
--- a/tests/ImageSharp.Web.Tests/DependencyInjection/MockWebProcessor.cs
+++ b/tests/ImageSharp.Web.Tests/DependencyInjection/MockWebProcessor.cs
@@ -1,27 +1,24 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.Extensions.Logging;
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Processors;
 
-namespace SixLabors.ImageSharp.Web.Tests.DependencyInjection
+namespace SixLabors.ImageSharp.Web.Tests.DependencyInjection;
+
+public class MockWebProcessor : IImageWebProcessor
 {
-    public class MockWebProcessor : IImageWebProcessor
-    {
-        public IEnumerable<string> Commands => Array.Empty<string>();
+    public IEnumerable<string> Commands => Array.Empty<string>();
 
-        public FormattedImage Process(
-            FormattedImage image,
-            ILogger logger,
-            CommandCollection commands,
-            CommandParser parser,
-            CultureInfo culture)
-            => image;
+    public FormattedImage Process(
+        FormattedImage image,
+        ILogger logger,
+        CommandCollection commands,
+        CommandParser parser,
+        CultureInfo culture)
+        => image;
 
-        public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
-    }
+    public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
 }
diff --git a/tests/ImageSharp.Web.Tests/DependencyInjection/ServiceRegistrationExtensionsTests.cs b/tests/ImageSharp.Web.Tests/DependencyInjection/ServiceRegistrationExtensionsTests.cs
index 443171ff..4a22a158 100644
--- a/tests/ImageSharp.Web.Tests/DependencyInjection/ServiceRegistrationExtensionsTests.cs
+++ b/tests/ImageSharp.Web.Tests/DependencyInjection/ServiceRegistrationExtensionsTests.cs
@@ -1,9 +1,6 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 using SixLabors.ImageSharp.Web.Caching;
@@ -12,403 +9,401 @@
 using SixLabors.ImageSharp.Web.DependencyInjection;
 using SixLabors.ImageSharp.Web.Processors;
 using SixLabors.ImageSharp.Web.Providers;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.DependencyInjection
+namespace SixLabors.ImageSharp.Web.Tests.DependencyInjection;
+
+public class ServiceRegistrationExtensionsTests
 {
-    public class ServiceRegistrationExtensionsTests
+    private static bool IsService<TService>(ServiceDescriptor descriptor)
+        => descriptor.ServiceType == typeof(TService);
+
+    private static bool IsService<TService, TImplementation>(ServiceDescriptor descriptor)
+        where TImplementation : TService
+        => IsServiceImplementationType<TService, TImplementation>(descriptor) ||
+           IsServiceImplementationInstance<TService, TImplementation>(descriptor) ||
+           IsServiceImplementationFactory<TService, TImplementation>(descriptor);
+
+    private static bool IsServiceImplementationType<TService, TImplementation>(ServiceDescriptor descriptor)
+        where TImplementation : TService
+        => IsService<TService>(descriptor) &&
+           descriptor.ImplementationType == typeof(TImplementation);
+
+    private static bool IsServiceImplementationInstance<TService, TImplementation>(ServiceDescriptor descriptor)
+        where TImplementation : TService
+        => IsService<TService>(descriptor) &&
+           descriptor.ImplementationInstance?.GetType() == typeof(TImplementation);
+
+    private static bool IsServiceImplementationFactory<TService, TImplementation>(ServiceDescriptor descriptor)
+        where TImplementation : TService
+        => IsService<TService>(descriptor) &&
+           (descriptor.ImplementationFactory?.GetMethodInfo().ReturnType == typeof(TImplementation) ||
+           descriptor.ImplementationFactory?.Invoke(null)?.GetType() == typeof(TImplementation)); // OK to invoke the factory in tests
+
+    private static IReadOnlyList<ServiceDescriptor> GetCollection<T>(IServiceCollection serviceDescriptors) => serviceDescriptors.Where(x => x.ServiceType == typeof(T)).ToList();
+
+    [Fact]
+    public void DefaultServicesAreRegistered()
+    {
+        var services = new ServiceCollection();
+        services.AddImageSharp();
+
+        Assert.Single(services, IsService<FormatUtilities>);
+        Assert.Single(services, IsServiceImplementationType<IRequestParser, QueryCollectionRequestParser>);
+        Assert.Single(services, IsServiceImplementationType<IImageCache, PhysicalFileSystemCache>);
+        Assert.Single(services, IsServiceImplementationType<ICacheKey, UriRelativeLowerInvariantCacheKey>);
+        Assert.Single(services, IsServiceImplementationType<ICacheHash, SHA256CacheHash>);
+        Assert.Single(services, IsServiceImplementationType<IImageProvider, PhysicalFileSystemProvider>);
+        Assert.Single(services, IsServiceImplementationType<IImageWebProcessor, ResizeWebProcessor>);
+        Assert.Single(services, IsServiceImplementationType<IImageWebProcessor, FormatWebProcessor>);
+        Assert.Single(services, IsServiceImplementationType<IImageWebProcessor, BackgroundColorWebProcessor>);
+        Assert.Single(services, IsServiceImplementationType<IImageWebProcessor, QualityWebProcessor>);
+        Assert.Single(services, IsService<CommandParser>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, IntegralNumberConverter<sbyte>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, IntegralNumberConverter<byte>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, IntegralNumberConverter<short>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, IntegralNumberConverter<ushort>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, IntegralNumberConverter<int>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, IntegralNumberConverter<uint>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, IntegralNumberConverter<long>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, IntegralNumberConverter<ulong>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, SimpleCommandConverter<decimal>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, SimpleCommandConverter<float>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, SimpleCommandConverter<double>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, SimpleCommandConverter<string>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, SimpleCommandConverter<bool>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<sbyte>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<byte>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<short>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<ushort>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<int>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<uint>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<long>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<ulong>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<decimal>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<float>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<double>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<string>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<bool>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<sbyte>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<byte>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<short>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<ushort>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<int>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<uint>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<long>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<ulong>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<decimal>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<float>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<double>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<string>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<bool>>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, ColorConverter>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, EnumConverter>);
+    }
+
+    [Fact]
+    public void CanSetRequestParser()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.SetRequestParser<MockRequestParser>();
+        Assert.Single(services, IsService<IRequestParser>);
+        Assert.Single(services, IsServiceImplementationType<IRequestParser, MockRequestParser>);
+
+        builder.SetRequestParser(_ => new MockRequestParser());
+        Assert.Single(services, IsService<IRequestParser>);
+        Assert.Single(services, IsServiceImplementationFactory<IRequestParser, MockRequestParser>);
+    }
+
+    [Fact]
+    public void CanSetCache()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.SetCache<MockImageCache>();
+        Assert.Single(services, IsService<IImageCache>);
+        Assert.Single(services, IsServiceImplementationType<IImageCache, MockImageCache>);
+
+        builder.SetCache(_ => new MockImageCache());
+        Assert.Single(services, IsService<IImageCache>);
+        Assert.Single(services, IsServiceImplementationFactory<IImageCache, MockImageCache>);
+    }
+
+    [Fact]
+    public void CanSetCacheKey()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.SetCacheKey<MockCacheKey>();
+        Assert.Single(services, IsService<ICacheKey>);
+        Assert.Single(services, IsServiceImplementationType<ICacheKey, MockCacheKey>);
+
+        builder.SetCacheKey(_ => new MockCacheKey());
+        Assert.Single(services, IsService<ICacheKey>);
+        Assert.Single(services, IsServiceImplementationFactory<ICacheKey, MockCacheKey>);
+    }
+
+    [Fact]
+    public void CanSetCacheHash()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.SetCacheHash<MockCacheHash>();
+        Assert.Single(services, IsService<ICacheHash>);
+        Assert.Single(services, IsServiceImplementationType<ICacheHash, MockCacheHash>);
+
+        builder.SetCacheHash(_ => new MockCacheHash());
+        Assert.Single(services, IsService<ICacheHash>);
+        Assert.Single(services, IsServiceImplementationFactory<ICacheHash, MockCacheHash>);
+    }
+
+    [Fact]
+    public void CanAddRemoveImageProviders()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.AddProvider<MockImageProvider>();
+        Assert.Single(services, IsService<IImageProvider, MockImageProvider>);
+        Assert.Single(services, IsServiceImplementationType<IImageProvider, MockImageProvider>);
+
+        builder.RemoveProvider<MockImageProvider>();
+        Assert.DoesNotContain(services, IsService<IImageProvider, MockImageProvider>);
+    }
+
+    [Fact]
+    public void CanInsertRemoveImageProviders()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.InsertProvider<MockImageProvider>(0);
+        Assert.Single(services, IsService<IImageProvider, MockImageProvider>);
+        Assert.Single(services, IsServiceImplementationType<IImageProvider, MockImageProvider>);
+
+        IReadOnlyList<ServiceDescriptor> providers = GetCollection<IImageProvider>(services);
+        Assert.Equal(2, providers.Count);
+        Assert.True(IsService<IImageProvider, MockImageProvider>(providers[0]));
+        Assert.True(IsServiceImplementationType<IImageProvider, MockImageProvider>(providers[0]));
+
+        builder.RemoveProvider<MockImageProvider>();
+        Assert.DoesNotContain(services, IsService<IImageProvider, MockImageProvider>);
+    }
+
+    [Fact]
+    public void CanInsertIdempotentImageProviders()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.InsertProvider<MockImageProvider>(0);
+        builder.InsertProvider<MockImageProvider>(1);
+
+        Assert.Throws<ArgumentOutOfRangeException>(() => builder.InsertProvider<MockImageProvider>(2));
+
+        Assert.Single(services, IsService<IImageProvider, MockImageProvider>);
+        Assert.Single(services, IsServiceImplementationType<IImageProvider, MockImageProvider>);
+
+        IReadOnlyList<ServiceDescriptor> providers = GetCollection<IImageProvider>(services);
+        Assert.Equal(2, providers.Count);
+        Assert.True(IsService<IImageProvider, MockImageProvider>(providers[1]));
+        Assert.True(IsServiceImplementationType<IImageProvider, MockImageProvider>(providers[1]));
+    }
+
+    [Fact]
+    public void CanAddRemoveFactoryImageProviders()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.AddProvider(_ => new MockImageProvider());
+        Assert.Single(services, IsService<IImageProvider, MockImageProvider>);
+        Assert.Single(services, IsServiceImplementationFactory<IImageProvider, MockImageProvider>);
+
+        builder.RemoveProvider<MockImageProvider>();
+        Assert.DoesNotContain(services, IsService<IImageProvider, MockImageProvider>);
+    }
+
+    [Fact]
+    public void CanInsertIdempotentFactoryImageProviders()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.InsertProvider(0, _ => new MockImageProvider());
+        builder.InsertProvider(1, _ => new MockImageProvider());
+
+        Assert.Throws<ArgumentOutOfRangeException>(() => builder.InsertProvider(2, _ => new MockImageProvider()));
+
+        Assert.Single(services, IsService<IImageProvider, MockImageProvider>);
+        Assert.Single(services, IsServiceImplementationFactory<IImageProvider, MockImageProvider>);
+
+        IReadOnlyList<ServiceDescriptor> providers = GetCollection<IImageProvider>(services);
+        Assert.Equal(2, providers.Count);
+        Assert.True(IsService<IImageProvider, MockImageProvider>(providers[1]));
+        Assert.True(IsServiceImplementationFactory<IImageProvider, MockImageProvider>(providers[1]));
+    }
+
+    [Fact]
+    public void CanInsertRemoveFactoryImageProviders()
     {
-        private static bool IsService<TService>(ServiceDescriptor descriptor)
-            => descriptor.ServiceType == typeof(TService);
-
-        private static bool IsService<TService, TImplementation>(ServiceDescriptor descriptor)
-            where TImplementation : TService
-            => IsServiceImplementationType<TService, TImplementation>(descriptor) ||
-               IsServiceImplementationInstance<TService, TImplementation>(descriptor) ||
-               IsServiceImplementationFactory<TService, TImplementation>(descriptor);
-
-        private static bool IsServiceImplementationType<TService, TImplementation>(ServiceDescriptor descriptor)
-            where TImplementation : TService
-            => IsService<TService>(descriptor) &&
-               descriptor.ImplementationType == typeof(TImplementation);
-
-        private static bool IsServiceImplementationInstance<TService, TImplementation>(ServiceDescriptor descriptor)
-            where TImplementation : TService
-            => IsService<TService>(descriptor) &&
-               descriptor.ImplementationInstance?.GetType() == typeof(TImplementation);
-
-        private static bool IsServiceImplementationFactory<TService, TImplementation>(ServiceDescriptor descriptor)
-            where TImplementation : TService
-            => IsService<TService>(descriptor) &&
-               (descriptor.ImplementationFactory?.GetMethodInfo().ReturnType == typeof(TImplementation) ||
-               descriptor.ImplementationFactory?.Invoke(null)?.GetType() == typeof(TImplementation)); // OK to invoke the factory in tests
-
-        private static IReadOnlyList<ServiceDescriptor> GetCollection<T>(IServiceCollection serviceDescriptors) => serviceDescriptors.Where(x => x.ServiceType == typeof(T)).ToList();
-
-        [Fact]
-        public void DefaultServicesAreRegistered()
-        {
-            var services = new ServiceCollection();
-            services.AddImageSharp();
-
-            Assert.Single(services, IsService<FormatUtilities>);
-            Assert.Single(services, IsServiceImplementationType<IRequestParser, QueryCollectionRequestParser>);
-            Assert.Single(services, IsServiceImplementationType<IImageCache, PhysicalFileSystemCache>);
-            Assert.Single(services, IsServiceImplementationType<ICacheKey, UriRelativeLowerInvariantCacheKey>);
-            Assert.Single(services, IsServiceImplementationType<ICacheHash, SHA256CacheHash>);
-            Assert.Single(services, IsServiceImplementationType<IImageProvider, PhysicalFileSystemProvider>);
-            Assert.Single(services, IsServiceImplementationType<IImageWebProcessor, ResizeWebProcessor>);
-            Assert.Single(services, IsServiceImplementationType<IImageWebProcessor, FormatWebProcessor>);
-            Assert.Single(services, IsServiceImplementationType<IImageWebProcessor, BackgroundColorWebProcessor>);
-            Assert.Single(services, IsServiceImplementationType<IImageWebProcessor, QualityWebProcessor>);
-            Assert.Single(services, IsService<CommandParser>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, IntegralNumberConverter<sbyte>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, IntegralNumberConverter<byte>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, IntegralNumberConverter<short>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, IntegralNumberConverter<ushort>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, IntegralNumberConverter<int>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, IntegralNumberConverter<uint>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, IntegralNumberConverter<long>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, IntegralNumberConverter<ulong>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, SimpleCommandConverter<decimal>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, SimpleCommandConverter<float>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, SimpleCommandConverter<double>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, SimpleCommandConverter<string>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, SimpleCommandConverter<bool>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<sbyte>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<byte>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<short>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<ushort>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<int>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<uint>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<long>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<ulong>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<decimal>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<float>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<double>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<string>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ArrayConverter<bool>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<sbyte>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<byte>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<short>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<ushort>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<int>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<uint>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<long>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<ulong>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<decimal>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<float>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<double>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<string>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ListConverter<bool>>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, ColorConverter>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, EnumConverter>);
-        }
-
-        [Fact]
-        public void CanSetRequestParser()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.SetRequestParser<MockRequestParser>();
-            Assert.Single(services, IsService<IRequestParser>);
-            Assert.Single(services, IsServiceImplementationType<IRequestParser, MockRequestParser>);
-
-            builder.SetRequestParser(_ => new MockRequestParser());
-            Assert.Single(services, IsService<IRequestParser>);
-            Assert.Single(services, IsServiceImplementationFactory<IRequestParser, MockRequestParser>);
-        }
-
-        [Fact]
-        public void CanSetCache()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.SetCache<MockImageCache>();
-            Assert.Single(services, IsService<IImageCache>);
-            Assert.Single(services, IsServiceImplementationType<IImageCache, MockImageCache>);
-
-            builder.SetCache(_ => new MockImageCache());
-            Assert.Single(services, IsService<IImageCache>);
-            Assert.Single(services, IsServiceImplementationFactory<IImageCache, MockImageCache>);
-        }
-
-        [Fact]
-        public void CanSetCacheKey()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.SetCacheKey<MockCacheKey>();
-            Assert.Single(services, IsService<ICacheKey>);
-            Assert.Single(services, IsServiceImplementationType<ICacheKey, MockCacheKey>);
-
-            builder.SetCacheKey(_ => new MockCacheKey());
-            Assert.Single(services, IsService<ICacheKey>);
-            Assert.Single(services, IsServiceImplementationFactory<ICacheKey, MockCacheKey>);
-        }
-
-        [Fact]
-        public void CanSetCacheHash()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.SetCacheHash<MockCacheHash>();
-            Assert.Single(services, IsService<ICacheHash>);
-            Assert.Single(services, IsServiceImplementationType<ICacheHash, MockCacheHash>);
-
-            builder.SetCacheHash(_ => new MockCacheHash());
-            Assert.Single(services, IsService<ICacheHash>);
-            Assert.Single(services, IsServiceImplementationFactory<ICacheHash, MockCacheHash>);
-        }
-
-        [Fact]
-        public void CanAddRemoveImageProviders()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.AddProvider<MockImageProvider>();
-            Assert.Single(services, IsService<IImageProvider, MockImageProvider>);
-            Assert.Single(services, IsServiceImplementationType<IImageProvider, MockImageProvider>);
-
-            builder.RemoveProvider<MockImageProvider>();
-            Assert.DoesNotContain(services, IsService<IImageProvider, MockImageProvider>);
-        }
-
-        [Fact]
-        public void CanInsertRemoveImageProviders()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.InsertProvider<MockImageProvider>(0);
-            Assert.Single(services, IsService<IImageProvider, MockImageProvider>);
-            Assert.Single(services, IsServiceImplementationType<IImageProvider, MockImageProvider>);
-
-            IReadOnlyList<ServiceDescriptor> providers = GetCollection<IImageProvider>(services);
-            Assert.Equal(2, providers.Count);
-            Assert.True(IsService<IImageProvider, MockImageProvider>(providers[0]));
-            Assert.True(IsServiceImplementationType<IImageProvider, MockImageProvider>(providers[0]));
-
-            builder.RemoveProvider<MockImageProvider>();
-            Assert.DoesNotContain(services, IsService<IImageProvider, MockImageProvider>);
-        }
-
-        [Fact]
-        public void CanInsertIdempotentImageProviders()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.InsertProvider<MockImageProvider>(0);
-            builder.InsertProvider<MockImageProvider>(1);
-
-            Assert.Throws<ArgumentOutOfRangeException>(() => builder.InsertProvider<MockImageProvider>(2));
-
-            Assert.Single(services, IsService<IImageProvider, MockImageProvider>);
-            Assert.Single(services, IsServiceImplementationType<IImageProvider, MockImageProvider>);
-
-            IReadOnlyList<ServiceDescriptor> providers = GetCollection<IImageProvider>(services);
-            Assert.Equal(2, providers.Count);
-            Assert.True(IsService<IImageProvider, MockImageProvider>(providers[1]));
-            Assert.True(IsServiceImplementationType<IImageProvider, MockImageProvider>(providers[1]));
-        }
-
-        [Fact]
-        public void CanAddRemoveFactoryImageProviders()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.AddProvider(_ => new MockImageProvider());
-            Assert.Single(services, IsService<IImageProvider, MockImageProvider>);
-            Assert.Single(services, IsServiceImplementationFactory<IImageProvider, MockImageProvider>);
-
-            builder.RemoveProvider<MockImageProvider>();
-            Assert.DoesNotContain(services, IsService<IImageProvider, MockImageProvider>);
-        }
-
-        [Fact]
-        public void CanInsertIdempotentFactoryImageProviders()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.InsertProvider(0, _ => new MockImageProvider());
-            builder.InsertProvider(1, _ => new MockImageProvider());
-
-            Assert.Throws<ArgumentOutOfRangeException>(() => builder.InsertProvider(2, _ => new MockImageProvider()));
-
-            Assert.Single(services, IsService<IImageProvider, MockImageProvider>);
-            Assert.Single(services, IsServiceImplementationFactory<IImageProvider, MockImageProvider>);
-
-            IReadOnlyList<ServiceDescriptor> providers = GetCollection<IImageProvider>(services);
-            Assert.Equal(2, providers.Count);
-            Assert.True(IsService<IImageProvider, MockImageProvider>(providers[1]));
-            Assert.True(IsServiceImplementationFactory<IImageProvider, MockImageProvider>(providers[1]));
-        }
-
-        [Fact]
-        public void CanInsertRemoveFactoryImageProviders()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.InsertProvider(0, _ => new MockImageProvider());
-            Assert.Single(services, IsService<IImageProvider, MockImageProvider>);
-            Assert.Single(services, IsServiceImplementationFactory<IImageProvider, MockImageProvider>);
-
-            IReadOnlyList<ServiceDescriptor> providers = GetCollection<IImageProvider>(services);
-            Assert.Equal(2, providers.Count);
-            Assert.True(IsService<IImageProvider, MockImageProvider>(providers[0]));
-            Assert.True(IsServiceImplementationFactory<IImageProvider, MockImageProvider>(providers[0]));
-
-            builder.RemoveProvider<MockImageProvider>();
-            Assert.DoesNotContain(services, IsService<IImageProvider, MockImageProvider>);
-        }
-
-        [Fact]
-        public void CanAddRemoveAllImageProviders()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.AddProvider<MockImageProvider>();
-            Assert.Single(services, IsService<IImageProvider, MockImageProvider>);
-            Assert.Single(services, IsServiceImplementationType<IImageProvider, MockImageProvider>);
-
-            builder.ClearProviders();
-            Assert.DoesNotContain(services, IsService<IImageProvider>);
-        }
-
-        [Fact]
-        public void CanAddRemoveAllFactoryImageProviders()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.AddProvider(_ => new MockImageProvider());
-            Assert.Single(services, IsService<IImageProvider, MockImageProvider>);
-            Assert.Single(services, IsServiceImplementationFactory<IImageProvider, MockImageProvider>);
-
-            builder.ClearProviders();
-            Assert.DoesNotContain(services, IsService<IImageProvider>);
-        }
-
-        [Fact]
-        public void CanAddRemoveImageProcessors()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.AddProcessor<MockWebProcessor>();
-            Assert.Single(services, IsService<IImageWebProcessor, MockWebProcessor>);
-            Assert.Single(services, IsServiceImplementationType<IImageWebProcessor, MockWebProcessor>);
-
-            builder.RemoveProcessor<MockWebProcessor>();
-            Assert.DoesNotContain(services, IsService<IImageWebProcessor, MockWebProcessor>);
-        }
-
-        [Fact]
-        public void CanAddRemoveFactoryImageProcessors()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.AddProcessor(_ => new MockWebProcessor());
-            Assert.Single(services, IsService<IImageWebProcessor, MockWebProcessor>);
-            Assert.Single(services, IsServiceImplementationFactory<IImageWebProcessor, MockWebProcessor>);
-
-            builder.RemoveProcessor<MockWebProcessor>();
-            Assert.DoesNotContain(services, IsService<IImageWebProcessor, MockWebProcessor>);
-        }
-
-        [Fact]
-        public void CanAddRemoveAllImageProcessors()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.AddProcessor<MockWebProcessor>();
-            Assert.Single(services, IsService<IImageWebProcessor, MockWebProcessor>);
-            Assert.Single(services, IsServiceImplementationType<IImageWebProcessor, MockWebProcessor>);
-
-            builder.ClearProcessors();
-            Assert.DoesNotContain(services, IsService<IImageWebProcessor>);
-        }
-
-        [Fact]
-        public void CanAddRemoveAllFactoryImageProcessors()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.AddProcessor(_ => new MockWebProcessor());
-            Assert.Single(services, IsService<IImageWebProcessor, MockWebProcessor>);
-            Assert.Single(services, IsServiceImplementationFactory<IImageWebProcessor, MockWebProcessor>);
-
-            builder.ClearProcessors();
-            Assert.DoesNotContain(services, IsService<IImageWebProcessor>);
-        }
-
-        [Fact]
-        public void CanAddRemoveCommandConverters()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.AddConverter<MockCommandConverter>();
-            Assert.Single(services, IsService<ICommandConverter, MockCommandConverter>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, MockCommandConverter>);
-
-            builder.RemoveConverter<MockCommandConverter>();
-            Assert.DoesNotContain(services, IsService<ICommandConverter, MockCommandConverter>);
-        }
-
-        [Fact]
-        public void CanAddRemoveFactoryCommandConverters()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.AddConverter(_ => new MockCommandConverter());
-            Assert.Single(services, IsService<ICommandConverter, MockCommandConverter>);
-            Assert.Single(services, IsServiceImplementationFactory<ICommandConverter, MockCommandConverter>);
-
-            builder.RemoveConverter<MockCommandConverter>();
-            Assert.DoesNotContain(services, IsService<ICommandConverter, MockCommandConverter>);
-        }
-
-        [Fact]
-        public void CanAddRemoveAllCommandConverters()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.AddConverter<MockCommandConverter>();
-            Assert.Single(services, IsService<ICommandConverter, MockCommandConverter>);
-            Assert.Single(services, IsServiceImplementationType<ICommandConverter, MockCommandConverter>);
-
-            builder.ClearConverters();
-            Assert.DoesNotContain(services, IsService<ICommandConverter>);
-        }
-
-        [Fact]
-        public void CanAddRemoveAllFactoryCommandConverters()
-        {
-            var services = new ServiceCollection();
-            IImageSharpBuilder builder = services.AddImageSharp();
-
-            builder.AddConverter(_ => new MockCommandConverter());
-            Assert.Single(services, IsService<ICommandConverter, MockCommandConverter>);
-            Assert.Single(services, IsServiceImplementationFactory<ICommandConverter, MockCommandConverter>);
-
-            builder.ClearConverters();
-            Assert.DoesNotContain(services, IsService<ICommandConverter>);
-        }
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.InsertProvider(0, _ => new MockImageProvider());
+        Assert.Single(services, IsService<IImageProvider, MockImageProvider>);
+        Assert.Single(services, IsServiceImplementationFactory<IImageProvider, MockImageProvider>);
+
+        IReadOnlyList<ServiceDescriptor> providers = GetCollection<IImageProvider>(services);
+        Assert.Equal(2, providers.Count);
+        Assert.True(IsService<IImageProvider, MockImageProvider>(providers[0]));
+        Assert.True(IsServiceImplementationFactory<IImageProvider, MockImageProvider>(providers[0]));
+
+        builder.RemoveProvider<MockImageProvider>();
+        Assert.DoesNotContain(services, IsService<IImageProvider, MockImageProvider>);
+    }
+
+    [Fact]
+    public void CanAddRemoveAllImageProviders()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.AddProvider<MockImageProvider>();
+        Assert.Single(services, IsService<IImageProvider, MockImageProvider>);
+        Assert.Single(services, IsServiceImplementationType<IImageProvider, MockImageProvider>);
+
+        builder.ClearProviders();
+        Assert.DoesNotContain(services, IsService<IImageProvider>);
+    }
+
+    [Fact]
+    public void CanAddRemoveAllFactoryImageProviders()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.AddProvider(_ => new MockImageProvider());
+        Assert.Single(services, IsService<IImageProvider, MockImageProvider>);
+        Assert.Single(services, IsServiceImplementationFactory<IImageProvider, MockImageProvider>);
+
+        builder.ClearProviders();
+        Assert.DoesNotContain(services, IsService<IImageProvider>);
+    }
+
+    [Fact]
+    public void CanAddRemoveImageProcessors()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.AddProcessor<MockWebProcessor>();
+        Assert.Single(services, IsService<IImageWebProcessor, MockWebProcessor>);
+        Assert.Single(services, IsServiceImplementationType<IImageWebProcessor, MockWebProcessor>);
+
+        builder.RemoveProcessor<MockWebProcessor>();
+        Assert.DoesNotContain(services, IsService<IImageWebProcessor, MockWebProcessor>);
+    }
+
+    [Fact]
+    public void CanAddRemoveFactoryImageProcessors()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.AddProcessor(_ => new MockWebProcessor());
+        Assert.Single(services, IsService<IImageWebProcessor, MockWebProcessor>);
+        Assert.Single(services, IsServiceImplementationFactory<IImageWebProcessor, MockWebProcessor>);
+
+        builder.RemoveProcessor<MockWebProcessor>();
+        Assert.DoesNotContain(services, IsService<IImageWebProcessor, MockWebProcessor>);
+    }
+
+    [Fact]
+    public void CanAddRemoveAllImageProcessors()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.AddProcessor<MockWebProcessor>();
+        Assert.Single(services, IsService<IImageWebProcessor, MockWebProcessor>);
+        Assert.Single(services, IsServiceImplementationType<IImageWebProcessor, MockWebProcessor>);
+
+        builder.ClearProcessors();
+        Assert.DoesNotContain(services, IsService<IImageWebProcessor>);
+    }
+
+    [Fact]
+    public void CanAddRemoveAllFactoryImageProcessors()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.AddProcessor(_ => new MockWebProcessor());
+        Assert.Single(services, IsService<IImageWebProcessor, MockWebProcessor>);
+        Assert.Single(services, IsServiceImplementationFactory<IImageWebProcessor, MockWebProcessor>);
+
+        builder.ClearProcessors();
+        Assert.DoesNotContain(services, IsService<IImageWebProcessor>);
+    }
+
+    [Fact]
+    public void CanAddRemoveCommandConverters()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.AddConverter<MockCommandConverter>();
+        Assert.Single(services, IsService<ICommandConverter, MockCommandConverter>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, MockCommandConverter>);
+
+        builder.RemoveConverter<MockCommandConverter>();
+        Assert.DoesNotContain(services, IsService<ICommandConverter, MockCommandConverter>);
+    }
+
+    [Fact]
+    public void CanAddRemoveFactoryCommandConverters()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.AddConverter(_ => new MockCommandConverter());
+        Assert.Single(services, IsService<ICommandConverter, MockCommandConverter>);
+        Assert.Single(services, IsServiceImplementationFactory<ICommandConverter, MockCommandConverter>);
+
+        builder.RemoveConverter<MockCommandConverter>();
+        Assert.DoesNotContain(services, IsService<ICommandConverter, MockCommandConverter>);
+    }
+
+    [Fact]
+    public void CanAddRemoveAllCommandConverters()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.AddConverter<MockCommandConverter>();
+        Assert.Single(services, IsService<ICommandConverter, MockCommandConverter>);
+        Assert.Single(services, IsServiceImplementationType<ICommandConverter, MockCommandConverter>);
+
+        builder.ClearConverters();
+        Assert.DoesNotContain(services, IsService<ICommandConverter>);
+    }
+
+    [Fact]
+    public void CanAddRemoveAllFactoryCommandConverters()
+    {
+        var services = new ServiceCollection();
+        IImageSharpBuilder builder = services.AddImageSharp();
+
+        builder.AddConverter(_ => new MockCommandConverter());
+        Assert.Single(services, IsService<ICommandConverter, MockCommandConverter>);
+        Assert.Single(services, IsServiceImplementationFactory<ICommandConverter, MockCommandConverter>);
+
+        builder.ClearConverters();
+        Assert.DoesNotContain(services, IsService<ICommandConverter>);
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Helpers/CaseHandlingUriBuilderTests.cs b/tests/ImageSharp.Web.Tests/Helpers/CaseHandlingUriBuilderTests.cs
index 0e13a7e6..de2fdf99 100644
--- a/tests/ImageSharp.Web.Tests/Helpers/CaseHandlingUriBuilderTests.cs
+++ b/tests/ImageSharp.Web.Tests/Helpers/CaseHandlingUriBuilderTests.cs
@@ -1,30 +1,27 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using Xunit;
+namespace SixLabors.ImageSharp.Web.Tests.Helpers;
 
-namespace SixLabors.ImageSharp.Web.Tests.Helpers
+public class CaseHandlingUriBuilderTests
 {
-    public class CaseHandlingUriBuilderTests
+    [Theory]
+    [InlineData(CaseHandlingUriBuilder.CaseHandling.None, "https://sixlabors.com:443/Path/?query=1")]
+    [InlineData(CaseHandlingUriBuilder.CaseHandling.LowerInvariant, "https://sixlabors.com:443/path/?query=1")]
+    public void CanEncodeAbsoluteUri(CaseHandlingUriBuilder.CaseHandling value, string expected)
     {
-        [Theory]
-        [InlineData(CaseHandlingUriBuilder.CaseHandling.None, "https://sixlabors.com:443/Path/?query=1")]
-        [InlineData(CaseHandlingUriBuilder.CaseHandling.LowerInvariant, "https://sixlabors.com:443/path/?query=1")]
-        public void CanEncodeAbsoluteUri(CaseHandlingUriBuilder.CaseHandling value, string expected)
-        {
-            const string input = "https://sixlabors.com/Path/?Query=1";
-            string actual = CaseHandlingUriBuilder.Encode(value, input);
-            Assert.Equal(expected, actual);
-        }
+        const string input = "https://sixlabors.com/Path/?Query=1";
+        string actual = CaseHandlingUriBuilder.Encode(value, input);
+        Assert.Equal(expected, actual);
+    }
 
-        [Theory]
-        [InlineData(CaseHandlingUriBuilder.CaseHandling.None, "/Path/?query=1")]
-        [InlineData(CaseHandlingUriBuilder.CaseHandling.LowerInvariant, "/path/?query=1")]
-        public void CanEncodeRelativeUri(CaseHandlingUriBuilder.CaseHandling value, string expected)
-        {
-            const string input = "/Path/?Query=1";
-            string actual = CaseHandlingUriBuilder.Encode(value, input);
-            Assert.Equal(expected, actual);
-        }
+    [Theory]
+    [InlineData(CaseHandlingUriBuilder.CaseHandling.None, "/Path/?query=1")]
+    [InlineData(CaseHandlingUriBuilder.CaseHandling.LowerInvariant, "/path/?query=1")]
+    public void CanEncodeRelativeUri(CaseHandlingUriBuilder.CaseHandling value, string expected)
+    {
+        const string input = "/Path/?Query=1";
+        string actual = CaseHandlingUriBuilder.Encode(value, input);
+        Assert.Equal(expected, actual);
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Helpers/ExifOrientationUtilitiesTests.cs b/tests/ImageSharp.Web.Tests/Helpers/ExifOrientationUtilitiesTests.cs
index c92fc70f..c553a743 100644
--- a/tests/ImageSharp.Web.Tests/Helpers/ExifOrientationUtilitiesTests.cs
+++ b/tests/ImageSharp.Web.Tests/Helpers/ExifOrientationUtilitiesTests.cs
@@ -1,169 +1,167 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using System.Numerics;
 using SixLabors.ImageSharp.Metadata.Profiles.Exif;
 using SixLabors.ImageSharp.Processing;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Helpers
-{
-    public class ExifOrientationUtilitiesTests
-    {
-        //                  150
-        // ┌─────┬─────┬─────┬─────┬─────┬─────┐
-        // │     │     │     │     │     │     │
-        // │     │    FFFFFFFFFFFFFFF    │     │
-        // ├─────X────F┌─────┬─────┬─────┼─────┤
-        // │     │    F│     │     │     │     │
-        // │     │    FFFFFFFFFFFFFFF    │     │
-        // ├─────┼────F┌─────┬─────┬─────┼─────┤ 100
-        // │     │    F│     │     │     │     │
-        // │     │    F│     │     │     │     │
-        // ├─────┼────F├─────┼─────┼─────┼─────┤
-        // │     │    F│     │     │     │     │
-        // │     │     │     │     │     │     │
-        // └─────┴─────┴─────┴─────┴─────┴─────┘
-        public static TheoryData<Vector2, Vector2, Vector2, ushort, Vector2> TransformVectorData =
-            new()
-            {
-                { new Vector2(25F, 25F), Vector2.Zero, new Vector2(150, 100), ExifOrientationMode.Unknown, new Vector2(25F, 25F) },
-                { new Vector2(25F, 25F), Vector2.Zero, new Vector2(150, 100), ExifOrientationMode.TopLeft, new Vector2(25F, 25F) },
-                { new Vector2(25F, 25F), Vector2.Zero, new Vector2(150, 100), ExifOrientationMode.TopRight, new Vector2(125F, 25F) },
-                { new Vector2(25F, 25F), Vector2.Zero, new Vector2(150, 100), ExifOrientationMode.BottomRight, new Vector2(125F, 75F) },
-                { new Vector2(25F, 25F), Vector2.Zero, new Vector2(150, 100), ExifOrientationMode.BottomLeft, new Vector2(25F, 75F) },
-                { new Vector2(25F, 25F), Vector2.Zero, new Vector2(150, 100), ExifOrientationMode.LeftTop, new Vector2(25F, 25F) },
-                { new Vector2(25F, 25F), Vector2.Zero, new Vector2(150, 100), ExifOrientationMode.RightTop, new Vector2(25F, 125F) },
-                { new Vector2(25F, 25F), Vector2.Zero, new Vector2(150, 100), ExifOrientationMode.RightBottom, new Vector2(75F, 125F) },
-                { new Vector2(25F, 25F), Vector2.Zero, new Vector2(150, 100), ExifOrientationMode.LeftBottom, new Vector2(75F, 25F) },
-            };
+namespace SixLabors.ImageSharp.Web.Tests.Helpers;
 
-        [Theory]
-        [MemberData(nameof(TransformVectorData))]
-        public void CanTransformVector(Vector2 position, Vector2 min, Vector2 max, ushort orientation, Vector2 expected)
+public class ExifOrientationUtilitiesTests
+{
+    //                  150
+    // ┌─────┬─────┬─────┬─────┬─────┬─────┐
+    // │     │     │     │     │     │     │
+    // │     │    FFFFFFFFFFFFFFF    │     │
+    // ├─────X────F┌─────┬─────┬─────┼─────┤
+    // │     │    F│     │     │     │     │
+    // │     │    FFFFFFFFFFFFFFF    │     │
+    // ├─────┼────F┌─────┬─────┬─────┼─────┤ 100
+    // │     │    F│     │     │     │     │
+    // │     │    F│     │     │     │     │
+    // ├─────┼────F├─────┼─────┼─────┼─────┤
+    // │     │    F│     │     │     │     │
+    // │     │     │     │     │     │     │
+    // └─────┴─────┴─────┴─────┴─────┴─────┘
+    public static TheoryData<Vector2, Vector2, Vector2, ushort, Vector2> TransformVectorData =
+        new()
         {
-            Vector2 actual = ExifOrientationUtilities.Transform(position, min, max, orientation);
+            { new Vector2(25F, 25F), Vector2.Zero, new Vector2(150, 100), ExifOrientationMode.Unknown, new Vector2(25F, 25F) },
+            { new Vector2(25F, 25F), Vector2.Zero, new Vector2(150, 100), ExifOrientationMode.TopLeft, new Vector2(25F, 25F) },
+            { new Vector2(25F, 25F), Vector2.Zero, new Vector2(150, 100), ExifOrientationMode.TopRight, new Vector2(125F, 25F) },
+            { new Vector2(25F, 25F), Vector2.Zero, new Vector2(150, 100), ExifOrientationMode.BottomRight, new Vector2(125F, 75F) },
+            { new Vector2(25F, 25F), Vector2.Zero, new Vector2(150, 100), ExifOrientationMode.BottomLeft, new Vector2(25F, 75F) },
+            { new Vector2(25F, 25F), Vector2.Zero, new Vector2(150, 100), ExifOrientationMode.LeftTop, new Vector2(25F, 25F) },
+            { new Vector2(25F, 25F), Vector2.Zero, new Vector2(150, 100), ExifOrientationMode.RightTop, new Vector2(25F, 125F) },
+            { new Vector2(25F, 25F), Vector2.Zero, new Vector2(150, 100), ExifOrientationMode.RightBottom, new Vector2(75F, 125F) },
+            { new Vector2(25F, 25F), Vector2.Zero, new Vector2(150, 100), ExifOrientationMode.LeftBottom, new Vector2(75F, 25F) },
+        };
 
-            Assert.Equal(expected.X, actual.X, 4);
-            Assert.Equal(expected.Y, actual.Y, 4);
-        }
+    [Theory]
+    [MemberData(nameof(TransformVectorData))]
+    public void CanTransformVector(Vector2 position, Vector2 min, Vector2 max, ushort orientation, Vector2 expected)
+    {
+        Vector2 actual = ExifOrientationUtilities.Transform(position, min, max, orientation);
 
-        public static TheoryData<Size, ushort, Size> TransformSizeData =
-            new()
-            {
-                { new Size(150, 100), ExifOrientationMode.Unknown, new Size(150, 100) },
-                { new Size(150, 100), ExifOrientationMode.TopLeft, new Size(150, 100) },
-                { new Size(150, 100), ExifOrientationMode.TopRight, new Size(150, 100) },
-                { new Size(150, 100), ExifOrientationMode.BottomRight, new Size(150, 100) },
-                { new Size(150, 100), ExifOrientationMode.BottomLeft, new Size(150, 100) },
-                { new Size(150, 100), ExifOrientationMode.LeftTop, new Size(100, 150) },
-                { new Size(150, 100), ExifOrientationMode.RightTop, new Size(100, 150) },
-                { new Size(150, 100), ExifOrientationMode.RightBottom, new Size(100, 150) },
-                { new Size(150, 100), ExifOrientationMode.LeftBottom, new Size(100, 150) },
-            };
+        Assert.Equal(expected.X, actual.X, 4);
+        Assert.Equal(expected.Y, actual.Y, 4);
+    }
 
-        [Theory]
-        [MemberData(nameof(TransformSizeData))]
-        public void CanTransformSize(Size size, ushort orientation, Size expected)
+    public static TheoryData<Size, ushort, Size> TransformSizeData =
+        new()
         {
-            Size actual = ExifOrientationUtilities.Transform(size, orientation);
+            { new Size(150, 100), ExifOrientationMode.Unknown, new Size(150, 100) },
+            { new Size(150, 100), ExifOrientationMode.TopLeft, new Size(150, 100) },
+            { new Size(150, 100), ExifOrientationMode.TopRight, new Size(150, 100) },
+            { new Size(150, 100), ExifOrientationMode.BottomRight, new Size(150, 100) },
+            { new Size(150, 100), ExifOrientationMode.BottomLeft, new Size(150, 100) },
+            { new Size(150, 100), ExifOrientationMode.LeftTop, new Size(100, 150) },
+            { new Size(150, 100), ExifOrientationMode.RightTop, new Size(100, 150) },
+            { new Size(150, 100), ExifOrientationMode.RightBottom, new Size(100, 150) },
+            { new Size(150, 100), ExifOrientationMode.LeftBottom, new Size(100, 150) },
+        };
 
-            Assert.Equal(expected, actual);
-        }
+    [Theory]
+    [MemberData(nameof(TransformSizeData))]
+    public void CanTransformSize(Size size, ushort orientation, Size expected)
+    {
+        Size actual = ExifOrientationUtilities.Transform(size, orientation);
 
-        public static TheoryData<AnchorPositionMode, ushort, AnchorPositionMode> TransformAnchorData =
-            new()
-            {
-                { AnchorPositionMode.Center, ExifOrientationMode.Unknown, AnchorPositionMode.Center },
-                { AnchorPositionMode.Center, ExifOrientationMode.TopLeft, AnchorPositionMode.Center },
-                { AnchorPositionMode.Center, ExifOrientationMode.TopRight, AnchorPositionMode.Center },
-                { AnchorPositionMode.Center, ExifOrientationMode.BottomRight, AnchorPositionMode.Center },
-                { AnchorPositionMode.Center, ExifOrientationMode.BottomLeft, AnchorPositionMode.Center },
-                { AnchorPositionMode.Center, ExifOrientationMode.LeftTop, AnchorPositionMode.Center },
-                { AnchorPositionMode.Center, ExifOrientationMode.RightTop, AnchorPositionMode.Center },
-                { AnchorPositionMode.Center, ExifOrientationMode.RightBottom, AnchorPositionMode.Center },
-                { AnchorPositionMode.Center, ExifOrientationMode.LeftBottom, AnchorPositionMode.Center },
-                { AnchorPositionMode.Top, ExifOrientationMode.Unknown, AnchorPositionMode.Top },
-                { AnchorPositionMode.Top, ExifOrientationMode.TopLeft, AnchorPositionMode.Top },
-                { AnchorPositionMode.Top, ExifOrientationMode.TopRight, AnchorPositionMode.Top },
-                { AnchorPositionMode.Top, ExifOrientationMode.BottomRight, AnchorPositionMode.Bottom },
-                { AnchorPositionMode.Top, ExifOrientationMode.BottomLeft, AnchorPositionMode.Bottom },
-                { AnchorPositionMode.Top, ExifOrientationMode.LeftTop, AnchorPositionMode.Left },
-                { AnchorPositionMode.Top, ExifOrientationMode.RightTop, AnchorPositionMode.Left },
-                { AnchorPositionMode.Top, ExifOrientationMode.RightBottom, AnchorPositionMode.Right },
-                { AnchorPositionMode.Top, ExifOrientationMode.LeftBottom, AnchorPositionMode.Right },
-                { AnchorPositionMode.Bottom, ExifOrientationMode.Unknown, AnchorPositionMode.Bottom },
-                { AnchorPositionMode.Bottom, ExifOrientationMode.TopLeft, AnchorPositionMode.Bottom },
-                { AnchorPositionMode.Bottom, ExifOrientationMode.TopRight, AnchorPositionMode.Bottom },
-                { AnchorPositionMode.Bottom, ExifOrientationMode.BottomRight, AnchorPositionMode.Top },
-                { AnchorPositionMode.Bottom, ExifOrientationMode.BottomLeft, AnchorPositionMode.Top },
-                { AnchorPositionMode.Bottom, ExifOrientationMode.LeftTop, AnchorPositionMode.Right },
-                { AnchorPositionMode.Bottom, ExifOrientationMode.RightTop, AnchorPositionMode.Right },
-                { AnchorPositionMode.Bottom, ExifOrientationMode.RightBottom, AnchorPositionMode.Left },
-                { AnchorPositionMode.Bottom, ExifOrientationMode.LeftBottom, AnchorPositionMode.Left },
-                { AnchorPositionMode.Left, ExifOrientationMode.Unknown, AnchorPositionMode.Left },
-                { AnchorPositionMode.Left, ExifOrientationMode.TopLeft, AnchorPositionMode.Left },
-                { AnchorPositionMode.Left, ExifOrientationMode.TopRight, AnchorPositionMode.Right },
-                { AnchorPositionMode.Left, ExifOrientationMode.BottomRight, AnchorPositionMode.Right },
-                { AnchorPositionMode.Left, ExifOrientationMode.BottomLeft, AnchorPositionMode.Left },
-                { AnchorPositionMode.Left, ExifOrientationMode.LeftTop, AnchorPositionMode.Top },
-                { AnchorPositionMode.Left, ExifOrientationMode.RightTop, AnchorPositionMode.Bottom },
-                { AnchorPositionMode.Left, ExifOrientationMode.RightBottom, AnchorPositionMode.Bottom },
-                { AnchorPositionMode.Left, ExifOrientationMode.LeftBottom, AnchorPositionMode.Top },
-                { AnchorPositionMode.Right, ExifOrientationMode.Unknown, AnchorPositionMode.Right },
-                { AnchorPositionMode.Right, ExifOrientationMode.TopLeft, AnchorPositionMode.Right },
-                { AnchorPositionMode.Right, ExifOrientationMode.TopRight, AnchorPositionMode.Left },
-                { AnchorPositionMode.Right, ExifOrientationMode.BottomRight, AnchorPositionMode.Left },
-                { AnchorPositionMode.Right, ExifOrientationMode.BottomLeft, AnchorPositionMode.Right },
-                { AnchorPositionMode.Right, ExifOrientationMode.LeftTop, AnchorPositionMode.Bottom },
-                { AnchorPositionMode.Right, ExifOrientationMode.RightTop, AnchorPositionMode.Top },
-                { AnchorPositionMode.Right, ExifOrientationMode.RightBottom, AnchorPositionMode.Top },
-                { AnchorPositionMode.Right, ExifOrientationMode.LeftBottom, AnchorPositionMode.Bottom },
-                { AnchorPositionMode.TopLeft, ExifOrientationMode.Unknown, AnchorPositionMode.TopLeft },
-                { AnchorPositionMode.TopLeft, ExifOrientationMode.TopLeft, AnchorPositionMode.TopLeft },
-                { AnchorPositionMode.TopLeft, ExifOrientationMode.TopRight, AnchorPositionMode.TopRight },
-                { AnchorPositionMode.TopLeft, ExifOrientationMode.BottomRight, AnchorPositionMode.BottomRight },
-                { AnchorPositionMode.TopLeft, ExifOrientationMode.BottomLeft, AnchorPositionMode.BottomLeft },
-                { AnchorPositionMode.TopLeft, ExifOrientationMode.LeftTop, AnchorPositionMode.TopLeft },
-                { AnchorPositionMode.TopLeft, ExifOrientationMode.RightTop, AnchorPositionMode.BottomLeft },
-                { AnchorPositionMode.TopLeft, ExifOrientationMode.RightBottom, AnchorPositionMode.BottomRight },
-                { AnchorPositionMode.TopLeft, ExifOrientationMode.LeftBottom, AnchorPositionMode.TopRight },
-                { AnchorPositionMode.TopRight, ExifOrientationMode.Unknown, AnchorPositionMode.TopRight },
-                { AnchorPositionMode.TopRight, ExifOrientationMode.TopLeft, AnchorPositionMode.TopRight },
-                { AnchorPositionMode.TopRight, ExifOrientationMode.TopRight, AnchorPositionMode.TopLeft },
-                { AnchorPositionMode.TopRight, ExifOrientationMode.BottomRight, AnchorPositionMode.BottomLeft },
-                { AnchorPositionMode.TopRight, ExifOrientationMode.BottomLeft, AnchorPositionMode.BottomRight },
-                { AnchorPositionMode.TopRight, ExifOrientationMode.LeftTop, AnchorPositionMode.BottomLeft },
-                { AnchorPositionMode.TopRight, ExifOrientationMode.RightTop, AnchorPositionMode.TopLeft },
-                { AnchorPositionMode.TopRight, ExifOrientationMode.RightBottom, AnchorPositionMode.TopRight },
-                { AnchorPositionMode.TopRight, ExifOrientationMode.LeftBottom, AnchorPositionMode.BottomRight },
-                { AnchorPositionMode.BottomRight, ExifOrientationMode.Unknown, AnchorPositionMode.BottomRight },
-                { AnchorPositionMode.BottomRight, ExifOrientationMode.TopLeft, AnchorPositionMode.BottomRight },
-                { AnchorPositionMode.BottomRight, ExifOrientationMode.TopRight, AnchorPositionMode.BottomLeft },
-                { AnchorPositionMode.BottomRight, ExifOrientationMode.BottomRight, AnchorPositionMode.TopLeft },
-                { AnchorPositionMode.BottomRight, ExifOrientationMode.BottomLeft, AnchorPositionMode.TopRight },
-                { AnchorPositionMode.BottomRight, ExifOrientationMode.LeftTop, AnchorPositionMode.BottomRight },
-                { AnchorPositionMode.BottomRight, ExifOrientationMode.RightTop, AnchorPositionMode.TopRight },
-                { AnchorPositionMode.BottomRight, ExifOrientationMode.RightBottom, AnchorPositionMode.TopLeft },
-                { AnchorPositionMode.BottomRight, ExifOrientationMode.LeftBottom, AnchorPositionMode.BottomLeft },
-                { AnchorPositionMode.BottomLeft, ExifOrientationMode.Unknown, AnchorPositionMode.BottomLeft },
-                { AnchorPositionMode.BottomLeft, ExifOrientationMode.TopLeft, AnchorPositionMode.BottomLeft },
-                { AnchorPositionMode.BottomLeft, ExifOrientationMode.TopRight, AnchorPositionMode.BottomRight },
-                { AnchorPositionMode.BottomLeft, ExifOrientationMode.BottomRight, AnchorPositionMode.TopRight },
-                { AnchorPositionMode.BottomLeft, ExifOrientationMode.BottomLeft, AnchorPositionMode.TopLeft },
-                { AnchorPositionMode.BottomLeft, ExifOrientationMode.LeftTop, AnchorPositionMode.TopRight },
-                { AnchorPositionMode.BottomLeft, ExifOrientationMode.RightTop, AnchorPositionMode.BottomRight },
-                { AnchorPositionMode.BottomLeft, ExifOrientationMode.RightBottom, AnchorPositionMode.BottomLeft },
-                { AnchorPositionMode.BottomLeft, ExifOrientationMode.LeftBottom, AnchorPositionMode.TopLeft },
-            };
+        Assert.Equal(expected, actual);
+    }
 
-        [Theory]
-        [MemberData(nameof(TransformAnchorData))]
-        public void CanTransformAnchor(AnchorPositionMode anchor, ushort orientation, AnchorPositionMode expected)
+    public static TheoryData<AnchorPositionMode, ushort, AnchorPositionMode> TransformAnchorData =
+        new()
         {
-            AnchorPositionMode actual = ExifOrientationUtilities.Transform(anchor, orientation);
+            { AnchorPositionMode.Center, ExifOrientationMode.Unknown, AnchorPositionMode.Center },
+            { AnchorPositionMode.Center, ExifOrientationMode.TopLeft, AnchorPositionMode.Center },
+            { AnchorPositionMode.Center, ExifOrientationMode.TopRight, AnchorPositionMode.Center },
+            { AnchorPositionMode.Center, ExifOrientationMode.BottomRight, AnchorPositionMode.Center },
+            { AnchorPositionMode.Center, ExifOrientationMode.BottomLeft, AnchorPositionMode.Center },
+            { AnchorPositionMode.Center, ExifOrientationMode.LeftTop, AnchorPositionMode.Center },
+            { AnchorPositionMode.Center, ExifOrientationMode.RightTop, AnchorPositionMode.Center },
+            { AnchorPositionMode.Center, ExifOrientationMode.RightBottom, AnchorPositionMode.Center },
+            { AnchorPositionMode.Center, ExifOrientationMode.LeftBottom, AnchorPositionMode.Center },
+            { AnchorPositionMode.Top, ExifOrientationMode.Unknown, AnchorPositionMode.Top },
+            { AnchorPositionMode.Top, ExifOrientationMode.TopLeft, AnchorPositionMode.Top },
+            { AnchorPositionMode.Top, ExifOrientationMode.TopRight, AnchorPositionMode.Top },
+            { AnchorPositionMode.Top, ExifOrientationMode.BottomRight, AnchorPositionMode.Bottom },
+            { AnchorPositionMode.Top, ExifOrientationMode.BottomLeft, AnchorPositionMode.Bottom },
+            { AnchorPositionMode.Top, ExifOrientationMode.LeftTop, AnchorPositionMode.Left },
+            { AnchorPositionMode.Top, ExifOrientationMode.RightTop, AnchorPositionMode.Left },
+            { AnchorPositionMode.Top, ExifOrientationMode.RightBottom, AnchorPositionMode.Right },
+            { AnchorPositionMode.Top, ExifOrientationMode.LeftBottom, AnchorPositionMode.Right },
+            { AnchorPositionMode.Bottom, ExifOrientationMode.Unknown, AnchorPositionMode.Bottom },
+            { AnchorPositionMode.Bottom, ExifOrientationMode.TopLeft, AnchorPositionMode.Bottom },
+            { AnchorPositionMode.Bottom, ExifOrientationMode.TopRight, AnchorPositionMode.Bottom },
+            { AnchorPositionMode.Bottom, ExifOrientationMode.BottomRight, AnchorPositionMode.Top },
+            { AnchorPositionMode.Bottom, ExifOrientationMode.BottomLeft, AnchorPositionMode.Top },
+            { AnchorPositionMode.Bottom, ExifOrientationMode.LeftTop, AnchorPositionMode.Right },
+            { AnchorPositionMode.Bottom, ExifOrientationMode.RightTop, AnchorPositionMode.Right },
+            { AnchorPositionMode.Bottom, ExifOrientationMode.RightBottom, AnchorPositionMode.Left },
+            { AnchorPositionMode.Bottom, ExifOrientationMode.LeftBottom, AnchorPositionMode.Left },
+            { AnchorPositionMode.Left, ExifOrientationMode.Unknown, AnchorPositionMode.Left },
+            { AnchorPositionMode.Left, ExifOrientationMode.TopLeft, AnchorPositionMode.Left },
+            { AnchorPositionMode.Left, ExifOrientationMode.TopRight, AnchorPositionMode.Right },
+            { AnchorPositionMode.Left, ExifOrientationMode.BottomRight, AnchorPositionMode.Right },
+            { AnchorPositionMode.Left, ExifOrientationMode.BottomLeft, AnchorPositionMode.Left },
+            { AnchorPositionMode.Left, ExifOrientationMode.LeftTop, AnchorPositionMode.Top },
+            { AnchorPositionMode.Left, ExifOrientationMode.RightTop, AnchorPositionMode.Bottom },
+            { AnchorPositionMode.Left, ExifOrientationMode.RightBottom, AnchorPositionMode.Bottom },
+            { AnchorPositionMode.Left, ExifOrientationMode.LeftBottom, AnchorPositionMode.Top },
+            { AnchorPositionMode.Right, ExifOrientationMode.Unknown, AnchorPositionMode.Right },
+            { AnchorPositionMode.Right, ExifOrientationMode.TopLeft, AnchorPositionMode.Right },
+            { AnchorPositionMode.Right, ExifOrientationMode.TopRight, AnchorPositionMode.Left },
+            { AnchorPositionMode.Right, ExifOrientationMode.BottomRight, AnchorPositionMode.Left },
+            { AnchorPositionMode.Right, ExifOrientationMode.BottomLeft, AnchorPositionMode.Right },
+            { AnchorPositionMode.Right, ExifOrientationMode.LeftTop, AnchorPositionMode.Bottom },
+            { AnchorPositionMode.Right, ExifOrientationMode.RightTop, AnchorPositionMode.Top },
+            { AnchorPositionMode.Right, ExifOrientationMode.RightBottom, AnchorPositionMode.Top },
+            { AnchorPositionMode.Right, ExifOrientationMode.LeftBottom, AnchorPositionMode.Bottom },
+            { AnchorPositionMode.TopLeft, ExifOrientationMode.Unknown, AnchorPositionMode.TopLeft },
+            { AnchorPositionMode.TopLeft, ExifOrientationMode.TopLeft, AnchorPositionMode.TopLeft },
+            { AnchorPositionMode.TopLeft, ExifOrientationMode.TopRight, AnchorPositionMode.TopRight },
+            { AnchorPositionMode.TopLeft, ExifOrientationMode.BottomRight, AnchorPositionMode.BottomRight },
+            { AnchorPositionMode.TopLeft, ExifOrientationMode.BottomLeft, AnchorPositionMode.BottomLeft },
+            { AnchorPositionMode.TopLeft, ExifOrientationMode.LeftTop, AnchorPositionMode.TopLeft },
+            { AnchorPositionMode.TopLeft, ExifOrientationMode.RightTop, AnchorPositionMode.BottomLeft },
+            { AnchorPositionMode.TopLeft, ExifOrientationMode.RightBottom, AnchorPositionMode.BottomRight },
+            { AnchorPositionMode.TopLeft, ExifOrientationMode.LeftBottom, AnchorPositionMode.TopRight },
+            { AnchorPositionMode.TopRight, ExifOrientationMode.Unknown, AnchorPositionMode.TopRight },
+            { AnchorPositionMode.TopRight, ExifOrientationMode.TopLeft, AnchorPositionMode.TopRight },
+            { AnchorPositionMode.TopRight, ExifOrientationMode.TopRight, AnchorPositionMode.TopLeft },
+            { AnchorPositionMode.TopRight, ExifOrientationMode.BottomRight, AnchorPositionMode.BottomLeft },
+            { AnchorPositionMode.TopRight, ExifOrientationMode.BottomLeft, AnchorPositionMode.BottomRight },
+            { AnchorPositionMode.TopRight, ExifOrientationMode.LeftTop, AnchorPositionMode.BottomLeft },
+            { AnchorPositionMode.TopRight, ExifOrientationMode.RightTop, AnchorPositionMode.TopLeft },
+            { AnchorPositionMode.TopRight, ExifOrientationMode.RightBottom, AnchorPositionMode.TopRight },
+            { AnchorPositionMode.TopRight, ExifOrientationMode.LeftBottom, AnchorPositionMode.BottomRight },
+            { AnchorPositionMode.BottomRight, ExifOrientationMode.Unknown, AnchorPositionMode.BottomRight },
+            { AnchorPositionMode.BottomRight, ExifOrientationMode.TopLeft, AnchorPositionMode.BottomRight },
+            { AnchorPositionMode.BottomRight, ExifOrientationMode.TopRight, AnchorPositionMode.BottomLeft },
+            { AnchorPositionMode.BottomRight, ExifOrientationMode.BottomRight, AnchorPositionMode.TopLeft },
+            { AnchorPositionMode.BottomRight, ExifOrientationMode.BottomLeft, AnchorPositionMode.TopRight },
+            { AnchorPositionMode.BottomRight, ExifOrientationMode.LeftTop, AnchorPositionMode.BottomRight },
+            { AnchorPositionMode.BottomRight, ExifOrientationMode.RightTop, AnchorPositionMode.TopRight },
+            { AnchorPositionMode.BottomRight, ExifOrientationMode.RightBottom, AnchorPositionMode.TopLeft },
+            { AnchorPositionMode.BottomRight, ExifOrientationMode.LeftBottom, AnchorPositionMode.BottomLeft },
+            { AnchorPositionMode.BottomLeft, ExifOrientationMode.Unknown, AnchorPositionMode.BottomLeft },
+            { AnchorPositionMode.BottomLeft, ExifOrientationMode.TopLeft, AnchorPositionMode.BottomLeft },
+            { AnchorPositionMode.BottomLeft, ExifOrientationMode.TopRight, AnchorPositionMode.BottomRight },
+            { AnchorPositionMode.BottomLeft, ExifOrientationMode.BottomRight, AnchorPositionMode.TopRight },
+            { AnchorPositionMode.BottomLeft, ExifOrientationMode.BottomLeft, AnchorPositionMode.TopLeft },
+            { AnchorPositionMode.BottomLeft, ExifOrientationMode.LeftTop, AnchorPositionMode.TopRight },
+            { AnchorPositionMode.BottomLeft, ExifOrientationMode.RightTop, AnchorPositionMode.BottomRight },
+            { AnchorPositionMode.BottomLeft, ExifOrientationMode.RightBottom, AnchorPositionMode.BottomLeft },
+            { AnchorPositionMode.BottomLeft, ExifOrientationMode.LeftBottom, AnchorPositionMode.TopLeft },
+        };
+
+    [Theory]
+    [MemberData(nameof(TransformAnchorData))]
+    public void CanTransformAnchor(AnchorPositionMode anchor, ushort orientation, AnchorPositionMode expected)
+    {
+        AnchorPositionMode actual = ExifOrientationUtilities.Transform(anchor, orientation);
 
-            Assert.Equal(expected, actual);
-        }
+        Assert.Equal(expected, actual);
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Helpers/FormatUtilitiesTests.cs b/tests/ImageSharp.Web.Tests/Helpers/FormatUtilitiesTests.cs
index 7d6453d6..cbc150a8 100644
--- a/tests/ImageSharp.Web.Tests/Helpers/FormatUtilitiesTests.cs
+++ b/tests/ImageSharp.Web.Tests/Helpers/FormatUtilitiesTests.cs
@@ -1,58 +1,54 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System.Collections.Generic;
-using System.Linq;
 using Microsoft.Extensions.Options;
 using SixLabors.ImageSharp.Web.Middleware;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Helpers
+namespace SixLabors.ImageSharp.Web.Tests.Helpers;
+
+public class FormatUtilitiesTests
 {
-    public class FormatUtilitiesTests
+    public static IEnumerable<object[]> DefaultExtensions =
+        Configuration.Default.ImageFormats.SelectMany(f => f.FileExtensions.Select(e => new object[] { e, e }));
+
+    private static readonly FormatUtilities FormatUtilities = new(Options.Create(new ImageSharpMiddlewareOptions()));
+
+    [Theory]
+    [MemberData(nameof(DefaultExtensions))]
+    public void GetExtensionShouldMatchDefaultExtensions(string expected, string ext)
+    {
+        string uri = $"http://www.example.org/some/path/to/image.{ext}?width=300";
+        FormatUtilities.TryGetExtensionFromUri(uri, out string actual);
+        Assert.Equal(expected, actual);
+    }
+
+    [Fact]
+    public void GetExtensionShouldNotMatchExtensionWithoutDotPrefix()
+    {
+        const string uri = "http://www.example.org/some/path/to/bmpimage";
+        Assert.False(FormatUtilities.TryGetExtensionFromUri(uri, out _));
+    }
+
+    [Fact]
+    public void GetExtensionShouldIgnoreQueryStringWithoutFormatParamter()
+    {
+        const string uri = "http://www.example.org/some/path/to/image.bmp?width=300&foo=.png";
+        FormatUtilities.TryGetExtensionFromUri(uri, out string actual);
+        Assert.Equal("bmp", actual);
+    }
+
+    [Fact]
+    public void GetExtensionShouldAcknowledgeQueryStringFormatParameter()
+    {
+        const string uri = "http://www.example.org/some/path/to/image.bmp?width=300&format=png";
+        FormatUtilities.TryGetExtensionFromUri(uri, out string actual);
+        Assert.Equal("png", actual);
+    }
+
+    [Fact]
+    public void GetExtensionShouldRejectInvalidQueryStringFormatParameter()
     {
-        public static IEnumerable<object[]> DefaultExtensions =
-            Configuration.Default.ImageFormats.SelectMany(f => f.FileExtensions.Select(e => new object[] { e, e }));
-
-        private static readonly FormatUtilities FormatUtilities = new(Options.Create(new ImageSharpMiddlewareOptions()));
-
-        [Theory]
-        [MemberData(nameof(DefaultExtensions))]
-        public void GetExtensionShouldMatchDefaultExtensions(string expected, string ext)
-        {
-            string uri = $"http://www.example.org/some/path/to/image.{ext}?width=300";
-            FormatUtilities.TryGetExtensionFromUri(uri, out string actual);
-            Assert.Equal(expected, actual);
-        }
-
-        [Fact]
-        public void GetExtensionShouldNotMatchExtensionWithoutDotPrefix()
-        {
-            const string uri = "http://www.example.org/some/path/to/bmpimage";
-            Assert.False(FormatUtilities.TryGetExtensionFromUri(uri, out _));
-        }
-
-        [Fact]
-        public void GetExtensionShouldIgnoreQueryStringWithoutFormatParamter()
-        {
-            const string uri = "http://www.example.org/some/path/to/image.bmp?width=300&foo=.png";
-            FormatUtilities.TryGetExtensionFromUri(uri, out string actual);
-            Assert.Equal("bmp", actual);
-        }
-
-        [Fact]
-        public void GetExtensionShouldAcknowledgeQueryStringFormatParameter()
-        {
-            const string uri = "http://www.example.org/some/path/to/image.bmp?width=300&format=png";
-            FormatUtilities.TryGetExtensionFromUri(uri, out string actual);
-            Assert.Equal("png", actual);
-        }
-
-        [Fact]
-        public void GetExtensionShouldRejectInvalidQueryStringFormatParameter()
-        {
-            const string uri = "http://www.example.org/some/path/to/image.bmp?width=300&format=invalid";
-            Assert.False(FormatUtilities.TryGetExtensionFromUri(uri, out _));
-        }
+        const string uri = "http://www.example.org/some/path/to/image.bmp?width=300&format=invalid";
+        Assert.False(FormatUtilities.TryGetExtensionFromUri(uri, out _));
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Helpers/HMACUtilitiesTests.cs b/tests/ImageSharp.Web.Tests/Helpers/HMACUtilitiesTests.cs
index 561182c7..31af8782 100644
--- a/tests/ImageSharp.Web.Tests/Helpers/HMACUtilitiesTests.cs
+++ b/tests/ImageSharp.Web.Tests/Helpers/HMACUtilitiesTests.cs
@@ -1,48 +1,45 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using Xunit;
+namespace SixLabors.ImageSharp.Web.Tests.Helpers;
 
-namespace SixLabors.ImageSharp.Web.Tests.Helpers
+public class HMACUtilitiesTests
 {
-    public class HMACUtilitiesTests
+    private static readonly byte[] HMACSecretKey = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 };
+
+    [Theory]
+    [InlineData("The quick brown fox jumped.")]
+    [InlineData("Over the lazy dog.")]
+    public void CanGenerate256BitHMAC(string value)
+    {
+        string expected = HMACUtilities.ComputeHMACSHA256(value, HMACSecretKey);
+        string actual = HMACUtilities.ComputeHMACSHA256(value, HMACSecretKey);
+
+        Assert.Equal(expected, actual);
+        Assert.Equal(64, expected.Length);
+    }
+
+    [Theory]
+    [InlineData("The quick brown fox jumped.")]
+    [InlineData("Over the lazy dog.")]
+    public void CanGenerate384BitHMAC(string value)
     {
-        private static readonly byte[] HMACSecretKey = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 };
-
-        [Theory]
-        [InlineData("The quick brown fox jumped.")]
-        [InlineData("Over the lazy dog.")]
-        public void CanGenerate256BitHMAC(string value)
-        {
-            string expected = HMACUtilities.ComputeHMACSHA256(value, HMACSecretKey);
-            string actual = HMACUtilities.ComputeHMACSHA256(value, HMACSecretKey);
-
-            Assert.Equal(expected, actual);
-            Assert.Equal(64, expected.Length);
-        }
-
-        [Theory]
-        [InlineData("The quick brown fox jumped.")]
-        [InlineData("Over the lazy dog.")]
-        public void CanGenerate384BitHMAC(string value)
-        {
-            string expected = HMACUtilities.ComputeHMACSHA384(value, HMACSecretKey);
-            string actual = HMACUtilities.ComputeHMACSHA384(value, HMACSecretKey);
-
-            Assert.Equal(expected, actual);
-            Assert.Equal(96, expected.Length);
-        }
-
-        [Theory]
-        [InlineData("The quick brown fox jumped.")]
-        [InlineData("Over the lazy dog.")]
-        public void CanGenerate512BitHMAC(string value)
-        {
-            string expected = HMACUtilities.ComputeHMACSHA512(value, HMACSecretKey);
-            string actual = HMACUtilities.ComputeHMACSHA512(value, HMACSecretKey);
-
-            Assert.Equal(expected, actual);
-            Assert.Equal(128, expected.Length);
-        }
+        string expected = HMACUtilities.ComputeHMACSHA384(value, HMACSecretKey);
+        string actual = HMACUtilities.ComputeHMACSHA384(value, HMACSecretKey);
+
+        Assert.Equal(expected, actual);
+        Assert.Equal(96, expected.Length);
+    }
+
+    [Theory]
+    [InlineData("The quick brown fox jumped.")]
+    [InlineData("Over the lazy dog.")]
+    public void CanGenerate512BitHMAC(string value)
+    {
+        string expected = HMACUtilities.ComputeHMACSHA512(value, HMACSecretKey);
+        string actual = HMACUtilities.ComputeHMACSHA512(value, HMACSecretKey);
+
+        Assert.Equal(expected, actual);
+        Assert.Equal(128, expected.Length);
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/ImageSharp.Web.Tests.csproj b/tests/ImageSharp.Web.Tests/ImageSharp.Web.Tests.csproj
index ea578a88..8ce5cb2e 100644
--- a/tests/ImageSharp.Web.Tests/ImageSharp.Web.Tests.csproj
+++ b/tests/ImageSharp.Web.Tests/ImageSharp.Web.Tests.csproj
@@ -3,9 +3,21 @@
   <PropertyGroup>
     <RootNamespace>SixLabors.ImageSharp.Web.Tests</RootNamespace>
     <AssemblyName>SixLabors.ImageSharp.Web.Tests</AssemblyName>
-    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
+  <Choose>
+    <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
+      <PropertyGroup>
+        <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <TargetFrameworks>net6.0</TargetFrameworks>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.TestHost" />
   </ItemGroup>
diff --git a/tests/ImageSharp.Web.Tests/Processing/AWSS3StorageCacheServerTests.cs b/tests/ImageSharp.Web.Tests/Processing/AWSS3StorageCacheServerTests.cs
index 8d1d9611..f7ef1b4b 100644
--- a/tests/ImageSharp.Web.Tests/Processing/AWSS3StorageCacheServerTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processing/AWSS3StorageCacheServerTests.cs
@@ -1,16 +1,15 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Web.Tests.TestUtilities;
 using Xunit.Abstractions;
 
-namespace SixLabors.ImageSharp.Web.Tests.Processing
+namespace SixLabors.ImageSharp.Web.Tests.Processing;
+
+public class AWSS3StorageCacheServerTests : ServerTestBase<AWSS3StorageCacheTestServerFixture>
 {
-    public class AWSS3StorageCacheServerTests : ServerTestBase<AWSS3StorageCacheTestServerFixture>
+    public AWSS3StorageCacheServerTests(AWSS3StorageCacheTestServerFixture fixture, ITestOutputHelper outputHelper)
+        : base(fixture, outputHelper, TestConstants.AWSTestImage)
     {
-        public AWSS3StorageCacheServerTests(AWSS3StorageCacheTestServerFixture fixture, ITestOutputHelper outputHelper)
-            : base(fixture, outputHelper, TestConstants.AWSTestImage)
-        {
-        }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processing/AzureBlobStorageCacheServerTests.cs b/tests/ImageSharp.Web.Tests/Processing/AzureBlobStorageCacheServerTests.cs
index 130f6c27..cd95c9e4 100644
--- a/tests/ImageSharp.Web.Tests/Processing/AzureBlobStorageCacheServerTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processing/AzureBlobStorageCacheServerTests.cs
@@ -1,16 +1,15 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Web.Tests.TestUtilities;
 using Xunit.Abstractions;
 
-namespace SixLabors.ImageSharp.Web.Tests.Processing
+namespace SixLabors.ImageSharp.Web.Tests.Processing;
+
+public class AzureBlobStorageCacheServerTests : ServerTestBase<AzureBlobStorageCacheTestServerFixture>
 {
-    public class AzureBlobStorageCacheServerTests : ServerTestBase<AzureBlobStorageCacheTestServerFixture>
+    public AzureBlobStorageCacheServerTests(AzureBlobStorageCacheTestServerFixture fixture, ITestOutputHelper outputHelper)
+        : base(fixture, outputHelper, TestConstants.AzureTestImage)
     {
-        public AzureBlobStorageCacheServerTests(AzureBlobStorageCacheTestServerFixture fixture, ITestOutputHelper outputHelper)
-            : base(fixture, outputHelper, TestConstants.AzureTestImage)
-        {
-        }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processing/PhysicalFileSystemCacheAuthenticatedServerTests.cs b/tests/ImageSharp.Web.Tests/Processing/PhysicalFileSystemCacheAuthenticatedServerTests.cs
index 34e976ab..848b6b35 100644
--- a/tests/ImageSharp.Web.Tests/Processing/PhysicalFileSystemCacheAuthenticatedServerTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processing/PhysicalFileSystemCacheAuthenticatedServerTests.cs
@@ -1,16 +1,15 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Web.Tests.TestUtilities;
 using Xunit.Abstractions;
 
-namespace SixLabors.ImageSharp.Web.Tests.Processing
+namespace SixLabors.ImageSharp.Web.Tests.Processing;
+
+public class PhysicalFileSystemCacheAuthenticatedServerTests : AuthenticatedServerTestBase<PhysicalFileSystemCacheAuthenticatedTestServerFixture>
 {
-    public class PhysicalFileSystemCacheAuthenticatedServerTests : AuthenticatedServerTestBase<PhysicalFileSystemCacheAuthenticatedTestServerFixture>
+    public PhysicalFileSystemCacheAuthenticatedServerTests(PhysicalFileSystemCacheAuthenticatedTestServerFixture fixture, ITestOutputHelper outputHelper)
+        : base(fixture, outputHelper, TestConstants.PhysicalTestImage)
     {
-        public PhysicalFileSystemCacheAuthenticatedServerTests(PhysicalFileSystemCacheAuthenticatedTestServerFixture fixture, ITestOutputHelper outputHelper)
-            : base(fixture, outputHelper, TestConstants.PhysicalTestImage)
-        {
-        }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processing/PhysicalFileSystemCacheServerTests.cs b/tests/ImageSharp.Web.Tests/Processing/PhysicalFileSystemCacheServerTests.cs
index af71741c..ba54113f 100644
--- a/tests/ImageSharp.Web.Tests/Processing/PhysicalFileSystemCacheServerTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processing/PhysicalFileSystemCacheServerTests.cs
@@ -1,16 +1,15 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Web.Tests.TestUtilities;
 using Xunit.Abstractions;
 
-namespace SixLabors.ImageSharp.Web.Tests.Processing
+namespace SixLabors.ImageSharp.Web.Tests.Processing;
+
+public class PhysicalFileSystemCacheServerTests : ServerTestBase<PhysicalFileSystemCacheTestServerFixture>
 {
-    public class PhysicalFileSystemCacheServerTests : ServerTestBase<PhysicalFileSystemCacheTestServerFixture>
+    public PhysicalFileSystemCacheServerTests(PhysicalFileSystemCacheTestServerFixture fixture, ITestOutputHelper outputHelper)
+        : base(fixture, outputHelper, TestConstants.PhysicalTestImage)
     {
-        public PhysicalFileSystemCacheServerTests(PhysicalFileSystemCacheTestServerFixture fixture, ITestOutputHelper outputHelper)
-            : base(fixture, outputHelper, TestConstants.PhysicalTestImage)
-        {
-        }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processors/AutoOrientWebProcessorTests.cs b/tests/ImageSharp.Web.Tests/Processors/AutoOrientWebProcessorTests.cs
index 6c896882..de4b8919 100644
--- a/tests/ImageSharp.Web.Tests/Processors/AutoOrientWebProcessorTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processors/AutoOrientWebProcessorTests.cs
@@ -1,5 +1,5 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using System.Globalization;
 using SixLabors.ImageSharp.Formats.Png;
@@ -8,37 +8,35 @@
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Commands.Converters;
 using SixLabors.ImageSharp.Web.Processors;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Processors
+namespace SixLabors.ImageSharp.Web.Tests.Processors;
+
+public class AutoOrientWebProcessorTests
 {
-    public class AutoOrientWebProcessorTests
+    [Fact]
+    public void AutoOrientWebProcessor_UpdatesOrientation()
     {
-        [Fact]
-        public void AutoOrientWebProcessor_UpdatesOrientation()
-        {
-            CommandParser parser = new(new[] { new SimpleCommandConverter<bool>() });
-            CultureInfo culture = CultureInfo.InvariantCulture;
+        CommandParser parser = new(new[] { new SimpleCommandConverter<bool>() });
+        CultureInfo culture = CultureInfo.InvariantCulture;
 
-            CommandCollection commands = new()
-            {
-                { new(AutoOrientWebProcessor.AutoOrient, bool.TrueString) }
-            };
+        CommandCollection commands = new()
+        {
+            { new(AutoOrientWebProcessor.AutoOrient, bool.TrueString) }
+        };
 
-            const ushort tl = 1;
-            const ushort br = 3;
-            using var image = new Image<Rgba32>(1, 1);
-            image.Metadata.ExifProfile = new();
-            image.Metadata.ExifProfile.SetValue(ExifTag.Orientation, br);
+        const ushort tl = 1;
+        const ushort br = 3;
+        using var image = new Image<Rgba32>(1, 1);
+        image.Metadata.ExifProfile = new();
+        image.Metadata.ExifProfile.SetValue(ExifTag.Orientation, br);
 
-            IExifValue<ushort> orientation = image.Metadata.ExifProfile.GetValue(ExifTag.Orientation);
-            Assert.Equal(br, orientation.Value);
+        IExifValue<ushort> orientation = image.Metadata.ExifProfile.GetValue(ExifTag.Orientation);
+        Assert.Equal(br, orientation.Value);
 
-            using var formatted = new FormattedImage(image, PngFormat.Instance);
-            new AutoOrientWebProcessor().Process(formatted, null, commands, parser, culture);
+        using var formatted = new FormattedImage(image, PngFormat.Instance);
+        new AutoOrientWebProcessor().Process(formatted, null, commands, parser, culture);
 
-            orientation = image.Metadata.ExifProfile.GetValue(ExifTag.Orientation);
-            Assert.Equal(tl, orientation.Value);
-        }
+        orientation = image.Metadata.ExifProfile.GetValue(ExifTag.Orientation);
+        Assert.Equal(tl, orientation.Value);
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processors/BackgroundColorWebProcessorTests.cs b/tests/ImageSharp.Web.Tests/Processors/BackgroundColorWebProcessorTests.cs
index c72aed12..6ad05672 100644
--- a/tests/ImageSharp.Web.Tests/Processors/BackgroundColorWebProcessorTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processors/BackgroundColorWebProcessorTests.cs
@@ -1,5 +1,5 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using System.Globalization;
 using SixLabors.ImageSharp.Formats.Png;
@@ -7,48 +7,46 @@
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Commands.Converters;
 using SixLabors.ImageSharp.Web.Processors;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Processors
+namespace SixLabors.ImageSharp.Web.Tests.Processors;
+
+public class BackgroundColorWebProcessorTests
 {
-    public class BackgroundColorWebProcessorTests
+    [Fact]
+    public void BackgroundColorWebProcessor_UpdatesColor()
     {
-        [Fact]
-        public void BackgroundColorWebProcessor_UpdatesColor()
+        CommandParser parser = new(new[] { new ColorConverter() });
+        CultureInfo culture = CultureInfo.InvariantCulture;
+
+        CommandCollection commands = new()
         {
-            CommandParser parser = new(new[] { new ColorConverter() });
-            CultureInfo culture = CultureInfo.InvariantCulture;
+            { new(BackgroundColorWebProcessor.Color, nameof(Color.Orange)) }
+        };
 
-            CommandCollection commands = new()
-            {
-                { new(BackgroundColorWebProcessor.Color, nameof(Color.Orange)) }
-            };
+        using var image = new Image<Rgba32>(1, 1);
+        Assert.True(Color.Transparent.Equals(image[0, 0]));
 
-            using var image = new Image<Rgba32>(1, 1);
-            Assert.True(Color.Transparent.Equals(image[0, 0]));
+        using var formatted = new FormattedImage(image, PngFormat.Instance);
+        new BackgroundColorWebProcessor().Process(formatted, null, commands, parser, culture);
 
-            using var formatted = new FormattedImage(image, PngFormat.Instance);
-            new BackgroundColorWebProcessor().Process(formatted, null, commands, parser, culture);
+        Assert.True(Color.Orange.Equals(image[0, 0]));
+    }
 
-            Assert.True(Color.Orange.Equals(image[0, 0]));
-        }
+    [Theory]
+    [InlineData(nameof(Color.Orange))]
+    [InlineData(nameof(Color.Black))]
+    [InlineData(nameof(Color.Blue))]
+    [InlineData(nameof(Color.RebeccaPurple))]
+    public void BackgroundColorWebProcessor_CanReportAlphaRequirements(string color)
+    {
+        CommandParser parser = new(new[] { new ColorConverter() });
+        CultureInfo culture = CultureInfo.InvariantCulture;
 
-        [Theory]
-        [InlineData(nameof(Color.Orange))]
-        [InlineData(nameof(Color.Black))]
-        [InlineData(nameof(Color.Blue))]
-        [InlineData(nameof(Color.RebeccaPurple))]
-        public void BackgroundColorWebProcessor_CanReportAlphaRequirements(string color)
+        CommandCollection commands = new()
         {
-            CommandParser parser = new(new[] { new ColorConverter() });
-            CultureInfo culture = CultureInfo.InvariantCulture;
-
-            CommandCollection commands = new()
-            {
-                { new(BackgroundColorWebProcessor.Color, color) }
-            };
+            { new(BackgroundColorWebProcessor.Color, color) }
+        };
 
-            Assert.True(new BackgroundColorWebProcessor().RequiresTrueColorPixelFormat(commands, parser, culture));
-        }
+        Assert.True(new BackgroundColorWebProcessor().RequiresTrueColorPixelFormat(commands, parser, culture));
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processors/FormatWebProcessorTests.cs b/tests/ImageSharp.Web.Tests/Processors/FormatWebProcessorTests.cs
index 45c87af5..b54802e4 100644
--- a/tests/ImageSharp.Web.Tests/Processors/FormatWebProcessorTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processors/FormatWebProcessorTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.Extensions.Options;
 using SixLabors.ImageSharp.Formats.Bmp;
@@ -15,57 +13,55 @@
 using SixLabors.ImageSharp.Web.Commands.Converters;
 using SixLabors.ImageSharp.Web.Middleware;
 using SixLabors.ImageSharp.Web.Processors;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Processors
+namespace SixLabors.ImageSharp.Web.Tests.Processors;
+
+public class FormatWebProcessorTests
 {
-    public class FormatWebProcessorTests
+    public static TheoryData<string> FormatNameData { get; }
+        = new TheoryData<string>
+        {
+            { BmpFormat.Instance.Name },
+            { GifFormat.Instance.Name },
+            { PngFormat.Instance.Name },
+            { JpegFormat.Instance.Name },
+            { WebpFormat.Instance.Name },
+        };
+
+    [Fact]
+    public void FormatWebProcessor_UpdatesFormat()
     {
-        public static TheoryData<string> FormatNameData { get; }
-            = new TheoryData<string>
-            {
-                { BmpFormat.Instance.Name },
-                { GifFormat.Instance.Name },
-                { PngFormat.Instance.Name },
-                { JpegFormat.Instance.Name },
-                { WebpFormat.Instance.Name },
-            };
+        CommandParser parser = new(Array.Empty<ICommandConverter>());
+        CultureInfo culture = CultureInfo.InvariantCulture;
 
-        [Fact]
-        public void FormatWebProcessor_UpdatesFormat()
+        CommandCollection commands = new()
         {
-            CommandParser parser = new(Array.Empty<ICommandConverter>());
-            CultureInfo culture = CultureInfo.InvariantCulture;
+            { new(FormatWebProcessor.Format, GifFormat.Instance.Name) },
+        };
 
-            CommandCollection commands = new()
-            {
-                { new(FormatWebProcessor.Format, GifFormat.Instance.Name) },
-            };
+        using var image = new Image<Rgba32>(1, 1);
+        using var formatted = new FormattedImage(image, PngFormat.Instance);
+        Assert.Equal(formatted.Format, PngFormat.Instance);
 
-            using var image = new Image<Rgba32>(1, 1);
-            using var formatted = new FormattedImage(image, PngFormat.Instance);
-            Assert.Equal(formatted.Format, PngFormat.Instance);
+        new FormatWebProcessor(Options.Create(new ImageSharpMiddlewareOptions()))
+            .Process(formatted, null, commands, parser, culture);
 
-            new FormatWebProcessor(Options.Create(new ImageSharpMiddlewareOptions()))
-                .Process(formatted, null, commands, parser, culture);
+        Assert.Equal(formatted.Format, GifFormat.Instance);
+    }
 
-            Assert.Equal(formatted.Format, GifFormat.Instance);
-        }
+    [Theory]
+    [MemberData(nameof(FormatNameData))]
+    public void FormatWebProcessor_CanReportAlphaRequirements(string format)
+    {
+        CommandParser parser = new(Array.Empty<ICommandConverter>());
+        CultureInfo culture = CultureInfo.InvariantCulture;
 
-        [Theory]
-        [MemberData(nameof(FormatNameData))]
-        public void FormatWebProcessor_CanReportAlphaRequirements(string format)
+        CommandCollection commands = new()
         {
-            CommandParser parser = new(Array.Empty<ICommandConverter>());
-            CultureInfo culture = CultureInfo.InvariantCulture;
-
-            CommandCollection commands = new()
-            {
-                { new(FormatWebProcessor.Format, format) },
-            };
+            { new(FormatWebProcessor.Format, format) },
+        };
 
-            FormatWebProcessor processor = new(Options.Create(new ImageSharpMiddlewareOptions()));
-            Assert.False(processor.RequiresTrueColorPixelFormat(commands, parser, culture));
-        }
+        FormatWebProcessor processor = new(Options.Create(new ImageSharpMiddlewareOptions()));
+        Assert.False(processor.RequiresTrueColorPixelFormat(commands, parser, culture));
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processors/FormattedImageTests.cs b/tests/ImageSharp.Web.Tests/Processors/FormattedImageTests.cs
index d8ce3d7c..66ed89eb 100644
--- a/tests/ImageSharp.Web.Tests/Processors/FormattedImageTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processors/FormattedImageTests.cs
@@ -1,72 +1,69 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
 using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.PixelFormats;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Processors
+namespace SixLabors.ImageSharp.Web.Tests.Processors;
+
+public class FormattedImageTests
 {
-    public class FormattedImageTests
+    [Fact]
+    public void ConstructorSetsProperties()
     {
-        [Fact]
-        public void ConstructorSetsProperties()
-        {
-            using var image = new Image<Rgba32>(1, 1);
-            using var formatted = new FormattedImage(image, JpegFormat.Instance);
+        using var image = new Image<Rgba32>(1, 1);
+        using var formatted = new FormattedImage(image, JpegFormat.Instance);
 
-            Assert.NotNull(formatted.Image);
-            Assert.Equal(image, formatted.Image);
+        Assert.NotNull(formatted.Image);
+        Assert.Equal(image, formatted.Image);
 
-            Assert.NotNull(formatted.Format);
-            Assert.Equal(JpegFormat.Instance, formatted.Format);
+        Assert.NotNull(formatted.Format);
+        Assert.Equal(JpegFormat.Instance, formatted.Format);
 
-            Assert.NotNull(formatted.Encoder);
-            Assert.Equal(typeof(JpegEncoder), formatted.Encoder.GetType());
-        }
+        Assert.NotNull(formatted.Encoder);
+        Assert.Equal(typeof(JpegEncoder), formatted.Encoder.GetType());
+    }
 
-        [Fact]
-        public void CanSetFormat()
-        {
-            using var image = new Image<Rgba32>(1, 1);
-            using var formatted = new FormattedImage(image, JpegFormat.Instance);
+    [Fact]
+    public void CanSetFormat()
+    {
+        using var image = new Image<Rgba32>(1, 1);
+        using var formatted = new FormattedImage(image, JpegFormat.Instance);
 
-            Assert.NotNull(formatted.Format);
-            Assert.Equal(JpegFormat.Instance, formatted.Format);
+        Assert.NotNull(formatted.Format);
+        Assert.Equal(JpegFormat.Instance, formatted.Format);
 
-            Assert.Throws<ArgumentNullException>(() => formatted.Format = null);
+        Assert.Throws<ArgumentNullException>(() => formatted.Format = null);
 
-            formatted.Format = PngFormat.Instance;
-            Assert.Equal(PngFormat.Instance, formatted.Format);
-            Assert.Equal(typeof(PngEncoder), formatted.Encoder.GetType());
-        }
+        formatted.Format = PngFormat.Instance;
+        Assert.Equal(PngFormat.Instance, formatted.Format);
+        Assert.Equal(typeof(PngEncoder), formatted.Encoder.GetType());
+    }
 
-        [Fact]
-        public void CanSetEncoder()
-        {
-            using var image = new Image<Rgba32>(1, 1);
-            using var formatted = new FormattedImage(image, PngFormat.Instance);
+    [Fact]
+    public void CanSetEncoder()
+    {
+        using var image = new Image<Rgba32>(1, 1);
+        using var formatted = new FormattedImage(image, PngFormat.Instance);
 
-            Assert.NotNull(formatted.Format);
-            Assert.Equal(PngFormat.Instance, formatted.Format);
+        Assert.NotNull(formatted.Format);
+        Assert.Equal(PngFormat.Instance, formatted.Format);
 
-            Assert.Throws<ArgumentNullException>(() => formatted.Encoder = null);
-            Assert.Throws<ArgumentException>(() => formatted.Encoder = new JpegEncoder());
+        Assert.Throws<ArgumentNullException>(() => formatted.Encoder = null);
+        Assert.Throws<ArgumentException>(() => formatted.Encoder = new JpegEncoder());
 
-            formatted.Format = JpegFormat.Instance;
-            Assert.Equal(typeof(JpegEncoder), formatted.Encoder.GetType());
+        formatted.Format = JpegFormat.Instance;
+        Assert.Equal(typeof(JpegEncoder), formatted.Encoder.GetType());
 
-            JpegColorType current = ((JpegEncoder)formatted.Encoder).ColorType.GetValueOrDefault();
+        JpegColorType current = ((JpegEncoder)formatted.Encoder).ColorType.GetValueOrDefault();
 
-            Assert.Equal(JpegColorType.YCbCrRatio420, current);
-            formatted.Encoder = new JpegEncoder { ColorType = JpegColorType.YCbCrRatio444 };
+        Assert.Equal(JpegColorType.YCbCrRatio420, current);
+        formatted.Encoder = new JpegEncoder { ColorType = JpegColorType.YCbCrRatio444 };
 
-            JpegColorType replacement = ((JpegEncoder)formatted.Encoder).ColorType.GetValueOrDefault();
+        JpegColorType replacement = ((JpegEncoder)formatted.Encoder).ColorType.GetValueOrDefault();
 
-            Assert.NotEqual(current, replacement);
-            Assert.Equal(JpegColorType.YCbCrRatio444, replacement);
-        }
+        Assert.NotEqual(current, replacement);
+        Assert.Equal(JpegColorType.YCbCrRatio444, replacement);
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processors/QualityWebProcessorTests.cs b/tests/ImageSharp.Web.Tests/Processors/QualityWebProcessorTests.cs
index 853b18ad..d4bae8c1 100644
--- a/tests/ImageSharp.Web.Tests/Processors/QualityWebProcessorTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processors/QualityWebProcessorTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
 using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Formats.Webp;
@@ -10,80 +8,78 @@
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Commands.Converters;
 using SixLabors.ImageSharp.Web.Processors;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Processors
+namespace SixLabors.ImageSharp.Web.Tests.Processors;
+
+public class QualityWebProcessorTests
 {
-    public class QualityWebProcessorTests
+    private readonly Random random = new();
+
+    [Fact]
+    public void QualityWebProcessor_UpdatesJpegQuality()
     {
-        private readonly Random random = new();
+        CommandParser parser = new(new[] { new IntegralNumberConverter<int>() });
+        CultureInfo culture = CultureInfo.InvariantCulture;
 
-        [Fact]
-        public void QualityWebProcessor_UpdatesJpegQuality()
+        CommandCollection commands = new()
         {
-            CommandParser parser = new(new[] { new IntegralNumberConverter<int>() });
-            CultureInfo culture = CultureInfo.InvariantCulture;
+            { new(QualityWebProcessor.Quality, "42") },
+        };
 
-            CommandCollection commands = new()
-            {
-                { new(QualityWebProcessor.Quality, "42") },
-            };
+        using var image = new Image<Rgba32>(1, 1);
+        using var formatted = new FormattedImage(image, JpegFormat.Instance);
+        Assert.Equal(JpegFormat.Instance, formatted.Format);
+        Assert.Equal(typeof(JpegEncoder), formatted.Encoder.GetType());
 
-            using var image = new Image<Rgba32>(1, 1);
-            using var formatted = new FormattedImage(image, JpegFormat.Instance);
-            Assert.Equal(JpegFormat.Instance, formatted.Format);
-            Assert.Equal(typeof(JpegEncoder), formatted.Encoder.GetType());
+        new QualityWebProcessor()
+            .Process(formatted, null, commands, parser, culture);
 
-            new QualityWebProcessor()
-                .Process(formatted, null, commands, parser, culture);
+        Assert.Equal(JpegFormat.Instance, formatted.Format);
+        Assert.Equal(42, ((JpegEncoder)formatted.Encoder).Quality);
+    }
 
-            Assert.Equal(JpegFormat.Instance, formatted.Format);
-            Assert.Equal(42, ((JpegEncoder)formatted.Encoder).Quality);
-        }
+    [Fact]
+    public void QualityWebProcessor_UpdatesWebpQuality()
+    {
+        CommandParser parser = new(new[] { new IntegralNumberConverter<int>() });
+        CultureInfo culture = CultureInfo.InvariantCulture;
 
-        [Fact]
-        public void QualityWebProcessor_UpdatesWebpQuality()
+        CommandCollection commands = new()
         {
-            CommandParser parser = new(new[] { new IntegralNumberConverter<int>() });
-            CultureInfo culture = CultureInfo.InvariantCulture;
-
-            CommandCollection commands = new()
             {
-                {
-                    new(QualityWebProcessor.Quality, "42")
-                },
-            };
-
-            using var image = new Image<Rgba32>(1, 1);
-            using var formatted = new FormattedImage(image, WebpFormat.Instance);
-            Assert.Equal(WebpFormat.Instance, formatted.Format);
-            Assert.Equal(typeof(WebpEncoder), formatted.Encoder.GetType());
-
-            new QualityWebProcessor()
-                .Process(formatted, null, commands, parser, culture);
-
-            Assert.Equal(WebpFormat.Instance, formatted.Format);
-            Assert.Equal(42, ((WebpEncoder)formatted.Encoder).Quality);
-            Assert.Equal(WebpFileFormatType.Lossy, ((WebpEncoder)formatted.Encoder).FileFormat);
-        }
-
-        [Fact]
-        public void QualityWebProcessor_CanReportAlphaRequirements()
+                new(QualityWebProcessor.Quality, "42")
+            },
+        };
+
+        using var image = new Image<Rgba32>(1, 1);
+        using var formatted = new FormattedImage(image, WebpFormat.Instance);
+        Assert.Equal(WebpFormat.Instance, formatted.Format);
+        Assert.Equal(typeof(WebpEncoder), formatted.Encoder.GetType());
+
+        new QualityWebProcessor()
+            .Process(formatted, null, commands, parser, culture);
+
+        Assert.Equal(WebpFormat.Instance, formatted.Format);
+        Assert.Equal(42, ((WebpEncoder)formatted.Encoder).Quality);
+        Assert.Equal(WebpFileFormatType.Lossy, ((WebpEncoder)formatted.Encoder).FileFormat);
+    }
+
+    [Fact]
+    public void QualityWebProcessor_CanReportAlphaRequirements()
+    {
+        var converters = new List<ICommandConverter>
         {
-            var converters = new List<ICommandConverter>
-            {
-                new IntegralNumberConverter<int>(),
-            };
+            new IntegralNumberConverter<int>(),
+        };
 
-            var parser = new CommandParser(converters);
-            CultureInfo culture = CultureInfo.InvariantCulture;
+        var parser = new CommandParser(converters);
+        CultureInfo culture = CultureInfo.InvariantCulture;
 
-            CommandCollection commands = new()
-            {
-                { new(QualityWebProcessor.Quality, this.random.Next(1, 100).ToString()) },
-            };
+        CommandCollection commands = new()
+        {
+            { new(QualityWebProcessor.Quality, this.random.Next(1, 100).ToString()) },
+        };
 
-            Assert.False(new QualityWebProcessor().RequiresTrueColorPixelFormat(commands, parser, culture));
-        }
+        Assert.False(new QualityWebProcessor().RequiresTrueColorPixelFormat(commands, parser, culture));
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processors/ResizeWebProcessorTests.cs b/tests/ImageSharp.Web.Tests/Processors/ResizeWebProcessorTests.cs
index 6205f350..62ae8d28 100644
--- a/tests/ImageSharp.Web.Tests/Processors/ResizeWebProcessorTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processors/ResizeWebProcessorTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Numerics;
 using SixLabors.ImageSharp.Formats.Png;
@@ -12,284 +10,282 @@
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Commands.Converters;
 using SixLabors.ImageSharp.Web.Processors;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Processors
+namespace SixLabors.ImageSharp.Web.Tests.Processors;
+
+public class ResizeWebProcessorTests
 {
-    public class ResizeWebProcessorTests
+    [Theory]
+    [InlineData(nameof(KnownResamplers.Bicubic))]
+    [InlineData(nameof(KnownResamplers.Box))]
+    [InlineData(nameof(KnownResamplers.CatmullRom))]
+    [InlineData(nameof(KnownResamplers.Hermite))]
+    [InlineData(nameof(KnownResamplers.Lanczos2))]
+    [InlineData(nameof(KnownResamplers.Lanczos3))]
+    [InlineData(nameof(KnownResamplers.Lanczos5))]
+    [InlineData(nameof(KnownResamplers.Lanczos8))]
+    [InlineData(nameof(KnownResamplers.MitchellNetravali))]
+    [InlineData(nameof(KnownResamplers.NearestNeighbor))]
+    [InlineData(nameof(KnownResamplers.Robidoux))]
+    [InlineData(nameof(KnownResamplers.RobidouxSharp))]
+    [InlineData(nameof(KnownResamplers.Spline))]
+    [InlineData(nameof(KnownResamplers.Triangle))]
+    [InlineData(nameof(KnownResamplers.Welch))]
+    public void ResizeWebProcessor_UpdatesSize(string resampler)
     {
-        [Theory]
-        [InlineData(nameof(KnownResamplers.Bicubic))]
-        [InlineData(nameof(KnownResamplers.Box))]
-        [InlineData(nameof(KnownResamplers.CatmullRom))]
-        [InlineData(nameof(KnownResamplers.Hermite))]
-        [InlineData(nameof(KnownResamplers.Lanczos2))]
-        [InlineData(nameof(KnownResamplers.Lanczos3))]
-        [InlineData(nameof(KnownResamplers.Lanczos5))]
-        [InlineData(nameof(KnownResamplers.Lanczos8))]
-        [InlineData(nameof(KnownResamplers.MitchellNetravali))]
-        [InlineData(nameof(KnownResamplers.NearestNeighbor))]
-        [InlineData(nameof(KnownResamplers.Robidoux))]
-        [InlineData(nameof(KnownResamplers.RobidouxSharp))]
-        [InlineData(nameof(KnownResamplers.Spline))]
-        [InlineData(nameof(KnownResamplers.Triangle))]
-        [InlineData(nameof(KnownResamplers.Welch))]
-        public void ResizeWebProcessor_UpdatesSize(string resampler)
+        const int width = 4;
+        const int height = 6;
+
+        var converters = new List<ICommandConverter>
+        {
+            new IntegralNumberConverter<uint>(),
+            new ArrayConverter<float>(),
+            new EnumConverter(),
+            new SimpleCommandConverter<bool>(),
+            new SimpleCommandConverter<float>(),
+            new ColorConverter()
+        };
+
+        var parser = new CommandParser(converters);
+        CultureInfo culture = CultureInfo.InvariantCulture;
+
+        CommandCollection commands = new()
         {
-            const int width = 4;
-            const int height = 6;
+            // We only need to do this for the unit tests.
+            // Commands generated via URL will automatically be converted to lowecase
+            { new(ResizeWebProcessor.Sampler, resampler.ToLowerInvariant()) },
+            { new(ResizeWebProcessor.Width, width.ToString()) },
+            { new(ResizeWebProcessor.Height, height.ToString()) },
+            { new(ResizeWebProcessor.Xy, "0,0") },
+            { new(ResizeWebProcessor.Mode, nameof(ResizeMode.Stretch)) }
+        };
+
+        using var image = new Image<Rgba32>(1, 1);
+        using var formatted = new FormattedImage(image, PngFormat.Instance);
+        new ResizeWebProcessor().Process(formatted, null, commands, parser, culture);
+
+        Assert.Equal(width, image.Width);
+        Assert.Equal(height, image.Height);
+    }
 
-            var converters = new List<ICommandConverter>
-            {
-                new IntegralNumberConverter<uint>(),
-                new ArrayConverter<float>(),
-                new EnumConverter(),
-                new SimpleCommandConverter<bool>(),
-                new SimpleCommandConverter<float>(),
-                new ColorConverter()
-            };
+    [Theory]
+    [InlineData(ExifOrientationMode.Unknown, false)]
+    [InlineData(ExifOrientationMode.TopLeft, false)]
+    [InlineData(ExifOrientationMode.TopRight, false)]
+    [InlineData(ExifOrientationMode.BottomRight, false)]
+    [InlineData(ExifOrientationMode.BottomLeft, false)]
+    [InlineData(ExifOrientationMode.LeftTop, true)]
+    [InlineData(ExifOrientationMode.RightTop, true)]
+    [InlineData(ExifOrientationMode.RightBottom, true)]
+    [InlineData(ExifOrientationMode.LeftBottom, true)]
+    public void ResizeWebProcessor_RespectsOrientation_Size(ushort orientation, bool rotated)
+    {
+        const int width = 4;
+        const int height = 6;
 
-            var parser = new CommandParser(converters);
-            CultureInfo culture = CultureInfo.InvariantCulture;
+        var converters = new List<ICommandConverter>
+        {
+            new IntegralNumberConverter<uint>(),
+            new ArrayConverter<float>(),
+            new EnumConverter(),
+            new SimpleCommandConverter<bool>(),
+            new SimpleCommandConverter<float>(),
+            new ColorConverter()
+        };
+
+        var parser = new CommandParser(converters);
+        CultureInfo culture = CultureInfo.InvariantCulture;
+
+        CommandCollection commands = new()
+        {
+            { new(ResizeWebProcessor.Width, width.ToString()) },
+            { new(ResizeWebProcessor.Height, height.ToString()) },
+            { new(ResizeWebProcessor.Mode, nameof(ResizeMode.Stretch)) }
+        };
 
-            CommandCollection commands = new()
-            {
-                // We only need to do this for the unit tests.
-                // Commands generated via URL will automatically be converted to lowecase
-                { new(ResizeWebProcessor.Sampler, resampler.ToLowerInvariant()) },
-                { new(ResizeWebProcessor.Width, width.ToString()) },
-                { new(ResizeWebProcessor.Height, height.ToString()) },
-                { new(ResizeWebProcessor.Xy, "0,0") },
-                { new(ResizeWebProcessor.Mode, nameof(ResizeMode.Stretch)) }
-            };
+        using var image = new Image<Rgba32>(1, 1);
+        image.Metadata.ExifProfile = new();
+        image.Metadata.ExifProfile.SetValue(ExifTag.Orientation, orientation);
 
-            using var image = new Image<Rgba32>(1, 1);
-            using var formatted = new FormattedImage(image, PngFormat.Instance);
-            new ResizeWebProcessor().Process(formatted, null, commands, parser, culture);
+        using var formatted = new FormattedImage(image, PngFormat.Instance);
+        new ResizeWebProcessor().Process(formatted, null, commands, parser, culture);
 
+        if (rotated)
+        {
+            Assert.Equal(height, image.Width);
+            Assert.Equal(width, image.Height);
+        }
+        else
+        {
             Assert.Equal(width, image.Width);
             Assert.Equal(height, image.Height);
         }
+    }
 
-        [Theory]
-        [InlineData(ExifOrientationMode.Unknown, false)]
-        [InlineData(ExifOrientationMode.TopLeft, false)]
-        [InlineData(ExifOrientationMode.TopRight, false)]
-        [InlineData(ExifOrientationMode.BottomRight, false)]
-        [InlineData(ExifOrientationMode.BottomLeft, false)]
-        [InlineData(ExifOrientationMode.LeftTop, true)]
-        [InlineData(ExifOrientationMode.RightTop, true)]
-        [InlineData(ExifOrientationMode.RightBottom, true)]
-        [InlineData(ExifOrientationMode.LeftBottom, true)]
-        public void ResizeWebProcessor_RespectsOrientation_Size(ushort orientation, bool rotated)
-        {
-            const int width = 4;
-            const int height = 6;
-
-            var converters = new List<ICommandConverter>
-            {
-                new IntegralNumberConverter<uint>(),
-                new ArrayConverter<float>(),
-                new EnumConverter(),
-                new SimpleCommandConverter<bool>(),
-                new SimpleCommandConverter<float>(),
-                new ColorConverter()
-            };
-
-            var parser = new CommandParser(converters);
-            CultureInfo culture = CultureInfo.InvariantCulture;
-
-            CommandCollection commands = new()
-            {
-                { new(ResizeWebProcessor.Width, width.ToString()) },
-                { new(ResizeWebProcessor.Height, height.ToString()) },
-                { new(ResizeWebProcessor.Mode, nameof(ResizeMode.Stretch)) }
-            };
-
-            using var image = new Image<Rgba32>(1, 1);
-            image.Metadata.ExifProfile = new();
-            image.Metadata.ExifProfile.SetValue(ExifTag.Orientation, orientation);
-
-            using var formatted = new FormattedImage(image, PngFormat.Instance);
-            new ResizeWebProcessor().Process(formatted, null, commands, parser, culture);
-
-            if (rotated)
-            {
-                Assert.Equal(height, image.Width);
-                Assert.Equal(width, image.Height);
-            }
-            else
-            {
-                Assert.Equal(width, image.Width);
-                Assert.Equal(height, image.Height);
-            }
-        }
+    [Theory]
+    [InlineData(ExifOrientationMode.Unknown)]
+    [InlineData(ExifOrientationMode.TopLeft)]
+    [InlineData(ExifOrientationMode.TopRight)]
+    [InlineData(ExifOrientationMode.BottomRight)]
+    [InlineData(ExifOrientationMode.BottomLeft)]
+    [InlineData(ExifOrientationMode.LeftTop)]
+    [InlineData(ExifOrientationMode.RightTop)]
+    [InlineData(ExifOrientationMode.RightBottom)]
+    [InlineData(ExifOrientationMode.LeftBottom)]
+    public void ResizeWebProcessor_RespectsOrientation_Center(ushort orientation)
+    {
+        const int width = 4;
+        const int height = 6;
+        const float x = .25F;
+        const float y = .5F;
 
-        [Theory]
-        [InlineData(ExifOrientationMode.Unknown)]
-        [InlineData(ExifOrientationMode.TopLeft)]
-        [InlineData(ExifOrientationMode.TopRight)]
-        [InlineData(ExifOrientationMode.BottomRight)]
-        [InlineData(ExifOrientationMode.BottomLeft)]
-        [InlineData(ExifOrientationMode.LeftTop)]
-        [InlineData(ExifOrientationMode.RightTop)]
-        [InlineData(ExifOrientationMode.RightBottom)]
-        [InlineData(ExifOrientationMode.LeftBottom)]
-        public void ResizeWebProcessor_RespectsOrientation_Center(ushort orientation)
+        var converters = new List<ICommandConverter>
         {
-            const int width = 4;
-            const int height = 6;
-            const float x = .25F;
-            const float y = .5F;
-
-            var converters = new List<ICommandConverter>
-            {
-                new IntegralNumberConverter<uint>(),
-                new ArrayConverter<float>(),
-                new EnumConverter(),
-                new SimpleCommandConverter<bool>(),
-                new SimpleCommandConverter<float>(),
-                new ColorConverter()
-            };
-
-            var parser = new CommandParser(converters);
-            CultureInfo culture = CultureInfo.InvariantCulture;
+            new IntegralNumberConverter<uint>(),
+            new ArrayConverter<float>(),
+            new EnumConverter(),
+            new SimpleCommandConverter<bool>(),
+            new SimpleCommandConverter<float>(),
+            new ColorConverter()
+        };
+
+        var parser = new CommandParser(converters);
+        CultureInfo culture = CultureInfo.InvariantCulture;
+
+        CommandCollection commands = new()
+        {
+            { new(ResizeWebProcessor.Width, width.ToString()) },
+            { new(ResizeWebProcessor.Height, height.ToString()) },
+            { new(ResizeWebProcessor.Xy, FormattableString.Invariant($"{x},{y}")) },
+            { new(ResizeWebProcessor.Mode, nameof(ResizeMode.Stretch)) }
+        };
+
+        using var image = new Image<Rgba32>(3, 3);
+        image.Metadata.ExifProfile = new();
+        image.Metadata.ExifProfile.SetValue(ExifTag.Orientation, orientation);
+        using var formatted = new FormattedImage(image, PngFormat.Instance);
+
+        PointF expected = ExifOrientationUtilities.Transform(new Vector2(x, y), Vector2.Zero, Vector2.One, orientation);
+        ResizeOptions options = ResizeWebProcessor.GetResizeOptions(formatted, commands, parser, culture);
+        Assert.Equal(expected, options.CenterCoordinates);
+    }
 
+    [Theory]
+    [InlineData(ExifOrientationMode.Unknown)]
+    [InlineData(ExifOrientationMode.TopLeft)]
+    [InlineData(ExifOrientationMode.TopRight)]
+    [InlineData(ExifOrientationMode.BottomRight)]
+    [InlineData(ExifOrientationMode.BottomLeft)]
+    [InlineData(ExifOrientationMode.LeftTop)]
+    [InlineData(ExifOrientationMode.RightTop)]
+    [InlineData(ExifOrientationMode.RightBottom)]
+    [InlineData(ExifOrientationMode.LeftBottom)]
+    public void ResizeWebProcessor_RespectsOrientation_Anchor(ushort orientation)
+    {
+        var converters = new List<ICommandConverter>
+        {
+            new IntegralNumberConverter<uint>(),
+            new ArrayConverter<float>(),
+            new EnumConverter(),
+            new SimpleCommandConverter<bool>(),
+            new SimpleCommandConverter<float>(),
+            new ColorConverter()
+        };
+
+        var parser = new CommandParser(converters);
+        CultureInfo culture = CultureInfo.InvariantCulture;
+
+        using Image<Rgba32> image = new(1, 1);
+        image.Metadata.ExifProfile = new();
+        image.Metadata.ExifProfile.SetValue(ExifTag.Orientation, orientation);
+        using FormattedImage formatted = new(image, PngFormat.Instance);
+
+        foreach (AnchorPositionMode anchor in (AnchorPositionMode[])Enum.GetValues(typeof(AnchorPositionMode)))
+        {
             CommandCollection commands = new()
             {
-                { new(ResizeWebProcessor.Width, width.ToString()) },
-                { new(ResizeWebProcessor.Height, height.ToString()) },
-                { new(ResizeWebProcessor.Xy, FormattableString.Invariant($"{x},{y}")) },
-                { new(ResizeWebProcessor.Mode, nameof(ResizeMode.Stretch)) }
+                { new(ResizeWebProcessor.Width, 4.ToString()) },
+                { new(ResizeWebProcessor.Height, 6.ToString()) },
+                { new(ResizeWebProcessor.Mode, nameof(ResizeMode.Stretch)) },
+                { new(ResizeWebProcessor.Anchor, anchor.ToString()) },
             };
 
-            using var image = new Image<Rgba32>(3, 3);
-            image.Metadata.ExifProfile = new();
-            image.Metadata.ExifProfile.SetValue(ExifTag.Orientation, orientation);
-            using var formatted = new FormattedImage(image, PngFormat.Instance);
-
-            PointF expected = ExifOrientationUtilities.Transform(new Vector2(x, y), Vector2.Zero, Vector2.One, orientation);
+            AnchorPositionMode expected = ExifOrientationUtilities.Transform(anchor, orientation);
             ResizeOptions options = ResizeWebProcessor.GetResizeOptions(formatted, commands, parser, culture);
-            Assert.Equal(expected, options.CenterCoordinates);
+            Assert.Equal(expected, options.Position);
         }
+    }
 
-        [Theory]
-        [InlineData(ExifOrientationMode.Unknown)]
-        [InlineData(ExifOrientationMode.TopLeft)]
-        [InlineData(ExifOrientationMode.TopRight)]
-        [InlineData(ExifOrientationMode.BottomRight)]
-        [InlineData(ExifOrientationMode.BottomLeft)]
-        [InlineData(ExifOrientationMode.LeftTop)]
-        [InlineData(ExifOrientationMode.RightTop)]
-        [InlineData(ExifOrientationMode.RightBottom)]
-        [InlineData(ExifOrientationMode.LeftBottom)]
-        public void ResizeWebProcessor_RespectsOrientation_Anchor(ushort orientation)
-        {
-            var converters = new List<ICommandConverter>
-            {
-                new IntegralNumberConverter<uint>(),
-                new ArrayConverter<float>(),
-                new EnumConverter(),
-                new SimpleCommandConverter<bool>(),
-                new SimpleCommandConverter<float>(),
-                new ColorConverter()
-            };
-
-            var parser = new CommandParser(converters);
-            CultureInfo culture = CultureInfo.InvariantCulture;
-
-            using Image<Rgba32> image = new(1, 1);
-            image.Metadata.ExifProfile = new();
-            image.Metadata.ExifProfile.SetValue(ExifTag.Orientation, orientation);
-            using FormattedImage formatted = new(image, PngFormat.Instance);
-
-            foreach (AnchorPositionMode anchor in (AnchorPositionMode[])Enum.GetValues(typeof(AnchorPositionMode)))
-            {
-                CommandCollection commands = new()
-                {
-                    { new(ResizeWebProcessor.Width, 4.ToString()) },
-                    { new(ResizeWebProcessor.Height, 6.ToString()) },
-                    { new(ResizeWebProcessor.Mode, nameof(ResizeMode.Stretch)) },
-                    { new(ResizeWebProcessor.Anchor, anchor.ToString()) },
-                };
-
-                AnchorPositionMode expected = ExifOrientationUtilities.Transform(anchor, orientation);
-                ResizeOptions options = ResizeWebProcessor.GetResizeOptions(formatted, commands, parser, culture);
-                Assert.Equal(expected, options.Position);
-            }
-        }
+    [Theory]
+    [InlineData(ExifOrientationMode.Unknown)]
+    [InlineData(ExifOrientationMode.TopLeft)]
+    [InlineData(ExifOrientationMode.TopRight)]
+    [InlineData(ExifOrientationMode.BottomRight)]
+    [InlineData(ExifOrientationMode.BottomLeft)]
+    [InlineData(ExifOrientationMode.LeftTop)]
+    [InlineData(ExifOrientationMode.RightTop)]
+    [InlineData(ExifOrientationMode.RightBottom)]
+    [InlineData(ExifOrientationMode.LeftBottom)]
+    public void ResizeWebProcessor_CanIgnoreOrientation(ushort orientation)
+    {
+        const int width = 4;
+        const int height = 6;
 
-        [Theory]
-        [InlineData(ExifOrientationMode.Unknown)]
-        [InlineData(ExifOrientationMode.TopLeft)]
-        [InlineData(ExifOrientationMode.TopRight)]
-        [InlineData(ExifOrientationMode.BottomRight)]
-        [InlineData(ExifOrientationMode.BottomLeft)]
-        [InlineData(ExifOrientationMode.LeftTop)]
-        [InlineData(ExifOrientationMode.RightTop)]
-        [InlineData(ExifOrientationMode.RightBottom)]
-        [InlineData(ExifOrientationMode.LeftBottom)]
-        public void ResizeWebProcessor_CanIgnoreOrientation(ushort orientation)
+        var converters = new List<ICommandConverter>
         {
-            const int width = 4;
-            const int height = 6;
-
-            var converters = new List<ICommandConverter>
-            {
-                new IntegralNumberConverter<uint>(),
-                new ArrayConverter<float>(),
-                new EnumConverter(),
-                new SimpleCommandConverter<bool>(),
-                new SimpleCommandConverter<float>(),
-                new ColorConverter()
-            };
-
-            var parser = new CommandParser(converters);
-            CultureInfo culture = CultureInfo.InvariantCulture;
-
-            CommandCollection commands = new()
-            {
-                { new(ResizeWebProcessor.Width, width.ToString()) },
-                { new(ResizeWebProcessor.Height, height.ToString()) },
-                { new(ResizeWebProcessor.Mode, nameof(ResizeMode.Stretch)) },
-                { new(ResizeWebProcessor.Orient, bool.FalseString) }
-            };
+            new IntegralNumberConverter<uint>(),
+            new ArrayConverter<float>(),
+            new EnumConverter(),
+            new SimpleCommandConverter<bool>(),
+            new SimpleCommandConverter<float>(),
+            new ColorConverter()
+        };
+
+        var parser = new CommandParser(converters);
+        CultureInfo culture = CultureInfo.InvariantCulture;
+
+        CommandCollection commands = new()
+        {
+            { new(ResizeWebProcessor.Width, width.ToString()) },
+            { new(ResizeWebProcessor.Height, height.ToString()) },
+            { new(ResizeWebProcessor.Mode, nameof(ResizeMode.Stretch)) },
+            { new(ResizeWebProcessor.Orient, bool.FalseString) }
+        };
 
-            using var image = new Image<Rgba32>(1, 1);
-            image.Metadata.ExifProfile = new();
-            image.Metadata.ExifProfile.SetValue(ExifTag.Orientation, orientation);
+        using var image = new Image<Rgba32>(1, 1);
+        image.Metadata.ExifProfile = new();
+        image.Metadata.ExifProfile.SetValue(ExifTag.Orientation, orientation);
 
-            using var formatted = new FormattedImage(image, PngFormat.Instance);
-            new ResizeWebProcessor().Process(formatted, null, commands, parser, culture);
+        using var formatted = new FormattedImage(image, PngFormat.Instance);
+        new ResizeWebProcessor().Process(formatted, null, commands, parser, culture);
 
-            Assert.Equal(width, image.Width);
-            Assert.Equal(height, image.Height);
-        }
+        Assert.Equal(width, image.Width);
+        Assert.Equal(height, image.Height);
+    }
 
-        [Theory]
-        [InlineData(ResizeMode.Crop, false)]
-        [InlineData(ResizeMode.Pad, true)]
-        [InlineData(ResizeMode.BoxPad, true)]
-        [InlineData(ResizeMode.Max, false)]
-        [InlineData(ResizeMode.Min, false)]
-        [InlineData(ResizeMode.Stretch, false)]
-        [InlineData(ResizeMode.Manual, false)]
-        public void ResizeWebProcessor_CanReportAlphaRequirements(ResizeMode resizeMode, bool requiresAlpha)
+    [Theory]
+    [InlineData(ResizeMode.Crop, false)]
+    [InlineData(ResizeMode.Pad, true)]
+    [InlineData(ResizeMode.BoxPad, true)]
+    [InlineData(ResizeMode.Max, false)]
+    [InlineData(ResizeMode.Min, false)]
+    [InlineData(ResizeMode.Stretch, false)]
+    [InlineData(ResizeMode.Manual, false)]
+    public void ResizeWebProcessor_CanReportAlphaRequirements(ResizeMode resizeMode, bool requiresAlpha)
+    {
+        var converters = new List<ICommandConverter>
         {
-            var converters = new List<ICommandConverter>
-            {
-                new EnumConverter(),
-            };
+            new EnumConverter(),
+        };
 
-            var parser = new CommandParser(converters);
-            CultureInfo culture = CultureInfo.InvariantCulture;
+        var parser = new CommandParser(converters);
+        CultureInfo culture = CultureInfo.InvariantCulture;
 
-            CommandCollection commands = new()
-            {
-                { new(ResizeWebProcessor.Mode, resizeMode.ToString()) },
-            };
+        CommandCollection commands = new()
+        {
+            { new(ResizeWebProcessor.Mode, resizeMode.ToString()) },
+        };
 
-            Assert.Equal(requiresAlpha, new ResizeWebProcessor().RequiresTrueColorPixelFormat(commands, parser, culture));
-        }
+        Assert.Equal(requiresAlpha, new ResizeWebProcessor().RequiresTrueColorPixelFormat(commands, parser, culture));
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processors/WebProcessingExtensionsTests.cs b/tests/ImageSharp.Web.Tests/Processors/WebProcessingExtensionsTests.cs
index b6f86d78..e31027c2 100644
--- a/tests/ImageSharp.Web.Tests/Processors/WebProcessingExtensionsTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processors/WebProcessingExtensionsTests.cs
@@ -1,54 +1,51 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System.Collections.Generic;
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Processors;
 using SixLabors.ImageSharp.Web.Tests.DependencyInjection;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Processors
+namespace SixLabors.ImageSharp.Web.Tests.Processors;
+
+public class WebProcessingExtensionsTests
 {
-    public class WebProcessingExtensionsTests
+    [Fact]
+    public void WebProcessingExtensions_GetBySupportedCommands()
     {
-        [Fact]
-        public void WebProcessingExtensions_GetBySupportedCommands()
+        var processors = new IImageWebProcessor[]
+        {
+            new QualityWebProcessor(),
+            new ResizeWebProcessor(),
+            new BackgroundColorWebProcessor(),
+            new MockWebProcessor()
+        };
+
+        CommandCollection commands = new()
         {
-            var processors = new IImageWebProcessor[]
-            {
-                new QualityWebProcessor(),
-                new ResizeWebProcessor(),
-                new BackgroundColorWebProcessor(),
-                new MockWebProcessor()
-            };
-
-            CommandCollection commands = new()
-            {
-                new(ResizeWebProcessor.Width, null),
-                new(QualityWebProcessor.Quality, null),
-                new(ResizeWebProcessor.Height, null)
-            };
-
-            IReadOnlyList<(int Index, IImageWebProcessor Processor)> supportedProcessors = processors.OrderBySupportedCommands(commands);
-
-            Assert.Equal(2, supportedProcessors.Count);
-            Assert.IsType<ResizeWebProcessor>(supportedProcessors[0].Processor);
-            Assert.IsType<QualityWebProcessor>(supportedProcessors[1].Processor);
-        }
-
-        [Fact]
-        public void WebProcessingExtensions_GetBySupportedCommands_Empty()
+            new(ResizeWebProcessor.Width, null),
+            new(QualityWebProcessor.Quality, null),
+            new(ResizeWebProcessor.Height, null)
+        };
+
+        IReadOnlyList<(int Index, IImageWebProcessor Processor)> supportedProcessors = processors.OrderBySupportedCommands(commands);
+
+        Assert.Equal(2, supportedProcessors.Count);
+        Assert.IsType<ResizeWebProcessor>(supportedProcessors[0].Processor);
+        Assert.IsType<QualityWebProcessor>(supportedProcessors[1].Processor);
+    }
+
+    [Fact]
+    public void WebProcessingExtensions_GetBySupportedCommands_Empty()
+    {
+        var processors = new IImageWebProcessor[]
         {
-            var processors = new IImageWebProcessor[]
-            {
-                new MockWebProcessor()
-            };
+            new MockWebProcessor()
+        };
 
-            CommandCollection commands = new();
+        CommandCollection commands = new();
 
-            IReadOnlyList<(int Index, IImageWebProcessor Processor)> supportedProcessors = processors.OrderBySupportedCommands(commands);
+        IReadOnlyList<(int Index, IImageWebProcessor Processor)> supportedProcessors = processors.OrderBySupportedCommands(commands);
 
-            Assert.Empty(supportedProcessors);
-        }
+        Assert.Empty(supportedProcessors);
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Providers/PhysicalFileSystemProviderTests.cs b/tests/ImageSharp.Web.Tests/Providers/PhysicalFileSystemProviderTests.cs
index b84ca943..26a3b6c2 100644
--- a/tests/ImageSharp.Web.Tests/Providers/PhysicalFileSystemProviderTests.cs
+++ b/tests/ImageSharp.Web.Tests/Providers/PhysicalFileSystemProviderTests.cs
@@ -1,58 +1,55 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
 using SixLabors.ImageSharp.Web.Providers;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Providers
+namespace SixLabors.ImageSharp.Web.Tests.Providers;
+
+public class PhysicalFileSystemProviderTests
 {
-    public class PhysicalFileSystemProviderTests
-    {
-        [Theory]
+    [Theory]
 #if OS_LINUX
-        [InlineData(null, "wwwroot", "/Users/root/", "/Users/root/wwwroot/")]
-        [InlineData(null, "/Users/WebRoot", "/Users/root/", "/Users/WebRoot/")]
-        [InlineData("providerFolder", "../Temp", "/Users/this/a/root", "/Users/this/a/root/providerFolder/")]
-        [InlineData("../Temp", null, "/Users/this/a/root", "/Users/this/a/Temp/")]
-        [InlineData("/Users/WebRoot", null, "/Users/this/a/root", "/Users/WebRoot/")]
+    [InlineData(null, "wwwroot", "/Users/root/", "/Users/root/wwwroot/")]
+    [InlineData(null, "/Users/WebRoot", "/Users/root/", "/Users/WebRoot/")]
+    [InlineData("providerFolder", "../Temp", "/Users/this/a/root", "/Users/this/a/root/providerFolder/")]
+    [InlineData("../Temp", null, "/Users/this/a/root", "/Users/this/a/Temp/")]
+    [InlineData("/Users/WebRoot", null, "/Users/this/a/root", "/Users/WebRoot/")]
 #elif OS_OSX
-        [InlineData(null, "wwwroot", "/Users/root/", "/Users/root/wwwroot/")]
-        [InlineData(null, "/Users/WebRoot", "/Users/root/", "/Users/WebRoot/")]
-        [InlineData("providerFolder", "../Temp", "/Users/this/a/root", "/Users/this/a/root/providerFolder/")]
-        [InlineData("../Temp", null, "/Users/this/a/root", "/Users/this/a/Temp/")]
-        [InlineData("/Users/WebRoot", null, "/Users/this/a/root", "/Users/WebRoot/")]
+    [InlineData(null, "wwwroot", "/Users/root/", "/Users/root/wwwroot/")]
+    [InlineData(null, "/Users/WebRoot", "/Users/root/", "/Users/WebRoot/")]
+    [InlineData("providerFolder", "../Temp", "/Users/this/a/root", "/Users/this/a/root/providerFolder/")]
+    [InlineData("../Temp", null, "/Users/this/a/root", "/Users/this/a/Temp/")]
+    [InlineData("/Users/WebRoot", null, "/Users/this/a/root", "/Users/WebRoot/")]
 #elif OS_WINDOWS
-        [InlineData(null, "wwwroot", "C:\\root\\", "C:\\root\\wwwroot\\")]
-        [InlineData(null, "C:\\WebRoot", "C:\\root\\", "C:\\WebRoot\\")]
-        [InlineData("providerFolder", "..\\Temp", "C:\\this\\a\\root", "C:\\this\\a\\root\\providerFolder\\")]
-        [InlineData("..\\Temp", null, "C:\\this\\a\\root", "C:\\this\\a\\Temp\\")]
-        [InlineData("C:\\WebRoot", null, "C:\\this\\a\\root", "C:\\WebRoot\\")]
+    [InlineData(null, "wwwroot", "C:\\root\\", "C:\\root\\wwwroot\\")]
+    [InlineData(null, "C:\\WebRoot", "C:\\root\\", "C:\\WebRoot\\")]
+    [InlineData("providerFolder", "..\\Temp", "C:\\this\\a\\root", "C:\\this\\a\\root\\providerFolder\\")]
+    [InlineData("..\\Temp", null, "C:\\this\\a\\root", "C:\\this\\a\\Temp\\")]
+    [InlineData("C:\\WebRoot", null, "C:\\this\\a\\root", "C:\\WebRoot\\")]
 #endif
-        public void GetProviderRoot(string providerRootPath, string webRootPath, string contentRootPath, string expected)
+    public void GetProviderRoot(string providerRootPath, string webRootPath, string contentRootPath, string expected)
+    {
+        var providerOptions = new PhysicalFileSystemProviderOptions
         {
-            var providerOptions = new PhysicalFileSystemProviderOptions
-            {
-                ProviderRootPath = providerRootPath
-            };
+            ProviderRootPath = providerRootPath
+        };
 
-            string actual = PhysicalFileSystemProvider.GetProviderRoot(providerOptions, webRootPath, contentRootPath);
+        string actual = PhysicalFileSystemProvider.GetProviderRoot(providerOptions, webRootPath, contentRootPath);
 
-            Assert.Equal(expected, actual);
-        }
+        Assert.Equal(expected, actual);
+    }
 
-        [Theory]
-        [InlineData(null, null, "C:\\root\\")]
-        [InlineData("", null, "C:\\root\\")]
-        [InlineData(null, "", "C:\\root\\")]
-        public void GetProviderRootThrows(string providerRootPath, string webRootPath, string contentRootPath)
+    [Theory]
+    [InlineData(null, null, "C:\\root\\")]
+    [InlineData("", null, "C:\\root\\")]
+    [InlineData(null, "", "C:\\root\\")]
+    public void GetProviderRootThrows(string providerRootPath, string webRootPath, string contentRootPath)
+    {
+        var providerOptions = new PhysicalFileSystemProviderOptions
         {
-            var providerOptions = new PhysicalFileSystemProviderOptions
-            {
-                ProviderRootPath = providerRootPath
-            };
+            ProviderRootPath = providerRootPath
+        };
 
-            Assert.Throws<InvalidOperationException>(() => PhysicalFileSystemProvider.GetProviderRoot(providerOptions, webRootPath, contentRootPath));
-        }
+        Assert.Throws<InvalidOperationException>(() => PhysicalFileSystemProvider.GetProviderRoot(providerOptions, webRootPath, contentRootPath));
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Synchronization/AsyncKeyLockTests.cs b/tests/ImageSharp.Web.Tests/Synchronization/AsyncKeyLockTests.cs
index c0564f05..9b97dda1 100644
--- a/tests/ImageSharp.Web.Tests/Synchronization/AsyncKeyLockTests.cs
+++ b/tests/ImageSharp.Web.Tests/Synchronization/AsyncKeyLockTests.cs
@@ -1,62 +1,58 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using System.Threading.Tasks;
 using SixLabors.ImageSharp.Web.Synchronization;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Synchronization
+namespace SixLabors.ImageSharp.Web.Tests.Synchronization;
+
+public class AsyncKeyLockTests
 {
-    public class AsyncKeyLockTests
+    [Fact]
+    public async Task OneAtATime()
     {
-        [Fact]
-        public async Task OneAtATime()
-        {
-            AsyncKeyLock<string> l = new();
+        AsyncKeyLock<string> l = new();
 
-            Task<IDisposable> first = l.LockAsync("key");
-            Assert.True(first.IsCompletedSuccessfully);
+        Task<IDisposable> first = l.LockAsync("key");
+        Assert.True(first.IsCompletedSuccessfully);
 
-            Task<IDisposable> second = l.LockAsync("key");
-            Assert.False(second.IsCompleted);
+        Task<IDisposable> second = l.LockAsync("key");
+        Assert.False(second.IsCompleted);
 
-            // Release first hold on the lock
-            first.Result.Dispose();
+        // Release first hold on the lock
+        first.Result.Dispose();
 
-            // Await the second task to make sure we get the lock.
-            await second;
+        // Await the second task to make sure we get the lock.
+        await second;
 
-            l.Dispose();
-        }
+        l.Dispose();
+    }
 
-        [Fact]
-        public async Task OneAtATime_ByKey()
-        {
-            AsyncKeyLock<string> l = new();
+    [Fact]
+    public async Task OneAtATime_ByKey()
+    {
+        AsyncKeyLock<string> l = new();
 
-            Task<IDisposable> firstFoo = l.LockAsync("Foo");
-            Assert.True(firstFoo.IsCompletedSuccessfully);
+        Task<IDisposable> firstFoo = l.LockAsync("Foo");
+        Assert.True(firstFoo.IsCompletedSuccessfully);
 
-            Task<IDisposable> secondFoo = l.LockAsync("Foo");
-            Assert.False(secondFoo.IsCompleted);
+        Task<IDisposable> secondFoo = l.LockAsync("Foo");
+        Assert.False(secondFoo.IsCompleted);
 
-            // Now take a different lock ("bar") and confirm it doesn't conflict with the previous lock
-            Task<IDisposable> firstBar = l.LockAsync("Bar");
-            Assert.True(firstBar.IsCompletedSuccessfully);
+        // Now take a different lock ("bar") and confirm it doesn't conflict with the previous lock
+        Task<IDisposable> firstBar = l.LockAsync("Bar");
+        Assert.True(firstBar.IsCompletedSuccessfully);
 
-            // Release the "bar" lock, and confirm it doesn't change anything about the original "foo" lock.
-            // The second caller that was waiting on the "foo" lock should still be waiting.
-            firstBar.Result.Dispose();
-            Assert.False(secondFoo.IsCompleted);
+        // Release the "bar" lock, and confirm it doesn't change anything about the original "foo" lock.
+        // The second caller that was waiting on the "foo" lock should still be waiting.
+        firstBar.Result.Dispose();
+        Assert.False(secondFoo.IsCompleted);
 
-            // Release the "foo" lock
-            firstFoo.Result.Dispose();
+        // Release the "foo" lock
+        firstFoo.Result.Dispose();
 
-            // Await the second task to make sure it gets the lock.
-            await secondFoo;
+        // Await the second task to make sure it gets the lock.
+        await secondFoo;
 
-            l.Dispose();
-        }
+        l.Dispose();
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Synchronization/AsyncKeyReaderWriterLockTests.cs b/tests/ImageSharp.Web.Tests/Synchronization/AsyncKeyReaderWriterLockTests.cs
index 343d2175..6ad95b2b 100644
--- a/tests/ImageSharp.Web.Tests/Synchronization/AsyncKeyReaderWriterLockTests.cs
+++ b/tests/ImageSharp.Web.Tests/Synchronization/AsyncKeyReaderWriterLockTests.cs
@@ -1,130 +1,126 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using System.Threading.Tasks;
 using SixLabors.ImageSharp.Web.Synchronization;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Synchronization
+namespace SixLabors.ImageSharp.Web.Tests.Synchronization;
+
+public class AsyncKeyReaderWriterLockTests
 {
-    public class AsyncKeyReaderWriterLockTests
+    [Fact]
+    public void OneWriterAtATime()
     {
-        [Fact]
-        public void OneWriterAtATime()
-        {
-            AsyncKeyReaderWriterLock<string> l = new();
+        AsyncKeyReaderWriterLock<string> l = new();
 
-            Task<IDisposable> first = l.WriterLockAsync("key");
-            Assert.True(first.IsCompletedSuccessfully);
+        Task<IDisposable> first = l.WriterLockAsync("key");
+        Assert.True(first.IsCompletedSuccessfully);
 
-            Task<IDisposable> second = l.WriterLockAsync("key");
-            Assert.False(second.IsCompleted);
+        Task<IDisposable> second = l.WriterLockAsync("key");
+        Assert.False(second.IsCompleted);
 
-            first.Result.Dispose();
-            Assert.True(second.IsCompletedSuccessfully);
-        }
+        first.Result.Dispose();
+        Assert.True(second.IsCompletedSuccessfully);
+    }
 
-        [Fact]
-        public async Task OneWriterAtATime_ByKey()
-        {
-            AsyncKeyReaderWriterLock<string> l = new();
+    [Fact]
+    public async Task OneWriterAtATime_ByKey()
+    {
+        AsyncKeyReaderWriterLock<string> l = new();
 
-            Task<IDisposable> firstFoo = l.WriterLockAsync("Foo");
-            Assert.True(firstFoo.IsCompletedSuccessfully);
+        Task<IDisposable> firstFoo = l.WriterLockAsync("Foo");
+        Assert.True(firstFoo.IsCompletedSuccessfully);
 
-            Task<IDisposable> secondFoo = l.WriterLockAsync("Foo");
-            Assert.False(secondFoo.IsCompleted);
+        Task<IDisposable> secondFoo = l.WriterLockAsync("Foo");
+        Assert.False(secondFoo.IsCompleted);
 
-            // Now take a different lock ("bar") and confirm it doesn't conflict with the previous lock
-            Task<IDisposable> firstBar = l.WriterLockAsync("Bar");
-            Assert.True(firstBar.IsCompletedSuccessfully);
+        // Now take a different lock ("bar") and confirm it doesn't conflict with the previous lock
+        Task<IDisposable> firstBar = l.WriterLockAsync("Bar");
+        Assert.True(firstBar.IsCompletedSuccessfully);
 
-            // Release the "bar" lock, and confirm it doesn't change anything about the original "foo" lock.
-            // The second caller that was waiting on the "foo" lock should still be waiting.
-            firstBar.Result.Dispose();
-            Assert.False(secondFoo.IsCompleted);
+        // Release the "bar" lock, and confirm it doesn't change anything about the original "foo" lock.
+        // The second caller that was waiting on the "foo" lock should still be waiting.
+        firstBar.Result.Dispose();
+        Assert.False(secondFoo.IsCompleted);
 
-            // Release the "foo" lock
-            firstFoo.Result.Dispose();
+        // Release the "foo" lock
+        firstFoo.Result.Dispose();
 
-            // Await the second task to make sure it gets the lock.
-            await secondFoo;
-        }
+        // Await the second task to make sure it gets the lock.
+        await secondFoo;
+    }
 
-        [Fact]
-        public void WriterBlocksReaders()
-        {
-            AsyncKeyReaderWriterLock<string> l = new();
+    [Fact]
+    public void WriterBlocksReaders()
+    {
+        AsyncKeyReaderWriterLock<string> l = new();
 
-            Task<IDisposable> first = l.WriterLockAsync("key");
-            Assert.True(first.IsCompletedSuccessfully);
+        Task<IDisposable> first = l.WriterLockAsync("key");
+        Assert.True(first.IsCompletedSuccessfully);
 
-            Task<IDisposable> second = l.ReaderLockAsync("key");
-            Assert.False(second.IsCompleted);
+        Task<IDisposable> second = l.ReaderLockAsync("key");
+        Assert.False(second.IsCompleted);
 
-            first.Result.Dispose();
-            Assert.True(second.IsCompletedSuccessfully);
-        }
+        first.Result.Dispose();
+        Assert.True(second.IsCompletedSuccessfully);
+    }
 
-        [Fact]
-        public void WaitingWriterBlocksReaders()
-        {
-            AsyncKeyReaderWriterLock<string> l = new();
+    [Fact]
+    public void WaitingWriterBlocksReaders()
+    {
+        AsyncKeyReaderWriterLock<string> l = new();
 
-            Task<IDisposable> first = l.ReaderLockAsync("key");
-            Assert.True(first.IsCompletedSuccessfully);
+        Task<IDisposable> first = l.ReaderLockAsync("key");
+        Assert.True(first.IsCompletedSuccessfully);
 
-            Task<IDisposable> second = l.WriterLockAsync("key");
-            Assert.False(second.IsCompleted);
+        Task<IDisposable> second = l.WriterLockAsync("key");
+        Assert.False(second.IsCompleted);
 
-            Task<IDisposable> third = l.ReaderLockAsync("key");
-            Assert.False(third.IsCompleted);
+        Task<IDisposable> third = l.ReaderLockAsync("key");
+        Assert.False(third.IsCompleted);
 
-            first.Result.Dispose();
-            Assert.True(second.IsCompletedSuccessfully);
-            Assert.False(third.IsCompleted);
+        first.Result.Dispose();
+        Assert.True(second.IsCompletedSuccessfully);
+        Assert.False(third.IsCompleted);
 
-            second.Result.Dispose();
-            Assert.True(third.IsCompletedSuccessfully);
-        }
+        second.Result.Dispose();
+        Assert.True(third.IsCompletedSuccessfully);
+    }
 
-        [Fact]
-        public void MultipleReadersAtOnce()
-        {
-            AsyncKeyReaderWriterLock<string> l = new();
+    [Fact]
+    public void MultipleReadersAtOnce()
+    {
+        AsyncKeyReaderWriterLock<string> l = new();
 
-            Task<IDisposable> first = l.ReaderLockAsync("key");
-            Assert.True(first.IsCompletedSuccessfully);
+        Task<IDisposable> first = l.ReaderLockAsync("key");
+        Assert.True(first.IsCompletedSuccessfully);
 
-            Task<IDisposable> second = l.ReaderLockAsync("key");
-            Assert.True(second.IsCompletedSuccessfully);
+        Task<IDisposable> second = l.ReaderLockAsync("key");
+        Assert.True(second.IsCompletedSuccessfully);
 
-            Task<IDisposable> third = l.ReaderLockAsync("key");
-            Assert.True(third.IsCompletedSuccessfully);
-        }
+        Task<IDisposable> third = l.ReaderLockAsync("key");
+        Assert.True(third.IsCompletedSuccessfully);
+    }
 
-        [Fact]
-        public void AllWaitingReadersReleasedConcurrently()
-        {
-            AsyncKeyReaderWriterLock<string> l = new();
+    [Fact]
+    public void AllWaitingReadersReleasedConcurrently()
+    {
+        AsyncKeyReaderWriterLock<string> l = new();
 
-            Task<IDisposable> writer = l.WriterLockAsync("key");
-            Assert.True(writer.IsCompletedSuccessfully);
+        Task<IDisposable> writer = l.WriterLockAsync("key");
+        Assert.True(writer.IsCompletedSuccessfully);
 
-            Task<IDisposable> reader1 = l.ReaderLockAsync("key");
-            Assert.False(reader1.IsCompleted);
+        Task<IDisposable> reader1 = l.ReaderLockAsync("key");
+        Assert.False(reader1.IsCompleted);
 
-            Task<IDisposable> reader2 = l.ReaderLockAsync("key");
-            Assert.False(reader2.IsCompleted);
+        Task<IDisposable> reader2 = l.ReaderLockAsync("key");
+        Assert.False(reader2.IsCompleted);
 
-            Task<IDisposable> reader3 = l.ReaderLockAsync("key");
-            Assert.False(reader3.IsCompleted);
+        Task<IDisposable> reader3 = l.ReaderLockAsync("key");
+        Assert.False(reader3.IsCompleted);
 
-            writer.Result.Dispose();
-            Assert.True(reader1.IsCompletedSuccessfully);
-            Assert.True(reader2.IsCompletedSuccessfully);
-            Assert.True(reader3.IsCompletedSuccessfully);
-        }
+        writer.Result.Dispose();
+        Assert.True(reader1.IsCompletedSuccessfully);
+        Assert.True(reader2.IsCompletedSuccessfully);
+        Assert.True(reader3.IsCompletedSuccessfully);
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Synchronization/AsyncLockTests.cs b/tests/ImageSharp.Web.Tests/Synchronization/AsyncLockTests.cs
index f6746812..731b50dc 100644
--- a/tests/ImageSharp.Web.Tests/Synchronization/AsyncLockTests.cs
+++ b/tests/ImageSharp.Web.Tests/Synchronization/AsyncLockTests.cs
@@ -1,33 +1,29 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using System.Threading.Tasks;
 using SixLabors.ImageSharp.Web.Synchronization;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Synchronization
+namespace SixLabors.ImageSharp.Web.Tests.Synchronization;
+
+public class AsyncLockTests
 {
-    public class AsyncLockTests
+    [Fact]
+    public async Task OneAtATime()
     {
-        [Fact]
-        public async Task OneAtATime()
-        {
-            AsyncLock l = new();
+        AsyncLock l = new();
 
-            Task<IDisposable> first = l.LockAsync();
-            Assert.True(first.IsCompletedSuccessfully);
+        Task<IDisposable> first = l.LockAsync();
+        Assert.True(first.IsCompletedSuccessfully);
 
-            Task<IDisposable> second = l.LockAsync();
-            Assert.False(second.IsCompleted);
+        Task<IDisposable> second = l.LockAsync();
+        Assert.False(second.IsCompleted);
 
-            // Release first hold on the lock and then await the second task to confirm it completes.
-            first.Result.Dispose();
+        // Release first hold on the lock and then await the second task to confirm it completes.
+        first.Result.Dispose();
 
-            // Await the second task to make sure we get the lock.
-            await second;
+        // Await the second task to make sure we get the lock.
+        await second;
 
-            l.Dispose();
-        }
+        l.Dispose();
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Synchronization/AsyncReaderWriterLockTests.cs b/tests/ImageSharp.Web.Tests/Synchronization/AsyncReaderWriterLockTests.cs
index c07d0d3a..3edf5918 100644
--- a/tests/ImageSharp.Web.Tests/Synchronization/AsyncReaderWriterLockTests.cs
+++ b/tests/ImageSharp.Web.Tests/Synchronization/AsyncReaderWriterLockTests.cs
@@ -1,103 +1,99 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using System.Threading.Tasks;
 using SixLabors.ImageSharp.Web.Synchronization;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Synchronization
+namespace SixLabors.ImageSharp.Web.Tests.Synchronization;
+
+public class AsyncReaderWriterLockTests
 {
-    public class AsyncReaderWriterLockTests
+    [Fact]
+    public void OneWriterAtATime()
     {
-        [Fact]
-        public void OneWriterAtATime()
-        {
-            AsyncReaderWriterLock l = new();
+        AsyncReaderWriterLock l = new();
 
-            Task<IDisposable> first = l.WriterLockAsync();
-            Assert.True(first.IsCompletedSuccessfully);
+        Task<IDisposable> first = l.WriterLockAsync();
+        Assert.True(first.IsCompletedSuccessfully);
 
-            Task<IDisposable> second = l.WriterLockAsync();
-            Assert.False(second.IsCompleted);
+        Task<IDisposable> second = l.WriterLockAsync();
+        Assert.False(second.IsCompleted);
 
-            first.Result.Dispose();
-            Assert.True(second.IsCompletedSuccessfully);
-        }
+        first.Result.Dispose();
+        Assert.True(second.IsCompletedSuccessfully);
+    }
 
-        [Fact]
-        public void WriterBlocksReaders()
-        {
-            AsyncReaderWriterLock l = new();
+    [Fact]
+    public void WriterBlocksReaders()
+    {
+        AsyncReaderWriterLock l = new();
 
-            Task<IDisposable> first = l.WriterLockAsync();
-            Assert.True(first.IsCompletedSuccessfully);
+        Task<IDisposable> first = l.WriterLockAsync();
+        Assert.True(first.IsCompletedSuccessfully);
 
-            Task<IDisposable> second = l.ReaderLockAsync();
-            Assert.False(second.IsCompleted);
+        Task<IDisposable> second = l.ReaderLockAsync();
+        Assert.False(second.IsCompleted);
 
-            first.Result.Dispose();
-            Assert.True(second.IsCompletedSuccessfully);
-        }
+        first.Result.Dispose();
+        Assert.True(second.IsCompletedSuccessfully);
+    }
 
-        [Fact]
-        public void WaitingWriterBlocksReaders()
-        {
-            AsyncReaderWriterLock l = new();
+    [Fact]
+    public void WaitingWriterBlocksReaders()
+    {
+        AsyncReaderWriterLock l = new();
 
-            Task<IDisposable> first = l.ReaderLockAsync();
-            Assert.True(first.IsCompletedSuccessfully);
+        Task<IDisposable> first = l.ReaderLockAsync();
+        Assert.True(first.IsCompletedSuccessfully);
 
-            Task<IDisposable> second = l.WriterLockAsync();
-            Assert.False(second.IsCompleted);
+        Task<IDisposable> second = l.WriterLockAsync();
+        Assert.False(second.IsCompleted);
 
-            Task<IDisposable> third = l.ReaderLockAsync();
-            Assert.False(third.IsCompleted);
+        Task<IDisposable> third = l.ReaderLockAsync();
+        Assert.False(third.IsCompleted);
 
-            first.Result.Dispose();
-            Assert.True(second.IsCompletedSuccessfully);
-            Assert.False(third.IsCompleted);
+        first.Result.Dispose();
+        Assert.True(second.IsCompletedSuccessfully);
+        Assert.False(third.IsCompleted);
 
-            second.Result.Dispose();
-            Assert.True(third.IsCompletedSuccessfully);
-        }
+        second.Result.Dispose();
+        Assert.True(third.IsCompletedSuccessfully);
+    }
 
-        [Fact]
-        public void MultipleReadersAtOnce()
-        {
-            AsyncReaderWriterLock l = new();
+    [Fact]
+    public void MultipleReadersAtOnce()
+    {
+        AsyncReaderWriterLock l = new();
 
-            Task<IDisposable> first = l.ReaderLockAsync();
-            Assert.True(first.IsCompletedSuccessfully);
+        Task<IDisposable> first = l.ReaderLockAsync();
+        Assert.True(first.IsCompletedSuccessfully);
 
-            Task<IDisposable> second = l.ReaderLockAsync();
-            Assert.True(second.IsCompletedSuccessfully);
+        Task<IDisposable> second = l.ReaderLockAsync();
+        Assert.True(second.IsCompletedSuccessfully);
 
-            Task<IDisposable> third = l.ReaderLockAsync();
-            Assert.True(third.IsCompletedSuccessfully);
-        }
+        Task<IDisposable> third = l.ReaderLockAsync();
+        Assert.True(third.IsCompletedSuccessfully);
+    }
 
-        [Fact]
-        public void AllWaitingReadersReleasedConcurrently()
-        {
-            AsyncReaderWriterLock l = new();
+    [Fact]
+    public void AllWaitingReadersReleasedConcurrently()
+    {
+        AsyncReaderWriterLock l = new();
 
-            Task<IDisposable> writer = l.WriterLockAsync();
-            Assert.True(writer.IsCompletedSuccessfully);
+        Task<IDisposable> writer = l.WriterLockAsync();
+        Assert.True(writer.IsCompletedSuccessfully);
 
-            Task<IDisposable> reader1 = l.ReaderLockAsync();
-            Assert.False(reader1.IsCompleted);
+        Task<IDisposable> reader1 = l.ReaderLockAsync();
+        Assert.False(reader1.IsCompleted);
 
-            Task<IDisposable> reader2 = l.ReaderLockAsync();
-            Assert.False(reader2.IsCompleted);
+        Task<IDisposable> reader2 = l.ReaderLockAsync();
+        Assert.False(reader2.IsCompleted);
 
-            Task<IDisposable> reader3 = l.ReaderLockAsync();
-            Assert.False(reader3.IsCompleted);
+        Task<IDisposable> reader3 = l.ReaderLockAsync();
+        Assert.False(reader3.IsCompleted);
 
-            writer.Result.Dispose();
-            Assert.True(reader1.IsCompletedSuccessfully);
-            Assert.True(reader2.IsCompletedSuccessfully);
-            Assert.True(reader3.IsCompletedSuccessfully);
-        }
+        writer.Result.Dispose();
+        Assert.True(reader1.IsCompletedSuccessfully);
+        Assert.True(reader2.IsCompletedSuccessfully);
+        Assert.True(reader3.IsCompletedSuccessfully);
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Synchronization/RefCountedConcurrentDictionaryTests.cs b/tests/ImageSharp.Web.Tests/Synchronization/RefCountedConcurrentDictionaryTests.cs
index fa65f456..c8ad2e6b 100644
--- a/tests/ImageSharp.Web.Tests/Synchronization/RefCountedConcurrentDictionaryTests.cs
+++ b/tests/ImageSharp.Web.Tests/Synchronization/RefCountedConcurrentDictionaryTests.cs
@@ -1,151 +1,146 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
 using System.Collections.Concurrent;
-using System.Linq;
-using System.Threading.Tasks;
 using SixLabors.ImageSharp.Web.Synchronization;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.Synchronization
+namespace SixLabors.ImageSharp.Web.Tests.Synchronization;
+
+public class RefCountedConcurrentDictionaryTests
 {
-    public class RefCountedConcurrentDictionaryTests
+    private readonly ConcurrentBag<string> released;
+    private readonly RefCountedConcurrentDictionary<string, string> dictionary;
+
+    public RefCountedConcurrentDictionaryTests()
     {
-        private readonly ConcurrentBag<string> released;
-        private readonly RefCountedConcurrentDictionary<string, string> dictionary;
+        this.released = new ConcurrentBag<string>();
+        this.dictionary = new RefCountedConcurrentDictionary<string, string>(
+            valueFactory: this.ValueForKey,
+            valueReleaser: value => this.released.Add(value));
+    }
 
-        public RefCountedConcurrentDictionaryTests()
-        {
-            this.released = new ConcurrentBag<string>();
-            this.dictionary = new RefCountedConcurrentDictionary<string, string>(
-                valueFactory: this.ValueForKey,
-                valueReleaser: value => this.released.Add(value));
-        }
+    [Fact]
+    public void AddThenRelease()
+    {
+        this.dictionary.Get("test");
+        this.ValidateDictionary(("test", 1));
+        this.ValidateReleased();
 
-        [Fact]
-        public void AddThenRelease()
-        {
-            this.dictionary.Get("test");
-            this.ValidateDictionary(("test", 1));
-            this.ValidateReleased();
+        this.dictionary.Release("test");
+        this.ValidateDictionary();
+        this.ValidateReleased("test");
+    }
 
-            this.dictionary.Release("test");
-            this.ValidateDictionary();
-            this.ValidateReleased("test");
-        }
+    [Fact]
+    public void AddTwiceThenReleaseTwice()
+    {
+        this.dictionary.Get("test");
+        this.ValidateDictionary(("test", 1));
+        this.ValidateReleased();
 
-        [Fact]
-        public void AddTwiceThenReleaseTwice()
-        {
-            this.dictionary.Get("test");
-            this.ValidateDictionary(("test", 1));
-            this.ValidateReleased();
+        this.dictionary.Get("test");
+        this.ValidateDictionary(("test", 2));
+        this.ValidateReleased();
 
-            this.dictionary.Get("test");
-            this.ValidateDictionary(("test", 2));
-            this.ValidateReleased();
+        this.dictionary.Release("test");
+        this.ValidateDictionary(("test", 1));
+        this.ValidateReleased();
 
-            this.dictionary.Release("test");
-            this.ValidateDictionary(("test", 1));
-            this.ValidateReleased();
+        this.dictionary.Release("test");
+        this.ValidateDictionary();
+        this.ValidateReleased("test");
+    }
 
-            this.dictionary.Release("test");
-            this.ValidateDictionary();
-            this.ValidateReleased("test");
-        }
+    [Fact]
+    public void AddAndReleaseABunchOfKeys()
+    {
+        this.dictionary.Get("a");
+        this.dictionary.Get("b");
+        this.dictionary.Get("c");
+        this.dictionary.Get("a");
+        this.dictionary.Release("b");
+        this.dictionary.Get("b");
+        this.ValidateDictionary(("a", 2), ("b", 1), ("c", 1));
+        this.ValidateReleased("b");
+
+        this.dictionary.Release("a");
+        this.dictionary.Release("b");
+        this.dictionary.Release("c");
+        this.ValidateDictionary(("a", 1));
+        this.ValidateReleased("b", "b", "c");
+
+        this.dictionary.Release("a");
+        this.ValidateDictionary();
+        this.ValidateReleased("a", "b", "b", "c");
+    }
 
-        [Fact]
-        public void AddAndReleaseABunchOfKeys()
-        {
-            this.dictionary.Get("a");
-            this.dictionary.Get("b");
-            this.dictionary.Get("c");
-            this.dictionary.Get("a");
-            this.dictionary.Release("b");
-            this.dictionary.Get("b");
-            this.ValidateDictionary(("a", 2), ("b", 1), ("c", 1));
-            this.ValidateReleased("b");
-
-            this.dictionary.Release("a");
-            this.dictionary.Release("b");
-            this.dictionary.Release("c");
-            this.ValidateDictionary(("a", 1));
-            this.ValidateReleased("b", "b", "c");
-
-            this.dictionary.Release("a");
-            this.ValidateDictionary();
-            this.ValidateReleased("a", "b", "b", "c");
-        }
+    [Fact]
+    public async Task StressTest()
+    {
+        string[] keys = new string[] { "a", "b", "c", "d", "e", "f", "g", "h" };
 
-        [Fact]
-        public async Task StressTest()
+        async Task Worker(int workerIndex)
         {
-            string[] keys = new string[] { "a", "b", "c", "d", "e", "f", "g", "h" };
-
-            async Task Worker(int workerIndex)
+            var random = new Random(workerIndex);
+            for (int i = 0; i < 1000; i++)
             {
-                var random = new Random(workerIndex);
-                for (int i = 0; i < 1000; i++)
-                {
-                    string key = keys[random.Next(0, keys.Length)];
-                    this.dictionary.Get(key);
-                    await Task.Delay(random.Next(0, 2));
-                    this.dictionary.Release(key);
-                }
+                string key = keys[random.Next(0, keys.Length)];
+                this.dictionary.Get(key);
+                await Task.Delay(random.Next(0, 2));
+                this.dictionary.Release(key);
             }
+        }
 
-            await Task.WhenAll(Enumerable.Range(0, 1000).Select(Worker));
+        await Task.WhenAll(Enumerable.Range(0, 1000).Select(Worker));
 
-            Assert.Empty(this.dictionary.DebugGetContents());
-        }
+        Assert.Empty(this.dictionary.DebugGetContents());
+    }
 
-        [Fact]
-        public void ReleaseNonExistentThrows()
-            => Assert.Throws<InvalidOperationException>(() => this.dictionary.Release("test"));
+    [Fact]
+    public void ReleaseNonExistentThrows()
+        => Assert.Throws<InvalidOperationException>(() => this.dictionary.Release("test"));
 
-        [Fact]
-        public void DoubleReleaseThrows()
-        {
-            this.dictionary.Get("test");
-            this.dictionary.Release("test");
-            Assert.Throws<InvalidOperationException>(() => this.dictionary.Release("test"));
-        }
+    [Fact]
+    public void DoubleReleaseThrows()
+    {
+        this.dictionary.Get("test");
+        this.dictionary.Release("test");
+        Assert.Throws<InvalidOperationException>(() => this.dictionary.Release("test"));
+    }
 
-        [Fact]
-        public void ValueFactoryIsRequired()
-            => Assert.Throws<ArgumentNullException>("valueFactory", () => new RefCountedConcurrentDictionary<string, string>(null!, null));
+    [Fact]
+    public void ValueFactoryIsRequired()
+        => Assert.Throws<ArgumentNullException>("valueFactory", () => new RefCountedConcurrentDictionary<string, string>(null!, null));
 
-        private string ValueForKey(string key) => $"{key}.value";
+    private string ValueForKey(string key) => $"{key}.value";
 
-        /// <summary>
-        /// Validate that the dictionary contains precisely the specified key/value/refcount tuples.
-        /// </summary>
-        private void ValidateDictionary(params (string Key, int RefCount)[] expectedValues)
-        {
-            Action<(string, string, int)> CreateElementInspector((string Key, int RefCount) expected)
-                => ((string Key, string Value, int RefCount) actual) =>
-                {
-                    Assert.Equal(expected.Key, actual.Key);
-                    Assert.Equal(this.ValueForKey(expected.Key), actual.Value);
-                    Assert.Equal(expected.RefCount, actual.RefCount);
-                };
-
-            Assert.Collection(
-                collection: this.dictionary.DebugGetContents().OrderBy(v => v.Key),
-                elementInspectors: expectedValues.OrderBy(v => v.Key).Select(CreateElementInspector).ToArray());
-        }
+    /// <summary>
+    /// Validate that the dictionary contains precisely the specified key/value/refcount tuples.
+    /// </summary>
+    private void ValidateDictionary(params (string Key, int RefCount)[] expectedValues)
+    {
+        Action<(string, string, int)> CreateElementInspector((string Key, int RefCount) expected)
+            => ((string Key, string Value, int RefCount) actual) =>
+            {
+                Assert.Equal(expected.Key, actual.Key);
+                Assert.Equal(this.ValueForKey(expected.Key), actual.Value);
+                Assert.Equal(expected.RefCount, actual.RefCount);
+            };
+
+        Assert.Collection(
+            collection: this.dictionary.DebugGetContents().OrderBy(v => v.Key),
+            elementInspectors: expectedValues.OrderBy(v => v.Key).Select(CreateElementInspector).ToArray());
+    }
 
-        /// <summary>
-        /// Validate that the specific values were released.
-        /// </summary>
-        private void ValidateReleased(params string[] expectedValues)
-        {
-            Action<string> CreateElementInspector(string expected) => (string actual) => Assert.Equal(this.ValueForKey(expected), actual);
+    /// <summary>
+    /// Validate that the specific values were released.
+    /// </summary>
+    private void ValidateReleased(params string[] expectedValues)
+    {
+        Action<string> CreateElementInspector(string expected) => (string actual) => Assert.Equal(this.ValueForKey(expected), actual);
 
-            Assert.Collection(
-                collection: this.released.OrderBy(v => v),
-                elementInspectors: expectedValues.OrderBy(v => v).Select(CreateElementInspector).ToArray());
-        }
+        Assert.Collection(
+            collection: this.released.OrderBy(v => v),
+            elementInspectors: expectedValues.OrderBy(v => v).Select(CreateElementInspector).ToArray());
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs
index ab95d5bd..cb016f22 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs
@@ -1,5 +1,5 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using Amazon.S3;
 using Microsoft.Extensions.DependencyInjection;
@@ -7,35 +7,34 @@
 using SixLabors.ImageSharp.Web.DependencyInjection;
 using SixLabors.ImageSharp.Web.Providers.AWS;
 
-namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
+namespace SixLabors.ImageSharp.Web.Tests.TestUtilities;
+
+public class AWSS3StorageCacheTestServerFixture : TestServerFixture
 {
-    public class AWSS3StorageCacheTestServerFixture : TestServerFixture
-    {
-        protected override void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder)
-            => builder
-            .Configure<AWSS3StorageImageProviderOptions>(o =>
-                o.S3Buckets.Add(
-                new AWSS3BucketClientOptions
-                {
-                    Endpoint = TestConstants.AWSEndpoint,
-                    BucketName = TestConstants.AWSBucketName,
-                    AccessKey = TestConstants.AWSAccessKey,
-                    AccessSecret = TestConstants.AWSAccessSecret,
-                    Region = TestConstants.AWSRegion,
-                    Timeout = TestConstants.AWSTimeout,
-                }))
-            .AddProvider(AWSS3StorageImageProviderFactory.Create)
-            .Configure<AWSS3StorageCacheOptions>(o =>
+    protected override void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder)
+        => builder
+        .Configure<AWSS3StorageImageProviderOptions>(o =>
+            o.S3Buckets.Add(
+            new AWSS3BucketClientOptions
             {
-                o.Endpoint = TestConstants.AWSEndpoint;
-                o.BucketName = TestConstants.AWSCacheBucketName;
-                o.AccessKey = TestConstants.AWSAccessKey;
-                o.AccessSecret = TestConstants.AWSAccessSecret;
-                o.Region = TestConstants.AWSRegion;
-                o.Timeout = TestConstants.AWSTimeout;
+                Endpoint = TestConstants.AWSEndpoint,
+                BucketName = TestConstants.AWSBucketName,
+                AccessKey = TestConstants.AWSAccessKey,
+                AccessSecret = TestConstants.AWSAccessSecret,
+                Region = TestConstants.AWSRegion,
+                Timeout = TestConstants.AWSTimeout,
+            }))
+        .AddProvider(AWSS3StorageImageProviderFactory.Create)
+        .Configure<AWSS3StorageCacheOptions>(o =>
+        {
+            o.Endpoint = TestConstants.AWSEndpoint;
+            o.BucketName = TestConstants.AWSCacheBucketName;
+            o.AccessKey = TestConstants.AWSAccessKey;
+            o.AccessSecret = TestConstants.AWSAccessSecret;
+            o.Region = TestConstants.AWSRegion;
+            o.Timeout = TestConstants.AWSTimeout;
 
-                AWSS3StorageCache.CreateIfNotExists(o, S3CannedACL.Private);
-            })
-            .SetCache<AWSS3StorageCache>();
-    }
+            AWSS3StorageCache.CreateIfNotExists(o, S3CannedACL.Private);
+        })
+        .SetCache<AWSS3StorageCache>();
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageImageProviderFactory.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageImageProviderFactory.cs
index 8571afb8..5af0560e 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageImageProviderFactory.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageImageProviderFactory.cs
@@ -1,11 +1,7 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using System.IO;
-using System.Linq;
 using System.Net.Http.Headers;
-using System.Threading.Tasks;
 using Amazon.S3;
 using Amazon.S3.Model;
 using Microsoft.AspNetCore.Hosting;
@@ -14,101 +10,100 @@
 using Microsoft.Extensions.Options;
 using SixLabors.ImageSharp.Web.Providers.AWS;
 
-namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
+namespace SixLabors.ImageSharp.Web.Tests.TestUtilities;
+
+public static class AWSS3StorageImageProviderFactory
 {
-    public static class AWSS3StorageImageProviderFactory
+    public static AWSS3StorageImageProvider Create(IServiceProvider services)
     {
-        public static AWSS3StorageImageProvider Create(IServiceProvider services)
-        {
-            IOptions<AWSS3StorageImageProviderOptions> options = services.GetRequiredService<IOptions<AWSS3StorageImageProviderOptions>>();
-            FormatUtilities utilities = services.GetRequiredService<FormatUtilities>();
-            AsyncHelper.RunSync(() => InitializeAWSStorageAsync(services, options.Value));
+        IOptions<AWSS3StorageImageProviderOptions> options = services.GetRequiredService<IOptions<AWSS3StorageImageProviderOptions>>();
+        FormatUtilities utilities = services.GetRequiredService<FormatUtilities>();
+        AsyncHelper.RunSync(() => InitializeAWSStorageAsync(services, options.Value));
 
-            return new AWSS3StorageImageProvider(options, utilities);
-        }
+        return new AWSS3StorageImageProvider(options, utilities);
+    }
 
-        private static async Task InitializeAWSStorageAsync(IServiceProvider services, AWSS3StorageImageProviderOptions options)
-        {
-            // Upload an image to the AWS Test Storage;
-            AWSS3BucketClientOptions bucketOptions = options.S3Buckets.First();
-            AmazonS3Client amazonS3Client = AmazonS3ClientFactory.CreateClient(bucketOptions);
-            ListBucketsResponse listBucketsResponse = await amazonS3Client.ListBucketsAsync();
+    private static async Task InitializeAWSStorageAsync(IServiceProvider services, AWSS3StorageImageProviderOptions options)
+    {
+        // Upload an image to the AWS Test Storage;
+        AWSS3BucketClientOptions bucketOptions = options.S3Buckets.First();
+        AmazonS3Client amazonS3Client = AmazonS3ClientFactory.CreateClient(bucketOptions);
+        ListBucketsResponse listBucketsResponse = await amazonS3Client.ListBucketsAsync();
 
-            bool foundBucket = false;
-            foreach (S3Bucket b in listBucketsResponse.Buckets)
+        bool foundBucket = false;
+        foreach (S3Bucket b in listBucketsResponse.Buckets)
+        {
+            if (b.BucketName == bucketOptions.BucketName)
             {
-                if (b.BucketName == bucketOptions.BucketName)
-                {
-                    foundBucket = true;
-                    break;
-                }
+                foundBucket = true;
+                break;
             }
+        }
 
-            if (!foundBucket)
+        if (!foundBucket)
+        {
+            try
             {
-                try
+                var putBucketRequest = new PutBucketRequest
                 {
-                    var putBucketRequest = new PutBucketRequest
-                    {
-                        BucketName = bucketOptions.BucketName,
-                        BucketRegion = bucketOptions.Region,
-                        CannedACL = S3CannedACL.PublicRead
-                    };
+                    BucketName = bucketOptions.BucketName,
+                    BucketRegion = bucketOptions.Region,
+                    CannedACL = S3CannedACL.PublicRead
+                };
 
-                    await amazonS3Client.PutBucketAsync(putBucketRequest);
-                }
-                catch (AmazonS3Exception e)
+                await amazonS3Client.PutBucketAsync(putBucketRequest);
+            }
+            catch (AmazonS3Exception e)
+            {
+                // CI tests are run in parallel and can sometimes return a
+                // false negative for the existance of a bucket.
+                if (string.Equals(e.ErrorCode, "BucketAlreadyExists"))
                 {
-                    // CI tests are run in parallel and can sometimes return a
-                    // false negative for the existance of a bucket.
-                    if (string.Equals(e.ErrorCode, "BucketAlreadyExists"))
-                    {
-                        return;
-                    }
-
-                    throw;
+                    return;
                 }
+
+                throw;
             }
+        }
 
-            IWebHostEnvironment environment = services.GetRequiredService<IWebHostEnvironment>();
+        IWebHostEnvironment environment = services.GetRequiredService<IWebHostEnvironment>();
 
-            try
+        try
+        {
+            GetObjectRequest request = new()
             {
-                GetObjectRequest request = new()
-                {
-                    BucketName = bucketOptions.BucketName,
-                    Key = TestConstants.ImagePath
-                };
+                BucketName = bucketOptions.BucketName,
+                Key = TestConstants.ImagePath
+            };
 
-                await amazonS3Client.GetObjectAsync(request);
-            }
-            catch
-            {
-                IFileInfo file = environment.WebRootFileProvider.GetFileInfo(TestConstants.ImagePath);
-                using Stream stream = file.CreateReadStream();
+            await amazonS3Client.GetObjectAsync(request);
+        }
+        catch
+        {
+            IFileInfo file = environment.WebRootFileProvider.GetFileInfo(TestConstants.ImagePath);
+            using Stream stream = file.CreateReadStream();
 
-                // Set the max-age property so we get coverage for testing in our AWS provider.
-                var cacheControl = new CacheControlHeaderValue
-                {
-                    Public = true,
-                    MaxAge = TimeSpan.FromDays(7),
-                    MustRevalidate = true
-                };
+            // Set the max-age property so we get coverage for testing in our AWS provider.
+            var cacheControl = new CacheControlHeaderValue
+            {
+                Public = true,
+                MaxAge = TimeSpan.FromDays(7),
+                MustRevalidate = true
+            };
 
-                var putRequest = new PutObjectRequest()
+            var putRequest = new PutObjectRequest()
+            {
+                BucketName = bucketOptions.BucketName,
+                Key = TestConstants.ImagePath,
+                Headers =
                 {
-                    BucketName = bucketOptions.BucketName,
-                    Key = TestConstants.ImagePath,
-                    Headers =
-                    {
-                        CacheControl = cacheControl.ToString()
-                    },
-                    ContentType = "	image/png",
-                    InputStream = stream
-                };
+                    CacheControl = cacheControl.ToString()
+                },
+                ContentType = "	image/png",
+                InputStream = stream
+            };
 
-                await amazonS3Client.PutObjectAsync(putRequest);
-            }
+            await amazonS3Client.PutObjectAsync(putRequest);
         }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs
index 2759aa94..5f05efb6 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs
@@ -1,62 +1,58 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Xunit;
 using Xunit.Abstractions;
 
-namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
+namespace SixLabors.ImageSharp.Web.Tests.TestUtilities;
+
+public abstract class AuthenticatedServerTestBase<TFixture> : ServerTestBase<TFixture>
+     where TFixture : AuthenticatedTestServerFixture
 {
-    public abstract class AuthenticatedServerTestBase<TFixture> : ServerTestBase<TFixture>
-         where TFixture : AuthenticatedTestServerFixture
+    private readonly ImageSharpRequestAuthorizationUtilities authorizationUtilities;
+    private readonly string relativeImageSouce;
+
+    protected AuthenticatedServerTestBase(TFixture fixture, ITestOutputHelper outputHelper, string imageSource)
+        : base(fixture, outputHelper, imageSource)
     {
-        private readonly ImageSharpRequestAuthorizationUtilities authorizationUtilities;
-        private readonly string relativeImageSouce;
-
-        protected AuthenticatedServerTestBase(TFixture fixture, ITestOutputHelper outputHelper, string imageSource)
-            : base(fixture, outputHelper, imageSource)
-        {
-            this.authorizationUtilities =
-                       this.Fixture.Services.GetRequiredService<ImageSharpRequestAuthorizationUtilities>();
-
-            this.relativeImageSouce = this.ImageSource.Replace("http://localhost", string.Empty);
-        }
-
-        [Fact]
-        public async Task CanRejectUnauthorizedRequestAsync()
-        {
-            string url = this.ImageSource;
-
-            // Send an unaugmented request without a token.
-            HttpResponseMessage response = await this.HttpClient.GetAsync(url + this.Fixture.Commands[0]);
-            Assert.NotNull(response);
-            Assert.False(response.IsSuccessStatusCode);
-            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
-
-            // Now send an invalid token
-            response = await this.HttpClient.GetAsync(url + this.Fixture.Commands[0] + "&" + ImageSharpRequestAuthorizationUtilities.TokenCommand + "=INVALID");
-            Assert.NotNull(response);
-            Assert.False(response.IsSuccessStatusCode);
-            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
-        }
-
-        protected override async Task<string> AugmentCommandAsync(string command)
-        {
-            string uri = this.relativeImageSouce + command;
-            string token = await this.GetTokenAsync(uri);
-            return command + "&" + ImageSharpRequestAuthorizationUtilities.TokenCommand + "=" + token;
-        }
-
-        private async Task<string> GetTokenAsync(string uri)
-        {
-            string tokenSync = this.authorizationUtilities.ComputeHMAC(uri, CommandHandling.Sanitize);
-            string tokenAsync = await this.authorizationUtilities.ComputeHMACAsync(uri, CommandHandling.Sanitize);
-
-            Assert.Equal(tokenSync, tokenAsync);
-            return tokenSync;
-        }
+        this.authorizationUtilities =
+                   this.Fixture.Services.GetRequiredService<ImageSharpRequestAuthorizationUtilities>();
+
+        this.relativeImageSouce = this.ImageSource.Replace("http://localhost", string.Empty);
+    }
+
+    [Fact]
+    public async Task CanRejectUnauthorizedRequestAsync()
+    {
+        string url = this.ImageSource;
+
+        // Send an unaugmented request without a token.
+        HttpResponseMessage response = await this.HttpClient.GetAsync(url + this.Fixture.Commands[0]);
+        Assert.NotNull(response);
+        Assert.False(response.IsSuccessStatusCode);
+        Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+
+        // Now send an invalid token
+        response = await this.HttpClient.GetAsync(url + this.Fixture.Commands[0] + "&" + ImageSharpRequestAuthorizationUtilities.TokenCommand + "=INVALID");
+        Assert.NotNull(response);
+        Assert.False(response.IsSuccessStatusCode);
+        Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+    }
+
+    protected override async Task<string> AugmentCommandAsync(string command)
+    {
+        string uri = this.relativeImageSouce + command;
+        string token = await this.GetTokenAsync(uri);
+        return command + "&" + ImageSharpRequestAuthorizationUtilities.TokenCommand + "=" + token;
+    }
+
+    private async Task<string> GetTokenAsync(string uri)
+    {
+        string tokenSync = this.authorizationUtilities.ComputeHMAC(uri, CommandHandling.Sanitize);
+        string tokenAsync = await this.authorizationUtilities.ComputeHMACAsync(uri, CommandHandling.Sanitize);
+
+        Assert.Equal(tokenSync, tokenAsync);
+        return tokenSync;
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedTestServerFixture.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedTestServerFixture.cs
index 4f1ca198..26954d90 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedTestServerFixture.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedTestServerFixture.cs
@@ -1,24 +1,23 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using Microsoft.Extensions.DependencyInjection;
 using SixLabors.ImageSharp.Web.DependencyInjection;
 using SixLabors.ImageSharp.Web.Middleware;
 
-namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
+namespace SixLabors.ImageSharp.Web.Tests.TestUtilities;
+
+public class AuthenticatedTestServerFixture : TestServerFixture
 {
-    public class AuthenticatedTestServerFixture : TestServerFixture
-    {
-        public static byte[] HMACSecretKey { get; } = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 };
+    public static byte[] HMACSecretKey { get; } = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 };
 
-        protected override void ConfigureImageSharpOptions(ImageSharpMiddlewareOptions options)
-        {
-            base.ConfigureImageSharpOptions(options);
-            options.HMACSecretKey = HMACSecretKey;
-        }
+    protected override void ConfigureImageSharpOptions(ImageSharpMiddlewareOptions options)
+    {
+        base.ConfigureImageSharpOptions(options);
+        options.HMACSecretKey = HMACSecretKey;
+    }
 
-        protected override void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder)
-        {
-        }
+    protected override void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder)
+    {
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AzureBlobStorageCacheTestServerFixture.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AzureBlobStorageCacheTestServerFixture.cs
index ac461848..e2002a9a 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AzureBlobStorageCacheTestServerFixture.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AzureBlobStorageCacheTestServerFixture.cs
@@ -1,5 +1,5 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using Azure.Storage.Blobs.Models;
 using Microsoft.Extensions.DependencyInjection;
@@ -7,27 +7,26 @@
 using SixLabors.ImageSharp.Web.DependencyInjection;
 using SixLabors.ImageSharp.Web.Providers.Azure;
 
-namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
+namespace SixLabors.ImageSharp.Web.Tests.TestUtilities;
+
+public class AzureBlobStorageCacheTestServerFixture : TestServerFixture
 {
-    public class AzureBlobStorageCacheTestServerFixture : TestServerFixture
-    {
-        protected override void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder)
-            => builder
-               .Configure<AzureBlobStorageImageProviderOptions>(o =>
-                    o.BlobContainers.Add(
-                    new AzureBlobContainerClientOptions
-                    {
-                        ConnectionString = TestConstants.AzureConnectionString,
-                        ContainerName = TestConstants.AzureContainerName
-                    }))
-                .AddProvider(AzureBlobStorageImageProviderFactory.Create)
-                .Configure<AzureBlobStorageCacheOptions>(o =>
+    protected override void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder)
+        => builder
+           .Configure<AzureBlobStorageImageProviderOptions>(o =>
+                o.BlobContainers.Add(
+                new AzureBlobContainerClientOptions
                 {
-                    o.ConnectionString = TestConstants.AzureConnectionString;
-                    o.ContainerName = TestConstants.AzureCacheContainerName;
+                    ConnectionString = TestConstants.AzureConnectionString,
+                    ContainerName = TestConstants.AzureContainerName
+                }))
+            .AddProvider(AzureBlobStorageImageProviderFactory.Create)
+            .Configure<AzureBlobStorageCacheOptions>(o =>
+            {
+                o.ConnectionString = TestConstants.AzureConnectionString;
+                o.ContainerName = TestConstants.AzureCacheContainerName;
 
-                    AzureBlobStorageCache.CreateIfNotExists(o, PublicAccessType.None);
-                })
-                .SetCache<AzureBlobStorageCache>();
-    }
+                AzureBlobStorageCache.CreateIfNotExists(o, PublicAccessType.None);
+            })
+            .SetCache<AzureBlobStorageCache>();
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AzureBlobStorageImageProviderFactory.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AzureBlobStorageImageProviderFactory.cs
index 8d1adc7d..b01ad5b3 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AzureBlobStorageImageProviderFactory.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AzureBlobStorageImageProviderFactory.cs
@@ -1,9 +1,6 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using System.IO;
-using System.Linq;
 using System.Net.Http.Headers;
 using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
@@ -13,50 +10,49 @@
 using Microsoft.Extensions.Options;
 using SixLabors.ImageSharp.Web.Providers.Azure;
 
-namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
+namespace SixLabors.ImageSharp.Web.Tests.TestUtilities;
+
+public static class AzureBlobStorageImageProviderFactory
 {
-    public static class AzureBlobStorageImageProviderFactory
+    public static AzureBlobStorageImageProvider Create(IServiceProvider services)
     {
-        public static AzureBlobStorageImageProvider Create(IServiceProvider services)
-        {
-            IOptions<AzureBlobStorageImageProviderOptions> options = services.GetRequiredService<IOptions<AzureBlobStorageImageProviderOptions>>();
-            FormatUtilities utilities = services.GetRequiredService<FormatUtilities>();
-            InitializeAzureStorage(services, options.Value);
+        IOptions<AzureBlobStorageImageProviderOptions> options = services.GetRequiredService<IOptions<AzureBlobStorageImageProviderOptions>>();
+        FormatUtilities utilities = services.GetRequiredService<FormatUtilities>();
+        InitializeAzureStorage(services, options.Value);
 
-            return new AzureBlobStorageImageProvider(options, utilities);
-        }
+        return new AzureBlobStorageImageProvider(options, utilities);
+    }
 
-        private static void InitializeAzureStorage(IServiceProvider services, AzureBlobStorageImageProviderOptions options)
-        {
-            // Upload an image to the Azure Test Storage;
-            AzureBlobContainerClientOptions containerOptions = options.BlobContainers.First();
-            var container = new BlobContainerClient(containerOptions.ConnectionString, containerOptions.ContainerName);
-            container.CreateIfNotExists(PublicAccessType.Blob);
+    private static void InitializeAzureStorage(IServiceProvider services, AzureBlobStorageImageProviderOptions options)
+    {
+        // Upload an image to the Azure Test Storage;
+        AzureBlobContainerClientOptions containerOptions = options.BlobContainers.First();
+        var container = new BlobContainerClient(containerOptions.ConnectionString, containerOptions.ContainerName);
+        container.CreateIfNotExists(PublicAccessType.Blob);
 
-            IWebHostEnvironment environment = services.GetRequiredService<IWebHostEnvironment>();
+        IWebHostEnvironment environment = services.GetRequiredService<IWebHostEnvironment>();
 
-            BlobClient blob = container.GetBlobClient(TestConstants.ImagePath);
+        BlobClient blob = container.GetBlobClient(TestConstants.ImagePath);
 
-            if (!blob.Exists())
+        if (!blob.Exists())
+        {
+            IFileInfo file = environment.WebRootFileProvider.GetFileInfo(TestConstants.ImagePath);
+            using Stream stream = file.CreateReadStream();
+
+            // Set the max-age property so we get coverage for testing is in our Azure provider.
+            var cacheControl = new CacheControlHeaderValue
             {
-                IFileInfo file = environment.WebRootFileProvider.GetFileInfo(TestConstants.ImagePath);
-                using Stream stream = file.CreateReadStream();
-
-                // Set the max-age property so we get coverage for testing is in our Azure provider.
-                var cacheControl = new CacheControlHeaderValue
-                {
-                    Public = true,
-                    MaxAge = TimeSpan.FromDays(7),
-                    MustRevalidate = true
-                };
-
-                var headers = new BlobHttpHeaders
-                {
-                    CacheControl = cacheControl.ToString(),
-                };
-
-                blob.Upload(stream, httpHeaders: headers);
-            }
+                Public = true,
+                MaxAge = TimeSpan.FromDays(7),
+                MustRevalidate = true
+            };
+
+            var headers = new BlobHttpHeaders
+            {
+                CacheControl = cacheControl.ToString(),
+            };
+
+            blob.Upload(stream, httpHeaders: headers);
         }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/CacheBusterWebProcessor.cs b/tests/ImageSharp.Web.Tests/TestUtilities/CacheBusterWebProcessor.cs
index d0fb9af3..52f4f893 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/CacheBusterWebProcessor.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/CacheBusterWebProcessor.cs
@@ -1,28 +1,26 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.Extensions.Logging;
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Processors;
 
-namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
+namespace SixLabors.ImageSharp.Web.Tests.TestUtilities;
+
+public class CacheBusterWebProcessor : IImageWebProcessor
 {
-    public class CacheBusterWebProcessor : IImageWebProcessor
-    {
-        public const string Command = "v";
+    public const string Command = "v";
 
-        public IEnumerable<string> Commands { get; } = new[] { Command };
+    public IEnumerable<string> Commands { get; } = new[] { Command };
 
-        public FormattedImage Process(
-            FormattedImage image,
-            ILogger logger,
-            CommandCollection commands,
-            CommandParser parser,
-            CultureInfo culture)
-            => image;
+    public FormattedImage Process(
+        FormattedImage image,
+        ILogger logger,
+        CommandCollection commands,
+        CommandParser parser,
+        CultureInfo culture)
+        => image;
 
-        public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
-    }
+    public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/PhysicalFileSystemCacheAuthenticatedTestServerFixture.cs b/tests/ImageSharp.Web.Tests/TestUtilities/PhysicalFileSystemCacheAuthenticatedTestServerFixture.cs
index 6ae1409d..0991f610 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/PhysicalFileSystemCacheAuthenticatedTestServerFixture.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/PhysicalFileSystemCacheAuthenticatedTestServerFixture.cs
@@ -1,18 +1,17 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using Microsoft.Extensions.DependencyInjection;
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.DependencyInjection;
 using SixLabors.ImageSharp.Web.Providers;
 
-namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
+namespace SixLabors.ImageSharp.Web.Tests.TestUtilities;
+
+public class PhysicalFileSystemCacheAuthenticatedTestServerFixture : AuthenticatedTestServerFixture
 {
-    public class PhysicalFileSystemCacheAuthenticatedTestServerFixture : AuthenticatedTestServerFixture
-    {
-        protected override void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder)
-            => builder
-            .AddProvider<PhysicalFileSystemProvider>()
-            .SetCache<PhysicalFileSystemCache>();
-    }
+    protected override void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder)
+        => builder
+        .AddProvider<PhysicalFileSystemProvider>()
+        .SetCache<PhysicalFileSystemCache>();
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/PhysicalFileSystemCacheTestServerFixture.cs b/tests/ImageSharp.Web.Tests/TestUtilities/PhysicalFileSystemCacheTestServerFixture.cs
index 8926cd9a..d9a7af71 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/PhysicalFileSystemCacheTestServerFixture.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/PhysicalFileSystemCacheTestServerFixture.cs
@@ -1,18 +1,17 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using Microsoft.Extensions.DependencyInjection;
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.DependencyInjection;
 using SixLabors.ImageSharp.Web.Providers;
 
-namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
+namespace SixLabors.ImageSharp.Web.Tests.TestUtilities;
+
+public class PhysicalFileSystemCacheTestServerFixture : TestServerFixture
 {
-    public class PhysicalFileSystemCacheTestServerFixture : TestServerFixture
-    {
-        protected override void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder)
-            => builder
-            .AddProvider<PhysicalFileSystemProvider>()
-            .SetCache<PhysicalFileSystemCache>();
-    }
+    protected override void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder)
+        => builder
+        .AddProvider<PhysicalFileSystemProvider>()
+        .SetCache<PhysicalFileSystemCache>();
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs b/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs
index 7545304f..f9fa82a2 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs
@@ -1,149 +1,142 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
 using System.Collections;
-using System.IO;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using SixLabors.ImageSharp.Formats;
-using Xunit;
 using Xunit.Abstractions;
 
-namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
+namespace SixLabors.ImageSharp.Web.Tests.TestUtilities;
+
+[Collection("Server tests")]
+public abstract class ServerTestBase<TFixture> : IClassFixture<TFixture>
+    where TFixture : TestServerFixture
 {
-    [Collection("Server tests")]
-    public abstract class ServerTestBase<TFixture> : IClassFixture<TFixture>
-        where TFixture : TestServerFixture
+    private const int Width = 20;
+
+    protected ServerTestBase(TFixture fixture, ITestOutputHelper outputHelper, string imageSource)
     {
-        private const int Width = 20;
+        this.Fixture = fixture;
+        this.HttpClient = fixture.HttpClient;
+        this.OutputHelper = outputHelper;
+        this.ImageSource = imageSource;
 
-        protected ServerTestBase(TFixture fixture, ITestOutputHelper outputHelper, string imageSource)
+        this.OutputHelper.WriteLine("EnvironmentalVariables");
+        foreach (DictionaryEntry item in Environment.GetEnvironmentVariables())
         {
-            this.Fixture = fixture;
-            this.HttpClient = fixture.HttpClient;
-            this.OutputHelper = outputHelper;
-            this.ImageSource = imageSource;
-
-            this.OutputHelper.WriteLine("EnvironmentalVariables");
-            foreach (DictionaryEntry item in Environment.GetEnvironmentVariables())
-            {
-                this.OutputHelper.WriteLine($"Key = {item.Key}, Value = {item.Value}");
-            }
+            this.OutputHelper.WriteLine($"Key = {item.Key}, Value = {item.Value}");
         }
+    }
 
-        public TFixture Fixture { get; }
+    public TFixture Fixture { get; }
 
-        public HttpClient HttpClient { get; }
+    public HttpClient HttpClient { get; }
 
-        public ITestOutputHelper OutputHelper { get; }
+    public ITestOutputHelper OutputHelper { get; }
 
-        public string ImageSource { get; }
+    public string ImageSource { get; }
 
-        [Fact]
-        public async Task CanProcessAndResolveImageAsync()
-        {
-            string url = this.ImageSource;
+    [Fact]
+    public async Task CanProcessAndResolveImageAsync()
+    {
+        string url = this.ImageSource;
 
-            string ext = Path.GetExtension(url);
-            IImageFormat format = Configuration.Default.ImageFormatsManager.FindFormatByFileExtension(ext);
+        string ext = Path.GetExtension(url);
+        IImageFormat format = Configuration.Default.ImageFormatsManager.FindFormatByFileExtension(ext);
 
-            // First response
-            HttpResponseMessage response = await this.HttpClient.GetAsync(url + await this.AugmentCommandAsync(this.Fixture.Commands[0]));
+        // First response
+        HttpResponseMessage response = await this.HttpClient.GetAsync(url + await this.AugmentCommandAsync(this.Fixture.Commands[0]));
 
-            Assert.NotNull(response);
-            Assert.True(response.IsSuccessStatusCode);
-            Assert.True(response.Content.Headers.ContentLength > 0);
-            Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
+        Assert.NotNull(response);
+        Assert.True(response.IsSuccessStatusCode);
+        Assert.True(response.Content.Headers.ContentLength > 0);
+        Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
 
-            (Image Image, IImageFormat Format) actual = await Image.LoadWithFormatAsync(await response.Content.ReadAsStreamAsync());
-            using Image image = actual.Image;
+        (Image Image, IImageFormat Format) actual = await Image.LoadWithFormatAsync(await response.Content.ReadAsStreamAsync());
+        using Image image = actual.Image;
 
-            Assert.Equal(Width, image.Width);
-            Assert.Equal(format, actual.Format);
+        Assert.Equal(Width, image.Width);
+        Assert.Equal(format, actual.Format);
 
-            response.Dispose();
+        response.Dispose();
 
-            // Cached Response
-            response = await this.HttpClient.GetAsync(url + await this.AugmentCommandAsync(this.Fixture.Commands[0]));
+        // Cached Response
+        response = await this.HttpClient.GetAsync(url + await this.AugmentCommandAsync(this.Fixture.Commands[0]));
 
-            Assert.NotNull(response);
-            Assert.True(response.IsSuccessStatusCode);
-            Assert.True(response.Content.Headers.ContentLength > 0);
-            Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
+        Assert.NotNull(response);
+        Assert.True(response.IsSuccessStatusCode);
+        Assert.True(response.Content.Headers.ContentLength > 0);
+        Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
+
+        (Image Image, IImageFormat Format) cachedActual = await Image.LoadWithFormatAsync(await response.Content.ReadAsStreamAsync());
+        using Image cached = cachedActual.Image;
 
-            (Image Image, IImageFormat Format) cachedActual = await Image.LoadWithFormatAsync(await response.Content.ReadAsStreamAsync());
-            using Image cached = cachedActual.Image;
+        Assert.Equal(Width, cached.Width);
+        Assert.Equal(format, actual.Format);
 
-            Assert.Equal(Width, cached.Width);
-            Assert.Equal(format, actual.Format);
+        response.Dispose();
 
-            response.Dispose();
+        // 304 response
+        var request = new HttpRequestMessage
+        {
+            RequestUri = new Uri(url + await this.AugmentCommandAsync(this.Fixture.Commands[0])),
+            Method = HttpMethod.Get,
+        };
 
-            // 304 response
-            var request = new HttpRequestMessage
-            {
-                RequestUri = new Uri(url + await this.AugmentCommandAsync(this.Fixture.Commands[0])),
-                Method = HttpMethod.Get,
-            };
+        request.Headers.IfModifiedSince = DateTimeOffset.UtcNow;
 
-            request.Headers.IfModifiedSince = DateTimeOffset.UtcNow;
+        response = await this.HttpClient.SendAsync(request);
 
-            response = await this.HttpClient.SendAsync(request);
+        // This test is flaky in the CI environment.
+        if (!TestEnvironment.RunsOnCI)
+        {
+            Assert.Equal(HttpStatusCode.NotModified, response.StatusCode);
+            Assert.Equal(0, response.Content.Headers.ContentLength);
+        }
 
-            // This test is flaky in the CI environment.
-            if (!TestEnvironment.RunsOnCI)
-            {
-                Assert.Equal(HttpStatusCode.NotModified, response.StatusCode);
-                Assert.Equal(0, response.Content.Headers.ContentLength);
-            }
+        Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
 
-            Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
+        request.Dispose();
+        response.Dispose();
 
-            request.Dispose();
-            response.Dispose();
+        // 412 response
+        request = new HttpRequestMessage
+        {
+            RequestUri = new Uri(url + await this.AugmentCommandAsync(this.Fixture.Commands[0])),
+            Method = HttpMethod.Get,
+        };
 
-            // 412 response
-            request = new HttpRequestMessage
-            {
-                RequestUri = new Uri(url + await this.AugmentCommandAsync(this.Fixture.Commands[0])),
-                Method = HttpMethod.Get,
-            };
+        request.Headers.IfUnmodifiedSince = DateTimeOffset.MinValue;
 
-            request.Headers.IfUnmodifiedSince = DateTimeOffset.MinValue;
+        response = await this.HttpClient.SendAsync(request);
 
-            response = await this.HttpClient.SendAsync(request);
+        Assert.Equal(HttpStatusCode.PreconditionFailed, response.StatusCode);
+        Assert.Equal(0, response.Content.Headers.ContentLength);
 
-            Assert.Equal(HttpStatusCode.PreconditionFailed, response.StatusCode);
-            Assert.Equal(0, response.Content.Headers.ContentLength);
+        request.Dispose();
+        response.Dispose();
+    }
 
-            request.Dispose();
-            response.Dispose();
-        }
+    [Fact]
+    public async Task CanProcessMultipleIdenticalQueriesAsync()
+    {
+        string url = this.ImageSource;
+        string command1 = await this.AugmentCommandAsync(this.Fixture.Commands[0]);
+        string command2 = await this.AugmentCommandAsync(this.Fixture.Commands[1]);
 
-        [Fact]
-        public async Task CanProcessMultipleIdenticalQueriesAsync()
+        Task[] tasks = Enumerable.Range(0, 100).Select(i => Task.Run(async () =>
         {
-            string url = this.ImageSource;
-            string command1 = await this.AugmentCommandAsync(this.Fixture.Commands[0]);
-            string command2 = await this.AugmentCommandAsync(this.Fixture.Commands[1]);
-
-            Task[] tasks = Enumerable.Range(0, 100).Select(i => Task.Run(async () =>
-            {
-                string command = i % 2 == 0 ? command1 : command2;
-                using HttpResponseMessage response = await this.HttpClient.GetAsync(url + command);
-                Assert.NotNull(response);
-                Assert.True(response.IsSuccessStatusCode);
-                Assert.True(response.Content.Headers.ContentLength > 0);
-            })).ToArray();
-
-            var all = Task.WhenAll(tasks);
-            await all;
-            Assert.True(all.IsCompletedSuccessfully);
-        }
+            string command = i % 2 == 0 ? command1 : command2;
+            using HttpResponseMessage response = await this.HttpClient.GetAsync(url + command);
+            Assert.NotNull(response);
+            Assert.True(response.IsSuccessStatusCode);
+            Assert.True(response.Content.Headers.ContentLength > 0);
+        })).ToArray();
 
-        protected virtual Task<string> AugmentCommandAsync(string command) => Task.FromResult(command);
+        var all = Task.WhenAll(tasks);
+        await all;
+        Assert.True(all.IsCompletedSuccessfully);
     }
+
+    protected virtual Task<string> AugmentCommandAsync(string command) => Task.FromResult(command);
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs b/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
index 9c764d7e..bc1ba269 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
@@ -1,25 +1,22 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
+namespace SixLabors.ImageSharp.Web.Tests.TestUtilities;
 
-namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
+public static class TestConstants
 {
-    public static class TestConstants
-    {
-        public const string AzureConnectionString = "UseDevelopmentStorage=true";
-        public const string AzureContainerName = "azure";
-        public const string AzureCacheContainerName = "is-cache";
-        public const string AWSEndpoint = "http://127.0.0.1:4568/";
-        public const string AWSRegion = "eu-west-2";
-        public const string AWSBucketName = "aws";
-        public const string AWSCacheBucketName = "aws-cache";
-        public const string AWSAccessKey = "";
-        public const string AWSAccessSecret = "";
-        public const string ImagePath = "SubFolder/sîxläbörs.îmägéshärp.wéb.png";
-        public const string PhysicalTestImage = "http://localhost/" + ImagePath;
-        public const string AzureTestImage = "http://localhost/" + AzureContainerName + "/" + ImagePath;
-        public const string AWSTestImage = "http://localhost/" + AWSBucketName + "/" + ImagePath;
-        public static readonly TimeSpan AWSTimeout = TimeSpan.FromSeconds(10);
-    }
+    public const string AzureConnectionString = "UseDevelopmentStorage=true";
+    public const string AzureContainerName = "azure";
+    public const string AzureCacheContainerName = "is-cache";
+    public const string AWSEndpoint = "http://127.0.0.1:4568/";
+    public const string AWSRegion = "eu-west-2";
+    public const string AWSBucketName = "aws";
+    public const string AWSCacheBucketName = "aws-cache";
+    public const string AWSAccessKey = "";
+    public const string AWSAccessSecret = "";
+    public const string ImagePath = "SubFolder/sîxläbörs.îmägéshärp.wéb.png";
+    public const string PhysicalTestImage = "http://localhost/" + ImagePath;
+    public const string AzureTestImage = "http://localhost/" + AzureContainerName + "/" + ImagePath;
+    public const string AWSTestImage = "http://localhost/" + AWSBucketName + "/" + ImagePath;
+    public static readonly TimeSpan AWSTimeout = TimeSpan.FromSeconds(10);
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/TestEnvironment.cs b/tests/ImageSharp.Web.Tests/TestUtilities/TestEnvironment.cs
index 6d9918db..33a6c62a 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/TestEnvironment.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/TestEnvironment.cs
@@ -1,31 +1,30 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+
 #if !ENV_CI
-using System;
 #endif
 
-namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
+namespace SixLabors.ImageSharp.Web.Tests.TestUtilities;
+
+internal static class TestEnvironment
 {
-    internal static class TestEnvironment
-    {
-        /// <summary>
-        /// Gets a value indicating whether test execution runs on CI.
-        /// </summary>
+    /// <summary>
+    /// Gets a value indicating whether test execution runs on CI.
+    /// </summary>
 #if ENV_CI
-        internal static bool RunsOnCI => true;
+    internal static bool RunsOnCI => true;
 #else
-        internal static bool RunsOnCI
+    internal static bool RunsOnCI
+    {
+        get
         {
-            get
-            {
-                // TODO: Something weird going on with our environment constants here.
-                // try reading the environment directly.
-                // https://docs.github.com/en/actions/learn-github-actions/environment-variables
-                string variable = Environment.GetEnvironmentVariable("CI");
-                bool.TryParse(variable, out bool result);
-                return result;
-            }
+            // TODO: Something weird going on with our environment constants here.
+            // try reading the environment directly.
+            // https://docs.github.com/en/actions/learn-github-actions/environment-variables
+            string variable = Environment.GetEnvironmentVariable("CI");
+            bool.TryParse(variable, out bool result);
+            return result;
         }
-#endif
     }
+#endif
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs b/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs
index bdf89948..12ed053d 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs
@@ -1,10 +1,6 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
@@ -13,137 +9,135 @@
 using Microsoft.Extensions.DependencyInjection;
 using SixLabors.ImageSharp.Web.DependencyInjection;
 using SixLabors.ImageSharp.Web.Middleware;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
+namespace SixLabors.ImageSharp.Web.Tests.TestUtilities;
+
+public abstract class TestServerFixture : IDisposable
 {
-    public abstract class TestServerFixture : IDisposable
-    {
-        private const int Width = 20;
-        private static readonly string Command = "?width=" + Width + "&v=" + Guid.NewGuid().ToString();
-        private static readonly string Command2 = "?width=" + (Width + 1) + "&v=" + Guid.NewGuid().ToString();
+    private const int Width = 20;
+    private static readonly string Command = "?width=" + Width + "&v=" + Guid.NewGuid().ToString();
+    private static readonly string Command2 = "?width=" + (Width + 1) + "&v=" + Guid.NewGuid().ToString();
 
-        private TestServer server;
-        private bool isDisposed;
+    private TestServer server;
+    private bool isDisposed;
 
-        protected TestServerFixture()
+    protected TestServerFixture()
+    {
+        IConfigurationRoot configuration = new ConfigurationBuilder()
+        .AddInMemoryCollection(new[]
         {
-            IConfigurationRoot configuration = new ConfigurationBuilder()
-            .AddInMemoryCollection(new[]
-            {
-                new KeyValuePair<string, string>("webroot", string.Empty)
-            })
-            .AddEnvironmentVariables()
-            .Build();
-
-            IWebHostBuilder builder = new WebHostBuilder()
-                .UseConfiguration(configuration)
-                .Configure(this.Configure)
-                .ConfigureServices(this.ConfigureServices);
-
-            this.server = new TestServer(builder);
-            this.Services = this.server.Host.Services;
-            this.HttpClient = this.server.CreateClient();
-        }
+            new KeyValuePair<string, string>("webroot", string.Empty)
+        })
+        .AddEnvironmentVariables()
+        .Build();
+
+        IWebHostBuilder builder = new WebHostBuilder()
+            .UseConfiguration(configuration)
+            .Configure(this.Configure)
+            .ConfigureServices(this.ConfigureServices);
+
+        this.server = new TestServer(builder);
+        this.Services = this.server.Host.Services;
+        this.HttpClient = this.server.CreateClient();
+    }
 
-        public HttpClient HttpClient { get; private set; }
+    public HttpClient HttpClient { get; private set; }
 
-        public IServiceProvider Services { get; }
+    public IServiceProvider Services { get; }
 
-        public virtual IReadOnlyList<string> Commands { get; } = new List<string>
-        {
-            Command,
-            Command2
-        };
+    public virtual IReadOnlyList<string> Commands { get; } = new List<string>
+    {
+        Command,
+        Command2
+    };
 
-        protected void ConfigureServices(IServiceCollection services)
+    protected void ConfigureServices(IServiceCollection services)
+    {
+        IImageSharpBuilder builder = services.AddImageSharp(options =>
         {
-            IImageSharpBuilder builder = services.AddImageSharp(options =>
-            {
-                Func<ImageCommandContext, Task> onParseCommandsAsync = options.OnParseCommandsAsync;
+            Func<ImageCommandContext, Task> onParseCommandsAsync = options.OnParseCommandsAsync;
 
-                options.OnParseCommandsAsync = context =>
-                {
-                    Assert.NotNull(context);
-                    Assert.NotNull(context.Context);
-                    Assert.NotNull(context.Commands);
-                    Assert.NotNull(context.Parser);
+            options.OnParseCommandsAsync = context =>
+            {
+                Assert.NotNull(context);
+                Assert.NotNull(context.Context);
+                Assert.NotNull(context.Commands);
+                Assert.NotNull(context.Parser);
 
-                    return onParseCommandsAsync.Invoke(context);
-                };
+                return onParseCommandsAsync.Invoke(context);
+            };
 
-                Func<ImageProcessingContext, Task> onProcessedAsync = options.OnProcessedAsync;
+            Func<ImageProcessingContext, Task> onProcessedAsync = options.OnProcessedAsync;
 
-                options.OnProcessedAsync = context =>
-                {
-                    Assert.NotNull(context);
-                    Assert.NotNull(context.Commands);
-                    Assert.NotNull(context.ContentType);
-                    Assert.NotNull(context.Context);
-                    Assert.NotNull(context.Extension);
-                    Assert.NotNull(context.Stream);
+            options.OnProcessedAsync = context =>
+            {
+                Assert.NotNull(context);
+                Assert.NotNull(context.Commands);
+                Assert.NotNull(context.ContentType);
+                Assert.NotNull(context.Context);
+                Assert.NotNull(context.Extension);
+                Assert.NotNull(context.Stream);
 
-                    return onProcessedAsync.Invoke(context);
-                };
+                return onProcessedAsync.Invoke(context);
+            };
 
-                Func<FormattedImage, Task> onBeforeSaveAsync = options.OnBeforeSaveAsync;
+            Func<FormattedImage, Task> onBeforeSaveAsync = options.OnBeforeSaveAsync;
 
-                options.OnBeforeSaveAsync = context =>
-                {
-                    Assert.NotNull(context);
-                    Assert.NotNull(context.Format);
-                    Assert.NotNull(context.Encoder);
-                    Assert.NotNull(context.Image);
+            options.OnBeforeSaveAsync = context =>
+            {
+                Assert.NotNull(context);
+                Assert.NotNull(context.Format);
+                Assert.NotNull(context.Encoder);
+                Assert.NotNull(context.Image);
 
-                    return onBeforeSaveAsync.Invoke(context);
-                };
+                return onBeforeSaveAsync.Invoke(context);
+            };
 
-                Func<HttpContext, Task> onPrepareResponseAsync = options.OnPrepareResponseAsync;
+            Func<HttpContext, Task> onPrepareResponseAsync = options.OnPrepareResponseAsync;
 
-                options.OnPrepareResponseAsync = context =>
-                {
-                    Assert.NotNull(context);
-                    Assert.NotNull(context.Response);
+            options.OnPrepareResponseAsync = context =>
+            {
+                Assert.NotNull(context);
+                Assert.NotNull(context.Response);
 
-                    return onPrepareResponseAsync.Invoke(context);
-                };
+                return onPrepareResponseAsync.Invoke(context);
+            };
 
-                this.ConfigureImageSharpOptions(options);
-            })
-            .ClearProviders()
-            .AddProcessor<CacheBusterWebProcessor>();
+            this.ConfigureImageSharpOptions(options);
+        })
+        .ClearProviders()
+        .AddProcessor<CacheBusterWebProcessor>();
 
-            this.ConfigureCustomServices(services, builder);
-        }
+        this.ConfigureCustomServices(services, builder);
+    }
 
-        protected virtual void Configure(IApplicationBuilder app) => app.UseImageSharp();
+    protected virtual void Configure(IApplicationBuilder app) => app.UseImageSharp();
 
-        protected virtual void ConfigureImageSharpOptions(ImageSharpMiddlewareOptions options)
-        {
-        }
+    protected virtual void ConfigureImageSharpOptions(ImageSharpMiddlewareOptions options)
+    {
+    }
 
-        protected abstract void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder);
+    protected abstract void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder);
 
-        protected virtual void Dispose(bool disposing)
+    protected virtual void Dispose(bool disposing)
+    {
+        if (!this.isDisposed)
         {
-            if (!this.isDisposed)
+            if (disposing)
             {
-                if (disposing)
-                {
-                    this.server.Dispose();
-                    this.HttpClient.Dispose();
-                }
-
-                this.server = null;
-                this.HttpClient = null;
-                this.isDisposed = true;
+                this.server.Dispose();
+                this.HttpClient.Dispose();
             }
-        }
 
-        public void Dispose()
-        {
-            this.Dispose(true);
-            GC.SuppressFinalize(this);
+            this.server = null;
+            this.HttpClient = null;
+            this.isDisposed = true;
         }
     }
+
+    public void Dispose()
+    {
+        this.Dispose(true);
+        GC.SuppressFinalize(this);
+    }
 }

From c230dfa8cb5e4313b4e829498d9ce02bbfd0e5ad Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Wed, 8 Feb 2023 21:53:45 +1000
Subject: [PATCH 040/102] Update build-and-test.yml

---
 .github/workflows/build-and-test.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 4b8d6d39..e065a792 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -17,14 +17,17 @@ jobs:
         options:
           - os: ubuntu-latest
             framework: net7.0
+            sdk-preview: true
             runtime: -x64
             codecov: false
           - os: macos-latest
             framework: net7.0
+            sdk-preview: true
             runtime: -x64
             codecov: false
           - os: windows-latest
             framework: net7.0
+            sdk-preview: true
             runtime: -x64
             codecov: true
           - os: ubuntu-latest
@@ -121,6 +124,13 @@ jobs:
         env:
           SIXLABORS_TESTING: True
 
+      - name: DotNet Build Preview
+        if: ${{ matrix.options.sdk-preview == true }}
+        shell: pwsh
+        run: ./ci-build.ps1 "${{matrix.options.framework}}"
+        env:
+          SIXLABORS_TESTING_PREVIEW: True
+
       - name: DotNet Test
         shell: pwsh
         run: ./ci-test.ps1 "${{matrix.options.os}}" "${{matrix.options.framework}}" "${{matrix.options.runtime}}" "${{matrix.options.codecov}}"
@@ -128,6 +138,14 @@ jobs:
           SIXLABORS_TESTING: True
           XUNIT_PATH: .\tests\ImageSharp.Web.Tests # Required for xunit
 
+      - name: DotNet Test Preview
+        if: ${{ matrix.options.sdk-preview == true }}
+        shell: pwsh
+        run: ./ci-test.ps1 "${{matrix.options.os}}" "${{matrix.options.framework}}" "${{matrix.options.runtime}}" "${{matrix.options.codecov}}"
+        env:
+          SIXLABORS_TESTING_PREVIEW: True
+          XUNIT_PATH: .\tests\ImageSharp.Web.Tests # Required for xunit
+
       - name: Codecov Update
         uses: codecov/codecov-action@v3
         if: matrix.options.codecov == true && startsWith(github.repository, 'SixLabors')

From 12c3d31011520b300dafcda9af92e10ee1be24e3 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Wed, 8 Feb 2023 21:56:24 +1000
Subject: [PATCH 041/102] Update build-and-test.yml

---
 .github/workflows/build-and-test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index e065a792..e03d5964 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -132,6 +132,7 @@ jobs:
           SIXLABORS_TESTING_PREVIEW: True
 
       - name: DotNet Test
+        if: ${{ matrix.options.sdk-preview != true }}
         shell: pwsh
         run: ./ci-test.ps1 "${{matrix.options.os}}" "${{matrix.options.framework}}" "${{matrix.options.runtime}}" "${{matrix.options.codecov}}"
         env:

From d62bda921582fbfb264693ba7be2f858c65cf49a Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Wed, 8 Feb 2023 21:59:24 +1000
Subject: [PATCH 042/102] Update build-and-test.yml

---
 .github/workflows/build-and-test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index e03d5964..97aafb97 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -119,6 +119,7 @@ jobs:
             6.0.x
 
       - name: DotNet Build
+        if: ${{ matrix.options.sdk-preview != true }}
         shell: pwsh
         run: ./ci-build.ps1 "${{matrix.options.framework}}"
         env:

From 8d25c976dcdb6d184911d461bbe4ee109e64242e Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Wed, 8 Feb 2023 22:18:38 +1000
Subject: [PATCH 043/102] Update TFMs

---
 .../ImageSharp.Web.Providers.AWS.csproj                       | 4 ++--
 .../ImageSharp.Web.Providers.Azure.csproj                     | 4 ++--
 src/ImageSharp.Web/ImageSharp.Web.csproj                      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj b/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj
index 4cf1f6b1..ad497fff 100644
--- a/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj
+++ b/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj
@@ -23,9 +23,9 @@
     <!--Bump to V3 prior to tagged release.-->
     <MinVerMinimumMajorMinor>3.0</MinVerMinimumMajorMinor>
   </PropertyGroup>
-  
+
   <Choose>
-    <When Condition="$(SIXLABORS_TESTING) == true">
+    <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
         <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
       </PropertyGroup>
diff --git a/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj b/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj
index ed03b642..de6b2d6e 100644
--- a/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj
+++ b/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj
@@ -23,9 +23,9 @@
     <!--Bump to V3 prior to tagged release.-->
     <MinVerMinimumMajorMinor>3.0</MinVerMinimumMajorMinor>
   </PropertyGroup>
-  
+
   <Choose>
-    <When Condition="$(SIXLABORS_TESTING) == true">
+    <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
         <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
       </PropertyGroup>
diff --git a/src/ImageSharp.Web/ImageSharp.Web.csproj b/src/ImageSharp.Web/ImageSharp.Web.csproj
index 433ea587..26986650 100644
--- a/src/ImageSharp.Web/ImageSharp.Web.csproj
+++ b/src/ImageSharp.Web/ImageSharp.Web.csproj
@@ -23,9 +23,9 @@
     <!--Bump to V3 prior to tagged release.-->
     <MinVerMinimumMajorMinor>3.0</MinVerMinimumMajorMinor>
   </PropertyGroup>
-  
+
   <Choose>
-    <When Condition="$(SIXLABORS_TESTING) == true">
+    <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
         <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
       </PropertyGroup>

From c54b14907e32976d6ce752565645b5e37f953bda Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Wed, 8 Feb 2023 22:27:04 +1000
Subject: [PATCH 044/102] Fix .NET 7 build warnings

---
 src/ImageSharp.Web/Caching/SHA256CacheHash.cs            | 5 ++---
 src/ImageSharp.Web/Commands/Converters/ColorConverter.cs | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/ImageSharp.Web/Caching/SHA256CacheHash.cs b/src/ImageSharp.Web/Caching/SHA256CacheHash.cs
index 7d855c2c..f0d3f16d 100644
--- a/src/ImageSharp.Web/Caching/SHA256CacheHash.cs
+++ b/src/ImageSharp.Web/Caching/SHA256CacheHash.cs
@@ -56,14 +56,13 @@ public string Create(string value, uint length)
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static string HashValue(ReadOnlySpan<char> value, uint length, Span<byte> bufferSpan)
     {
-        using var hashAlgorithm = SHA256.Create();
         Encoding.ASCII.GetBytes(value, bufferSpan);
 
         // Hashed output maxes out at 32 bytes @ 256bit/8 so we're safe to use stackalloc
         Span<byte> hash = stackalloc byte[32];
-        hashAlgorithm.TryComputeHash(bufferSpan, hash, out int _);
+        SHA256.TryHashData(bufferSpan, hash, out int _);
 
         // Length maxes out at 64 since we throw if options is greater
-        return HexEncoder.Encode(hash.Slice(0, (int)(length / 2)));
+        return HexEncoder.Encode(hash[..(int)(length / 2)]);
     }
 }
diff --git a/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs b/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs
index bebc3587..eba6b37e 100644
--- a/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs
+++ b/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs
@@ -79,7 +79,7 @@ public Color ConvertFrom(CommandParser parser, CultureInfo culture, string value
 
         // Named colors
         IDictionary<string, Color> table = ColorConstantsTable.Value;
-        return table.ContainsKey(value) ? table[value] : default;
+        return table.TryGetValue(value, out Color color) ? color : default;
     }
 
     private static IDictionary<string, Color> InitializeColorConstantsTable()

From a1b84211ad354322b464bd8798ceb535522961d3 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Tue, 14 Feb 2023 19:42:41 +1000
Subject: [PATCH 045/102] Update to ImageSharp v3 builds

---
 .gitattributes                                |  5 +-
 samples/ImageSharp.Web.Sample/Startup.cs      | 92 ++++++++-----------
 shared-infrastructure                         |  2 +-
 src/ImageSharp.Web/FormatUtilities.cs         |  6 +-
 src/ImageSharp.Web/FormattedImage.cs          | 27 +++---
 src/ImageSharp.Web/ImageSharp.Web.csproj      |  2 +-
 .../Middleware/ImageSharpMiddleware.cs        |  7 +-
 .../Middleware/ImageSharpMiddlewareOptions.cs |  5 +-
 .../Processors/FormatWebProcessor.cs          | 10 +-
 .../Processors/QualityWebProcessor.cs         |  8 +-
 .../Processors/AutoOrientWebProcessorTests.cs |  8 +-
 .../Processors/FormattedImageTests.cs         | 22 ++---
 .../TestUtilities/ServerTestBase.cs           | 16 ++--
 13 files changed, 96 insertions(+), 114 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 2fdea90e..ff4ec940 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -64,18 +64,19 @@
 # Set explicit file behavior to:
 #   treat as text
 #   normalize to Unix-style line endings and
-#   use a union merge when resoling conflicts
+#   use a union merge when resolving conflicts
 ###############################################################################
 *.csproj            text        eol=lf          merge=union
 *.dbproj            text        eol=lf          merge=union
 *.fsproj            text        eol=lf          merge=union
 *.ncrunchproject    text        eol=lf          merge=union
 *.vbproj            text        eol=lf          merge=union
+*.shproj            text        eol=lf          merge=union
 ###############################################################################
 # Set explicit file behavior to:
 #   treat as text
 #   normalize to Windows-style line endings and
-#   use a union merge when resoling conflicts
+#   use a union merge when resolving conflicts
 ###############################################################################
 *.sln               text        eol=crlf        merge=union
 ###############################################################################
diff --git a/samples/ImageSharp.Web.Sample/Startup.cs b/samples/ImageSharp.Web.Sample/Startup.cs
index eaf01e31..63ac57eb 100644
--- a/samples/ImageSharp.Web.Sample/Startup.cs
+++ b/samples/ImageSharp.Web.Sample/Startup.cs
@@ -30,52 +30,46 @@ public class Startup
     /// </summary>
     /// <param name="services">The collection of service descriptors.</param>
     public void ConfigureServices(IServiceCollection services)
-    {
-        services.AddImageSharp()
-            .SetRequestParser<QueryCollectionRequestParser>()
-            .Configure<PhysicalFileSystemCacheOptions>(options =>
-            {
-                options.CacheRootPath = null;
-                options.CacheFolder = "is-cache";
-                options.CacheFolderDepth = 8;
-            })
-            .SetCache<PhysicalFileSystemCache>()
-            .SetCacheKey<UriRelativeLowerInvariantCacheKey>()
-            .SetCacheHash<SHA256CacheHash>()
-            .Configure<PhysicalFileSystemProviderOptions>(options =>
-            {
-                options.ProviderRootPath = null;
-            })
-            .AddProvider<PhysicalFileSystemProvider>()
-            .AddProcessor<ResizeWebProcessor>()
-            .AddProcessor<FormatWebProcessor>()
-            .AddProcessor<BackgroundColorWebProcessor>()
-            .AddProcessor<QualityWebProcessor>()
-            .AddProcessor<AutoOrientWebProcessor>();
+        => services.AddImageSharp()
+        .SetRequestParser<QueryCollectionRequestParser>()
+        .Configure<PhysicalFileSystemCacheOptions>(options =>
+        {
+            options.CacheRootPath = null;
+            options.CacheFolder = "is-cache";
+            options.CacheFolderDepth = 8;
+        })
+        .SetCache<PhysicalFileSystemCache>()
+        .SetCacheKey<UriRelativeLowerInvariantCacheKey>()
+        .SetCacheHash<SHA256CacheHash>()
+        .Configure<PhysicalFileSystemProviderOptions>(options => options.ProviderRootPath = null)
+        .AddProvider<PhysicalFileSystemProvider>()
+        .AddProcessor<ResizeWebProcessor>()
+        .AddProcessor<FormatWebProcessor>()
+        .AddProcessor<BackgroundColorWebProcessor>()
+        .AddProcessor<QualityWebProcessor>()
+        .AddProcessor<AutoOrientWebProcessor>();
 
-        // Add the default service and options.
-        //
-        // services.AddImageSharp();
+    // Add the default service and options.
+    //
+    // services.AddImageSharp();
 
-        // Or add the default service and custom options.
-        //
-        // this.ConfigureDefaultServicesAndCustomOptions(services);
+    // Or add the default service and custom options.
+    //
+    // this.ConfigureDefaultServicesAndCustomOptions(services);
 
-        // Or we can fine-grain control adding the default options and configure all other services.
-        //
-        // this.ConfigureCustomServicesAndDefaultOptions(services);
+    // Or we can fine-grain control adding the default options and configure all other services.
+    //
+    // this.ConfigureCustomServicesAndDefaultOptions(services);
 
-        // Or we can fine-grain control adding custom options and configure all other services
-        // There are also factory methods for each builder that will allow building from configuration files.
-        //
-        // this.ConfigureCustomServicesAndCustomOptions(services);
-    }
+    // Or we can fine-grain control adding custom options and configure all other services
+    // There are also factory methods for each builder that will allow building from configuration files.
+    //
+    // this.ConfigureCustomServicesAndCustomOptions(services);
 
     private void ConfigureDefaultServicesAndCustomOptions(IServiceCollection services)
-    {
-        services.AddImageSharp(options =>
+        => services.AddImageSharp(options =>
         {
-            options.Configuration = Configuration.Default;
+            options.DecoderOptions = new();
             options.BrowserMaxAge = TimeSpan.FromDays(7);
             options.CacheMaxAge = TimeSpan.FromDays(365);
             options.CacheHashLength = 8;
@@ -84,20 +78,16 @@ private void ConfigureDefaultServicesAndCustomOptions(IServiceCollection service
             options.OnProcessedAsync = _ => Task.CompletedTask;
             options.OnPrepareResponseAsync = _ => Task.CompletedTask;
         });
-    }
 
     private void ConfigureCustomServicesAndDefaultOptions(IServiceCollection services)
-    {
-        services.AddImageSharp()
-                .RemoveProcessor<FormatWebProcessor>()
-                .RemoveProcessor<BackgroundColorWebProcessor>();
-    }
+        => services.AddImageSharp()
+        .RemoveProcessor<FormatWebProcessor>()
+        .RemoveProcessor<BackgroundColorWebProcessor>();
 
     private void ConfigureCustomServicesAndCustomOptions(IServiceCollection services)
-    {
-        services.AddImageSharp(options =>
+        => services.AddImageSharp(options =>
         {
-            options.Configuration = Configuration.Default;
+            options.DecoderOptions = new();
             options.BrowserMaxAge = TimeSpan.FromDays(7);
             options.CacheMaxAge = TimeSpan.FromDays(365);
             options.CacheHashLength = 8;
@@ -107,10 +97,7 @@ private void ConfigureCustomServicesAndCustomOptions(IServiceCollection services
             options.OnPrepareResponseAsync = _ => Task.CompletedTask;
         })
             .SetRequestParser<QueryCollectionRequestParser>()
-            .Configure<PhysicalFileSystemCacheOptions>(options =>
-            {
-                options.CacheFolder = "different-cache";
-            })
+            .Configure<PhysicalFileSystemCacheOptions>(options => options.CacheFolder = "different-cache")
             .SetCache<PhysicalFileSystemCache>()
             .SetCacheKey<UriRelativeLowerInvariantCacheKey>()
             .SetCacheHash<SHA256CacheHash>()
@@ -121,7 +108,6 @@ private void ConfigureCustomServicesAndCustomOptions(IServiceCollection services
             .AddProcessor<FormatWebProcessor>()
             .AddProcessor<BackgroundColorWebProcessor>()
             .AddProcessor<QualityWebProcessor>();
-    }
 
     /// <summary>
     /// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
diff --git a/shared-infrastructure b/shared-infrastructure
index 6c52486c..777842e3 160000
--- a/shared-infrastructure
+++ b/shared-infrastructure
@@ -1 +1 @@
-Subproject commit 6c52486c512357475cbb92bbb7c4c0af4d85b1db
+Subproject commit 777842e38622ab374e03f4076cf2544ed54a062b
diff --git a/src/ImageSharp.Web/FormatUtilities.cs b/src/ImageSharp.Web/FormatUtilities.cs
index 174950b8..498d05f8 100644
--- a/src/ImageSharp.Web/FormatUtilities.cs
+++ b/src/ImageSharp.Web/FormatUtilities.cs
@@ -28,7 +28,7 @@ public FormatUtilities(IOptions<ImageSharpMiddlewareOptions> options)
     {
         Guard.NotNull(options, nameof(options));
 
-        foreach (IImageFormat imageFormat in options.Value.Configuration.ImageFormats)
+        foreach (IImageFormat imageFormat in options.Value.DecoderOptions.Configuration.ImageFormats)
         {
             string[] extensions = imageFormat.FileExtensions.ToArray();
 
@@ -60,7 +60,7 @@ public bool TryGetExtensionFromUri(string uri, out string extension)
         if (query > -1)
         {
             if (uri.Contains(FormatWebProcessor.Format, StringComparison.OrdinalIgnoreCase)
-                && QueryHelpers.ParseQuery(uri.Substring(query)).TryGetValue(FormatWebProcessor.Format, out StringValues ext))
+                && QueryHelpers.ParseQuery(uri[query..]).TryGetValue(FormatWebProcessor.Format, out StringValues ext))
             {
                 // We have a query but is it a valid one?
                 ReadOnlySpan<char> extSpan = ext[0].AsSpan();
@@ -86,7 +86,7 @@ public bool TryGetExtensionFromUri(string uri, out string extension)
         int extensionIndex;
         if ((extensionIndex = path.LastIndexOf('.')) != -1)
         {
-            ReadOnlySpan<char> pathExtension = path.Slice(extensionIndex + 1);
+            ReadOnlySpan<char> pathExtension = path[(extensionIndex + 1)..];
 
             foreach (string e in this.extensions)
             {
diff --git a/src/ImageSharp.Web/FormattedImage.cs b/src/ImageSharp.Web/FormattedImage.cs
index 4a270918..0ea5abbb 100644
--- a/src/ImageSharp.Web/FormattedImage.cs
+++ b/src/ImageSharp.Web/FormattedImage.cs
@@ -6,7 +6,6 @@
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Metadata.Profiles.Exif;
-using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Web;
 
@@ -64,7 +63,7 @@ public IImageFormat Format
             }
 
             this.format = value;
-            this.encoder = this.imageFormatsManager.FindEncoder(value);
+            this.encoder = this.imageFormatsManager.GetEncoder(value);
         }
     }
 
@@ -82,7 +81,7 @@ public IImageEncoder Encoder
             }
 
             // The given type should match the format encoder.
-            IImageEncoder reference = this.imageFormatsManager.FindEncoder(this.Format);
+            IImageEncoder reference = this.imageFormatsManager.GetEncoder(this.Format);
             if (reference.GetType() != value.GetType())
             {
                 ThrowInvalid(nameof(value));
@@ -96,26 +95,29 @@ public IImageEncoder Encoder
     /// Create a new instance of the <see cref="FormattedImage"/> class from the given stream.
     /// </summary>
     /// <typeparam name="TPixel">The pixel format.</typeparam>
-    /// <param name="configuration">The configuration.</param>
+    /// <param name="options">The general decoder options.</param>
     /// <param name="source">The source.</param>
     /// <returns>A <see cref="Task{FormattedImage}"/> representing the asynchronous operation.</returns>
-    internal static async Task<FormattedImage> LoadAsync<TPixel>(Configuration configuration, Stream source)
+    internal static async Task<FormattedImage> LoadAsync<TPixel>(DecoderOptions options, Stream source)
         where TPixel : unmanaged, IPixel<TPixel>
     {
-        (Image<TPixel> image, IImageFormat format) = await Image.LoadWithFormatAsync<TPixel>(configuration, source);
-        return new FormattedImage(image, format, false);
+        // TODO: We want to be able to apply decoder options per request.
+        // For example. If a resize command has been passed with no extra resampling options
+        // then we should apply those changes on decode. This will allow memory savings and performance improvements.
+        Image<TPixel> image = await Image.LoadAsync<TPixel>(options, source);
+        return new FormattedImage(image, image.Metadata.DecodedImageFormat, false);
     }
 
     /// <summary>
     /// Create a new instance of the <see cref="FormattedImage"/> class from the given stream.
     /// </summary>
-    /// <param name="configuration">The configuration.</param>
+    /// <param name="options">The general decoder options.</param>
     /// <param name="source">The source.</param>
     /// <returns>A <see cref="Task{FormattedImage}"/> representing the asynchronous operation.</returns>
-    internal static async Task<FormattedImage> LoadAsync(Configuration configuration, Stream source)
+    internal static async Task<FormattedImage> LoadAsync(DecoderOptions options, Stream source)
     {
-        (Image image, IImageFormat format) = await Image.LoadWithFormatAsync(configuration, source);
-        return new FormattedImage(image, format, false);
+        Image image = await Image.LoadAsync(options, source);
+        return new FormattedImage(image, image.Metadata.DecodedImageFormat, false);
     }
 
     /// <summary>
@@ -141,8 +143,7 @@ public bool TryGetExifOrientation(out ushort value)
         value = ExifOrientationMode.Unknown;
         if (this.Image.Metadata.ExifProfile != null)
         {
-            IExifValue<ushort> orientation = this.Image.Metadata.ExifProfile.GetValue(ExifTag.Orientation);
-            if (orientation is null)
+            if (!this.Image.Metadata.ExifProfile.TryGetValue(ExifTag.Orientation, out IExifValue<ushort> orientation))
             {
                 return false;
             }
diff --git a/src/ImageSharp.Web/ImageSharp.Web.csproj b/src/ImageSharp.Web/ImageSharp.Web.csproj
index 26986650..17866c44 100644
--- a/src/ImageSharp.Web/ImageSharp.Web.csproj
+++ b/src/ImageSharp.Web/ImageSharp.Web.csproj
@@ -45,7 +45,7 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.2.0" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.0-alpha.0.95" />
   </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
index d964f218..a4686ddd 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
@@ -10,7 +10,6 @@
 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;
@@ -352,7 +351,7 @@ private async Task ProcessRequestAsync(
                             {
                                 await inStream.CopyToAsync(outStream);
                                 outStream.Position = 0;
-                                format = await Image.DetectFormatAsync(this.options.Configuration, outStream);
+                                format = await Image.DetectFormatAsync(this.options.DecoderOptions, outStream);
                             }
                             else
                             {
@@ -370,11 +369,11 @@ private async Task ProcessRequestAsync(
 
                                     if (requiresAlpha)
                                     {
-                                        image = await FormattedImage.LoadAsync<Rgba32>(this.options.Configuration, inStream);
+                                        image = await FormattedImage.LoadAsync<Rgba32>(this.options.DecoderOptions, inStream);
                                     }
                                     else
                                     {
-                                        image = await FormattedImage.LoadAsync(this.options.Configuration, inStream);
+                                        image = await FormattedImage.LoadAsync(this.options.DecoderOptions, inStream);
                                     }
 
                                     image.Process(
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
index ebb294e8..3a14b42f 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
@@ -5,6 +5,7 @@
 using System.Globalization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.IO;
+using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Providers;
 
@@ -32,9 +33,9 @@ public class ImageSharpMiddlewareOptions
     private Func<HttpContext, Task> onPrepareResponseAsync = _ => Task.CompletedTask;
 
     /// <summary>
-    /// Gets or sets the base library configuration.
+    /// Gets or sets the default decoder options.
     /// </summary>
-    public Configuration Configuration { get; set; } = Configuration.Default;
+    public DecoderOptions DecoderOptions { get; set; } = new();
 
     /// <summary>
     /// Gets or sets the recyclable memorystream manager used for managing pooled stream
diff --git a/src/ImageSharp.Web/Processors/FormatWebProcessor.cs b/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
index f8665dc4..a11bc438 100644
--- a/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
@@ -52,14 +52,10 @@ public FormattedImage Process(
     {
         string extension = commands.GetValueOrDefault(Format);
 
-        if (!string.IsNullOrWhiteSpace(extension))
+        if (!string.IsNullOrWhiteSpace(extension)
+            && this.options.DecoderOptions.Configuration.ImageFormatsManager.TryFindFormatByFileExtension(extension, out IImageFormat format))
         {
-            IImageFormat format = this.options.Configuration.ImageFormatsManager.FindFormatByFileExtension(extension);
-
-            if (format != null)
-            {
-                image.Format = format;
-            }
+            image.Format = format;
         }
 
         return image;
diff --git a/src/ImageSharp.Web/Processors/QualityWebProcessor.cs b/src/ImageSharp.Web/Processors/QualityWebProcessor.cs
index 76af983f..81a3b8fb 100644
--- a/src/ImageSharp.Web/Processors/QualityWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/QualityWebProcessor.cs
@@ -45,11 +45,11 @@ public FormattedImage Process(
 
             if (image.Format is JpegFormat)
             {
-                var reference =
+                JpegEncoder reference =
                     (JpegEncoder)image.Image
                     .GetConfiguration()
                     .ImageFormatsManager
-                    .FindEncoder(image.Format);
+                    .GetEncoder(image.Format);
 
                 if (quality != reference.Quality)
                 {
@@ -58,11 +58,11 @@ public FormattedImage Process(
             }
             else if (image.Format is WebpFormat)
             {
-                var reference =
+                WebpEncoder reference =
                     (WebpEncoder)image.Image
                     .GetConfiguration()
                     .ImageFormatsManager
-                    .FindEncoder(image.Format);
+                    .GetEncoder(image.Format);
 
                 image.Encoder = new WebpEncoder()
                 {
diff --git a/tests/ImageSharp.Web.Tests/Processors/AutoOrientWebProcessorTests.cs b/tests/ImageSharp.Web.Tests/Processors/AutoOrientWebProcessorTests.cs
index de4b8919..706c8f31 100644
--- a/tests/ImageSharp.Web.Tests/Processors/AutoOrientWebProcessorTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processors/AutoOrientWebProcessorTests.cs
@@ -26,17 +26,17 @@ public void AutoOrientWebProcessor_UpdatesOrientation()
 
         const ushort tl = 1;
         const ushort br = 3;
-        using var image = new Image<Rgba32>(1, 1);
+        using Image<Rgba32> image = new(1, 1);
         image.Metadata.ExifProfile = new();
         image.Metadata.ExifProfile.SetValue(ExifTag.Orientation, br);
 
-        IExifValue<ushort> orientation = image.Metadata.ExifProfile.GetValue(ExifTag.Orientation);
+        Assert.True(image.Metadata.ExifProfile.TryGetValue(ExifTag.Orientation, out IExifValue<ushort> orientation));
         Assert.Equal(br, orientation.Value);
 
-        using var formatted = new FormattedImage(image, PngFormat.Instance);
+        using FormattedImage formatted = new(image, PngFormat.Instance);
         new AutoOrientWebProcessor().Process(formatted, null, commands, parser, culture);
 
-        orientation = image.Metadata.ExifProfile.GetValue(ExifTag.Orientation);
+        Assert.True(image.Metadata.ExifProfile.TryGetValue(ExifTag.Orientation, out orientation));
         Assert.Equal(tl, orientation.Value);
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processors/FormattedImageTests.cs b/tests/ImageSharp.Web.Tests/Processors/FormattedImageTests.cs
index 66ed89eb..982fb5ea 100644
--- a/tests/ImageSharp.Web.Tests/Processors/FormattedImageTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processors/FormattedImageTests.cs
@@ -12,8 +12,8 @@ public class FormattedImageTests
     [Fact]
     public void ConstructorSetsProperties()
     {
-        using var image = new Image<Rgba32>(1, 1);
-        using var formatted = new FormattedImage(image, JpegFormat.Instance);
+        using Image<Rgba32> image = new(1, 1);
+        using FormattedImage formatted = new(image, JpegFormat.Instance);
 
         Assert.NotNull(formatted.Image);
         Assert.Equal(image, formatted.Image);
@@ -28,8 +28,8 @@ public void ConstructorSetsProperties()
     [Fact]
     public void CanSetFormat()
     {
-        using var image = new Image<Rgba32>(1, 1);
-        using var formatted = new FormattedImage(image, JpegFormat.Instance);
+        using Image<Rgba32> image = new(1, 1);
+        using FormattedImage formatted = new(image, JpegFormat.Instance);
 
         Assert.NotNull(formatted.Format);
         Assert.Equal(JpegFormat.Instance, formatted.Format);
@@ -44,8 +44,8 @@ public void CanSetFormat()
     [Fact]
     public void CanSetEncoder()
     {
-        using var image = new Image<Rgba32>(1, 1);
-        using var formatted = new FormattedImage(image, PngFormat.Instance);
+        using Image<Rgba32> image = new(1, 1);
+        using FormattedImage formatted = new(image, PngFormat.Instance);
 
         Assert.NotNull(formatted.Format);
         Assert.Equal(PngFormat.Instance, formatted.Format);
@@ -56,14 +56,14 @@ public void CanSetEncoder()
         formatted.Format = JpegFormat.Instance;
         Assert.Equal(typeof(JpegEncoder), formatted.Encoder.GetType());
 
-        JpegColorType current = ((JpegEncoder)formatted.Encoder).ColorType.GetValueOrDefault();
+        JpegEncodingColor current = ((JpegEncoder)formatted.Encoder).ColorType.GetValueOrDefault();
 
-        Assert.Equal(JpegColorType.YCbCrRatio420, current);
-        formatted.Encoder = new JpegEncoder { ColorType = JpegColorType.YCbCrRatio444 };
+        Assert.Equal(JpegEncodingColor.YCbCrRatio420, current);
+        formatted.Encoder = new JpegEncoder { ColorType = JpegEncodingColor.YCbCrRatio444 };
 
-        JpegColorType replacement = ((JpegEncoder)formatted.Encoder).ColorType.GetValueOrDefault();
+        JpegEncodingColor replacement = ((JpegEncoder)formatted.Encoder).ColorType.GetValueOrDefault();
 
         Assert.NotEqual(current, replacement);
-        Assert.Equal(JpegColorType.YCbCrRatio444, replacement);
+        Assert.Equal(JpegEncodingColor.YCbCrRatio444, replacement);
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs b/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs
index f9fa82a2..6d8b5e83 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs
@@ -42,7 +42,7 @@ public async Task CanProcessAndResolveImageAsync()
         string url = this.ImageSource;
 
         string ext = Path.GetExtension(url);
-        IImageFormat format = Configuration.Default.ImageFormatsManager.FindFormatByFileExtension(ext);
+        Assert.True(Configuration.Default.ImageFormatsManager.TryFindFormatByFileExtension(ext, out IImageFormat format));
 
         // First response
         HttpResponseMessage response = await this.HttpClient.GetAsync(url + await this.AugmentCommandAsync(this.Fixture.Commands[0]));
@@ -52,11 +52,10 @@ public async Task CanProcessAndResolveImageAsync()
         Assert.True(response.Content.Headers.ContentLength > 0);
         Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
 
-        (Image Image, IImageFormat Format) actual = await Image.LoadWithFormatAsync(await response.Content.ReadAsStreamAsync());
-        using Image image = actual.Image;
+        using Image image = await Image.LoadAsync(await response.Content.ReadAsStreamAsync());
 
         Assert.Equal(Width, image.Width);
-        Assert.Equal(format, actual.Format);
+        Assert.Equal(format, image.Metadata.DecodedImageFormat);
 
         response.Dispose();
 
@@ -68,16 +67,15 @@ public async Task CanProcessAndResolveImageAsync()
         Assert.True(response.Content.Headers.ContentLength > 0);
         Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
 
-        (Image Image, IImageFormat Format) cachedActual = await Image.LoadWithFormatAsync(await response.Content.ReadAsStreamAsync());
-        using Image cached = cachedActual.Image;
+        using Image cached = await Image.LoadAsync(await response.Content.ReadAsStreamAsync());
 
         Assert.Equal(Width, cached.Width);
-        Assert.Equal(format, actual.Format);
+        Assert.Equal(format, image.Metadata.DecodedImageFormat);
 
         response.Dispose();
 
         // 304 response
-        var request = new HttpRequestMessage
+        HttpRequestMessage request = new()
         {
             RequestUri = new Uri(url + await this.AugmentCommandAsync(this.Fixture.Commands[0])),
             Method = HttpMethod.Get,
@@ -133,7 +131,7 @@ public async Task CanProcessMultipleIdenticalQueriesAsync()
             Assert.True(response.Content.Headers.ContentLength > 0);
         })).ToArray();
 
-        var all = Task.WhenAll(tasks);
+        Task all = Task.WhenAll(tasks);
         await all;
         Assert.True(all.IsCompletedSuccessfully);
     }

From 209298f6be0951d73cf55d45f3b2f8907c7a855e Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Tue, 14 Feb 2023 19:50:04 +1000
Subject: [PATCH 046/102] Remove unused namespaces

---
 src/ImageSharp.Web/ExifOrientationUtilities.cs               | 1 -
 src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs      | 1 -
 src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs | 1 -
 src/ImageSharp.Web/Processors/ResizeWebProcessor.cs          | 1 -
 4 files changed, 4 deletions(-)

diff --git a/src/ImageSharp.Web/ExifOrientationUtilities.cs b/src/ImageSharp.Web/ExifOrientationUtilities.cs
index 15e0d336..2e94f50a 100644
--- a/src/ImageSharp.Web/ExifOrientationUtilities.cs
+++ b/src/ImageSharp.Web/ExifOrientationUtilities.cs
@@ -5,7 +5,6 @@
 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/Processors/AutoOrientWebProcessor.cs b/src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs
index 392d58a5..9c3c4867 100644
--- a/src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs
@@ -4,7 +4,6 @@
 
 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
index 7fd82474..79668e09 100644
--- a/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs
@@ -4,7 +4,6 @@
 
 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/ResizeWebProcessor.cs b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
index 37a53a67..d4c1b2de 100644
--- a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
@@ -6,7 +6,6 @@
 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;
 

From 3d4e4128fbe695563a6c7fec9fbb86e0a899ddea Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 20 Feb 2023 19:32:33 +1000
Subject: [PATCH 047/102] Update shared-infrastructure

---
 shared-infrastructure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-infrastructure b/shared-infrastructure
index 6c52486c..777842e3 160000
--- a/shared-infrastructure
+++ b/shared-infrastructure
@@ -1 +1 @@
-Subproject commit 6c52486c512357475cbb92bbb7c4c0af4d85b1db
+Subproject commit 777842e38622ab374e03f4076cf2544ed54a062b

From 0ebd51ae4320d630ca2bda4b0f2fa0e7a094527e Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 20 Feb 2023 19:47:24 +1000
Subject: [PATCH 048/102] Fix build

---
 .gitattributes                                |   5 +-
 samples/ImageSharp.Web.Sample/Program.cs      |  99 +-
 .../ServiceCollectionExtensions.cs            | 220 ++--
 src/ImageSharp.Web/Format.cs                  |  59 +-
 src/ImageSharp.Web/FormatCommand.cs           |  29 +-
 src/ImageSharp.Web/Middleware/ImageContext.cs | 446 ++++----
 .../Middleware/ImageSharpMiddleware.cs        | 963 +++++++++---------
 .../Providers/FileProviderImageProvider.cs    |   2 -
 .../RequestAuthorizationUtilities.cs          | 465 +++++----
 src/ImageSharp.Web/Resampler.cs               |  75 +-
 src/ImageSharp.Web/ResamplerCommand.cs        |  29 +-
 .../TagHelpers/ImageTagHelper.cs              | 635 ++++++------
 .../AuthenticatedServerTestBase.cs            | 102 +-
 13 files changed, 1552 insertions(+), 1577 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 2fdea90e..ff4ec940 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -64,18 +64,19 @@
 # Set explicit file behavior to:
 #   treat as text
 #   normalize to Unix-style line endings and
-#   use a union merge when resoling conflicts
+#   use a union merge when resolving conflicts
 ###############################################################################
 *.csproj            text        eol=lf          merge=union
 *.dbproj            text        eol=lf          merge=union
 *.fsproj            text        eol=lf          merge=union
 *.ncrunchproject    text        eol=lf          merge=union
 *.vbproj            text        eol=lf          merge=union
+*.shproj            text        eol=lf          merge=union
 ###############################################################################
 # Set explicit file behavior to:
 #   treat as text
 #   normalize to Windows-style line endings and
-#   use a union merge when resoling conflicts
+#   use a union merge when resolving conflicts
 ###############################################################################
 *.sln               text        eol=crlf        merge=union
 ###############################################################################
diff --git a/samples/ImageSharp.Web.Sample/Program.cs b/samples/ImageSharp.Web.Sample/Program.cs
index 652c0a4c..44a5de87 100644
--- a/samples/ImageSharp.Web.Sample/Program.cs
+++ b/samples/ImageSharp.Web.Sample/Program.cs
@@ -1,5 +1,5 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Commands;
@@ -7,69 +7,68 @@
 using SixLabors.ImageSharp.Web.Processors;
 using SixLabors.ImageSharp.Web.Providers;
 
-namespace ImageSharp.Web.Sample
+namespace ImageSharp.Web.Sample;
+
+/// <summary>
+/// The running application.
+/// </summary>
+public static class Program
 {
     /// <summary>
-    /// The running application.
+    /// The main application entry point.
     /// </summary>
-    public static class Program
+    /// <param name="args">Argument paramateres.</param>
+    public static void Main(string[] args)
     {
-        /// <summary>
-        /// The main application entry point.
-        /// </summary>
-        /// <param name="args">Argument paramateres.</param>
-        public static void Main(string[] args)
-        {
-            WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
+        WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
-            // Add services to the container.
-            IServiceCollection services = builder.Services;
-            services.AddRazorPages();
+        // Add services to the container.
+        IServiceCollection services = builder.Services;
+        services.AddRazorPages();
 
-            // TODO: Enable HMAC
-            services.AddImageSharp(options => options.HMACSecretKey = new byte[] { 1, 2, 3, 4, 5 }) 
-                .SetRequestParser<QueryCollectionRequestParser>()
-                .Configure<PhysicalFileSystemCacheOptions>(options =>
-                {
-                    options.CacheRootPath = null;
-                    options.CacheFolder = "is-cache";
-                    options.CacheFolderDepth = 8;
-                })
-                .SetCache<PhysicalFileSystemCache>()
-                .SetCacheKey<UriRelativeLowerInvariantCacheKey>()
-                .SetCacheHash<SHA256CacheHash>()
-                .Configure<PhysicalFileSystemProviderOptions>(options => options.ProviderRootPath = null)
-                .AddProvider<PhysicalFileSystemProvider>()
-                .AddProcessor<ResizeWebProcessor>()
-                .AddProcessor<FormatWebProcessor>()
-                .AddProcessor<BackgroundColorWebProcessor>()
-                .AddProcessor<QualityWebProcessor>()
-                .AddProcessor<AutoOrientWebProcessor>();
+        // TODO: Enable HMAC
+        services.AddImageSharp(options => options.HMACSecretKey = new byte[] { 1, 2, 3, 4, 5 })
+            .SetRequestParser<QueryCollectionRequestParser>()
+            .Configure<PhysicalFileSystemCacheOptions>(options =>
+            {
+                options.CacheRootPath = null;
+                options.CacheFolder = "is-cache";
+                options.CacheFolderDepth = 8;
+            })
+            .SetCache<PhysicalFileSystemCache>()
+            .SetCacheKey<UriRelativeLowerInvariantCacheKey>()
+            .SetCacheHash<SHA256CacheHash>()
+            .Configure<PhysicalFileSystemProviderOptions>(options => options.ProviderRootPath = null)
+            .AddProvider<PhysicalFileSystemProvider>()
+            .AddProcessor<ResizeWebProcessor>()
+            .AddProcessor<FormatWebProcessor>()
+            .AddProcessor<BackgroundColorWebProcessor>()
+            .AddProcessor<QualityWebProcessor>()
+            .AddProcessor<AutoOrientWebProcessor>();
 
-            WebApplication app = builder.Build();
+        WebApplication app = builder.Build();
 
-            // Configure the HTTP request pipeline.
-            if (!app.Environment.IsDevelopment())
-            {
-                app.UseExceptionHandler("/Error");
+        // Configure the HTTP request pipeline.
+        if (!app.Environment.IsDevelopment())
+        {
+            app.UseExceptionHandler("/Error");
 
-                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-                app.UseHsts();
-            }
+            // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+            app.UseHsts();
+        }
 
-            app.UseHttpsRedirection();
+        app.UseHttpsRedirection();
 
-            app.UseImageSharp();
+        app.UseImageSharp();
 
-            app.UseStaticFiles();
+        app.UseStaticFiles();
 
-            app.UseRouting();
+        app.UseRouting();
 
-            app.UseAuthorization();
+        app.UseAuthorization();
 
-            app.MapRazorPages();
+        app.MapRazorPages();
 
-            app.Run();
-        }
+        app.Run();
     }
-}
\ No newline at end of file
+}
diff --git a/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs b/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs
index eb0501ee..4a3a3e59 100644
--- a/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs
+++ b/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs
@@ -1,10 +1,7 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Options;
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Commands.Converters;
@@ -13,116 +10,115 @@
 using SixLabors.ImageSharp.Web.Providers;
 using SixLabors.ImageSharp.Web.Synchronization;
 
-namespace SixLabors.ImageSharp.Web.DependencyInjection
+namespace SixLabors.ImageSharp.Web.DependencyInjection;
+
+/// <summary>
+/// Extension methods for <see cref="IServiceCollection"/> to simplify middleware service registration.
+/// </summary>
+public static class ServiceCollectionExtensions
 {
     /// <summary>
-    /// Extension methods for <see cref="IServiceCollection"/> to simplify middleware service registration.
+    /// Adds ImageSharp services to the specified <see cref="IServiceCollection" /> with the default options.
     /// </summary>
-    public static class ServiceCollectionExtensions
+    /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
+    /// <returns>An <see cref="IImageSharpBuilder"/> that can be used to further configure the ImageSharp services.</returns>
+    public static IImageSharpBuilder AddImageSharp(this IServiceCollection services)
+        => AddImageSharp(services, _ => { });
+
+    /// <summary>
+    /// Adds ImageSharp services to the specified <see cref="IServiceCollection" /> with the given options.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
+    /// <param name="setupAction">An <see cref="Action{ImageSharpMiddlewareOptions}"/> to configure the provided <see cref="ImageSharpMiddlewareOptions"/>.</param>
+    /// <returns>An <see cref="IImageSharpBuilder"/> that can be used to further configure the ImageSharp services.</returns>
+    public static IImageSharpBuilder AddImageSharp(
+        this IServiceCollection services,
+        Action<ImageSharpMiddlewareOptions> setupAction)
+    {
+        Guard.NotNull(services, nameof(services));
+        Guard.NotNull(setupAction, nameof(setupAction));
+
+        IImageSharpBuilder builder = new ImageSharpBuilder(services);
+
+        AddDefaultServices(builder, setupAction);
+
+        return builder;
+    }
+
+    private static void AddDefaultServices(
+        IImageSharpBuilder builder,
+        Action<ImageSharpMiddlewareOptions> setupAction)
     {
-        /// <summary>
-        /// Adds ImageSharp services to the specified <see cref="IServiceCollection" /> with the default options.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
-        /// <returns>An <see cref="IImageSharpBuilder"/> that can be used to further configure the ImageSharp services.</returns>
-        public static IImageSharpBuilder AddImageSharp(this IServiceCollection services)
-            => AddImageSharp(services, _ => { });
-
-        /// <summary>
-        /// Adds ImageSharp services to the specified <see cref="IServiceCollection" /> with the given options.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
-        /// <param name="setupAction">An <see cref="Action{ImageSharpMiddlewareOptions}"/> to configure the provided <see cref="ImageSharpMiddlewareOptions"/>.</param>
-        /// <returns>An <see cref="IImageSharpBuilder"/> that can be used to further configure the ImageSharp services.</returns>
-        public static IImageSharpBuilder AddImageSharp(
-            this IServiceCollection services,
-            Action<ImageSharpMiddlewareOptions> setupAction)
-        {
-            Guard.NotNull(services, nameof(services));
-            Guard.NotNull(setupAction, nameof(setupAction));
-
-            IImageSharpBuilder builder = new ImageSharpBuilder(services);
-
-            AddDefaultServices(builder, setupAction);
-
-            return builder;
-        }
-
-        private static void AddDefaultServices(
-            IImageSharpBuilder builder,
-            Action<ImageSharpMiddlewareOptions> setupAction)
-        {
-            builder.Services.Configure(setupAction);
-
-            builder.Services.AddSingleton<FormatUtilities>();
-
-            builder.Services.AddSingleton<AsyncKeyReaderWriterLock<string>>();
-
-            builder.SetRequestParser<QueryCollectionRequestParser>();
-
-            builder.Services.AddSingleton<RequestAuthorizationUtilities>();
-
-            builder.SetCache<PhysicalFileSystemCache>();
-
-            builder.SetCacheKey<UriRelativeLowerInvariantCacheKey>();
-
-            builder.SetCacheHash<SHA256CacheHash>();
-
-            builder.AddProvider<PhysicalFileSystemProvider>();
-
-            builder.AddProcessor<ResizeWebProcessor>()
-                   .AddProcessor<FormatWebProcessor>()
-                   .AddProcessor<BackgroundColorWebProcessor>()
-                   .AddProcessor<QualityWebProcessor>()
-                   .AddProcessor<AutoOrientWebProcessor>();
-
-            builder.AddConverter<IntegralNumberConverter<sbyte>>();
-            builder.AddConverter<IntegralNumberConverter<byte>>();
-            builder.AddConverter<IntegralNumberConverter<short>>();
-            builder.AddConverter<IntegralNumberConverter<ushort>>();
-            builder.AddConverter<IntegralNumberConverter<int>>();
-            builder.AddConverter<IntegralNumberConverter<uint>>();
-            builder.AddConverter<IntegralNumberConverter<long>>();
-            builder.AddConverter<IntegralNumberConverter<ulong>>();
-
-            builder.AddConverter<SimpleCommandConverter<decimal>>();
-            builder.AddConverter<SimpleCommandConverter<float>>();
-            builder.AddConverter<SimpleCommandConverter<double>>();
-            builder.AddConverter<SimpleCommandConverter<string>>();
-            builder.AddConverter<SimpleCommandConverter<bool>>();
-
-            builder.AddConverter<ArrayConverter<sbyte>>();
-            builder.AddConverter<ArrayConverter<byte>>();
-            builder.AddConverter<ArrayConverter<short>>();
-            builder.AddConverter<ArrayConverter<ushort>>();
-            builder.AddConverter<ArrayConverter<int>>();
-            builder.AddConverter<ArrayConverter<uint>>();
-            builder.AddConverter<ArrayConverter<long>>();
-            builder.AddConverter<ArrayConverter<ulong>>();
-            builder.AddConverter<ArrayConverter<decimal>>();
-            builder.AddConverter<ArrayConverter<float>>();
-            builder.AddConverter<ArrayConverter<double>>();
-            builder.AddConverter<ArrayConverter<string>>();
-            builder.AddConverter<ArrayConverter<bool>>();
-
-            builder.AddConverter<ListConverter<sbyte>>();
-            builder.AddConverter<ListConverter<byte>>();
-            builder.AddConverter<ListConverter<short>>();
-            builder.AddConverter<ListConverter<ushort>>();
-            builder.AddConverter<ListConverter<int>>();
-            builder.AddConverter<ListConverter<uint>>();
-            builder.AddConverter<ListConverter<long>>();
-            builder.AddConverter<ListConverter<ulong>>();
-            builder.AddConverter<ListConverter<decimal>>();
-            builder.AddConverter<ListConverter<float>>();
-            builder.AddConverter<ListConverter<double>>();
-            builder.AddConverter<ListConverter<string>>();
-            builder.AddConverter<ListConverter<bool>>();
-
-            builder.AddConverter<ColorConverter>();
-            builder.AddConverter<EnumConverter>();
-
-            builder.Services.AddSingleton<CommandParser>();
-        }
+        builder.Services.Configure(setupAction);
+
+        builder.Services.AddSingleton<FormatUtilities>();
+
+        builder.Services.AddSingleton<AsyncKeyReaderWriterLock<string>>();
+
+        builder.SetRequestParser<QueryCollectionRequestParser>();
+
+        builder.Services.AddSingleton<RequestAuthorizationUtilities>();
+
+        builder.SetCache<PhysicalFileSystemCache>();
+
+        builder.SetCacheKey<UriRelativeLowerInvariantCacheKey>();
+
+        builder.SetCacheHash<SHA256CacheHash>();
+
+        builder.AddProvider<PhysicalFileSystemProvider>();
+
+        builder.AddProcessor<ResizeWebProcessor>()
+               .AddProcessor<FormatWebProcessor>()
+               .AddProcessor<BackgroundColorWebProcessor>()
+               .AddProcessor<QualityWebProcessor>()
+               .AddProcessor<AutoOrientWebProcessor>();
+
+        builder.AddConverter<IntegralNumberConverter<sbyte>>();
+        builder.AddConverter<IntegralNumberConverter<byte>>();
+        builder.AddConverter<IntegralNumberConverter<short>>();
+        builder.AddConverter<IntegralNumberConverter<ushort>>();
+        builder.AddConverter<IntegralNumberConverter<int>>();
+        builder.AddConverter<IntegralNumberConverter<uint>>();
+        builder.AddConverter<IntegralNumberConverter<long>>();
+        builder.AddConverter<IntegralNumberConverter<ulong>>();
+
+        builder.AddConverter<SimpleCommandConverter<decimal>>();
+        builder.AddConverter<SimpleCommandConverter<float>>();
+        builder.AddConverter<SimpleCommandConverter<double>>();
+        builder.AddConverter<SimpleCommandConverter<string>>();
+        builder.AddConverter<SimpleCommandConverter<bool>>();
+
+        builder.AddConverter<ArrayConverter<sbyte>>();
+        builder.AddConverter<ArrayConverter<byte>>();
+        builder.AddConverter<ArrayConverter<short>>();
+        builder.AddConverter<ArrayConverter<ushort>>();
+        builder.AddConverter<ArrayConverter<int>>();
+        builder.AddConverter<ArrayConverter<uint>>();
+        builder.AddConverter<ArrayConverter<long>>();
+        builder.AddConverter<ArrayConverter<ulong>>();
+        builder.AddConverter<ArrayConverter<decimal>>();
+        builder.AddConverter<ArrayConverter<float>>();
+        builder.AddConverter<ArrayConverter<double>>();
+        builder.AddConverter<ArrayConverter<string>>();
+        builder.AddConverter<ArrayConverter<bool>>();
+
+        builder.AddConverter<ListConverter<sbyte>>();
+        builder.AddConverter<ListConverter<byte>>();
+        builder.AddConverter<ListConverter<short>>();
+        builder.AddConverter<ListConverter<ushort>>();
+        builder.AddConverter<ListConverter<int>>();
+        builder.AddConverter<ListConverter<uint>>();
+        builder.AddConverter<ListConverter<long>>();
+        builder.AddConverter<ListConverter<ulong>>();
+        builder.AddConverter<ListConverter<decimal>>();
+        builder.AddConverter<ListConverter<float>>();
+        builder.AddConverter<ListConverter<double>>();
+        builder.AddConverter<ListConverter<string>>();
+        builder.AddConverter<ListConverter<bool>>();
+
+        builder.AddConverter<ColorConverter>();
+        builder.AddConverter<EnumConverter>();
+
+        builder.Services.AddSingleton<CommandParser>();
     }
-}
\ No newline at end of file
+}
diff --git a/src/ImageSharp.Web/Format.cs b/src/ImageSharp.Web/Format.cs
index 8718c8ef..fa564487 100644
--- a/src/ImageSharp.Web/Format.cs
+++ b/src/ImageSharp.Web/Format.cs
@@ -1,41 +1,40 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Web
+namespace SixLabors.ImageSharp.Web;
+
+/// <summary>
+/// Contains reusable static instances of known image formats.
+/// </summary>
+public static class Format
 {
     /// <summary>
-    /// Contains reusable static instances of known image formats.
+    /// Gets the Bmp encoding format.
     /// </summary>
-    public static class Format
-    {
-        /// <summary>
-        /// Gets the Bmp encoding format.
-        /// </summary>
-        public static FormatCommand Bmp { get; } = new(nameof(Bmp));
+    public static FormatCommand Bmp { get; } = new(nameof(Bmp));
 
-        /// <summary>
-        /// Gets the Gif encoding format.
-        /// </summary>
-        public static FormatCommand Gif { get; } = new(nameof(Gif));
+    /// <summary>
+    /// Gets the Gif encoding format.
+    /// </summary>
+    public static FormatCommand Gif { get; } = new(nameof(Gif));
 
-        /// <summary>
-        /// Gets the Jpg encoding format.
-        /// </summary>
-        public static FormatCommand Jpg { get; } = new(nameof(Jpg));
+    /// <summary>
+    /// Gets the Jpg encoding format.
+    /// </summary>
+    public static FormatCommand Jpg { get; } = new(nameof(Jpg));
 
-        /// <summary>
-        /// Gets the Png encoding format.
-        /// </summary>
-        public static FormatCommand Png { get; } = new(nameof(Png));
+    /// <summary>
+    /// Gets the Png encoding format.
+    /// </summary>
+    public static FormatCommand Png { get; } = new(nameof(Png));
 
-        /// <summary>
-        /// Gets the Tga encoding format.
-        /// </summary>
-        public static FormatCommand Tga { get; } = new(nameof(Tga));
+    /// <summary>
+    /// Gets the Tga encoding format.
+    /// </summary>
+    public static FormatCommand Tga { get; } = new(nameof(Tga));
 
-        /// <summary>
-        /// Gets the WebP encoding format.
-        /// </summary>
-        public static FormatCommand WebP { get; } = new(nameof(WebP));
-    }
+    /// <summary>
+    /// Gets the WebP encoding format.
+    /// </summary>
+    public static FormatCommand WebP { get; } = new(nameof(WebP));
 }
diff --git a/src/ImageSharp.Web/FormatCommand.cs b/src/ImageSharp.Web/FormatCommand.cs
index 59273fa4..536564c3 100644
--- a/src/ImageSharp.Web/FormatCommand.cs
+++ b/src/ImageSharp.Web/FormatCommand.cs
@@ -1,22 +1,21 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Web
+namespace SixLabors.ImageSharp.Web;
+
+/// <summary>
+/// Represents a command for setting the type of format with which to encode processed images.
+/// </summary>
+public readonly struct FormatCommand
 {
     /// <summary>
-    /// Represents a command for setting the type of format with which to encode processed images.
+    /// Initializes a new instance of the <see cref="FormatCommand"/> struct.
     /// </summary>
-    public readonly struct FormatCommand
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FormatCommand"/> struct.
-        /// </summary>
-        /// <param name="name">The name of the resampler command.</param>
-        public FormatCommand(string name) => this.Name = name;
+    /// <param name="name">The name of the resampler command.</param>
+    public FormatCommand(string name) => this.Name = name;
 
-        /// <summary>
-        /// Gets the name of the resampler command.
-        /// </summary>
-        public string Name { get; }
-    }
+    /// <summary>
+    /// Gets the name of the resampler command.
+    /// </summary>
+    public string Name { get; }
 }
diff --git a/src/ImageSharp.Web/Middleware/ImageContext.cs b/src/ImageSharp.Web/Middleware/ImageContext.cs
index 3e768ab8..fda21726 100644
--- a/src/ImageSharp.Web/Middleware/ImageContext.cs
+++ b/src/ImageSharp.Web/Middleware/ImageContext.cs
@@ -1,293 +1,289 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Http.Headers;
 using Microsoft.Net.Http.Headers;
 
-namespace SixLabors.ImageSharp.Web.Middleware
+namespace SixLabors.ImageSharp.Web.Middleware;
+
+/// <summary>
+/// Provides information and methods regarding the current image request.
+/// </summary>
+internal struct ImageContext
 {
+    private readonly ImageSharpMiddlewareOptions options;
+    private readonly HttpContext context;
+    private readonly HttpRequest request;
+    private readonly HttpResponse response;
+    private readonly RequestHeaders requestHeaders;
+    private readonly ResponseHeaders responseHeaders;
+
+    private DateTimeOffset fileLastModified;
+    private long fileLength;
+    private EntityTagHeaderValue fileEtag;
+
+    private PreconditionState ifMatchState;
+    private PreconditionState ifNoneMatchState;
+    private PreconditionState ifModifiedSinceState;
+    private PreconditionState ifUnmodifiedSinceState;
+
     /// <summary>
-    /// Provides information and methods regarding the current image request.
+    /// Initializes a new instance of the <see cref="ImageContext"/> struct.
     /// </summary>
-    internal struct ImageContext
+    /// <param name="context">The current HTTP request context.</param>
+    /// <param name="options">The middleware options.</param>
+    public ImageContext(HttpContext context, ImageSharpMiddlewareOptions options)
     {
-        private readonly ImageSharpMiddlewareOptions options;
-        private readonly HttpContext context;
-        private readonly HttpRequest request;
-        private readonly HttpResponse response;
-        private readonly RequestHeaders requestHeaders;
-        private readonly ResponseHeaders responseHeaders;
-
-        private DateTimeOffset fileLastModified;
-        private long fileLength;
-        private EntityTagHeaderValue fileEtag;
-
-        private PreconditionState ifMatchState;
-        private PreconditionState ifNoneMatchState;
-        private PreconditionState ifModifiedSinceState;
-        private PreconditionState ifUnmodifiedSinceState;
+        this.context = context;
+        this.request = context.Request;
+        this.response = context.Response;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageContext"/> struct.
-        /// </summary>
-        /// <param name="context">The current HTTP request context.</param>
-        /// <param name="options">The middleware options.</param>
-        public ImageContext(HttpContext context, ImageSharpMiddlewareOptions options)
-        {
-            this.context = context;
-            this.request = context.Request;
-            this.response = context.Response;
+        this.requestHeaders = context.Request.GetTypedHeaders();
+        this.responseHeaders = context.Response.GetTypedHeaders();
 
-            this.requestHeaders = context.Request.GetTypedHeaders();
-            this.responseHeaders = context.Response.GetTypedHeaders();
+        this.options = options;
 
-            this.options = options;
+        this.fileLastModified = DateTimeOffset.MinValue;
+        this.fileLength = 0;
+        this.fileEtag = null;
 
-            this.fileLastModified = DateTimeOffset.MinValue;
-            this.fileLength = 0;
-            this.fileEtag = null;
+        this.ifMatchState = PreconditionState.Unspecified;
+        this.ifNoneMatchState = PreconditionState.Unspecified;
+        this.ifModifiedSinceState = PreconditionState.Unspecified;
+        this.ifUnmodifiedSinceState = PreconditionState.Unspecified;
+    }
 
-            this.ifMatchState = PreconditionState.Unspecified;
-            this.ifNoneMatchState = PreconditionState.Unspecified;
-            this.ifModifiedSinceState = PreconditionState.Unspecified;
-            this.ifUnmodifiedSinceState = PreconditionState.Unspecified;
-        }
+    /// <summary>
+    /// Enumerates the possible precondition states.
+    /// </summary>
+    internal enum PreconditionState
+    {
+        /// <summary>
+        /// Unspeciified
+        /// </summary>
+        Unspecified,
 
         /// <summary>
-        /// Enumerates the possible precondition states.
+        /// Not modified
         /// </summary>
-        internal enum PreconditionState
-        {
-            /// <summary>
-            /// Unspeciified
-            /// </summary>
-            Unspecified,
-
-            /// <summary>
-            /// Not modified
-            /// </summary>
-            NotModified,
-
-            /// <summary>
-            /// Should process
-            /// </summary>
-            ShouldProcess,
-
-            /// <summary>
-            /// Precondition Failed
-            /// </summary>
-            PreconditionFailed,
-        }
+        NotModified,
 
         /// <summary>
-        /// Returns the current HTTP image request display url.
+        /// Should process
         /// </summary>
-        /// <returns>
-        /// The combined components of the image request URL in a fully un-escaped form (except
-        /// for the QueryString) suitable only for display.
-        /// </returns>
-        public string GetDisplayUrl() => this.request.GetDisplayUrl();
+        ShouldProcess,
 
         /// <summary>
-        /// Analyzes the headers for the current request.
+        /// Precondition Failed
         /// </summary>
-        /// <param name="lastModified">The point in time when the cached file was last modified.</param>
-        /// <param name="length">The length of the cached file in bytes.</param>
-        public void ComprehendRequestHeaders(DateTimeOffset lastModified, long length)
-        {
-            this.fileLastModified = lastModified;
-            this.fileLength = length;
-            this.ComputeLastModified();
+        PreconditionFailed,
+    }
 
-            this.ComputeIfMatch();
+    /// <summary>
+    /// Returns the current HTTP image request display url.
+    /// </summary>
+    /// <returns>
+    /// The combined components of the image request URL in a fully un-escaped form (except
+    /// for the QueryString) suitable only for display.
+    /// </returns>
+    public string GetDisplayUrl() => this.request.GetDisplayUrl();
 
-            this.ComputeIfModifiedSince();
-        }
+    /// <summary>
+    /// Analyzes the headers for the current request.
+    /// </summary>
+    /// <param name="lastModified">The point in time when the cached file was last modified.</param>
+    /// <param name="length">The length of the cached file in bytes.</param>
+    public void ComprehendRequestHeaders(DateTimeOffset lastModified, long length)
+    {
+        this.fileLastModified = lastModified;
+        this.fileLength = length;
+        this.ComputeLastModified();
 
-        /// <summary>
-        /// Gets the preconditioned state of the request.
-        /// </summary>
-        /// <returns>The <see cref="PreconditionState"/>.</returns>
-        public PreconditionState GetPreconditionState()
-            => GetMaxPreconditionState(
-                this.ifMatchState,
-                this.ifNoneMatchState,
-                this.ifModifiedSinceState,
-                this.ifUnmodifiedSinceState);
+        this.ComputeIfMatch();
 
-        /// <summary>
-        /// Gets a value indicating whether this request is a head request.
-        /// </summary>
-        /// <returns>THe <see cref="bool"/>.</returns>
-        public bool IsHeadRequest()
-            => string.Equals("HEAD", this.request.Method, StringComparison.OrdinalIgnoreCase);
+        this.ComputeIfModifiedSince();
+    }
 
-        /// <summary>
-        /// Set the response status headers.
-        /// </summary>
-        /// <param name="statusCode">The status code.</param>
-        /// <param name="metaData">The image metadata.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        public Task SendStatusAsync(int statusCode, in ImageCacheMetadata metaData)
-            => this.ApplyResponseHeadersAsync(
-                statusCode,
-                metaData.ContentType,
-                metaData.CacheControlMaxAge);
+    /// <summary>
+    /// Gets the preconditioned state of the request.
+    /// </summary>
+    /// <returns>The <see cref="PreconditionState"/>.</returns>
+    public PreconditionState GetPreconditionState()
+        => GetMaxPreconditionState(
+            this.ifMatchState,
+            this.ifNoneMatchState,
+            this.ifModifiedSinceState,
+            this.ifUnmodifiedSinceState);
 
-        /// <summary>
-        /// Set the response content.
-        /// </summary>
-        /// <param name="stream">The output stream.</param>
-        /// <param name="metaData">The image metadata.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        public async Task SendAsync(Stream stream, ImageCacheMetadata metaData)
-        {
-            await this.ApplyResponseHeadersAsync(
-                ResponseConstants.Status200Ok,
-                metaData.ContentType,
-                metaData.CacheControlMaxAge);
+    /// <summary>
+    /// Gets a value indicating whether this request is a head request.
+    /// </summary>
+    /// <returns>THe <see cref="bool"/>.</returns>
+    public bool IsHeadRequest()
+        => string.Equals("HEAD", this.request.Method, StringComparison.OrdinalIgnoreCase);
 
-            if (stream.CanSeek)
-            {
-                stream.Position = 0;
-            }
+    /// <summary>
+    /// Set the response status headers.
+    /// </summary>
+    /// <param name="statusCode">The status code.</param>
+    /// <param name="metaData">The image metadata.</param>
+    /// <returns>The <see cref="Task"/>.</returns>
+    public Task SendStatusAsync(int statusCode, in ImageCacheMetadata metaData)
+        => this.ApplyResponseHeadersAsync(
+            statusCode,
+            metaData.ContentType,
+            metaData.CacheControlMaxAge);
 
-            // We don't need to directly cancel this, if the client disconnects it will fail silently.
-            await stream.CopyToAsync(this.response.Body);
-            if (this.response.Body.CanSeek)
-            {
-                this.response.Body.Position = 0;
-            }
-        }
+    /// <summary>
+    /// Set the response content.
+    /// </summary>
+    /// <param name="stream">The output stream.</param>
+    /// <param name="metaData">The image metadata.</param>
+    /// <returns>The <see cref="Task"/>.</returns>
+    public async Task SendAsync(Stream stream, ImageCacheMetadata metaData)
+    {
+        await this.ApplyResponseHeadersAsync(
+            ResponseConstants.Status200Ok,
+            metaData.ContentType,
+            metaData.CacheControlMaxAge);
 
-        private static PreconditionState GetMaxPreconditionState(params PreconditionState[] states)
+        if (stream.CanSeek)
         {
-            PreconditionState max = PreconditionState.Unspecified;
-            foreach (PreconditionState state in states)
-            {
-                if (state > max)
-                {
-                    max = state;
-                }
-            }
-
-            return max;
+            stream.Position = 0;
         }
 
-        private async Task ApplyResponseHeadersAsync(
-            int statusCode,
-            string contentType,
-            TimeSpan maxAge)
+        // We don't need to directly cancel this, if the client disconnects it will fail silently.
+        await stream.CopyToAsync(this.response.Body);
+        if (this.response.Body.CanSeek)
         {
-            this.response.StatusCode = statusCode;
+            this.response.Body.Position = 0;
+        }
+    }
 
-            if (statusCode < 400)
+    private static PreconditionState GetMaxPreconditionState(params PreconditionState[] states)
+    {
+        PreconditionState max = PreconditionState.Unspecified;
+        foreach (PreconditionState state in states)
+        {
+            if (state > max)
             {
-                // These headers are returned for 200 and 304
-                // They are not returned for 412
-                if (!string.IsNullOrEmpty(contentType))
-                {
-                    this.response.ContentType = contentType;
-                }
+                max = state;
+            }
+        }
 
-                this.responseHeaders.LastModified = this.fileLastModified;
-                this.responseHeaders.ETag = this.fileEtag;
-                this.responseHeaders.Headers[HeaderNames.AcceptRanges] = "bytes";
+        return max;
+    }
 
-                this.responseHeaders.CacheControl = new CacheControlHeaderValue
-                {
-                    Public = true,
-                    MaxAge = maxAge,
-                    MustRevalidate = true
-                };
+    private async Task ApplyResponseHeadersAsync(
+        int statusCode,
+        string contentType,
+        TimeSpan maxAge)
+    {
+        this.response.StatusCode = statusCode;
 
-                await this.options.OnPrepareResponseAsync.Invoke(this.context);
+        if (statusCode < 400)
+        {
+            // These headers are returned for 200 and 304
+            // They are not returned for 412
+            if (!string.IsNullOrEmpty(contentType))
+            {
+                this.response.ContentType = contentType;
             }
 
-            if (statusCode == ResponseConstants.Status200Ok)
+            this.responseHeaders.LastModified = this.fileLastModified;
+            this.responseHeaders.ETag = this.fileEtag;
+            this.responseHeaders.Headers[HeaderNames.AcceptRanges] = "bytes";
+
+            this.responseHeaders.CacheControl = new CacheControlHeaderValue
             {
-                // This header is only returned here for 200. It is not returned for 304, and 412
-                this.response.ContentLength = this.fileLength;
-            }
+                Public = true,
+                MaxAge = maxAge,
+                MustRevalidate = true
+            };
+
+            await this.options.OnPrepareResponseAsync.Invoke(this.context);
         }
 
-        private void ComputeLastModified()
+        if (statusCode == ResponseConstants.Status200Ok)
         {
-            // Truncate to the second.
-            this.fileLastModified = new DateTimeOffset(
-                this.fileLastModified.Year,
-                this.fileLastModified.Month,
-                this.fileLastModified.Day,
-                this.fileLastModified.Hour,
-                this.fileLastModified.Minute,
-                this.fileLastModified.Second,
-                this.fileLastModified.Offset)
-                .ToUniversalTime();
-
-            long etagHash = this.fileLastModified.ToFileTime() ^ this.fileLength;
-            this.fileEtag = new EntityTagHeaderValue($"{'\"'}{Convert.ToString(etagHash, 16)}{'\"'}");
+            // This header is only returned here for 200. It is not returned for 304, and 412
+            this.response.ContentLength = this.fileLength;
         }
+    }
 
-        private void ComputeIfMatch()
-        {
-            // 14.24 If-Match
-            IList<EntityTagHeaderValue> ifMatch = this.requestHeaders.IfMatch;
+    private void ComputeLastModified()
+    {
+        // Truncate to the second.
+        this.fileLastModified = new DateTimeOffset(
+            this.fileLastModified.Year,
+            this.fileLastModified.Month,
+            this.fileLastModified.Day,
+            this.fileLastModified.Hour,
+            this.fileLastModified.Minute,
+            this.fileLastModified.Second,
+            this.fileLastModified.Offset)
+            .ToUniversalTime();
+
+        long etagHash = this.fileLastModified.ToFileTime() ^ this.fileLength;
+        this.fileEtag = new EntityTagHeaderValue($"{'\"'}{Convert.ToString(etagHash, 16)}{'\"'}");
+    }
 
-            if (ifMatch?.Count > 0)
+    private void ComputeIfMatch()
+    {
+        // 14.24 If-Match
+        IList<EntityTagHeaderValue> ifMatch = this.requestHeaders.IfMatch;
+
+        if (ifMatch?.Count > 0)
+        {
+            this.ifMatchState = PreconditionState.PreconditionFailed;
+            foreach (EntityTagHeaderValue etag in ifMatch)
             {
-                this.ifMatchState = PreconditionState.PreconditionFailed;
-                foreach (EntityTagHeaderValue etag in ifMatch)
+                if (etag.Equals(EntityTagHeaderValue.Any) || etag.Compare(this.fileEtag, true))
                 {
-                    if (etag.Equals(EntityTagHeaderValue.Any) || etag.Compare(this.fileEtag, true))
-                    {
-                        this.ifMatchState = PreconditionState.ShouldProcess;
-                        break;
-                    }
+                    this.ifMatchState = PreconditionState.ShouldProcess;
+                    break;
                 }
             }
+        }
 
-            // 14.26 If-None-Match
-            IList<EntityTagHeaderValue> ifNoneMatch = this.requestHeaders.IfNoneMatch;
+        // 14.26 If-None-Match
+        IList<EntityTagHeaderValue> ifNoneMatch = this.requestHeaders.IfNoneMatch;
 
-            if (ifNoneMatch?.Count > 0)
+        if (ifNoneMatch?.Count > 0)
+        {
+            this.ifNoneMatchState = PreconditionState.ShouldProcess;
+            foreach (EntityTagHeaderValue etag in ifNoneMatch)
             {
-                this.ifNoneMatchState = PreconditionState.ShouldProcess;
-                foreach (EntityTagHeaderValue etag in ifNoneMatch)
+                if (etag.Equals(EntityTagHeaderValue.Any) || etag.Compare(this.fileEtag, true))
                 {
-                    if (etag.Equals(EntityTagHeaderValue.Any) || etag.Compare(this.fileEtag, true))
-                    {
-                        this.ifNoneMatchState = PreconditionState.NotModified;
-                        break;
-                    }
+                    this.ifNoneMatchState = PreconditionState.NotModified;
+                    break;
                 }
             }
         }
+    }
 
-        private void ComputeIfModifiedSince()
-        {
-            DateTimeOffset now = DateTimeOffset.UtcNow;
+    private void ComputeIfModifiedSince()
+    {
+        DateTimeOffset now = DateTimeOffset.UtcNow;
 
-            // 14.25 If-Modified-Since
-            DateTimeOffset? ifModifiedSince = this.requestHeaders.IfModifiedSince;
-            if (ifModifiedSince.HasValue && ifModifiedSince <= now)
-            {
-                bool modified = ifModifiedSince < this.fileLastModified;
-                this.ifModifiedSinceState = modified ? PreconditionState.ShouldProcess : PreconditionState.NotModified;
-            }
+        // 14.25 If-Modified-Since
+        DateTimeOffset? ifModifiedSince = this.requestHeaders.IfModifiedSince;
+        if (ifModifiedSince.HasValue && ifModifiedSince <= now)
+        {
+            bool modified = ifModifiedSince < this.fileLastModified;
+            this.ifModifiedSinceState = modified ? PreconditionState.ShouldProcess : PreconditionState.NotModified;
+        }
 
-            // 14.28 If-Unmodified-Since
-            DateTimeOffset? ifUnmodifiedSince = this.requestHeaders.IfUnmodifiedSince;
-            if (ifUnmodifiedSince.HasValue && ifUnmodifiedSince <= now)
-            {
-                bool unmodified = ifUnmodifiedSince >= this.fileLastModified;
-                this.ifUnmodifiedSinceState = unmodified ? PreconditionState.ShouldProcess : PreconditionState.PreconditionFailed;
-            }
+        // 14.28 If-Unmodified-Since
+        DateTimeOffset? ifUnmodifiedSince = this.requestHeaders.IfUnmodifiedSince;
+        if (ifUnmodifiedSince.HasValue && ifUnmodifiedSince <= now)
+        {
+            bool unmodified = ifUnmodifiedSince >= this.fileLastModified;
+            this.ifUnmodifiedSinceState = unmodified ? PreconditionState.ShouldProcess : PreconditionState.PreconditionFailed;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
index 5ac033df..d340d5cc 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
@@ -1,13 +1,9 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Extensions.Logging;
@@ -22,558 +18,557 @@
 using SixLabors.ImageSharp.Web.Resolvers;
 using SixLabors.ImageSharp.Web.Synchronization;
 
-namespace SixLabors.ImageSharp.Web.Middleware
+namespace SixLabors.ImageSharp.Web.Middleware;
+
+/// <summary>
+/// Middleware for handling the processing of images via image requests.
+/// </summary>
+public class ImageSharpMiddleware
 {
     /// <summary>
-    /// Middleware for handling the processing of images via image requests.
+    /// Used to temporarily store source metadata reads to reduce the overhead of cache lookups.
     /// </summary>
-    public class ImageSharpMiddleware
-    {
-        /// <summary>
-        /// Used to temporarily store source metadata reads to reduce the overhead of cache lookups.
-        /// </summary>
-        private static readonly ConcurrentTLruCache<string, ImageMetadata> SourceMetadataLru
-            = new(1024, TimeSpan.FromSeconds(30));
-
-        /// <summary>
-        /// Used to temporarily store cache resolver reads to reduce the overhead of cache lookups.
-        /// </summary>
-        private static readonly ConcurrentTLruCache<string, (IImageCacheResolver, ImageCacheMetadata)> CacheResolverLru
-            = new(1024, TimeSpan.FromSeconds(30));
-
-        /// <summary>
-        /// Used to temporarily store cached HMAC-s to reduce the overhead of HMAC token generation.
-        /// </summary>
-        private static readonly ConcurrentTLruCache<string, string> HMACTokenLru
-            = new(1024, TimeSpan.FromSeconds(30));
-
-        /// <summary>
-        /// The function processing the Http request.
-        /// </summary>
-        private readonly RequestDelegate next;
-
-        /// <summary>
-        /// The configuration options.
-        /// </summary>
-        private readonly ImageSharpMiddlewareOptions options;
-
-        /// <summary>
-        /// The type used for performing logging.
-        /// </summary>
-        private readonly ILogger logger;
-
-        /// <summary>
-        /// The parser for parsing commands from the current request.
-        /// </summary>
-        private readonly IRequestParser requestParser;
-
-        /// <summary>
-        /// The collection of image providers.
-        /// </summary>
-        private readonly IImageProvider[] providers;
-
-        /// <summary>
-        /// The collection of image processors.
-        /// </summary>
-        private readonly IImageWebProcessor[] processors;
-
-        /// <summary>
-        /// The cache key.
-        /// </summary>
-        private readonly ICacheKey cacheKey;
-
-        /// <summary>
-        /// The image cache.
-        /// </summary>
-        private readonly IImageCache cache;
-
-        /// <summary>
-        /// The hashing implementation to use when generating cached file names.
-        /// </summary>
-        private readonly ICacheHash cacheHash;
-
-        /// <summary>
-        /// Contains various helper methods based on the current configuration.
-        /// </summary>
-        private readonly FormatUtilities formatUtilities;
-
-        /// <summary>
-        /// Used to parse processing commands.
-        /// </summary>
-        private readonly CommandParser commandParser;
-
-        /// <summary>
-        /// The culture to use when parsing processing commands.
-        /// </summary>
-        private readonly CultureInfo parserCulture;
-
-        /// <summary>
-        /// The lock used to prevent concurrent processing of the same exact image request.
-        /// </summary>
-        private readonly AsyncKeyReaderWriterLock<string> asyncKeyLock;
-
-        /// <summary>
-        /// Contains helpers that allow authorization of image requests.
-        /// </summary>
-        private readonly RequestAuthorizationUtilities authorizationUtilities;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageSharpMiddleware"/> class.
-        /// </summary>
-        /// <param name="next">The next middleware in the pipeline.</param>
-        /// <param name="options">The middleware configuration options.</param>
-        /// <param name="loggerFactory">An <see cref="ILoggerFactory"/> instance used to create loggers.</param>
-        /// <param name="requestParser">An <see cref="IRequestParser"/> instance used to parse image requests for commands.</param>
-        /// <param name="resolvers">A collection of <see cref="IImageProvider"/> instances used to resolve images.</param>
-        /// <param name="processors">A collection of <see cref="IImageWebProcessor"/> instances used to process images.</param>
-        /// <param name="cache">An <see cref="IImageCache"/> instance used for caching images.</param>
-        /// <param name="cacheKey">An <see cref="ICacheKey"/> instance used for creating cache keys.</param>
-        /// <param name="cacheHash">An <see cref="ICacheHash"/>instance used for calculating cached file names.</param>
-        /// <param name="commandParser">The command parser.</param>
-        /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
-        /// <param name="asyncKeyLock">The async key lock.</param>
-        /// <param name="requestAuthorizationUtilities">Contains helpers that allow authorization of image requests.</param>
-        public ImageSharpMiddleware(
-            RequestDelegate next,
-            IOptions<ImageSharpMiddlewareOptions> options,
-            ILoggerFactory loggerFactory,
-            IRequestParser requestParser,
-            IEnumerable<IImageProvider> resolvers,
-            IEnumerable<IImageWebProcessor> processors,
-            IImageCache cache,
-            ICacheKey cacheKey,
-            ICacheHash cacheHash,
-            CommandParser commandParser,
-            FormatUtilities formatUtilities,
-            AsyncKeyReaderWriterLock<string> asyncKeyLock,
-            RequestAuthorizationUtilities requestAuthorizationUtilities)
-        {
-            Guard.NotNull(next, nameof(next));
-            Guard.NotNull(options, nameof(options));
-            Guard.NotNull(loggerFactory, nameof(loggerFactory));
-            Guard.NotNull(requestParser, nameof(requestParser));
-            Guard.NotNull(resolvers, nameof(resolvers));
-            Guard.NotNull(processors, nameof(processors));
-            Guard.NotNull(cache, nameof(cache));
-            Guard.NotNull(cacheKey, nameof(cacheKey));
-            Guard.NotNull(cacheHash, nameof(cacheHash));
-            Guard.NotNull(commandParser, nameof(commandParser));
-            Guard.NotNull(formatUtilities, nameof(formatUtilities));
-            Guard.NotNull(asyncKeyLock, nameof(asyncKeyLock));
-            Guard.NotNull(requestAuthorizationUtilities, nameof(requestAuthorizationUtilities));
-
-            this.next = next;
-            this.options = options.Value;
-            this.requestParser = requestParser;
-            this.providers = resolvers as IImageProvider[] ?? resolvers.ToArray();
-            this.processors = processors as IImageWebProcessor[] ?? processors.ToArray();
-            this.cache = cache;
-            this.cacheKey = cacheKey;
-            this.cacheHash = cacheHash;
-            this.commandParser = commandParser;
-            this.parserCulture = this.options.UseInvariantParsingCulture
-                ? CultureInfo.InvariantCulture
-                : CultureInfo.CurrentCulture;
-
-            this.logger = loggerFactory.CreateLogger<ImageSharpMiddleware>();
-            this.formatUtilities = formatUtilities;
-            this.asyncKeyLock = asyncKeyLock;
-            this.authorizationUtilities = requestAuthorizationUtilities;
-        }
+    private static readonly ConcurrentTLruCache<string, ImageMetadata> SourceMetadataLru
+        = new(1024, TimeSpan.FromSeconds(30));
 
-        /// <summary>
-        /// Performs operations upon the current request.
-        /// </summary>
-        /// <param name="httpContext">The current HTTP request context.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        public Task Invoke(HttpContext httpContext) => this.Invoke(httpContext, false);
+    /// <summary>
+    /// Used to temporarily store cache resolver reads to reduce the overhead of cache lookups.
+    /// </summary>
+    private static readonly ConcurrentTLruCache<string, (IImageCacheResolver, ImageCacheMetadata)> CacheResolverLru
+        = new(1024, TimeSpan.FromSeconds(30));
 
-        private async Task Invoke(HttpContext httpContext, bool retry)
-        {
-            // Get the correct provider for the request
-            IImageProvider provider = null;
-            foreach (IImageProvider resolver in this.providers)
-            {
-                if (resolver.Match(httpContext))
-                {
-                    provider = resolver;
-                    break;
-                }
-            }
+    /// <summary>
+    /// Used to temporarily store cached HMAC-s to reduce the overhead of HMAC token generation.
+    /// </summary>
+    private static readonly ConcurrentTLruCache<string, string> HMACTokenLru
+        = new(1024, TimeSpan.FromSeconds(30));
 
-            if (provider?.IsValidRequest(httpContext) != true)
-            {
-                // Nothing to do. call the next delegate/middleware in the pipeline
-                await this.next(httpContext);
-                return;
-            }
+    /// <summary>
+    /// The function processing the Http request.
+    /// </summary>
+    private readonly RequestDelegate next;
 
-            CommandCollection commands = this.requestParser.ParseRequestCommands(httpContext);
+    /// <summary>
+    /// The configuration options.
+    /// </summary>
+    private readonly ImageSharpMiddlewareOptions options;
 
-            // First check for a HMAC token and capture before the command is stripped out.
-            byte[] secret = this.options.HMACSecretKey;
-            bool checkHMAC = false;
-            string token = null;
-            if (secret?.Length > 0)
-            {
-                checkHMAC = true;
-                token = commands.GetValueOrDefault(RequestAuthorizationUtilities.TokenCommand);
-            }
+    /// <summary>
+    /// The type used for performing logging.
+    /// </summary>
+    private readonly ILogger logger;
 
-            this.authorizationUtilities.StripUnknownCommands(commands);
-            ImageCommandContext imageCommandContext = new(httpContext, commands, this.commandParser, this.parserCulture);
+    /// <summary>
+    /// The parser for parsing commands from the current request.
+    /// </summary>
+    private readonly IRequestParser requestParser;
 
-            // At this point we know that this is an image request so should attempt to compute a validating HMAC.
-            string hmac = null;
-            if (checkHMAC && token != null)
-            {
-                // Generate and cache a HMAC to validate against based upon the current valid commands from the request.
-                //
-                // If the command collection differs following the stripping of invalid commands prior to this point then this will mean
-                // the token will not match our validating HMAC, however, this would be indicative of an attack and should be treated as such.
-                //
-                // As a rule all image requests should contain valid commands only.
-                // Key generation uses string.Create under the hood with very low allocation so should be good enough as a cache key.
-                hmac = await HMACTokenLru.GetOrAddAsync(
-                    httpContext.Request.GetEncodedUrl(),
-                    _ => this.authorizationUtilities.ComputeHMACAsync(imageCommandContext));
-            }
+    /// <summary>
+    /// The collection of image providers.
+    /// </summary>
+    private readonly IImageProvider[] providers;
 
-            await this.options.OnParseCommandsAsync.Invoke(imageCommandContext);
+    /// <summary>
+    /// The collection of image processors.
+    /// </summary>
+    private readonly IImageWebProcessor[] processors;
 
-            if (commands.Count == 0 && provider?.ProcessingBehavior != ProcessingBehavior.All)
-            {
-                // Nothing to do. call the next delegate/middleware in the pipeline
-                await this.next(httpContext);
-                return;
-            }
+    /// <summary>
+    /// The cache key.
+    /// </summary>
+    private readonly ICacheKey cacheKey;
 
-            // At this point we know that this is an image request designed for processing via this middleware.
-            // Check for a token if required and reject if invalid.
-            if (checkHMAC)
-            {
-                if (token == null || hmac != token)
-                {
-                    SetBadRequest(httpContext);
-                    return;
-                }
-            }
+    /// <summary>
+    /// The image cache.
+    /// </summary>
+    private readonly IImageCache cache;
 
-            IImageResolver sourceImageResolver = await provider.GetAsync(httpContext);
+    /// <summary>
+    /// The hashing implementation to use when generating cached file names.
+    /// </summary>
+    private readonly ICacheHash cacheHash;
+
+    /// <summary>
+    /// Contains various helper methods based on the current configuration.
+    /// </summary>
+    private readonly FormatUtilities formatUtilities;
+
+    /// <summary>
+    /// Used to parse processing commands.
+    /// </summary>
+    private readonly CommandParser commandParser;
+
+    /// <summary>
+    /// The culture to use when parsing processing commands.
+    /// </summary>
+    private readonly CultureInfo parserCulture;
+
+    /// <summary>
+    /// The lock used to prevent concurrent processing of the same exact image request.
+    /// </summary>
+    private readonly AsyncKeyReaderWriterLock<string> asyncKeyLock;
+
+    /// <summary>
+    /// Contains helpers that allow authorization of image requests.
+    /// </summary>
+    private readonly RequestAuthorizationUtilities authorizationUtilities;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ImageSharpMiddleware"/> class.
+    /// </summary>
+    /// <param name="next">The next middleware in the pipeline.</param>
+    /// <param name="options">The middleware configuration options.</param>
+    /// <param name="loggerFactory">An <see cref="ILoggerFactory"/> instance used to create loggers.</param>
+    /// <param name="requestParser">An <see cref="IRequestParser"/> instance used to parse image requests for commands.</param>
+    /// <param name="resolvers">A collection of <see cref="IImageProvider"/> instances used to resolve images.</param>
+    /// <param name="processors">A collection of <see cref="IImageWebProcessor"/> instances used to process images.</param>
+    /// <param name="cache">An <see cref="IImageCache"/> instance used for caching images.</param>
+    /// <param name="cacheKey">An <see cref="ICacheKey"/> instance used for creating cache keys.</param>
+    /// <param name="cacheHash">An <see cref="ICacheHash"/>instance used for calculating cached file names.</param>
+    /// <param name="commandParser">The command parser.</param>
+    /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
+    /// <param name="asyncKeyLock">The async key lock.</param>
+    /// <param name="requestAuthorizationUtilities">Contains helpers that allow authorization of image requests.</param>
+    public ImageSharpMiddleware(
+        RequestDelegate next,
+        IOptions<ImageSharpMiddlewareOptions> options,
+        ILoggerFactory loggerFactory,
+        IRequestParser requestParser,
+        IEnumerable<IImageProvider> resolvers,
+        IEnumerable<IImageWebProcessor> processors,
+        IImageCache cache,
+        ICacheKey cacheKey,
+        ICacheHash cacheHash,
+        CommandParser commandParser,
+        FormatUtilities formatUtilities,
+        AsyncKeyReaderWriterLock<string> asyncKeyLock,
+        RequestAuthorizationUtilities requestAuthorizationUtilities)
+    {
+        Guard.NotNull(next, nameof(next));
+        Guard.NotNull(options, nameof(options));
+        Guard.NotNull(loggerFactory, nameof(loggerFactory));
+        Guard.NotNull(requestParser, nameof(requestParser));
+        Guard.NotNull(resolvers, nameof(resolvers));
+        Guard.NotNull(processors, nameof(processors));
+        Guard.NotNull(cache, nameof(cache));
+        Guard.NotNull(cacheKey, nameof(cacheKey));
+        Guard.NotNull(cacheHash, nameof(cacheHash));
+        Guard.NotNull(commandParser, nameof(commandParser));
+        Guard.NotNull(formatUtilities, nameof(formatUtilities));
+        Guard.NotNull(asyncKeyLock, nameof(asyncKeyLock));
+        Guard.NotNull(requestAuthorizationUtilities, nameof(requestAuthorizationUtilities));
+
+        this.next = next;
+        this.options = options.Value;
+        this.requestParser = requestParser;
+        this.providers = resolvers as IImageProvider[] ?? resolvers.ToArray();
+        this.processors = processors as IImageWebProcessor[] ?? processors.ToArray();
+        this.cache = cache;
+        this.cacheKey = cacheKey;
+        this.cacheHash = cacheHash;
+        this.commandParser = commandParser;
+        this.parserCulture = this.options.UseInvariantParsingCulture
+            ? CultureInfo.InvariantCulture
+            : CultureInfo.CurrentCulture;
+
+        this.logger = loggerFactory.CreateLogger<ImageSharpMiddleware>();
+        this.formatUtilities = formatUtilities;
+        this.asyncKeyLock = asyncKeyLock;
+        this.authorizationUtilities = requestAuthorizationUtilities;
+    }
+
+    /// <summary>
+    /// Performs operations upon the current request.
+    /// </summary>
+    /// <param name="httpContext">The current HTTP request context.</param>
+    /// <returns>The <see cref="Task"/>.</returns>
+    public Task Invoke(HttpContext httpContext) => this.Invoke(httpContext, false);
 
-            if (sourceImageResolver is null)
+    private async Task Invoke(HttpContext httpContext, bool retry)
+    {
+        // Get the correct provider for the request
+        IImageProvider provider = null;
+        foreach (IImageProvider resolver in this.providers)
+        {
+            if (resolver.Match(httpContext))
             {
-                // Log the error but let the pipeline handle the 404
-                // by calling the next delegate/middleware in the pipeline.
-                this.logger.LogImageResolveFailed(httpContext.Request.GetDisplayUrl());
-                await this.next(httpContext);
-                return;
+                provider = resolver;
+                break;
             }
+        }
 
-            await this.ProcessRequestAsync(
-                httpContext,
-                sourceImageResolver,
-                new ImageContext(httpContext, this.options),
-                commands,
-                retry);
+        if (provider?.IsValidRequest(httpContext) != true)
+        {
+            // Nothing to do. call the next delegate/middleware in the pipeline
+            await this.next(httpContext);
+            return;
         }
 
-        private static void SetBadRequest(HttpContext httpContext)
+        CommandCollection commands = this.requestParser.ParseRequestCommands(httpContext);
+
+        // First check for a HMAC token and capture before the command is stripped out.
+        byte[] secret = this.options.HMACSecretKey;
+        bool checkHMAC = false;
+        string token = null;
+        if (secret?.Length > 0)
         {
-            // We return a 400 rather than a 401 as we do not want to prompt follow up requests.
-            // We don't log the error to avoid attempts at log poisoning.
-            httpContext.Response.Clear();
-            httpContext.Response.StatusCode = StatusCodes.Status400BadRequest;
+            checkHMAC = true;
+            token = commands.GetValueOrDefault(RequestAuthorizationUtilities.TokenCommand);
         }
 
-        private async Task ProcessRequestAsync(
-            HttpContext httpContext,
-            IImageResolver sourceImageResolver,
-            ImageContext imageContext,
-            CommandCollection commands,
-            bool retry)
+        this.authorizationUtilities.StripUnknownCommands(commands);
+        ImageCommandContext imageCommandContext = new(httpContext, commands, this.commandParser, this.parserCulture);
+
+        // At this point we know that this is an image request so should attempt to compute a validating HMAC.
+        string hmac = null;
+        if (checkHMAC && token != null)
         {
-            // Create a hashed cache key
-            string key = this.cacheHash.Create(
-                this.cacheKey.Create(httpContext, commands),
-                this.options.CacheHashLength);
-
-            // Check the cache, if present, not out of date and not requiring an update
-            // we'll simply serve the file from there.
-            ImageWorkerResult readResult = default;
-            using (await this.asyncKeyLock.ReaderLockAsync(key))
-            {
-                readResult = await this.IsNewOrUpdatedAsync(sourceImageResolver, key);
-            }
+            // Generate and cache a HMAC to validate against based upon the current valid commands from the request.
+            //
+            // If the command collection differs following the stripping of invalid commands prior to this point then this will mean
+            // the token will not match our validating HMAC, however, this would be indicative of an attack and should be treated as such.
+            //
+            // As a rule all image requests should contain valid commands only.
+            // Key generation uses string.Create under the hood with very low allocation so should be good enough as a cache key.
+            hmac = await HMACTokenLru.GetOrAddAsync(
+                httpContext.Request.GetEncodedUrl(),
+                _ => this.authorizationUtilities.ComputeHMACAsync(imageCommandContext));
+        }
+
+        await this.options.OnParseCommandsAsync.Invoke(imageCommandContext);
+
+        if (commands.Count == 0 && provider?.ProcessingBehavior != ProcessingBehavior.All)
+        {
+            // Nothing to do. call the next delegate/middleware in the pipeline
+            await this.next(httpContext);
+            return;
+        }
 
-            if (!readResult.IsNewOrUpdated)
+        // At this point we know that this is an image request designed for processing via this middleware.
+        // Check for a token if required and reject if invalid.
+        if (checkHMAC)
+        {
+            if (token == null || hmac != token)
             {
-                await this.SendResponseAsync(httpContext, imageContext, key, readResult.CacheImageMetadata, readResult.Resolver, null, retry);
+                SetBadRequest(httpContext);
                 return;
             }
+        }
 
-            // Not cached, or is updated? Let's get it from the image resolver.
-            ImageMetadata sourceImageMetadata = readResult.SourceImageMetadata;
+        IImageResolver sourceImageResolver = await provider.GetAsync(httpContext);
 
-            // Enter an asynchronous write worker which prevents multiple writes and delays any reads for the same request.
-            // This reduces the overheads of unnecessary processing.
-            RecyclableMemoryStream outStream = null;
-            try
+        if (sourceImageResolver is null)
+        {
+            // Log the error but let the pipeline handle the 404
+            // by calling the next delegate/middleware in the pipeline.
+            this.logger.LogImageResolveFailed(httpContext.Request.GetDisplayUrl());
+            await this.next(httpContext);
+            return;
+        }
+
+        await this.ProcessRequestAsync(
+            httpContext,
+            sourceImageResolver,
+            new ImageContext(httpContext, this.options),
+            commands,
+            retry);
+    }
+
+    private static void SetBadRequest(HttpContext httpContext)
+    {
+        // We return a 400 rather than a 401 as we do not want to prompt follow up requests.
+        // We don't log the error to avoid attempts at log poisoning.
+        httpContext.Response.Clear();
+        httpContext.Response.StatusCode = StatusCodes.Status400BadRequest;
+    }
+
+    private async Task ProcessRequestAsync(
+        HttpContext httpContext,
+        IImageResolver sourceImageResolver,
+        ImageContext imageContext,
+        CommandCollection commands,
+        bool retry)
+    {
+        // Create a hashed cache key
+        string key = this.cacheHash.Create(
+            this.cacheKey.Create(httpContext, commands),
+            this.options.CacheHashLength);
+
+        // Check the cache, if present, not out of date and not requiring an update
+        // we'll simply serve the file from there.
+        ImageWorkerResult readResult = default;
+        using (await this.asyncKeyLock.ReaderLockAsync(key))
+        {
+            readResult = await this.IsNewOrUpdatedAsync(sourceImageResolver, key);
+        }
+
+        if (!readResult.IsNewOrUpdated)
+        {
+            await this.SendResponseAsync(httpContext, imageContext, key, readResult.CacheImageMetadata, readResult.Resolver, null, retry);
+            return;
+        }
+
+        // Not cached, or is updated? Let's get it from the image resolver.
+        ImageMetadata sourceImageMetadata = readResult.SourceImageMetadata;
+
+        // Enter an asynchronous write worker which prevents multiple writes and delays any reads for the same request.
+        // This reduces the overheads of unnecessary processing.
+        RecyclableMemoryStream outStream = null;
+        try
+        {
+            Task<IDisposable> takeLockTask = this.asyncKeyLock.WriterLockAsync(key);
+            bool lockWasAlreadyHeld = takeLockTask.Status != TaskStatus.RanToCompletion;
+            using (await takeLockTask)
             {
-                Task<IDisposable> takeLockTask = this.asyncKeyLock.WriterLockAsync(key);
-                bool lockWasAlreadyHeld = takeLockTask.Status != TaskStatus.RanToCompletion;
-                using (await takeLockTask)
+                // If the lock was already held, then that means there's a chance another worker has already
+                // processed this same request and the value may now be available in the cache, so check
+                // the cache one more time
+                if (lockWasAlreadyHeld)
                 {
-                    // If the lock was already held, then that means there's a chance another worker has already
-                    // processed this same request and the value may now be available in the cache, so check
-                    // the cache one more time
-                    if (lockWasAlreadyHeld)
-                    {
-                        readResult = await this.IsNewOrUpdatedAsync(sourceImageResolver, key);
-                    }
+                    readResult = await this.IsNewOrUpdatedAsync(sourceImageResolver, key);
+                }
 
-                    if (readResult.IsNewOrUpdated)
+                if (readResult.IsNewOrUpdated)
+                {
+                    try
                     {
-                        try
+                        ImageCacheMetadata cachedImageMetadata = default;
+                        outStream = new RecyclableMemoryStream(this.options.MemoryStreamManager);
+                        IImageFormat format;
+
+                        // 14.9.3 CacheControl Max-Age
+                        // Check to see if the source metadata has a CacheControl Max-Age value
+                        // and use it to override the default max age from our options.
+                        TimeSpan maxAge = this.options.BrowserMaxAge;
+                        if (!sourceImageMetadata.CacheControlMaxAge.Equals(TimeSpan.MinValue))
                         {
-                            ImageCacheMetadata cachedImageMetadata = default;
-                            outStream = new RecyclableMemoryStream(this.options.MemoryStreamManager);
-                            IImageFormat format;
-
-                            // 14.9.3 CacheControl Max-Age
-                            // Check to see if the source metadata has a CacheControl Max-Age value
-                            // and use it to override the default max age from our options.
-                            TimeSpan maxAge = this.options.BrowserMaxAge;
-                            if (!sourceImageMetadata.CacheControlMaxAge.Equals(TimeSpan.MinValue))
+                            maxAge = sourceImageMetadata.CacheControlMaxAge;
+                        }
+
+                        using (Stream inStream = await sourceImageResolver.OpenReadAsync())
+                        {
+                            // No commands? We simply copy the stream across.
+                            if (commands.Count == 0)
                             {
-                                maxAge = sourceImageMetadata.CacheControlMaxAge;
+                                await inStream.CopyToAsync(outStream);
+                                outStream.Position = 0;
+                                format = await Image.DetectFormatAsync(this.options.Configuration, outStream);
                             }
-
-                            using (Stream inStream = await sourceImageResolver.OpenReadAsync())
+                            else
                             {
-                                // No commands? We simply copy the stream across.
-                                if (commands.Count == 0)
-                                {
-                                    await inStream.CopyToAsync(outStream);
-                                    outStream.Position = 0;
-                                    format = await Image.DetectFormatAsync(this.options.Configuration, outStream);
-                                }
-                                else
+                                FormattedImage image = null;
+                                try
                                 {
-                                    FormattedImage image = null;
-                                    try
+                                    // Now we can finally process the image.
+                                    // We first sort the processor collection by command order then use that collection to determine whether the decoded image pixel format
+                                    // explicitly requires an alpha component in order to allow correct processing.
+                                    //
+                                    // The non-generic variant will decode to the correct pixel format based upon the encoded image metadata which can yield
+                                    // massive memory savings.
+                                    IReadOnlyList<(int Index, IImageWebProcessor Processor)> sortedProcessors = this.processors.OrderBySupportedCommands(commands);
+                                    bool requiresAlpha = sortedProcessors.RequiresTrueColorPixelFormat(commands, this.commandParser, this.parserCulture);
+
+                                    if (requiresAlpha)
                                     {
-                                        // Now we can finally process the image.
-                                        // We first sort the processor collection by command order then use that collection to determine whether the decoded image pixel format
-                                        // explicitly requires an alpha component in order to allow correct processing.
-                                        //
-                                        // The non-generic variant will decode to the correct pixel format based upon the encoded image metadata which can yield
-                                        // massive memory savings.
-                                        IReadOnlyList<(int Index, IImageWebProcessor Processor)> sortedProcessors = this.processors.OrderBySupportedCommands(commands);
-                                        bool requiresAlpha = sortedProcessors.RequiresTrueColorPixelFormat(commands, this.commandParser, this.parserCulture);
-
-                                        if (requiresAlpha)
-                                        {
-                                            image = await FormattedImage.LoadAsync<Rgba32>(this.options.Configuration, inStream);
-                                        }
-                                        else
-                                        {
-                                            image = await FormattedImage.LoadAsync(this.options.Configuration, inStream);
-                                        }
-
-                                        image.Process(
-                                            this.logger,
-                                            sortedProcessors,
-                                            commands,
-                                            this.commandParser,
-                                            this.parserCulture);
-
-                                        await this.options.OnBeforeSaveAsync.Invoke(image);
-
-                                        image.Save(outStream);
-                                        format = image.Format;
+                                        image = await FormattedImage.LoadAsync<Rgba32>(this.options.Configuration, inStream);
                                     }
-                                    finally
+                                    else
                                     {
-                                        image?.Dispose();
+                                        image = await FormattedImage.LoadAsync(this.options.Configuration, inStream);
                                     }
-                                }
-                            }
 
-                            // Allow for any further optimization of the image.
-                            outStream.Position = 0;
-                            string contentType = format.DefaultMimeType;
-                            string extension = this.formatUtilities.GetExtensionFromContentType(contentType);
-                            await this.options.OnProcessedAsync.Invoke(new ImageProcessingContext(httpContext, outStream, commands, contentType, extension));
-                            outStream.Position = 0;
-
-                            cachedImageMetadata = new ImageCacheMetadata(
-                                sourceImageMetadata.LastWriteTimeUtc,
-                                DateTime.UtcNow,
-                                contentType,
-                                maxAge,
-                                outStream.Length);
-
-                            // Save the image to the cache and send the response to the caller.
-                            await this.cache.SetAsync(key, outStream, cachedImageMetadata);
-                            outStream.Position = 0;
-
-                            // Remove any resolver from the cache so we always resolve next request
-                            // for the same key.
-                            CacheResolverLru.TryRemove(key);
+                                    image.Process(
+                                        this.logger,
+                                        sortedProcessors,
+                                        commands,
+                                        this.commandParser,
+                                        this.parserCulture);
 
-                            readResult = new ImageWorkerResult(cachedImageMetadata, null);
-                        }
-                        catch (Exception ex)
-                        {
-                            // Log the error internally then rethrow.
-                            // We don't call next here, the pipeline will automatically handle it
-                            this.logger.LogImageProcessingFailed(imageContext.GetDisplayUrl(), ex);
-                            throw;
+                                    await this.options.OnBeforeSaveAsync.Invoke(image);
+
+                                    image.Save(outStream);
+                                    format = image.Format;
+                                }
+                                finally
+                                {
+                                    image?.Dispose();
+                                }
+                            }
                         }
+
+                        // Allow for any further optimization of the image.
+                        outStream.Position = 0;
+                        string contentType = format.DefaultMimeType;
+                        string extension = this.formatUtilities.GetExtensionFromContentType(contentType);
+                        await this.options.OnProcessedAsync.Invoke(new ImageProcessingContext(httpContext, outStream, commands, contentType, extension));
+                        outStream.Position = 0;
+
+                        cachedImageMetadata = new ImageCacheMetadata(
+                            sourceImageMetadata.LastWriteTimeUtc,
+                            DateTime.UtcNow,
+                            contentType,
+                            maxAge,
+                            outStream.Length);
+
+                        // Save the image to the cache and send the response to the caller.
+                        await this.cache.SetAsync(key, outStream, cachedImageMetadata);
+                        outStream.Position = 0;
+
+                        // Remove any resolver from the cache so we always resolve next request
+                        // for the same key.
+                        CacheResolverLru.TryRemove(key);
+
+                        readResult = new ImageWorkerResult(cachedImageMetadata, null);
+                    }
+                    catch (Exception ex)
+                    {
+                        // Log the error internally then rethrow.
+                        // We don't call next here, the pipeline will automatically handle it
+                        this.logger.LogImageProcessingFailed(imageContext.GetDisplayUrl(), ex);
+                        throw;
                     }
                 }
-
-                await this.SendResponseAsync(httpContext, imageContext, key, readResult.CacheImageMetadata, readResult.Resolver, outStream, retry);
-            }
-            finally
-            {
-                await this.StreamDisposeAsync(outStream);
             }
-        }
 
-        private ValueTask StreamDisposeAsync(Stream stream)
+            await this.SendResponseAsync(httpContext, imageContext, key, readResult.CacheImageMetadata, readResult.Resolver, outStream, retry);
+        }
+        finally
         {
-            if (stream is null)
-            {
-                return default;
-            }
-
-            return stream.DisposeAsync();
+            await StreamDisposeAsync(outStream);
         }
+    }
 
-        private async Task<ImageWorkerResult> IsNewOrUpdatedAsync(
-            IImageResolver sourceImageResolver,
-            string key)
+    private static ValueTask StreamDisposeAsync(Stream stream)
+    {
+        if (stream is null)
         {
-            // Get the source metadata for processing, storing the result for future checks.
-            ImageMetadata sourceImageMetadata = await
-                SourceMetadataLru.GetOrAddAsync(
-                    key,
-                    _ => sourceImageResolver.GetMetaDataAsync());
-
-            // Check to see if the cache contains this image.
-            // If not, we return early. No further checks necessary.
-            (IImageCacheResolver ImageCacheResolver, ImageCacheMetadata ImageCacheMetadata) cachedImage = await
-                CacheResolverLru.GetOrAddAsync(
-                    key,
-                    async k =>
-                    {
-                        IImageCacheResolver resolver = await this.cache.GetAsync(k);
-                        ImageCacheMetadata metadata = default;
-                        if (resolver != null)
-                        {
-                            metadata = await resolver.GetMetaDataAsync();
-                        }
+            return default;
+        }
 
-                        return (resolver, metadata);
-                    });
+        return stream.DisposeAsync();
+    }
 
-            if (cachedImage.ImageCacheResolver is null)
-            {
-                // Remove the null resolver from the store.
-                CacheResolverLru.TryRemove(key);
+    private async Task<ImageWorkerResult> IsNewOrUpdatedAsync(
+        IImageResolver sourceImageResolver,
+        string key)
+    {
+        // Get the source metadata for processing, storing the result for future checks.
+        ImageMetadata sourceImageMetadata = await
+            SourceMetadataLru.GetOrAddAsync(
+                key,
+                _ => sourceImageResolver.GetMetaDataAsync());
+
+        // Check to see if the cache contains this image.
+        // If not, we return early. No further checks necessary.
+        (IImageCacheResolver ImageCacheResolver, ImageCacheMetadata ImageCacheMetadata) cachedImage = await
+            CacheResolverLru.GetOrAddAsync(
+                key,
+                async k =>
+                {
+                    IImageCacheResolver resolver = await this.cache.GetAsync(k);
+                    ImageCacheMetadata metadata = default;
+                    if (resolver != null)
+                    {
+                        metadata = await resolver.GetMetaDataAsync();
+                    }
 
-                return new ImageWorkerResult(sourceImageMetadata);
-            }
+                    return (resolver, metadata);
+                });
 
-            // Has the cached image expired?
-            // Or has the source image changed since the image was last cached?
-            if (cachedImage.ImageCacheMetadata.ContentLength == 0 // Fix for old cache without length property
-                || cachedImage.ImageCacheMetadata.CacheLastWriteTimeUtc <= (DateTimeOffset.UtcNow - this.options.CacheMaxAge)
-                || cachedImage.ImageCacheMetadata.SourceLastWriteTimeUtc != sourceImageMetadata.LastWriteTimeUtc)
-            {
-                // We want to remove the resolver from the store so that the next check gets the updated file.
-                CacheResolverLru.TryRemove(key);
-                return new ImageWorkerResult(sourceImageMetadata);
-            }
+        if (cachedImage.ImageCacheResolver is null)
+        {
+            // Remove the null resolver from the store.
+            CacheResolverLru.TryRemove(key);
 
-            // The image is cached. Return the cached image so multiple callers can write a response.
-            return new ImageWorkerResult(sourceImageMetadata, cachedImage.ImageCacheMetadata, cachedImage.ImageCacheResolver);
+            return new ImageWorkerResult(sourceImageMetadata);
         }
 
-        private async Task SendResponseAsync(
-            HttpContext httpContext,
-            ImageContext imageContext,
-            string key,
-            ImageCacheMetadata metadata,
-            IImageCacheResolver cacheResolver,
-            Stream stream,
-            bool retry)
+        // Has the cached image expired?
+        // Or has the source image changed since the image was last cached?
+        if (cachedImage.ImageCacheMetadata.ContentLength == 0 // Fix for old cache without length property
+            || cachedImage.ImageCacheMetadata.CacheLastWriteTimeUtc <= (DateTimeOffset.UtcNow - this.options.CacheMaxAge)
+            || cachedImage.ImageCacheMetadata.SourceLastWriteTimeUtc != sourceImageMetadata.LastWriteTimeUtc)
         {
-            imageContext.ComprehendRequestHeaders(metadata.CacheLastWriteTimeUtc, metadata.ContentLength);
+            // We want to remove the resolver from the store so that the next check gets the updated file.
+            CacheResolverLru.TryRemove(key);
+            return new ImageWorkerResult(sourceImageMetadata);
+        }
 
-            switch (imageContext.GetPreconditionState())
-            {
-                case ImageContext.PreconditionState.Unspecified:
-                case ImageContext.PreconditionState.ShouldProcess:
-                    if (imageContext.IsHeadRequest())
-                    {
-                        await imageContext.SendStatusAsync(ResponseConstants.Status200Ok, metadata);
-                        return;
-                    }
+        // The image is cached. Return the cached image so multiple callers can write a response.
+        return new ImageWorkerResult(sourceImageMetadata, cachedImage.ImageCacheMetadata, cachedImage.ImageCacheResolver);
+    }
+
+    private async Task SendResponseAsync(
+        HttpContext httpContext,
+        ImageContext imageContext,
+        string key,
+        ImageCacheMetadata metadata,
+        IImageCacheResolver cacheResolver,
+        Stream stream,
+        bool retry)
+    {
+        imageContext.ComprehendRequestHeaders(metadata.CacheLastWriteTimeUtc, metadata.ContentLength);
+
+        switch (imageContext.GetPreconditionState())
+        {
+            case ImageContext.PreconditionState.Unspecified:
+            case ImageContext.PreconditionState.ShouldProcess:
+                if (imageContext.IsHeadRequest())
+                {
+                    await imageContext.SendStatusAsync(ResponseConstants.Status200Ok, metadata);
+                    return;
+                }
 
-                    this.logger.LogImageServed(imageContext.GetDisplayUrl(), key);
+                this.logger.LogImageServed(imageContext.GetDisplayUrl(), key);
 
-                    // If stream is not null, then send it directly. Otherwise, use the cacheResolver
-                    // to load from the cache.
-                    if (stream != null)
+                // If stream is not null, then send it directly. Otherwise, use the cacheResolver
+                // to load from the cache.
+                if (stream != null)
+                {
+                    await imageContext.SendAsync(stream, metadata);
+                }
+                else
+                {
+                    try
                     {
-                        await imageContext.SendAsync(stream, metadata);
+                        using Stream cacheStream = await cacheResolver.OpenReadAsync();
+                        await imageContext.SendAsync(cacheStream, metadata);
                     }
-                    else
+                    catch (Exception ex)
                     {
-                        try
+                        if (!retry)
                         {
-                            using Stream cacheStream = await cacheResolver.OpenReadAsync();
-                            await imageContext.SendAsync(cacheStream, metadata);
+                            // The image has failed to be returned from the cache.
+                            // This can happen if the cached image has been physically deleted but the item is still in the LRU cache.
+                            // We'll retry running the request again in it's entirety. This ensures any changes to the source are tracked also.
+                            CacheResolverLru.TryRemove(key);
+                            await this.Invoke(httpContext, true);
+                            return;
                         }
-                        catch (Exception ex)
-                        {
-                            if (!retry)
-                            {
-                                // The image has failed to be returned from the cache.
-                                // This can happen if the cached image has been physically deleted but the item is still in the LRU cache.
-                                // We'll retry running the request again in it's entirety. This ensures any changes to the source are tracked also.
-                                CacheResolverLru.TryRemove(key);
-                                await this.Invoke(httpContext, true);
-                                return;
-                            }
 
-                            // We've already tried to run this request before.
-                            // Log the error internally then rethrow.
-                            // We don't call next here, the pipeline will automatically handle it
-                            this.logger.LogImageProcessingFailed(imageContext.GetDisplayUrl(), ex);
-                            throw;
-                        }
+                        // We've already tried to run this request before.
+                        // Log the error internally then rethrow.
+                        // We don't call next here, the pipeline will automatically handle it
+                        this.logger.LogImageProcessingFailed(imageContext.GetDisplayUrl(), ex);
+                        throw;
                     }
+                }
 
-                    return;
+                return;
 
-                case ImageContext.PreconditionState.NotModified:
-                    this.logger.LogImageNotModified(imageContext.GetDisplayUrl());
-                    await imageContext.SendStatusAsync(ResponseConstants.Status304NotModified, metadata);
-                    return;
+            case ImageContext.PreconditionState.NotModified:
+                this.logger.LogImageNotModified(imageContext.GetDisplayUrl());
+                await imageContext.SendStatusAsync(ResponseConstants.Status304NotModified, metadata);
+                return;
 
-                case ImageContext.PreconditionState.PreconditionFailed:
-                    this.logger.LogImagePreconditionFailed(imageContext.GetDisplayUrl());
-                    await imageContext.SendStatusAsync(ResponseConstants.Status412PreconditionFailed, metadata);
-                    return;
-                default:
-                    var exception = new NotImplementedException(imageContext.GetPreconditionState().ToString());
-                    Debug.Fail(exception.ToString());
-                    throw exception;
-            }
+            case ImageContext.PreconditionState.PreconditionFailed:
+                this.logger.LogImagePreconditionFailed(imageContext.GetDisplayUrl());
+                await imageContext.SendStatusAsync(ResponseConstants.Status412PreconditionFailed, metadata);
+                return;
+            default:
+                NotImplementedException exception = new(imageContext.GetPreconditionState().ToString());
+                Debug.Fail(exception.ToString());
+                throw exception;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs b/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs
index 812ef7ae..c7dc3a5b 100644
--- a/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs
+++ b/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs
@@ -2,8 +2,6 @@
 // Licensed under the Six Labors Split License.
 #nullable disable
 
-using System;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Extensions.FileProviders;
diff --git a/src/ImageSharp.Web/RequestAuthorizationUtilities.cs b/src/ImageSharp.Web/RequestAuthorizationUtilities.cs
index dcfee5ce..5f9178c7 100644
--- a/src/ImageSharp.Web/RequestAuthorizationUtilities.cs
+++ b/src/ImageSharp.Web/RequestAuthorizationUtilities.cs
@@ -1,10 +1,8 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Options;
@@ -12,275 +10,274 @@
 using SixLabors.ImageSharp.Web.Middleware;
 using SixLabors.ImageSharp.Web.Processors;
 
-namespace SixLabors.ImageSharp.Web
+namespace SixLabors.ImageSharp.Web;
+
+/// <summary>
+/// Contains various helper methods for authorizing image requests.
+/// </summary>
+public sealed class RequestAuthorizationUtilities
 {
     /// <summary>
-    /// Contains various helper methods for authorizing image requests.
+    /// The command used by image requests for transporting Hash-based Message Authentication Code (HMAC) tokens.
     /// </summary>
-    public sealed class RequestAuthorizationUtilities
-    {
-        /// <summary>
-        /// The command used by image requests for transporting Hash-based Message Authentication Code (HMAC) tokens.
-        /// </summary>
-        public const string TokenCommand = HMACUtilities.TokenCommand;
-        private static readonly Uri FallbackBaseUri = new("http://localhost/");
-        private readonly HashSet<string> knownCommands;
-        private readonly ImageSharpMiddlewareOptions options;
-        private readonly CommandParser commandParser;
-        private readonly CultureInfo parserCulture;
-        private readonly IRequestParser requestParser;
-        private readonly IServiceProvider serviceProvider;
+    public const string TokenCommand = HMACUtilities.TokenCommand;
+    private static readonly Uri FallbackBaseUri = new("http://localhost/");
+    private readonly HashSet<string> knownCommands;
+    private readonly ImageSharpMiddlewareOptions options;
+    private readonly CommandParser commandParser;
+    private readonly CultureInfo parserCulture;
+    private readonly IRequestParser requestParser;
+    private readonly IServiceProvider serviceProvider;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestAuthorizationUtilities"/> class.
-        /// </summary>
-        /// <param name="options">The middleware configuration options.</param>
-        /// <param name="requestParser">An <see cref="IRequestParser"/> instance used to parse image requests for commands.</param>
-        /// <param name="processors">A collection of <see cref="IImageWebProcessor"/> instances used to process images.</param>
-        /// <param name="commandParser">The command parser.</param>
-        /// <param name="serviceProvider">The service provider.</param>
-        public RequestAuthorizationUtilities(
-            IOptions<ImageSharpMiddlewareOptions> options,
-            IRequestParser requestParser,
-            IEnumerable<IImageWebProcessor> processors,
-            CommandParser commandParser,
-            IServiceProvider serviceProvider)
-        {
-            Guard.NotNull(options, nameof(options));
-            Guard.NotNull(requestParser, nameof(requestParser));
-            Guard.NotNull(processors, nameof(processors));
-            Guard.NotNull(commandParser, nameof(commandParser));
-            Guard.NotNull(serviceProvider, nameof(serviceProvider));
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestAuthorizationUtilities"/> class.
+    /// </summary>
+    /// <param name="options">The middleware configuration options.</param>
+    /// <param name="requestParser">An <see cref="IRequestParser"/> instance used to parse image requests for commands.</param>
+    /// <param name="processors">A collection of <see cref="IImageWebProcessor"/> instances used to process images.</param>
+    /// <param name="commandParser">The command parser.</param>
+    /// <param name="serviceProvider">The service provider.</param>
+    public RequestAuthorizationUtilities(
+        IOptions<ImageSharpMiddlewareOptions> options,
+        IRequestParser requestParser,
+        IEnumerable<IImageWebProcessor> processors,
+        CommandParser commandParser,
+        IServiceProvider serviceProvider)
+    {
+        Guard.NotNull(options, nameof(options));
+        Guard.NotNull(requestParser, nameof(requestParser));
+        Guard.NotNull(processors, nameof(processors));
+        Guard.NotNull(commandParser, nameof(commandParser));
+        Guard.NotNull(serviceProvider, nameof(serviceProvider));
 
-            this.options = options.Value;
-            this.requestParser = requestParser;
-            this.commandParser = commandParser;
-            this.parserCulture = this.options.UseInvariantParsingCulture
-                ? CultureInfo.InvariantCulture
-                : CultureInfo.CurrentCulture;
-            this.serviceProvider = serviceProvider;
+        this.options = options.Value;
+        this.requestParser = requestParser;
+        this.commandParser = commandParser;
+        this.parserCulture = this.options.UseInvariantParsingCulture
+            ? CultureInfo.InvariantCulture
+            : CultureInfo.CurrentCulture;
+        this.serviceProvider = serviceProvider;
 
-            HashSet<string> commands = new(StringComparer.OrdinalIgnoreCase);
-            foreach (IImageWebProcessor processor in processors)
+        HashSet<string> commands = new(StringComparer.OrdinalIgnoreCase);
+        foreach (IImageWebProcessor processor in processors)
+        {
+            foreach (string command in processor.Commands)
             {
-                foreach (string command in processor.Commands)
-                {
-                    commands.Add(command);
-                }
+                commands.Add(command);
             }
-
-            this.knownCommands = commands;
         }
 
-        /// <summary>
-        /// Strips any unknown commands from the command collection.
-        /// </summary>
-        /// <param name="commands">The unsanitized command collection.</param>
-        public void StripUnknownCommands(CommandCollection commands)
+        this.knownCommands = commands;
+    }
+
+    /// <summary>
+    /// Strips any unknown commands from the command collection.
+    /// </summary>
+    /// <param name="commands">The unsanitized command collection.</param>
+    public void StripUnknownCommands(CommandCollection commands)
+    {
+        if (commands?.Count > 0)
         {
-            if (commands?.Count > 0)
+            // Strip out any unknown commands, if needed.
+            List<string> keys = new(commands.Keys);
+            for (int i = keys.Count - 1; i >= 0; i--)
             {
-                // Strip out any unknown commands, if needed.
-                var keys = new List<string>(commands.Keys);
-                for (int i = keys.Count - 1; i >= 0; i--)
+                if (!this.knownCommands.Contains(keys[i]))
                 {
-                    if (!this.knownCommands.Contains(keys[i]))
-                    {
-                        commands.RemoveAt(i);
-                    }
+                    commands.RemoveAt(i);
                 }
             }
         }
+    }
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="uri">The uri to compute the code from.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public string ComputeHMAC(string uri, CommandHandling handling)
-            => this.ComputeHMAC(new Uri(uri, UriKind.RelativeOrAbsolute), handling);
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="uri">The uri to compute the code from.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public string ComputeHMAC(string uri, CommandHandling handling)
+        => this.ComputeHMAC(new Uri(uri, UriKind.RelativeOrAbsolute), handling);
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="uri">The uri to compute the code from.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public Task<string> ComputeHMACAsync(string uri, CommandHandling handling)
-            => this.ComputeHMACAsync(new Uri(uri, UriKind.RelativeOrAbsolute), handling);
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="uri">The uri to compute the code from.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public Task<string> ComputeHMACAsync(string uri, CommandHandling handling)
+        => this.ComputeHMACAsync(new Uri(uri, UriKind.RelativeOrAbsolute), handling);
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="uri">The uri to compute the code from.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public string ComputeHMAC(Uri uri, CommandHandling handling)
-        {
-            ToComponents(
-                uri,
-                out HostString host,
-                out PathString path,
-                out QueryString queryString);
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="uri">The uri to compute the code from.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public string ComputeHMAC(Uri uri, CommandHandling handling)
+    {
+        ToComponents(
+            uri,
+            out HostString host,
+            out PathString path,
+            out QueryString queryString);
 
-            return this.ComputeHMAC(host, path, queryString, handling);
-        }
+        return this.ComputeHMAC(host, path, queryString, handling);
+    }
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="uri">The uri to compute the code from.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public Task<string> ComputeHMACAsync(Uri uri, CommandHandling handling)
-        {
-            ToComponents(
-                uri,
-                out HostString host,
-                out PathString path,
-                out QueryString queryString);
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="uri">The uri to compute the code from.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public Task<string> ComputeHMACAsync(Uri uri, CommandHandling handling)
+    {
+        ToComponents(
+            uri,
+            out HostString host,
+            out PathString path,
+            out QueryString queryString);
 
-            return this.ComputeHMACAsync(host, path, queryString, handling);
-        }
+        return this.ComputeHMACAsync(host, path, queryString, handling);
+    }
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="host">The host header.</param>
-        /// <param name="path">The path or pathbase.</param>
-        /// <param name="queryString">The querystring.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public string ComputeHMAC(HostString host, PathString path, QueryString queryString, CommandHandling handling)
-            => this.ComputeHMAC(host, path, queryString, new(QueryHelpers.ParseQuery(queryString.Value)), handling);
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="host">The host header.</param>
+    /// <param name="path">The path or pathbase.</param>
+    /// <param name="queryString">The querystring.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public string ComputeHMAC(HostString host, PathString path, QueryString queryString, CommandHandling handling)
+        => this.ComputeHMAC(host, path, queryString, new(QueryHelpers.ParseQuery(queryString.Value)), handling);
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="host">The host header.</param>
-        /// <param name="path">The path or pathbase.</param>
-        /// <param name="queryString">The querystring.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public Task<string> ComputeHMACAsync(HostString host, PathString path, QueryString queryString, CommandHandling handling)
-            => this.ComputeHMACAsync(host, path, queryString, new(QueryHelpers.ParseQuery(queryString.Value)), handling);
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="host">The host header.</param>
+    /// <param name="path">The path or pathbase.</param>
+    /// <param name="queryString">The querystring.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public Task<string> ComputeHMACAsync(HostString host, PathString path, QueryString queryString, CommandHandling handling)
+        => this.ComputeHMACAsync(host, path, queryString, new(QueryHelpers.ParseQuery(queryString.Value)), handling);
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="host">The host header.</param>
-        /// <param name="path">The path or pathbase.</param>
-        /// <param name="queryString">The querystring.</param>
-        /// <param name="query">The query collection.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public string ComputeHMAC(HostString host, PathString path, QueryString queryString, QueryCollection query, CommandHandling handling)
-            => this.ComputeHMAC(this.ToHttpContext(host, path, queryString, query), handling);
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="host">The host header.</param>
+    /// <param name="path">The path or pathbase.</param>
+    /// <param name="queryString">The querystring.</param>
+    /// <param name="query">The query collection.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public string ComputeHMAC(HostString host, PathString path, QueryString queryString, QueryCollection query, CommandHandling handling)
+        => this.ComputeHMAC(this.ToHttpContext(host, path, queryString, query), handling);
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="host">The host header.</param>
-        /// <param name="path">The path or pathbase.</param>
-        /// <param name="queryString">The querystring.</param>
-        /// <param name="query">The query collection.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public Task<string> ComputeHMACAsync(HostString host, PathString path, QueryString queryString, QueryCollection query, CommandHandling handling)
-            => this.ComputeHMACAsync(this.ToHttpContext(host, path, queryString, query), handling);
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="host">The host header.</param>
+    /// <param name="path">The path or pathbase.</param>
+    /// <param name="queryString">The querystring.</param>
+    /// <param name="query">The query collection.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public Task<string> ComputeHMACAsync(HostString host, PathString path, QueryString queryString, QueryCollection query, CommandHandling handling)
+        => this.ComputeHMACAsync(this.ToHttpContext(host, path, queryString, query), handling);
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="context">The request HTTP context.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public string ComputeHMAC(HttpContext context, CommandHandling handling)
-            => AsyncHelper.RunSync(() => this.ComputeHMACAsync(context, handling));
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="context">The request HTTP context.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public string ComputeHMAC(HttpContext context, CommandHandling handling)
+        => AsyncHelper.RunSync(() => this.ComputeHMACAsync(context, handling));
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <param name="context">The request HTTP context.</param>
-        /// <param name="handling">The command collection handling.</param>
-        /// <returns>The computed HMAC.</returns>
-        public async Task<string> ComputeHMACAsync(HttpContext context, CommandHandling handling)
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <param name="context">The request HTTP context.</param>
+    /// <param name="handling">The command collection handling.</param>
+    /// <returns>The computed HMAC.</returns>
+    public async Task<string> ComputeHMACAsync(HttpContext context, CommandHandling handling)
+    {
+        byte[] secret = this.options.HMACSecretKey;
+        if (secret is null || secret.Length == 0)
         {
-            byte[] secret = this.options.HMACSecretKey;
-            if (secret is null || secret.Length == 0)
-            {
-                return null;
-            }
-
-            CommandCollection commands = this.requestParser.ParseRequestCommands(context);
-            if (handling == CommandHandling.Sanitize)
-            {
-                this.StripUnknownCommands(commands);
-            }
-
-            ImageCommandContext imageCommandContext = new(context, commands, this.commandParser, this.parserCulture);
-            return await this.options.OnComputeHMACAsync(imageCommandContext, secret);
+            return null;
         }
 
-        internal string ComputeHMAC(string uri, CommandCollection commands, byte[] secret)
+        CommandCollection commands = this.requestParser.ParseRequestCommands(context);
+        if (handling == CommandHandling.Sanitize)
         {
-            ToComponents(
-                new Uri(uri, UriKind.RelativeOrAbsolute),
-                out HostString host,
-                out PathString path,
-                out QueryString queryString);
-
-            var context = this.ToHttpContext(host, path, queryString, new(QueryHelpers.ParseQuery(queryString.Value)));
-            ImageCommandContext imageCommandContext = new(context, commands, this.commandParser, this.parserCulture);
-
-            return AsyncHelper.RunSync(() => this.options.OnComputeHMACAsync(imageCommandContext, secret));
+            this.StripUnknownCommands(commands);
         }
 
-        /// <summary>
-        /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
-        /// </summary>
-        /// <remarks>
-        /// This method is only called by the middleware and only if required.
-        /// As such, standard checks are avoided.
-        /// </remarks>
-        /// <param name="context">Contains information about the current image request and parsed commands.</param>
-        /// <returns>The computed HMAC.</returns>
-        internal Task<string> ComputeHMACAsync(ImageCommandContext context)
-            => this.options.OnComputeHMACAsync(context, this.options.HMACSecretKey);
+        ImageCommandContext imageCommandContext = new(context, commands, this.commandParser, this.parserCulture);
+        return await this.options.OnComputeHMACAsync(imageCommandContext, secret);
+    }
 
-        private static void ToComponents(
-            Uri uri,
+    internal string ComputeHMAC(string uri, CommandCollection commands, byte[] secret)
+    {
+        ToComponents(
+            new Uri(uri, UriKind.RelativeOrAbsolute),
             out HostString host,
             out PathString path,
-            out QueryString queryString)
+            out QueryString queryString);
+
+        HttpContext context = this.ToHttpContext(host, path, queryString, new(QueryHelpers.ParseQuery(queryString.Value)));
+        ImageCommandContext imageCommandContext = new(context, commands, this.commandParser, this.parserCulture);
+
+        return AsyncHelper.RunSync(() => this.options.OnComputeHMACAsync(imageCommandContext, secret));
+    }
+
+    /// <summary>
+    /// Compute a Hash-based Message Authentication Code (HMAC) for request authentication.
+    /// </summary>
+    /// <remarks>
+    /// This method is only called by the middleware and only if required.
+    /// As such, standard checks are avoided.
+    /// </remarks>
+    /// <param name="context">Contains information about the current image request and parsed commands.</param>
+    /// <returns>The computed HMAC.</returns>
+    internal Task<string> ComputeHMACAsync(ImageCommandContext context)
+        => this.options.OnComputeHMACAsync(context, this.options.HMACSecretKey);
+
+    private static void ToComponents(
+        Uri uri,
+        out HostString host,
+        out PathString path,
+        out QueryString queryString)
+    {
+        if (uri.IsAbsoluteUri)
         {
-            if (uri.IsAbsoluteUri)
-            {
-                host = HostString.FromUriComponent(uri);
-                path = PathString.FromUriComponent(uri);
-                queryString = QueryString.FromUriComponent(uri);
-            }
-            else
-            {
-                Uri faux = new(FallbackBaseUri, uri);
-                host = default;
-                path = PathString.FromUriComponent(faux);
-                queryString = QueryString.FromUriComponent(faux);
-            }
+            host = HostString.FromUriComponent(uri);
+            path = PathString.FromUriComponent(uri);
+            queryString = QueryString.FromUriComponent(uri);
         }
-
-        private HttpContext ToHttpContext(HostString host, PathString path, QueryString queryString, QueryCollection query)
+        else
         {
-            DefaultHttpContext context = new() { RequestServices = this.serviceProvider };
-            HttpRequest request = context.Request;
-            request.Method = HttpMethods.Get;
-            request.Host = host;
-            request.Path = path;
-            request.QueryString = queryString;
-            request.Query = query;
-
-            return context;
+            Uri faux = new(FallbackBaseUri, uri);
+            host = default;
+            path = PathString.FromUriComponent(faux);
+            queryString = QueryString.FromUriComponent(faux);
         }
     }
-}
\ No newline at end of file
+
+    private HttpContext ToHttpContext(HostString host, PathString path, QueryString queryString, QueryCollection query)
+    {
+        DefaultHttpContext context = new() { RequestServices = this.serviceProvider };
+        HttpRequest request = context.Request;
+        request.Method = HttpMethods.Get;
+        request.Host = host;
+        request.Path = path;
+        request.QueryString = queryString;
+        request.Query = query;
+
+        return context;
+    }
+}
diff --git a/src/ImageSharp.Web/Resampler.cs b/src/ImageSharp.Web/Resampler.cs
index 5819d1e0..732a9efe 100644
--- a/src/ImageSharp.Web/Resampler.cs
+++ b/src/ImageSharp.Web/Resampler.cs
@@ -1,58 +1,57 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Processing;
 
-namespace SixLabors.ImageSharp.Web
+namespace SixLabors.ImageSharp.Web;
+
+/// <summary>
+/// Contains reusable static instances of known resampling algorithms.
+/// </summary>
+public static class Resampler
 {
-    /// <summary>
-    /// Contains reusable static instances of known resampling algorithms.
-    /// </summary>
-    public static class Resampler
-    {
-        /// <inheritdoc cref="KnownResamplers.Bicubic"/>
-        public static ResamplerCommand Bicubic { get; } = new(nameof(Bicubic));
+    /// <inheritdoc cref="KnownResamplers.Bicubic"/>
+    public static ResamplerCommand Bicubic { get; } = new(nameof(Bicubic));
 
-        /// <inheritdoc cref="KnownResamplers.Box"/>
-        public static ResamplerCommand Box { get; } = new(nameof(Box));
+    /// <inheritdoc cref="KnownResamplers.Box"/>
+    public static ResamplerCommand Box { get; } = new(nameof(Box));
 
-        /// <inheritdoc cref="KnownResamplers.CatmullRom"/>
-        public static ResamplerCommand CatmullRom { get; } = new(nameof(CatmullRom));
+    /// <inheritdoc cref="KnownResamplers.CatmullRom"/>
+    public static ResamplerCommand CatmullRom { get; } = new(nameof(CatmullRom));
 
-        /// <inheritdoc cref="KnownResamplers.Hermite"/>
-        public static ResamplerCommand Hermite { get; } = new(nameof(Hermite));
+    /// <inheritdoc cref="KnownResamplers.Hermite"/>
+    public static ResamplerCommand Hermite { get; } = new(nameof(Hermite));
 
-        /// <inheritdoc cref="KnownResamplers.Lanczos2"/>
-        public static ResamplerCommand Lanczos2 { get; } = new(nameof(Lanczos2));
+    /// <inheritdoc cref="KnownResamplers.Lanczos2"/>
+    public static ResamplerCommand Lanczos2 { get; } = new(nameof(Lanczos2));
 
-        /// <inheritdoc cref="KnownResamplers.Lanczos3"/>
-        public static ResamplerCommand Lanczos3 { get; } = new(nameof(Lanczos3));
+    /// <inheritdoc cref="KnownResamplers.Lanczos3"/>
+    public static ResamplerCommand Lanczos3 { get; } = new(nameof(Lanczos3));
 
-        /// <inheritdoc cref="KnownResamplers.Lanczos5"/>
-        public static ResamplerCommand Lanczos5 { get; } = new(nameof(Lanczos5));
+    /// <inheritdoc cref="KnownResamplers.Lanczos5"/>
+    public static ResamplerCommand Lanczos5 { get; } = new(nameof(Lanczos5));
 
-        /// <inheritdoc cref="KnownResamplers.Lanczos8"/>
-        public static ResamplerCommand Lanczos8 { get; } = new(nameof(Lanczos8));
+    /// <inheritdoc cref="KnownResamplers.Lanczos8"/>
+    public static ResamplerCommand Lanczos8 { get; } = new(nameof(Lanczos8));
 
-        /// <inheritdoc cref="KnownResamplers.MitchellNetravali"/>
-        public static ResamplerCommand MitchellNetravali { get; } = new(nameof(MitchellNetravali));
+    /// <inheritdoc cref="KnownResamplers.MitchellNetravali"/>
+    public static ResamplerCommand MitchellNetravali { get; } = new(nameof(MitchellNetravali));
 
-        /// <inheritdoc cref="KnownResamplers.NearestNeighbor"/>
-        public static ResamplerCommand NearestNeighbor { get; } = new(nameof(NearestNeighbor));
+    /// <inheritdoc cref="KnownResamplers.NearestNeighbor"/>
+    public static ResamplerCommand NearestNeighbor { get; } = new(nameof(NearestNeighbor));
 
-        /// <inheritdoc cref="KnownResamplers.Robidoux"/>
-        public static ResamplerCommand Robidoux { get; } = new(nameof(Robidoux));
+    /// <inheritdoc cref="KnownResamplers.Robidoux"/>
+    public static ResamplerCommand Robidoux { get; } = new(nameof(Robidoux));
 
-        /// <inheritdoc cref="KnownResamplers.RobidouxSharp"/>
-        public static ResamplerCommand RobidouxSharp { get; } = new(nameof(RobidouxSharp));
+    /// <inheritdoc cref="KnownResamplers.RobidouxSharp"/>
+    public static ResamplerCommand RobidouxSharp { get; } = new(nameof(RobidouxSharp));
 
-        /// <inheritdoc cref="KnownResamplers.Spline"/>
-        public static ResamplerCommand Spline { get; } = new(nameof(Spline));
+    /// <inheritdoc cref="KnownResamplers.Spline"/>
+    public static ResamplerCommand Spline { get; } = new(nameof(Spline));
 
-        /// <inheritdoc cref="KnownResamplers.Triangle"/>
-        public static ResamplerCommand Triangle { get; } = new(nameof(Triangle));
+    /// <inheritdoc cref="KnownResamplers.Triangle"/>
+    public static ResamplerCommand Triangle { get; } = new(nameof(Triangle));
 
-        /// <inheritdoc cref="KnownResamplers.Welch"/>
-        public static ResamplerCommand Welch { get; } = new(nameof(Welch));
-    }
+    /// <inheritdoc cref="KnownResamplers.Welch"/>
+    public static ResamplerCommand Welch { get; } = new(nameof(Welch));
 }
diff --git a/src/ImageSharp.Web/ResamplerCommand.cs b/src/ImageSharp.Web/ResamplerCommand.cs
index bb1add92..432ed8ec 100644
--- a/src/ImageSharp.Web/ResamplerCommand.cs
+++ b/src/ImageSharp.Web/ResamplerCommand.cs
@@ -1,22 +1,21 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Web
+namespace SixLabors.ImageSharp.Web;
+
+/// <summary>
+/// Represents a command for setting the type of sampler to use for resampling operations.
+/// </summary>
+public readonly struct ResamplerCommand
 {
     /// <summary>
-    /// Represents a command for setting the type of sampler to use for resampling operations.
+    /// Initializes a new instance of the <see cref="ResamplerCommand"/> struct.
     /// </summary>
-    public readonly struct ResamplerCommand
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ResamplerCommand"/> struct.
-        /// </summary>
-        /// <param name="name">The name of the resampler command.</param>
-        public ResamplerCommand(string name) => this.Name = name;
+    /// <param name="name">The name of the resampler command.</param>
+    public ResamplerCommand(string name) => this.Name = name;
 
-        /// <summary>
-        /// Gets the name of the resampler command.
-        /// </summary>
-        public string Name { get; }
-    }
+    /// <summary>
+    /// Gets the name of the resampler command.
+    /// </summary>
+    public string Name { get; }
 }
diff --git a/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
index 04a51c24..aa2dfc0e 100644
--- a/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
+++ b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
@@ -1,8 +1,7 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
+#nullable disable
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
 using System.Text.Encodings.Web;
@@ -16,370 +15,372 @@
 using SixLabors.ImageSharp.Web.Middleware;
 using SixLabors.ImageSharp.Web.Processors;
 
-namespace SixLabors.ImageSharp.Web.TagHelpers
+namespace SixLabors.ImageSharp.Web.TagHelpers;
+
+/// <summary>
+/// A TagHelper implementation targeting &lt;img&gt; element that allows the automatic generation of HMAC protected processing commands.
+/// </summary>
+[HtmlTargetElement("img", Attributes = SrcAttributeName + "," + WidthAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+[HtmlTargetElement("img", Attributes = SrcAttributeName + "," + HeightAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+[HtmlTargetElement("img", Attributes = SrcAttributeName + "," + AnchorAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+[HtmlTargetElement("img", Attributes = SrcAttributeName + "," + RModeAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+[HtmlTargetElement("img", Attributes = SrcAttributeName + "," + XyAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+[HtmlTargetElement("img", Attributes = SrcAttributeName + "," + RColorAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+[HtmlTargetElement("img", Attributes = SrcAttributeName + "," + CompandAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+[HtmlTargetElement("img", Attributes = SrcAttributeName + "," + OrientAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+[HtmlTargetElement("img", Attributes = SrcAttributeName + "," + AutoOrientAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+[HtmlTargetElement("img", Attributes = SrcAttributeName + "," + FormatAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+[HtmlTargetElement("img", Attributes = SrcAttributeName + "," + BgColorAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+[HtmlTargetElement("img", Attributes = SrcAttributeName + "," + QualityAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+[HtmlTargetElement("img", Attributes = SrcAttributeName + "," + HMACAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+public class ImageTagHelper : UrlResolutionTagHelper
 {
+    private const string SrcAttributeName = "src";
+    private const string AttributePrefix = "imagesharp-";
+    private const string WidthAttributeName = AttributePrefix + ResizeWebProcessor.Width;
+    private const string HeightAttributeName = AttributePrefix + ResizeWebProcessor.Height;
+    private const string AnchorAttributeName = AttributePrefix + ResizeWebProcessor.Anchor;
+    private const string RModeAttributeName = AttributePrefix + ResizeWebProcessor.Mode;
+    private const string XyAttributeName = AttributePrefix + ResizeWebProcessor.Xy;
+    private const string RColorAttributeName = AttributePrefix + ResizeWebProcessor.Color;
+    private const string CompandAttributeName = AttributePrefix + ResizeWebProcessor.Compand;
+    private const string OrientAttributeName = AttributePrefix + ResizeWebProcessor.Orient;
+    private const string SamplerAttributeName = AttributePrefix + ResizeWebProcessor.Sampler;
+    private const string AutoOrientAttributeName = AttributePrefix + AutoOrientWebProcessor.AutoOrient;
+    private const string FormatAttributeName = AttributePrefix + FormatWebProcessor.Format;
+    private const string BgColorAttributeName = AttributePrefix + BackgroundColorWebProcessor.Color;
+    private const string QualityAttributeName = AttributePrefix + QualityWebProcessor.Quality;
+    private const string HMACAttributeName = AttributePrefix + RequestAuthorizationUtilities.TokenCommand;
+
+    private readonly ImageSharpMiddlewareOptions options;
+    private readonly CultureInfo parserCulture;
+    private readonly char separator;
+    private readonly RequestAuthorizationUtilities authorizationUtilities;
+
     /// <summary>
-    /// A TagHelper implementation targeting &lt;img&gt; element that allows the automatic generation of HMAC protected processing commands.
+    /// Initializes a new instance of the <see cref="ImageTagHelper"/> class.
     /// </summary>
-    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + WidthAttributeName, TagStructure = TagStructure.WithoutEndTag)]
-    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + HeightAttributeName, TagStructure = TagStructure.WithoutEndTag)]
-    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + AnchorAttributeName, TagStructure = TagStructure.WithoutEndTag)]
-    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + RModeAttributeName, TagStructure = TagStructure.WithoutEndTag)]
-    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + XyAttributeName, TagStructure = TagStructure.WithoutEndTag)]
-    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + RColorAttributeName, TagStructure = TagStructure.WithoutEndTag)]
-    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + CompandAttributeName, TagStructure = TagStructure.WithoutEndTag)]
-    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + OrientAttributeName, TagStructure = TagStructure.WithoutEndTag)]
-    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + AutoOrientAttributeName, TagStructure = TagStructure.WithoutEndTag)]
-    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + FormatAttributeName, TagStructure = TagStructure.WithoutEndTag)]
-    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + BgColorAttributeName, TagStructure = TagStructure.WithoutEndTag)]
-    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + QualityAttributeName, TagStructure = TagStructure.WithoutEndTag)]
-    [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + HMACAttributeName, TagStructure = TagStructure.WithoutEndTag)]
-    public class ImageTagHelper : UrlResolutionTagHelper
+    /// <param name="options">The middleware configuration options.</param>
+    /// <param name="authorizationUtilities">Contains helpers that allow authorization of image requests.</param>
+    /// <param name="urlHelperFactory">The URL helper factory.</param>
+    /// <param name="htmlEncoder">The HTML encorder.</param>
+    public ImageTagHelper(
+        IOptions<ImageSharpMiddlewareOptions> options,
+        RequestAuthorizationUtilities authorizationUtilities,
+        IUrlHelperFactory urlHelperFactory,
+        HtmlEncoder htmlEncoder)
+        : base(urlHelperFactory, htmlEncoder)
     {
-        private const string SrcAttributeName = "src";
-        private const string AttributePrefix = "imagesharp-";
-        private const string WidthAttributeName = AttributePrefix + ResizeWebProcessor.Width;
-        private const string HeightAttributeName = AttributePrefix + ResizeWebProcessor.Height;
-        private const string AnchorAttributeName = AttributePrefix + ResizeWebProcessor.Anchor;
-        private const string RModeAttributeName = AttributePrefix + ResizeWebProcessor.Mode;
-        private const string XyAttributeName = AttributePrefix + ResizeWebProcessor.Xy;
-        private const string RColorAttributeName = AttributePrefix + ResizeWebProcessor.Color;
-        private const string CompandAttributeName = AttributePrefix + ResizeWebProcessor.Compand;
-        private const string OrientAttributeName = AttributePrefix + ResizeWebProcessor.Orient;
-        private const string SamplerAttributeName = AttributePrefix + ResizeWebProcessor.Sampler;
-        private const string AutoOrientAttributeName = AttributePrefix + AutoOrientWebProcessor.AutoOrient;
-        private const string FormatAttributeName = AttributePrefix + FormatWebProcessor.Format;
-        private const string BgColorAttributeName = AttributePrefix + BackgroundColorWebProcessor.Color;
-        private const string QualityAttributeName = AttributePrefix + QualityWebProcessor.Quality;
-        private const string HMACAttributeName = AttributePrefix + RequestAuthorizationUtilities.TokenCommand;
-
-        private readonly ImageSharpMiddlewareOptions options;
-        private readonly CultureInfo parserCulture;
-        private readonly char separator;
-        private readonly RequestAuthorizationUtilities authorizationUtilities;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageTagHelper"/> class.
-        /// </summary>
-        /// <param name="options">The middleware configuration options.</param>
-        /// <param name="authorizationUtilities">Contains helpers that allow authorization of image requests.</param>
-        /// <param name="urlHelperFactory">The URL helper factory.</param>
-        /// <param name="htmlEncoder">The HTML encorder.</param>
-        public ImageTagHelper(
-            IOptions<ImageSharpMiddlewareOptions> options,
-            RequestAuthorizationUtilities authorizationUtilities,
-            IUrlHelperFactory urlHelperFactory,
-            HtmlEncoder htmlEncoder)
-            : base(urlHelperFactory, htmlEncoder)
-        {
-            Guard.NotNull(options, nameof(options));
-            Guard.NotNull(authorizationUtilities, nameof(authorizationUtilities));
+        Guard.NotNull(options, nameof(options));
+        Guard.NotNull(authorizationUtilities, nameof(authorizationUtilities));
 
-            this.options = options.Value;
-            this.parserCulture = this.options.UseInvariantParsingCulture
-                ? CultureInfo.InvariantCulture
-                : CultureInfo.CurrentCulture;
-            this.separator = this.parserCulture.TextInfo.ListSeparator[0];
+        this.options = options.Value;
+        this.parserCulture = this.options.UseInvariantParsingCulture
+            ? CultureInfo.InvariantCulture
+            : CultureInfo.CurrentCulture;
+        this.separator = this.parserCulture.TextInfo.ListSeparator[0];
 
-            this.authorizationUtilities = authorizationUtilities;
-        }
+        this.authorizationUtilities = authorizationUtilities;
+    }
 
-        /// <summary>
-        /// Gets or sets the src.
-        /// </summary>
-        /// <remarks>
-        /// Passed through to the generated HTML in all cases.
-        /// </remarks>
-        [HtmlAttributeName(SrcAttributeName)]
-        public string Src { get; set; }
-
-        /// <summary>
-        /// Gets or sets the width in pixel units.
-        /// </summary>
-        /// <remarks>
-        /// Passed through to the generated HTML in all cases.
-        /// </remarks>
-        [HtmlAttributeName(WidthAttributeName)]
-        public int? Width { get; set; }
-
-        /// <summary>
-        /// Gets or sets the height in pixel units.
-        /// </summary>
-        /// <remarks>
-        /// Passed through to the generated HTML in all cases.
-        /// </remarks>
-        [HtmlAttributeName(HeightAttributeName)]
-        public int? Height { get; set; }
-
-        /// <summary>
-        /// Gets or sets the resize mode.
-        /// </summary>
-        [HtmlAttributeName(RModeAttributeName)]
-        public ResizeMode? ResizeMode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the anchor position.
-        /// </summary>
-        [HtmlAttributeName(AnchorAttributeName)]
-        public AnchorPositionMode? AnchorPosition { get; set; }
-
-        /// <summary>
-        /// Gets or sets the center coordinates.
-        /// </summary>
-        [HtmlAttributeName(XyAttributeName)]
-        public PointF? Center { get; set; }
-
-        /// <summary>
-        /// Gets or sets the color to use as a background when padding an image.
-        /// </summary>
-        [HtmlAttributeName(RColorAttributeName)]
-        public Color? PadColor { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to compress
-        /// or expand individual pixel colors values on processing.
-        /// </summary>
-        [HtmlAttributeName(CompandAttributeName)]
-        public bool? Compand { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to factor embedded
-        /// EXIF orientation property values during processing.
-        /// </summary>
-        /// <remarks>Defaults to <see langword="true"/>.</remarks>
-        [HtmlAttributeName(OrientAttributeName)]
-        public bool? Orient { get; set; }
-
-        /// <summary>
-        /// Gets or sets the sampling algorithm to use when resizing images.
-        /// </summary>
-        [HtmlAttributeName(SamplerAttributeName)]
-        public ResamplerCommand? Sampler { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to automatically
-        /// rotate/flip the iput image based on embedded EXIF orientation property values
-        /// before processing.
-        /// </summary>
-        [HtmlAttributeName(AutoOrientAttributeName)]
-        public bool? AutoOrient { get; set; }
-
-        /// <summary>
-        /// Gets or sets the image format to convert to.
-        /// </summary>
-        [HtmlAttributeName(FormatAttributeName)]
-        public FormatCommand? Format { get; set; }
-
-        /// <summary>
-        /// Gets or sets the background color of the image.
-        /// </summary>
-        [HtmlAttributeName(BgColorAttributeName)]
-        public Color? BackgroundColor { get; set; }
-
-        /// <summary>
-        /// Gets or sets the quality, that will be used to encode the image. Quality
-        /// index must be between 0 and 100 (compression from max to min).
-        /// </summary>
-        [HtmlAttributeName(QualityAttributeName)]
-        public int? Quality { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to append a HMAC token to the request.
-        /// This value is always <see langword="true"/>. HMAC token usage is controlled by populating the
-        /// <see cref="ImageSharpMiddlewareOptions.HMACSecretKey"/> property.
-        /// </summary>
-        [HtmlAttributeName(HMACAttributeName)]
-        public bool AppendHMAC { get => true; set => _ = true; }
-
-        /// <inheritdoc />
-        public override void Process(TagHelperContext context, TagHelperOutput output)
-        {
-            Guard.NotNull(context, nameof(context));
-            Guard.NotNull(output, nameof(output));
+    /// <summary>
+    /// Gets or sets the src.
+    /// </summary>
+    /// <remarks>
+    /// Passed through to the generated HTML in all cases.
+    /// </remarks>
+    [HtmlAttributeName(SrcAttributeName)]
+    public string Src { get; set; }
 
-            string src = output.Attributes[SrcAttributeName]?.Value as string ?? this.Src;
-            if (string.IsNullOrWhiteSpace(src) || src.StartsWith("data", StringComparison.OrdinalIgnoreCase))
-            {
-                base.Process(context, output);
-                return;
-            }
+    /// <summary>
+    /// Gets or sets the width in pixel units.
+    /// </summary>
+    /// <remarks>
+    /// Passed through to the generated HTML in all cases.
+    /// </remarks>
+    [HtmlAttributeName(WidthAttributeName)]
+    public int? Width { get; set; }
 
-            output.CopyHtmlAttribute(SrcAttributeName, context);
-            this.ProcessUrlAttribute(SrcAttributeName, output);
+    /// <summary>
+    /// Gets or sets the height in pixel units.
+    /// </summary>
+    /// <remarks>
+    /// Passed through to the generated HTML in all cases.
+    /// </remarks>
+    [HtmlAttributeName(HeightAttributeName)]
+    public int? Height { get; set; }
 
-            CommandCollection commands = new();
-            this.AddProcessingCommands(context, output, commands, this.parserCulture);
+    /// <summary>
+    /// Gets or sets the resize mode.
+    /// </summary>
+    [HtmlAttributeName(RModeAttributeName)]
+    public ResizeMode? ResizeMode { get; set; }
 
-            byte[] secret = this.options.HMACSecretKey;
-            if (commands.Count > 0 || secret?.Length > 0)
-            {
-                // Retrieve the TagHelperOutput variation of the "src" attribute in case other TagHelpers in the
-                // pipeline have touched the value. If the value is already encoded this helper may
-                // not function properly.
-                src = output.Attributes[SrcAttributeName].Value as string;
-                if (secret?.Length > 0)
-                {
-                    string hash = this.authorizationUtilities.ComputeHMAC(src, commands, secret);
-                    commands.Add(RequestAuthorizationUtilities.TokenCommand, hash);
-                }
-
-                src = AddQueryString(src, commands);
-            }
+    /// <summary>
+    /// Gets or sets the anchor position.
+    /// </summary>
+    [HtmlAttributeName(AnchorAttributeName)]
+    public AnchorPositionMode? AnchorPosition { get; set; }
 
-            this.Src = src;
-            output.Attributes.SetAttribute(SrcAttributeName, src);
-        }
+    /// <summary>
+    /// Gets or sets the center coordinates.
+    /// </summary>
+    [HtmlAttributeName(XyAttributeName)]
+    public PointF? Center { get; set; }
+
+    /// <summary>
+    /// Gets or sets the color to use as a background when padding an image.
+    /// </summary>
+    [HtmlAttributeName(RColorAttributeName)]
+    public Color? PadColor { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to compress
+    /// or expand individual pixel colors values on processing.
+    /// </summary>
+    [HtmlAttributeName(CompandAttributeName)]
+    public bool? Compand { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to factor embedded
+    /// EXIF orientation property values during processing.
+    /// </summary>
+    /// <remarks>Defaults to <see langword="true"/>.</remarks>
+    [HtmlAttributeName(OrientAttributeName)]
+    public bool? Orient { get; set; }
 
-        /// <summary>
-        /// Allows the addition of processing commands by inheriting classes.
-        /// </summary>
-        /// <param name="context">Contains information associated with the current HTML tag.</param>
-        /// <param name="output">A stateful HTML element used to generate an HTML tag.</param>
-        /// <param name="commands">The command collection.</param>
-        /// <param name="commandCulture">The culture to use when generating and processing commands.</param>
-        protected virtual void AddProcessingCommands(
-            TagHelperContext context,
-            TagHelperOutput output,
-            CommandCollection commands,
-            CultureInfo commandCulture)
+    /// <summary>
+    /// Gets or sets the sampling algorithm to use when resizing images.
+    /// </summary>
+    [HtmlAttributeName(SamplerAttributeName)]
+    public ResamplerCommand? Sampler { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to automatically
+    /// rotate/flip the iput image based on embedded EXIF orientation property values
+    /// before processing.
+    /// </summary>
+    [HtmlAttributeName(AutoOrientAttributeName)]
+    public bool? AutoOrient { get; set; }
+
+    /// <summary>
+    /// Gets or sets the image format to convert to.
+    /// </summary>
+    [HtmlAttributeName(FormatAttributeName)]
+    public FormatCommand? Format { get; set; }
+
+    /// <summary>
+    /// Gets or sets the background color of the image.
+    /// </summary>
+    [HtmlAttributeName(BgColorAttributeName)]
+    public Color? BackgroundColor { get; set; }
+
+    /// <summary>
+    /// Gets or sets the quality, that will be used to encode the image. Quality
+    /// index must be between 0 and 100 (compression from max to min).
+    /// </summary>
+    [HtmlAttributeName(QualityAttributeName)]
+    public int? Quality { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to append a HMAC token to the request.
+    /// This value is always <see langword="true"/>. HMAC token usage is controlled by populating the
+    /// <see cref="ImageSharpMiddlewareOptions.HMACSecretKey"/> property.
+    /// </summary>
+    [HtmlAttributeName(HMACAttributeName)]
+#pragma warning disable CA1822 // Mark members as static
+    public bool AppendHMAC { get => true; set => _ = true; }
+#pragma warning restore CA1822 // Mark members as static
+
+    /// <inheritdoc />
+    public override void Process(TagHelperContext context, TagHelperOutput output)
+    {
+        Guard.NotNull(context, nameof(context));
+        Guard.NotNull(output, nameof(output));
+
+        string src = output.Attributes[SrcAttributeName]?.Value as string ?? this.Src;
+        if (string.IsNullOrWhiteSpace(src) || src.StartsWith("data", StringComparison.OrdinalIgnoreCase))
         {
-            this.AddResizeCommands(output, commands);
-            this.AddAutoOrientCommands(commands);
-            this.AddFormatCommands(commands);
-            this.AddBackgroundColorCommands(commands);
-            this.AddQualityCommands(commands);
+            base.Process(context, output);
+            return;
         }
 
-        private void AddResizeCommands(TagHelperOutput output, CommandCollection commands)
-        {
-            // If no explicit width/height has been set on the image, set the attributes to match the
-            // width/height from the process commands if present.
-            int? width = output.Attributes.ContainsName(ResizeWebProcessor.Width)
-                ? int.Parse(output.Attributes[ResizeWebProcessor.Width].Value.ToString(), this.parserCulture)
-                : null;
+        output.CopyHtmlAttribute(SrcAttributeName, context);
+        this.ProcessUrlAttribute(SrcAttributeName, output);
+
+        CommandCollection commands = new();
+        this.AddProcessingCommands(context, output, commands, this.parserCulture);
 
-            if (this.Width.HasValue)
+        byte[] secret = this.options.HMACSecretKey;
+        if (commands.Count > 0 || secret?.Length > 0)
+        {
+            // Retrieve the TagHelperOutput variation of the "src" attribute in case other TagHelpers in the
+            // pipeline have touched the value. If the value is already encoded this helper may
+            // not function properly.
+            src = output.Attributes[SrcAttributeName].Value as string;
+            if (secret?.Length > 0)
             {
-                commands.Add(ResizeWebProcessor.Width, this.Width.Value.ToString(this.parserCulture));
-                output.Attributes.SetAttribute(ResizeWebProcessor.Width, width ?? this.Width);
+                string hash = this.authorizationUtilities.ComputeHMAC(src, commands, secret);
+                commands.Add(RequestAuthorizationUtilities.TokenCommand, hash);
             }
 
-            int? height = output.Attributes.ContainsName(ResizeWebProcessor.Height)
-                ? int.Parse(output.Attributes[ResizeWebProcessor.Height].Value.ToString(), this.parserCulture)
-                : null;
+            src = AddQueryString(src, commands);
+        }
 
-            if (this.Height.HasValue)
-            {
-                commands.Add(ResizeWebProcessor.Height, this.Height.Value.ToString(this.parserCulture));
-                output.Attributes.SetAttribute(ResizeWebProcessor.Height, height ?? this.Height);
-            }
+        this.Src = src;
+        output.Attributes.SetAttribute(SrcAttributeName, src);
+    }
 
-            if (this.ResizeMode.HasValue)
-            {
-                commands.Add(ResizeWebProcessor.Mode, this.ResizeMode.Value.ToString());
-            }
+    /// <summary>
+    /// Allows the addition of processing commands by inheriting classes.
+    /// </summary>
+    /// <param name="context">Contains information associated with the current HTML tag.</param>
+    /// <param name="output">A stateful HTML element used to generate an HTML tag.</param>
+    /// <param name="commands">The command collection.</param>
+    /// <param name="commandCulture">The culture to use when generating and processing commands.</param>
+    protected virtual void AddProcessingCommands(
+        TagHelperContext context,
+        TagHelperOutput output,
+        CommandCollection commands,
+        CultureInfo commandCulture)
+    {
+        this.AddResizeCommands(output, commands);
+        this.AddAutoOrientCommands(commands);
+        this.AddFormatCommands(commands);
+        this.AddBackgroundColorCommands(commands);
+        this.AddQualityCommands(commands);
+    }
 
-            if (this.AnchorPosition.HasValue)
-            {
-                commands.Add(ResizeWebProcessor.Anchor, this.AnchorPosition.Value.ToString());
-            }
+    private void AddResizeCommands(TagHelperOutput output, CommandCollection commands)
+    {
+        // If no explicit width/height has been set on the image, set the attributes to match the
+        // width/height from the process commands if present.
+        int? width = output.Attributes.ContainsName(ResizeWebProcessor.Width)
+            ? int.Parse(output.Attributes[ResizeWebProcessor.Width].Value.ToString(), this.parserCulture)
+            : null;
 
-            if (this.Center.HasValue)
-            {
-                string xy = $"{this.Center.Value.X.ToString(this.parserCulture)}{this.separator}{this.Center.Value.Y.ToString(this.parserCulture)}";
-                commands.Add(ResizeWebProcessor.Xy, xy);
-            }
+        if (this.Width.HasValue)
+        {
+            commands.Add(ResizeWebProcessor.Width, this.Width.Value.ToString(this.parserCulture));
+            output.Attributes.SetAttribute(ResizeWebProcessor.Width, width ?? this.Width);
+        }
 
-            if (this.PadColor.HasValue)
-            {
-                commands.Add(ResizeWebProcessor.Color, this.PadColor.Value.ToHex());
-            }
+        int? height = output.Attributes.ContainsName(ResizeWebProcessor.Height)
+            ? int.Parse(output.Attributes[ResizeWebProcessor.Height].Value.ToString(), this.parserCulture)
+            : null;
 
-            if (this.Compand.HasValue)
-            {
-                commands.Add(ResizeWebProcessor.Compand, this.Compand.Value.ToString(this.parserCulture));
-            }
+        if (this.Height.HasValue)
+        {
+            commands.Add(ResizeWebProcessor.Height, this.Height.Value.ToString(this.parserCulture));
+            output.Attributes.SetAttribute(ResizeWebProcessor.Height, height ?? this.Height);
+        }
 
-            if (this.Orient.HasValue)
-            {
-                commands.Add(ResizeWebProcessor.Orient, this.Orient.Value.ToString(this.parserCulture));
-            }
+        if (this.ResizeMode.HasValue)
+        {
+            commands.Add(ResizeWebProcessor.Mode, this.ResizeMode.Value.ToString());
+        }
 
-            if (this.Sampler.HasValue)
-            {
-                commands.Add(ResizeWebProcessor.Sampler, this.Sampler.Value.Name);
-            }
+        if (this.AnchorPosition.HasValue)
+        {
+            commands.Add(ResizeWebProcessor.Anchor, this.AnchorPosition.Value.ToString());
         }
 
-        private void AddAutoOrientCommands(CommandCollection commands)
+        if (this.Center.HasValue)
         {
-            if (this.AutoOrient.HasValue)
-            {
-                commands.Add(AutoOrientWebProcessor.AutoOrient, this.AutoOrient.Value.ToString());
-            }
+            string xy = $"{this.Center.Value.X.ToString(this.parserCulture)}{this.separator}{this.Center.Value.Y.ToString(this.parserCulture)}";
+            commands.Add(ResizeWebProcessor.Xy, xy);
         }
 
-        private void AddFormatCommands(CommandCollection commands)
+        if (this.PadColor.HasValue)
         {
-            if (this.Format.HasValue)
-            {
-                commands.Add(FormatWebProcessor.Format, this.Format.Value.Name);
-            }
+            commands.Add(ResizeWebProcessor.Color, this.PadColor.Value.ToHex());
         }
 
-        private void AddBackgroundColorCommands(CommandCollection commands)
+        if (this.Compand.HasValue)
         {
-            if (this.BackgroundColor.HasValue)
-            {
-                commands.Add(BackgroundColorWebProcessor.Color, this.BackgroundColor.Value.ToHex());
-            }
+            commands.Add(ResizeWebProcessor.Compand, this.Compand.Value.ToString(this.parserCulture));
         }
 
-        private void AddQualityCommands(CommandCollection commands)
+        if (this.Orient.HasValue)
         {
-            if (this.Quality.HasValue)
-            {
-                commands.Add(QualityWebProcessor.Quality, this.Quality.Value.ToString(this.parserCulture));
-            }
+            commands.Add(ResizeWebProcessor.Orient, this.Orient.Value.ToString(this.parserCulture));
         }
 
-        private static string AddQueryString(
-            ReadOnlySpan<char> uri,
-            CommandCollection commands)
+        if (this.Sampler.HasValue)
         {
-            ReadOnlySpan<char> uriToBeAppended = uri;
-            ReadOnlySpan<char> anchorText = default;
+            commands.Add(ResizeWebProcessor.Sampler, this.Sampler.Value.Name);
+        }
+    }
 
-            // If there is an anchor, then the query string must be inserted before its first occurrence.
-            int anchorIndex = uri.IndexOf('#');
-            if (anchorIndex != -1)
-            {
-                anchorText = uri.Slice(anchorIndex);
-                uriToBeAppended = uri.Slice(0, anchorIndex);
-            }
+    private void AddAutoOrientCommands(CommandCollection commands)
+    {
+        if (this.AutoOrient.HasValue)
+        {
+            commands.Add(AutoOrientWebProcessor.AutoOrient, this.AutoOrient.Value.ToString());
+        }
+    }
+
+    private void AddFormatCommands(CommandCollection commands)
+    {
+        if (this.Format.HasValue)
+        {
+            commands.Add(FormatWebProcessor.Format, this.Format.Value.Name);
+        }
+    }
+
+    private void AddBackgroundColorCommands(CommandCollection commands)
+    {
+        if (this.BackgroundColor.HasValue)
+        {
+            commands.Add(BackgroundColorWebProcessor.Color, this.BackgroundColor.Value.ToHex());
+        }
+    }
 
-            int queryIndex = uriToBeAppended.IndexOf('?');
-            bool hasQuery = queryIndex != -1;
+    private void AddQualityCommands(CommandCollection commands)
+    {
+        if (this.Quality.HasValue)
+        {
+            commands.Add(QualityWebProcessor.Quality, this.Quality.Value.ToString(this.parserCulture));
+        }
+    }
 
-            StringBuilder sb = new();
-            sb.Append(uriToBeAppended);
+    private static string AddQueryString(
+        ReadOnlySpan<char> uri,
+        CommandCollection commands)
+    {
+        ReadOnlySpan<char> uriToBeAppended = uri;
+        ReadOnlySpan<char> anchorText = default;
 
-            foreach (KeyValuePair<string, string> parameter in commands)
+        // If there is an anchor, then the query string must be inserted before its first occurrence.
+        int anchorIndex = uri.IndexOf('#');
+        if (anchorIndex != -1)
+        {
+            anchorText = uri[anchorIndex..];
+            uriToBeAppended = uri[..anchorIndex];
+        }
+
+        int queryIndex = uriToBeAppended.IndexOf('?');
+        bool hasQuery = queryIndex != -1;
+
+        StringBuilder sb = new();
+        sb.Append(uriToBeAppended);
+
+        foreach (KeyValuePair<string, string> parameter in commands)
+        {
+            if (parameter.Value is null)
             {
-                if (parameter.Value is null)
-                {
-                    continue;
-                }
-
-                sb.Append(hasQuery ? '&' : '?');
-                sb.Append(UrlEncoder.Default.Encode(parameter.Key));
-                sb.Append('=');
-                sb.Append(UrlEncoder.Default.Encode(parameter.Value));
-                hasQuery = true;
+                continue;
             }
 
-            sb.Append(anchorText);
-            return sb.ToString();
+            sb.Append(hasQuery ? '&' : '?')
+              .Append(UrlEncoder.Default.Encode(parameter.Key))
+              .Append('=')
+              .Append(UrlEncoder.Default.Encode(parameter.Value));
+
+            hasQuery = true;
         }
+
+        sb.Append(anchorText);
+        return sb.ToString();
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs
index f54caa63..6ecc4ad6 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AuthenticatedServerTestBase.cs
@@ -1,62 +1,58 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Xunit;
 using Xunit.Abstractions;
 
-namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
+namespace SixLabors.ImageSharp.Web.Tests.TestUtilities;
+
+public abstract class AuthenticatedServerTestBase<TFixture> : ServerTestBase<TFixture>
+     where TFixture : AuthenticatedTestServerFixture
 {
-    public abstract class AuthenticatedServerTestBase<TFixture> : ServerTestBase<TFixture>
-         where TFixture : AuthenticatedTestServerFixture
+    private readonly RequestAuthorizationUtilities authorizationUtilities;
+    private readonly string relativeImageSouce;
+
+    protected AuthenticatedServerTestBase(TFixture fixture, ITestOutputHelper outputHelper, string imageSource)
+        : base(fixture, outputHelper, imageSource)
     {
-        private readonly RequestAuthorizationUtilities authorizationUtilities;
-        private readonly string relativeImageSouce;
-
-        protected AuthenticatedServerTestBase(TFixture fixture, ITestOutputHelper outputHelper, string imageSource)
-            : base(fixture, outputHelper, imageSource)
-        {
-            this.authorizationUtilities =
-                       this.Fixture.Services.GetRequiredService<RequestAuthorizationUtilities>();
-
-            this.relativeImageSouce = this.ImageSource.Replace("http://localhost", string.Empty);
-        }
-
-        [Fact]
-        public async Task CanRejectUnauthorizedRequestAsync()
-        {
-            string url = this.ImageSource;
-
-            // Send an unaugmented request without a token.
-            HttpResponseMessage response = await this.HttpClient.GetAsync(url + this.Fixture.Commands[0]);
-            Assert.NotNull(response);
-            Assert.False(response.IsSuccessStatusCode);
-            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
-
-            // Now send an invalid token
-            response = await this.HttpClient.GetAsync(url + this.Fixture.Commands[0] + "&" + RequestAuthorizationUtilities.TokenCommand + "=INVALID");
-            Assert.NotNull(response);
-            Assert.False(response.IsSuccessStatusCode);
-            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
-        }
-
-        protected override async Task<string> AugmentCommandAsync(string command)
-        {
-            string uri = this.relativeImageSouce + command;
-            string token = await this.GetTokenAsync(uri);
-            return command + "&" + RequestAuthorizationUtilities.TokenCommand + "=" + token;
-        }
-
-        private async Task<string> GetTokenAsync(string uri)
-        {
-            string tokenSync = this.authorizationUtilities.ComputeHMAC(uri, CommandHandling.Sanitize);
-            string tokenAsync = await this.authorizationUtilities.ComputeHMACAsync(uri, CommandHandling.Sanitize);
-
-            Assert.Equal(tokenSync, tokenAsync);
-            return tokenSync;
-        }
+        this.authorizationUtilities =
+                   this.Fixture.Services.GetRequiredService<RequestAuthorizationUtilities>();
+
+        this.relativeImageSouce = this.ImageSource.Replace("http://localhost", string.Empty);
+    }
+
+    [Fact]
+    public async Task CanRejectUnauthorizedRequestAsync()
+    {
+        string url = this.ImageSource;
+
+        // Send an unaugmented request without a token.
+        HttpResponseMessage response = await this.HttpClient.GetAsync(url + this.Fixture.Commands[0]);
+        Assert.NotNull(response);
+        Assert.False(response.IsSuccessStatusCode);
+        Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+
+        // Now send an invalid token
+        response = await this.HttpClient.GetAsync(url + this.Fixture.Commands[0] + "&" + RequestAuthorizationUtilities.TokenCommand + "=INVALID");
+        Assert.NotNull(response);
+        Assert.False(response.IsSuccessStatusCode);
+        Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+    }
+
+    protected override async Task<string> AugmentCommandAsync(string command)
+    {
+        string uri = this.relativeImageSouce + command;
+        string token = await this.GetTokenAsync(uri);
+        return command + "&" + RequestAuthorizationUtilities.TokenCommand + "=" + token;
+    }
+
+    private async Task<string> GetTokenAsync(string uri)
+    {
+        string tokenSync = this.authorizationUtilities.ComputeHMAC(uri, CommandHandling.Sanitize);
+        string tokenAsync = await this.authorizationUtilities.ComputeHMACAsync(uri, CommandHandling.Sanitize);
+
+        Assert.Equal(tokenSync, tokenAsync);
+        return tokenSync;
     }
-}
\ No newline at end of file
+}

From 581b9e0c7083d1ad78bc4a62e4375c257fc36091 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 20 Feb 2023 20:34:31 +1000
Subject: [PATCH 049/102] Update ImageSharp and fix build

---
 ci-pack.ps1                                   |  2 +-
 samples/ImageSharp.Web.Sample/Startup.cs      |  4 ++--
 src/ImageSharp.Web/FormatUtilities.cs         |  2 +-
 src/ImageSharp.Web/ImageSharp.Web.csproj      |  2 +-
 .../Middleware/ImageSharpMiddleware.cs        | 11 +++++++---
 .../Middleware/ImageSharpMiddlewareOptions.cs | 20 +++++++++++++++++--
 .../Processors/FormatWebProcessor.cs          |  2 +-
 7 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/ci-pack.ps1 b/ci-pack.ps1
index 09f45347..55c69fb5 100644
--- a/ci-pack.ps1
+++ b/ci-pack.ps1
@@ -3,4 +3,4 @@ dotnet clean -c Release
 $repositoryUrl = "https://github.com/$env:GITHUB_REPOSITORY"
 
 # Building for packing and publishing.
-dotnet pack -c Release --output "$PSScriptRoot/artifacts" /p:RepositoryUrl=$repositoryUrl
+dotnet pack -c Release -p:PackageOutputPath="$PSScriptRoot/artifacts" -p:RepositoryUrl=$repositoryUrl
diff --git a/samples/ImageSharp.Web.Sample/Startup.cs b/samples/ImageSharp.Web.Sample/Startup.cs
index 63ac57eb..a01e8c07 100644
--- a/samples/ImageSharp.Web.Sample/Startup.cs
+++ b/samples/ImageSharp.Web.Sample/Startup.cs
@@ -69,7 +69,7 @@ public void ConfigureServices(IServiceCollection services)
     private void ConfigureDefaultServicesAndCustomOptions(IServiceCollection services)
         => services.AddImageSharp(options =>
         {
-            options.DecoderOptions = new();
+            options.Configuration = Configuration.Default;
             options.BrowserMaxAge = TimeSpan.FromDays(7);
             options.CacheMaxAge = TimeSpan.FromDays(365);
             options.CacheHashLength = 8;
@@ -87,7 +87,7 @@ private void ConfigureCustomServicesAndDefaultOptions(IServiceCollection service
     private void ConfigureCustomServicesAndCustomOptions(IServiceCollection services)
         => services.AddImageSharp(options =>
         {
-            options.DecoderOptions = new();
+            options.Configuration = Configuration.Default;
             options.BrowserMaxAge = TimeSpan.FromDays(7);
             options.CacheMaxAge = TimeSpan.FromDays(365);
             options.CacheHashLength = 8;
diff --git a/src/ImageSharp.Web/FormatUtilities.cs b/src/ImageSharp.Web/FormatUtilities.cs
index 498d05f8..2d7da4ea 100644
--- a/src/ImageSharp.Web/FormatUtilities.cs
+++ b/src/ImageSharp.Web/FormatUtilities.cs
@@ -28,7 +28,7 @@ public FormatUtilities(IOptions<ImageSharpMiddlewareOptions> options)
     {
         Guard.NotNull(options, nameof(options));
 
-        foreach (IImageFormat imageFormat in options.Value.DecoderOptions.Configuration.ImageFormats)
+        foreach (IImageFormat imageFormat in options.Value.Configuration.ImageFormats)
         {
             string[] extensions = imageFormat.FileExtensions.ToArray();
 
diff --git a/src/ImageSharp.Web/ImageSharp.Web.csproj b/src/ImageSharp.Web/ImageSharp.Web.csproj
index 17866c44..87b6d8cb 100644
--- a/src/ImageSharp.Web/ImageSharp.Web.csproj
+++ b/src/ImageSharp.Web/ImageSharp.Web.csproj
@@ -45,7 +45,7 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.2.0" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.0-alpha.0.95" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.0-alpha.0.99" />
   </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
index a4686ddd..02424756 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
@@ -346,12 +346,17 @@ private async Task ProcessRequestAsync(
 
                         using (Stream inStream = await sourceImageResolver.OpenReadAsync())
                         {
+                            DecoderOptions decoderOptions = new() { Configuration = this.options.Configuration };
+
+                            // TODO: We need some way to set options based upon processors.
+                            await this.options.OnBeforeLoadAsync.Invoke(httpContext, decoderOptions);
+
                             // No commands? We simply copy the stream across.
                             if (commands.Count == 0)
                             {
                                 await inStream.CopyToAsync(outStream);
                                 outStream.Position = 0;
-                                format = await Image.DetectFormatAsync(this.options.DecoderOptions, outStream);
+                                format = await Image.DetectFormatAsync(decoderOptions, outStream);
                             }
                             else
                             {
@@ -369,11 +374,11 @@ private async Task ProcessRequestAsync(
 
                                     if (requiresAlpha)
                                     {
-                                        image = await FormattedImage.LoadAsync<Rgba32>(this.options.DecoderOptions, inStream);
+                                        image = await FormattedImage.LoadAsync<Rgba32>(decoderOptions, inStream);
                                     }
                                     else
                                     {
-                                        image = await FormattedImage.LoadAsync(this.options.DecoderOptions, inStream);
+                                        image = await FormattedImage.LoadAsync(decoderOptions, inStream);
                                     }
 
                                     image.Process(
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
index 3a14b42f..6c7bfd6e 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
@@ -28,14 +28,15 @@ public class ImageSharpMiddlewareOptions
     };
 
     private Func<ImageCommandContext, Task> onParseCommandsAsync = _ => Task.CompletedTask;
+    private Func<HttpContext, DecoderOptions, Task> onBeforeLoadAsync = (_, _) => Task.CompletedTask;
     private Func<FormattedImage, Task> onBeforeSaveAsync = _ => Task.CompletedTask;
     private Func<ImageProcessingContext, Task> onProcessedAsync = _ => Task.CompletedTask;
     private Func<HttpContext, Task> onPrepareResponseAsync = _ => Task.CompletedTask;
 
     /// <summary>
-    /// Gets or sets the default decoder options.
+    /// Gets or sets the base library configuration.
     /// </summary>
-    public DecoderOptions DecoderOptions { get; set; } = new();
+    public Configuration Configuration { get; set; } = Configuration.Default;
 
     /// <summary>
     /// Gets or sets the recyclable memorystream manager used for managing pooled stream
@@ -114,6 +115,21 @@ public Func<ImageCommandContext, Task> OnParseCommandsAsync
         }
     }
 
+    /// <summary>
+    /// Gets or sets the method that can be used to used to augment decoder options.
+    /// This is called before the image is decoded and loaded for processing.
+    /// </summary>
+    public Func<HttpContext, DecoderOptions, Task> OnBeforeLoadAsync
+    {
+        get => this.onBeforeLoadAsync;
+
+        set
+        {
+            Guard.NotNull(value, nameof(this.OnBeforeLoadAsync));
+            this.onBeforeLoadAsync = value;
+        }
+    }
+
     /// <summary>
     /// Gets or sets the additional method that can be used for final manipulation before the image is saved.
     /// This is called after image has been processed, but before the image has been saved to the output stream for caching.
diff --git a/src/ImageSharp.Web/Processors/FormatWebProcessor.cs b/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
index a11bc438..0117e9b6 100644
--- a/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
@@ -53,7 +53,7 @@ public FormattedImage Process(
         string extension = commands.GetValueOrDefault(Format);
 
         if (!string.IsNullOrWhiteSpace(extension)
-            && this.options.DecoderOptions.Configuration.ImageFormatsManager.TryFindFormatByFileExtension(extension, out IImageFormat format))
+            && this.options.Configuration.ImageFormatsManager.TryFindFormatByFileExtension(extension, out IImageFormat format))
         {
             image.Format = format;
         }

From 9e835f4d09245107c3c838947ad1d0b4eff02378 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 20 Feb 2023 20:51:49 +1000
Subject: [PATCH 050/102] Update TestServerFixture.cs

---
 tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs b/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs
index 12ed053d..09a187cd 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs
@@ -21,7 +21,9 @@ public abstract class TestServerFixture : IDisposable
     private TestServer server;
     private bool isDisposed;
 
-    protected TestServerFixture()
+#pragma warning disable RCS1160 // Abstract type should not have public constructors.
+    public TestServerFixture()
+#pragma warning restore RCS1160 // Abstract type should not have public constructors.
     {
         IConfigurationRoot configuration = new ConfigurationBuilder()
         .AddInMemoryCollection(new[]

From edb5b5bb468d9ecab3fed1ba4999d693578cd71c Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 20 Feb 2023 21:23:26 +1000
Subject: [PATCH 051/102] Try installing and running the s3ver locally

---
 .github/workflows/build-and-test.yml                      | 8 ++++----
 src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs | 5 +++--
 .../TestUtilities/AWSS3StorageImageProviderFactory.cs     | 8 ++++----
 .../TestUtilities/TestServerFixture.cs                    | 4 +---
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 97aafb97..06f64fdb 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -101,15 +101,15 @@ jobs:
         if: matrix.options.os != 'windows-latest'
         shell: bash
         run: |
-          sudo npm install -g s3rver
-          sudo s3rver -d . &
+          sudo npm install s3rver
+          sudo npx s3rver -d . &
 
       - name: S3rver Setup Windows
         if: matrix.options.os == 'windows-latest'
         shell: bash
         run: |
-          npm install -g s3rver
-          s3rver -d . &
+          npm install s3rver
+          npx s3rver -d . &
 
       - name: DotNet Setup
         uses: actions/setup-dotnet@v3
diff --git a/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs b/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs
index 772cc42d..e311ae86 100644
--- a/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs
+++ b/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs
@@ -18,6 +18,7 @@ internal static class AmazonS3ClientFactory
     /// <returns>
     /// A new <see cref="AmazonS3Client"/>.
     /// </returns>
+    /// <exception cref="ArgumentException">Invalid configuration.</exception>
     public static AmazonS3Client CreateClient(IAWSS3BucketClientOptions options)
     {
         if (!string.IsNullOrWhiteSpace(options.Endpoint))
@@ -33,14 +34,14 @@ public static AmazonS3Client CreateClient(IAWSS3BucketClientOptions options)
         {
             // AccessSecret can be empty.
             Guard.NotNullOrWhiteSpace(options.Region, nameof(options.Region));
-            var region = RegionEndpoint.GetBySystemName(options.Region);
+            RegionEndpoint region = RegionEndpoint.GetBySystemName(options.Region);
             AmazonS3Config config = new() { RegionEndpoint = region, UseAccelerateEndpoint = options.UseAccelerateEndpoint };
             SetTimeout(config, options.Timeout);
             return new AmazonS3Client(options.AccessKey, options.AccessSecret, config);
         }
         else if (!string.IsNullOrWhiteSpace(options.Region))
         {
-            var region = RegionEndpoint.GetBySystemName(options.Region);
+            RegionEndpoint region = RegionEndpoint.GetBySystemName(options.Region);
             AmazonS3Config config = new() { RegionEndpoint = region, UseAccelerateEndpoint = options.UseAccelerateEndpoint };
             SetTimeout(config, options.Timeout);
             return new AmazonS3Client(config);
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageImageProviderFactory.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageImageProviderFactory.cs
index 5af0560e..bbfb8a5d 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageImageProviderFactory.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageImageProviderFactory.cs
@@ -44,7 +44,7 @@ private static async Task InitializeAWSStorageAsync(IServiceProvider services, A
         {
             try
             {
-                var putBucketRequest = new PutBucketRequest
+                PutBucketRequest putBucketRequest = new()
                 {
                     BucketName = bucketOptions.BucketName,
                     BucketRegion = bucketOptions.Region,
@@ -57,7 +57,7 @@ private static async Task InitializeAWSStorageAsync(IServiceProvider services, A
             {
                 // CI tests are run in parallel and can sometimes return a
                 // false negative for the existance of a bucket.
-                if (string.Equals(e.ErrorCode, "BucketAlreadyExists"))
+                if (string.Equals(e.ErrorCode, "BucketAlreadyExists", StringComparison.Ordinal))
                 {
                     return;
                 }
@@ -84,14 +84,14 @@ private static async Task InitializeAWSStorageAsync(IServiceProvider services, A
             using Stream stream = file.CreateReadStream();
 
             // Set the max-age property so we get coverage for testing in our AWS provider.
-            var cacheControl = new CacheControlHeaderValue
+            CacheControlHeaderValue cacheControl = new()
             {
                 Public = true,
                 MaxAge = TimeSpan.FromDays(7),
                 MustRevalidate = true
             };
 
-            var putRequest = new PutObjectRequest()
+            PutObjectRequest putRequest = new()
             {
                 BucketName = bucketOptions.BucketName,
                 Key = TestConstants.ImagePath,
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs b/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs
index 09a187cd..12ed053d 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs
@@ -21,9 +21,7 @@ public abstract class TestServerFixture : IDisposable
     private TestServer server;
     private bool isDisposed;
 
-#pragma warning disable RCS1160 // Abstract type should not have public constructors.
-    public TestServerFixture()
-#pragma warning restore RCS1160 // Abstract type should not have public constructors.
+    protected TestServerFixture()
     {
         IConfigurationRoot configuration = new ConfigurationBuilder()
         .AddInMemoryCollection(new[]

From 548ec456f7c1a0fbf53aabd4b8f336cd0cbc703e Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 20 Feb 2023 21:29:29 +1000
Subject: [PATCH 052/102] Skip macOS to test other environments

---
 .github/workflows/build-and-test.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 06f64fdb..1a13a7f9 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -20,11 +20,11 @@ jobs:
             sdk-preview: true
             runtime: -x64
             codecov: false
-          - os: macos-latest
-            framework: net7.0
-            sdk-preview: true
-            runtime: -x64
-            codecov: false
+          #- os: macos-latest
+          #  framework: net7.0
+          #  sdk-preview: true
+          #  runtime: -x64
+          #  codecov: false
           - os: windows-latest
             framework: net7.0
             sdk-preview: true
@@ -34,10 +34,10 @@ jobs:
             framework: net6.0
             runtime: -x64
             codecov: false
-          - os: macos-latest
-            framework: net6.0
-            runtime: -x64
-            codecov: false
+          #- os: macos-latest
+          #  framework: net6.0
+          #  runtime: -x64
+          #  codecov: false
           - os: windows-latest
             framework: net6.0
             runtime: -x64

From e5349d8065534e2097be2e7dd738eaf2a0a7742a Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 20 Feb 2023 21:38:39 +1000
Subject: [PATCH 053/102] Revert action changes

---
 .github/workflows/build-and-test.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 1a13a7f9..97aafb97 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -20,11 +20,11 @@ jobs:
             sdk-preview: true
             runtime: -x64
             codecov: false
-          #- os: macos-latest
-          #  framework: net7.0
-          #  sdk-preview: true
-          #  runtime: -x64
-          #  codecov: false
+          - os: macos-latest
+            framework: net7.0
+            sdk-preview: true
+            runtime: -x64
+            codecov: false
           - os: windows-latest
             framework: net7.0
             sdk-preview: true
@@ -34,10 +34,10 @@ jobs:
             framework: net6.0
             runtime: -x64
             codecov: false
-          #- os: macos-latest
-          #  framework: net6.0
-          #  runtime: -x64
-          #  codecov: false
+          - os: macos-latest
+            framework: net6.0
+            runtime: -x64
+            codecov: false
           - os: windows-latest
             framework: net6.0
             runtime: -x64
@@ -101,15 +101,15 @@ jobs:
         if: matrix.options.os != 'windows-latest'
         shell: bash
         run: |
-          sudo npm install s3rver
-          sudo npx s3rver -d . &
+          sudo npm install -g s3rver
+          sudo s3rver -d . &
 
       - name: S3rver Setup Windows
         if: matrix.options.os == 'windows-latest'
         shell: bash
         run: |
-          npm install s3rver
-          npx s3rver -d . &
+          npm install -g s3rver
+          s3rver -d . &
 
       - name: DotNet Setup
         uses: actions/setup-dotnet@v3

From 5a1ac6af082282b4df50c84885186efeba942210 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 20 Feb 2023 21:41:14 +1000
Subject: [PATCH 054/102] Skip to see if Azurite works

---
 tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs b/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs
index 6d8b5e83..9bac966f 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs
@@ -36,7 +36,7 @@ protected ServerTestBase(TFixture fixture, ITestOutputHelper outputHelper, strin
 
     public string ImageSource { get; }
 
-    [Fact]
+    [Fact(Skip = "Investigating connection refused errors")]
     public async Task CanProcessAndResolveImageAsync()
     {
         string url = this.ImageSource;
@@ -115,7 +115,7 @@ public async Task CanProcessAndResolveImageAsync()
         response.Dispose();
     }
 
-    [Fact]
+    [Fact(Skip = "Investigating connection refused errors")]
     public async Task CanProcessMultipleIdenticalQueriesAsync()
     {
         string url = this.ImageSource;

From 1a71bcf3dc50ab2a0414470d142fb14bda650c45 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 20 Feb 2023 21:47:09 +1000
Subject: [PATCH 055/102] Skip config for testing

---
 .../AWSS3StorageCacheTestServerFixture.cs     | 50 ++++++++++---------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs
index cb016f22..3d40c28f 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs
@@ -12,29 +12,33 @@ namespace SixLabors.ImageSharp.Web.Tests.TestUtilities;
 public class AWSS3StorageCacheTestServerFixture : TestServerFixture
 {
     protected override void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder)
-        => builder
-        .Configure<AWSS3StorageImageProviderOptions>(o =>
-            o.S3Buckets.Add(
-            new AWSS3BucketClientOptions
+    {
+        return;
+
+        builder
+            .Configure<AWSS3StorageImageProviderOptions>(o =>
+                o.S3Buckets.Add(
+                new AWSS3BucketClientOptions
+                {
+                    Endpoint = TestConstants.AWSEndpoint,
+                    BucketName = TestConstants.AWSBucketName,
+                    AccessKey = TestConstants.AWSAccessKey,
+                    AccessSecret = TestConstants.AWSAccessSecret,
+                    Region = TestConstants.AWSRegion,
+                    Timeout = TestConstants.AWSTimeout,
+                }))
+            .AddProvider(AWSS3StorageImageProviderFactory.Create)
+            .Configure<AWSS3StorageCacheOptions>(o =>
             {
-                Endpoint = TestConstants.AWSEndpoint,
-                BucketName = TestConstants.AWSBucketName,
-                AccessKey = TestConstants.AWSAccessKey,
-                AccessSecret = TestConstants.AWSAccessSecret,
-                Region = TestConstants.AWSRegion,
-                Timeout = TestConstants.AWSTimeout,
-            }))
-        .AddProvider(AWSS3StorageImageProviderFactory.Create)
-        .Configure<AWSS3StorageCacheOptions>(o =>
-        {
-            o.Endpoint = TestConstants.AWSEndpoint;
-            o.BucketName = TestConstants.AWSCacheBucketName;
-            o.AccessKey = TestConstants.AWSAccessKey;
-            o.AccessSecret = TestConstants.AWSAccessSecret;
-            o.Region = TestConstants.AWSRegion;
-            o.Timeout = TestConstants.AWSTimeout;
+                o.Endpoint = TestConstants.AWSEndpoint;
+                o.BucketName = TestConstants.AWSCacheBucketName;
+                o.AccessKey = TestConstants.AWSAccessKey;
+                o.AccessSecret = TestConstants.AWSAccessSecret;
+                o.Region = TestConstants.AWSRegion;
+                o.Timeout = TestConstants.AWSTimeout;
 
-            AWSS3StorageCache.CreateIfNotExists(o, S3CannedACL.Private);
-        })
-        .SetCache<AWSS3StorageCache>();
+                AWSS3StorageCache.CreateIfNotExists(o, S3CannedACL.Private);
+            })
+            .SetCache<AWSS3StorageCache>();
+    }
 }

From 0c176ac0b6a2f675e802c38752b93d241ad8aedb Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 20 Feb 2023 22:00:56 +1000
Subject: [PATCH 056/102] Try using a different port

---
 .github/workflows/build-and-test.yml          |  4 +-
 .../AWSS3StorageCacheTestServerFixture.cs     | 50 +++++++++----------
 .../TestUtilities/ServerTestBase.cs           |  4 +-
 .../TestUtilities/TestConstants.cs            |  2 +-
 4 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 97aafb97..952d2d1d 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -102,14 +102,14 @@ jobs:
         shell: bash
         run: |
           sudo npm install -g s3rver
-          sudo s3rver -d . &
+          sudo s3rver -p 10003 -d . &
 
       - name: S3rver Setup Windows
         if: matrix.options.os == 'windows-latest'
         shell: bash
         run: |
           npm install -g s3rver
-          s3rver -d . &
+          s3rver -p 10003 -d . &
 
       - name: DotNet Setup
         uses: actions/setup-dotnet@v3
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs
index 3d40c28f..cb016f22 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs
@@ -12,33 +12,29 @@ namespace SixLabors.ImageSharp.Web.Tests.TestUtilities;
 public class AWSS3StorageCacheTestServerFixture : TestServerFixture
 {
     protected override void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder)
-    {
-        return;
-
-        builder
-            .Configure<AWSS3StorageImageProviderOptions>(o =>
-                o.S3Buckets.Add(
-                new AWSS3BucketClientOptions
-                {
-                    Endpoint = TestConstants.AWSEndpoint,
-                    BucketName = TestConstants.AWSBucketName,
-                    AccessKey = TestConstants.AWSAccessKey,
-                    AccessSecret = TestConstants.AWSAccessSecret,
-                    Region = TestConstants.AWSRegion,
-                    Timeout = TestConstants.AWSTimeout,
-                }))
-            .AddProvider(AWSS3StorageImageProviderFactory.Create)
-            .Configure<AWSS3StorageCacheOptions>(o =>
+        => builder
+        .Configure<AWSS3StorageImageProviderOptions>(o =>
+            o.S3Buckets.Add(
+            new AWSS3BucketClientOptions
             {
-                o.Endpoint = TestConstants.AWSEndpoint;
-                o.BucketName = TestConstants.AWSCacheBucketName;
-                o.AccessKey = TestConstants.AWSAccessKey;
-                o.AccessSecret = TestConstants.AWSAccessSecret;
-                o.Region = TestConstants.AWSRegion;
-                o.Timeout = TestConstants.AWSTimeout;
+                Endpoint = TestConstants.AWSEndpoint,
+                BucketName = TestConstants.AWSBucketName,
+                AccessKey = TestConstants.AWSAccessKey,
+                AccessSecret = TestConstants.AWSAccessSecret,
+                Region = TestConstants.AWSRegion,
+                Timeout = TestConstants.AWSTimeout,
+            }))
+        .AddProvider(AWSS3StorageImageProviderFactory.Create)
+        .Configure<AWSS3StorageCacheOptions>(o =>
+        {
+            o.Endpoint = TestConstants.AWSEndpoint;
+            o.BucketName = TestConstants.AWSCacheBucketName;
+            o.AccessKey = TestConstants.AWSAccessKey;
+            o.AccessSecret = TestConstants.AWSAccessSecret;
+            o.Region = TestConstants.AWSRegion;
+            o.Timeout = TestConstants.AWSTimeout;
 
-                AWSS3StorageCache.CreateIfNotExists(o, S3CannedACL.Private);
-            })
-            .SetCache<AWSS3StorageCache>();
-    }
+            AWSS3StorageCache.CreateIfNotExists(o, S3CannedACL.Private);
+        })
+        .SetCache<AWSS3StorageCache>();
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs b/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs
index 9bac966f..6d8b5e83 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs
@@ -36,7 +36,7 @@ protected ServerTestBase(TFixture fixture, ITestOutputHelper outputHelper, strin
 
     public string ImageSource { get; }
 
-    [Fact(Skip = "Investigating connection refused errors")]
+    [Fact]
     public async Task CanProcessAndResolveImageAsync()
     {
         string url = this.ImageSource;
@@ -115,7 +115,7 @@ public async Task CanProcessAndResolveImageAsync()
         response.Dispose();
     }
 
-    [Fact(Skip = "Investigating connection refused errors")]
+    [Fact]
     public async Task CanProcessMultipleIdenticalQueriesAsync()
     {
         string url = this.ImageSource;
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs b/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
index bc1ba269..7e1aee78 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
@@ -8,7 +8,7 @@ public static class TestConstants
     public const string AzureConnectionString = "UseDevelopmentStorage=true";
     public const string AzureContainerName = "azure";
     public const string AzureCacheContainerName = "is-cache";
-    public const string AWSEndpoint = "http://127.0.0.1:4568/";
+    public const string AWSEndpoint = "http://127.0.0.1:10003/";
     public const string AWSRegion = "eu-west-2";
     public const string AWSBucketName = "aws";
     public const string AWSCacheBucketName = "aws-cache";

From 85d84f7ad58970008f186d50f6f2a460bcd239b3 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 20 Feb 2023 22:09:11 +1000
Subject: [PATCH 057/102] Try specifying localhost

---
 tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs b/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
index 7e1aee78..c4529eff 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
@@ -8,7 +8,7 @@ public static class TestConstants
     public const string AzureConnectionString = "UseDevelopmentStorage=true";
     public const string AzureContainerName = "azure";
     public const string AzureCacheContainerName = "is-cache";
-    public const string AWSEndpoint = "http://127.0.0.1:10003/";
+    public const string AWSEndpoint = "http://localhost:10003/";
     public const string AWSRegion = "eu-west-2";
     public const string AWSBucketName = "aws";
     public const string AWSCacheBucketName = "aws-cache";

From b86a433422478ed99ce9155816084b44be29c7b9 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 20 Feb 2023 22:12:57 +1000
Subject: [PATCH 058/102] Use default configuration

---
 .github/workflows/build-and-test.yml                      | 4 ++--
 tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 952d2d1d..97aafb97 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -102,14 +102,14 @@ jobs:
         shell: bash
         run: |
           sudo npm install -g s3rver
-          sudo s3rver -p 10003 -d . &
+          sudo s3rver -d . &
 
       - name: S3rver Setup Windows
         if: matrix.options.os == 'windows-latest'
         shell: bash
         run: |
           npm install -g s3rver
-          s3rver -p 10003 -d . &
+          s3rver -d . &
 
       - name: DotNet Setup
         uses: actions/setup-dotnet@v3
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs b/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
index c4529eff..26c64845 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
@@ -8,7 +8,7 @@ public static class TestConstants
     public const string AzureConnectionString = "UseDevelopmentStorage=true";
     public const string AzureContainerName = "azure";
     public const string AzureCacheContainerName = "is-cache";
-    public const string AWSEndpoint = "http://localhost:10003/";
+    public const string AWSEndpoint = "http://localhost:4568/";
     public const string AWSRegion = "eu-west-2";
     public const string AWSBucketName = "aws";
     public const string AWSCacheBucketName = "aws-cache";

From 97bea0725579e30fcc1923a35a109c617172b498 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 20 Feb 2023 22:28:22 +1000
Subject: [PATCH 059/102] Test OnBeforeLoadAsync

---
 .../TestUtilities/TestServerFixture.cs                | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs b/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs
index 12ed053d..a9f68eed 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs
@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Web.DependencyInjection;
 using SixLabors.ImageSharp.Web.Middleware;
 
@@ -67,6 +68,16 @@ protected void ConfigureServices(IServiceCollection services)
                 return onParseCommandsAsync.Invoke(context);
             };
 
+            Func<HttpContext, DecoderOptions, Task> onBeforeLoadAsync = options.OnBeforeLoadAsync;
+
+            options.OnBeforeLoadAsync = (context, decoderOptions) =>
+            {
+                Assert.NotNull(context);
+                Assert.NotNull(decoderOptions);
+
+                return onBeforeLoadAsync.Invoke(context, decoderOptions);
+            };
+
             Func<ImageProcessingContext, Task> onProcessedAsync = options.OnProcessedAsync;
 
             options.OnProcessedAsync = context =>

From 2239a9a471b06b977d3f0e1b7879cbfbe844003a Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 27 Feb 2023 23:47:23 +1000
Subject: [PATCH 060/102] Update to latest build

---
 shared-infrastructure                    | 2 +-
 src/ImageSharp.Web/ImageSharp.Web.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared-infrastructure b/shared-infrastructure
index 777842e3..9a6cf00d 160000
--- a/shared-infrastructure
+++ b/shared-infrastructure
@@ -1 +1 @@
-Subproject commit 777842e38622ab374e03f4076cf2544ed54a062b
+Subproject commit 9a6cf00d9a3d482bb08211dd8309f4724a2735cb
diff --git a/src/ImageSharp.Web/ImageSharp.Web.csproj b/src/ImageSharp.Web/ImageSharp.Web.csproj
index 87b6d8cb..a4f69af8 100644
--- a/src/ImageSharp.Web/ImageSharp.Web.csproj
+++ b/src/ImageSharp.Web/ImageSharp.Web.csproj
@@ -45,7 +45,7 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.2.0" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.0-alpha.0.99" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.0-alpha.0.106" />
   </ItemGroup>
 
   <Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />

From 43aa837af4d86b5035d17336a997898e4312fc4b Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 27 Feb 2023 23:54:07 +1000
Subject: [PATCH 061/102] Update QualityWebProcessor.cs

---
 src/ImageSharp.Web/Processors/QualityWebProcessor.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/ImageSharp.Web/Processors/QualityWebProcessor.cs b/src/ImageSharp.Web/Processors/QualityWebProcessor.cs
index 81a3b8fb..84af1804 100644
--- a/src/ImageSharp.Web/Processors/QualityWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/QualityWebProcessor.cs
@@ -53,7 +53,13 @@ public FormattedImage Process(
 
                 if (quality != reference.Quality)
                 {
-                    image.Encoder = new JpegEncoder() { Quality = quality, ColorType = reference.ColorType };
+                    image.Encoder = new JpegEncoder()
+                    {
+                        Quality = quality,
+                        Interleaved = reference.Interleaved,
+                        ColorType = reference.ColorType,
+                        SkipMetadata = reference.SkipMetadata
+                    };
                 }
             }
             else if (image.Format is WebpFormat)
@@ -76,6 +82,7 @@ public FormattedImage Process(
                     TransparentColorMode = reference.TransparentColorMode,
                     NearLossless = reference.NearLossless,
                     NearLosslessQuality = reference.NearLosslessQuality,
+                    SkipMetadata = reference.SkipMetadata
                 };
             }
         }

From d1ffdf8706b0ee64d34bb684b5ffc22ba78fe4ad Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Wed, 1 Mar 2023 20:22:45 +0100
Subject: [PATCH 062/102] Add Parsing of TargetRectangle to ResizeWebProcessor

---
 .../Processors/ResizeWebProcessor.cs          | 51 ++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
index d4c1b2de..f85447a7 100644
--- a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
+
 #nullable disable
 
 using System.Globalization;
@@ -61,6 +62,26 @@ public class ResizeWebProcessor : IImageWebProcessor
     /// </summary>
     public const string Compand = "compand";
 
+    /// <summary>
+    /// The command constant for the resize TargetRectangle X
+    /// </summary>
+    public const string TargetRectangleX = "targetrectanglex";
+
+    /// <summary>
+    /// The command constant for the resize TargetRectangle X
+    /// </summary>
+    public const string TargetRectangleY = "targetrectangley";
+
+    /// <summary>
+    /// The command constant for the resize TargetRectangle X
+    /// </summary>
+    public const string TargetRectangleWidth = "targetrectanglewidth";
+
+    /// <summary>
+    /// The command constant for the resize TargetRectangle X
+    /// </summary>
+    public const string TargetRectangleHeight = "targetrectangleheight";
+
     private static readonly IEnumerable<string> ResizeCommands
         = new[]
         {
@@ -126,6 +147,8 @@ internal static ResizeOptions GetResizeOptions(
             return null;
         }
 
+        Rectangle? targetRectangle = ParseRectangle(commands, parser, culture);
+
         return new()
         {
             Size = size,
@@ -134,7 +157,8 @@ internal static ResizeOptions GetResizeOptions(
             Mode = GetMode(commands, parser, culture),
             Compand = GetCompandMode(commands, parser, culture),
             Sampler = GetSampler(commands),
-            PadColor = parser.ParseValue<Color>(commands.GetValueOrDefault(Color), culture)
+            PadColor = parser.ParseValue<Color>(commands.GetValueOrDefault(Color), culture),
+            TargetRectangle = targetRectangle
         };
     }
 
@@ -158,6 +182,31 @@ private static Size ParseSize(
         return ExifOrientationUtilities.Transform(new Size(width, height), orientation);
     }
 
+    private static Rectangle? ParseRectangle(
+        CommandCollection commands,
+        CommandParser parser,
+        CultureInfo culture)
+    {
+        if (!commands.Contains(TargetRectangleWidth) || !commands.Contains(TargetRectangleHeight))
+        {
+            return null;
+        }
+
+        // The command parser will reject negative numbers as it clamps values to ranges.
+        int width = (int)parser.ParseValue<uint>(commands.GetValueOrDefault(TargetRectangleWidth), culture);
+        int height = (int)parser.ParseValue<uint>(commands.GetValueOrDefault(TargetRectangleHeight), culture);
+
+        if (!commands.Contains(TargetRectangleX) || !commands.Contains(TargetRectangleY))
+        {
+            return new Rectangle(0, 0, width, height);
+        }
+
+        int x = (int)parser.ParseValue<uint>(commands.GetValueOrDefault(TargetRectangleX), culture);
+        int y = (int)parser.ParseValue<uint>(commands.GetValueOrDefault(TargetRectangleY), culture);
+
+        return new Rectangle(x, y, width, height);
+    }
+
     private static PointF? GetCenter(
         ushort orientation,
         CommandCollection commands,

From 5f0f77b8bd14efd1a0185f598970c466abb957d8 Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Wed, 1 Mar 2023 20:33:24 +0100
Subject: [PATCH 063/102] Remove nullabel disable

First batch of removing nullable disable
---
 src/ImageSharp.Web/AsyncHelper.cs             |  1 -
 src/ImageSharp.Web/CaseHandlingUriBuilder.cs  |  1 -
 src/ImageSharp.Web/CommandHandling.cs         |  1 -
 .../ExifOrientationUtilities.cs               |  1 -
 src/ImageSharp.Web/FormatUtilities.cs         |  4 ++--
 src/ImageSharp.Web/HMACUtilities.cs           |  3 +--
 src/ImageSharp.Web/ImageCacheMetadata.cs      | 16 +++++++-------
 src/ImageSharp.Web/ImageMetadata.cs           |  3 +--
 ...ImageSharpRequestAuthorizationUtilities.cs | 21 +++++++++----------
 src/ImageSharp.Web/PathUtilities.cs           |  1 -
 10 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/src/ImageSharp.Web/AsyncHelper.cs b/src/ImageSharp.Web/AsyncHelper.cs
index 8bc52d93..3ba68fcb 100644
--- a/src/ImageSharp.Web/AsyncHelper.cs
+++ b/src/ImageSharp.Web/AsyncHelper.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 
diff --git a/src/ImageSharp.Web/CaseHandlingUriBuilder.cs b/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
index f257fa08..e3418820 100644
--- a/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
+++ b/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Buffers;
 using System.Runtime.CompilerServices;
diff --git a/src/ImageSharp.Web/CommandHandling.cs b/src/ImageSharp.Web/CommandHandling.cs
index 02f2e19b..2e436ea6 100644
--- a/src/ImageSharp.Web/CommandHandling.cs
+++ b/src/ImageSharp.Web/CommandHandling.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using SixLabors.ImageSharp.Web.Commands;
 
diff --git a/src/ImageSharp.Web/ExifOrientationUtilities.cs b/src/ImageSharp.Web/ExifOrientationUtilities.cs
index 2e94f50a..dab77e8c 100644
--- a/src/ImageSharp.Web/ExifOrientationUtilities.cs
+++ b/src/ImageSharp.Web/ExifOrientationUtilities.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Numerics;
 using System.Runtime.CompilerServices;
diff --git a/src/ImageSharp.Web/FormatUtilities.cs b/src/ImageSharp.Web/FormatUtilities.cs
index 2d7da4ea..4e9cba52 100644
--- a/src/ImageSharp.Web/FormatUtilities.cs
+++ b/src/ImageSharp.Web/FormatUtilities.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
+using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Options;
@@ -51,7 +51,7 @@ public FormatUtilities(IOptions<ImageSharpMiddlewareOptions> options)
     /// <see langword="true" /> if the uri contains an extension; otherwise, <see langword="false" />.
     /// </returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public bool TryGetExtensionFromUri(string uri, out string extension)
+    public bool TryGetExtensionFromUri(string uri, [NotNullWhen(true)] out string? extension)
     {
         extension = null;
         int query = uri.IndexOf('?');
diff --git a/src/ImageSharp.Web/HMACUtilities.cs b/src/ImageSharp.Web/HMACUtilities.cs
index eb9d497a..f90d8c52 100644
--- a/src/ImageSharp.Web/HMACUtilities.cs
+++ b/src/ImageSharp.Web/HMACUtilities.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Buffers;
 using System.Runtime.CompilerServices;
@@ -70,7 +69,7 @@ public static unsafe string ComputeHMACSHA512(string value, byte[] secret)
     private static unsafe string CreateHMAC(string value, HMAC hmac)
     {
         int byteCount = Encoding.ASCII.GetByteCount(value);
-        byte[] buffer = null;
+        byte[]? buffer = null;
 
         try
         {
diff --git a/src/ImageSharp.Web/ImageCacheMetadata.cs b/src/ImageSharp.Web/ImageCacheMetadata.cs
index 0e1ce20d..d871fd8d 100644
--- a/src/ImageSharp.Web/ImageCacheMetadata.cs
+++ b/src/ImageSharp.Web/ImageCacheMetadata.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using System.Runtime.CompilerServices;
@@ -98,23 +97,24 @@ public ImageCacheMetadata(
     public static ImageCacheMetadata FromDictionary(IDictionary<string, string> dictionary)
     {
         // DateTime.TryParse(null) ==  DateTime.MinValue so no need for conditional;
-        dictionary.TryGetValue(SourceLastModifiedKey, out string sourceLastWriteTimeUtcString);
+        dictionary.TryGetValue(SourceLastModifiedKey, out string? sourceLastWriteTimeUtcString);
         DateTime.TryParse(sourceLastWriteTimeUtcString, null, DateTimeStyles.RoundtripKind, out DateTime sourceLastWriteTimeUtc);
 
-        dictionary.TryGetValue(CacheLastModifiedKey, out string cacheLastWriteTimeUtcString);
+        dictionary.TryGetValue(CacheLastModifiedKey, out string? cacheLastWriteTimeUtcString);
         DateTime.TryParse(cacheLastWriteTimeUtcString, null, DateTimeStyles.RoundtripKind, out DateTime cacheLastWriteTimeUtc);
 
-        dictionary.TryGetValue(ContentTypeKey, out string contentType);
+        dictionary.TryGetValue(ContentTypeKey, out string? contentType);
+        Guard.NotNull(contentType);
 
         // int.TryParse(null) == 0 and we want to return TimeSpan.MinValue not TimeSpan.Zero
         TimeSpan cacheControlMaxAge = TimeSpan.MinValue;
-        if (dictionary.TryGetValue(CacheControlKey, out string cacheControlMaxAgeString))
+        if (dictionary.TryGetValue(CacheControlKey, out string? cacheControlMaxAgeString))
         {
             _ = int.TryParse(cacheControlMaxAgeString, out int maxAge);
             cacheControlMaxAge = TimeSpan.FromSeconds(maxAge);
         }
 
-        dictionary.TryGetValue(ContentLengthKey, out string contentLengthString);
+        dictionary.TryGetValue(ContentLengthKey, out string? contentLengthString);
         _ = long.TryParse(contentLengthString, out long contentLength);
 
         return new ImageCacheMetadata(
@@ -135,7 +135,7 @@ public static async Task<ImageCacheMetadata> ReadAsync(Stream stream)
         Dictionary<string, string> dictionary = new();
         using (StreamReader reader = new(stream, Encoding.UTF8))
         {
-            string line;
+            string? line;
             while ((line = await reader.ReadLineAsync()) != null)
             {
                 int idx = line.IndexOf(':');
@@ -160,7 +160,7 @@ public bool Equals(ImageCacheMetadata other)
         && this.ContentLength == other.ContentLength;
 
     /// <inheritdoc/>
-    public override bool Equals(object obj)
+    public override bool Equals(object? obj)
         => obj is ImageCacheMetadata data && this.Equals(data);
 
     /// <inheritdoc/>
diff --git a/src/ImageSharp.Web/ImageMetadata.cs b/src/ImageSharp.Web/ImageMetadata.cs
index 9ff37df7..ba2d5462 100644
--- a/src/ImageSharp.Web/ImageMetadata.cs
+++ b/src/ImageSharp.Web/ImageMetadata.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Runtime.CompilerServices;
 
@@ -90,7 +89,7 @@ public bool Equals(ImageMetadata other)
         && this.ContentLength == other.ContentLength;
 
     /// <inheritdoc/>
-    public override bool Equals(object obj)
+    public override bool Equals(object? obj)
         => obj is ImageMetadata data && this.Equals(data);
 
     /// <inheritdoc/>
diff --git a/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs b/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
index 18a5c502..7c1aede5 100644
--- a/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
+++ b/src/ImageSharp.Web/ImageSharpRequestAuthorizationUtilities.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using Microsoft.AspNetCore.Http;
@@ -96,7 +95,7 @@ public void StripUnknownCommands(CommandCollection commands)
     /// <param name="uri">The uri to compute the code from.</param>
     /// <param name="handling">The command collection handling.</param>
     /// <returns>The computed HMAC.</returns>
-    public string ComputeHMAC(string uri, CommandHandling handling)
+    public string? ComputeHMAC(string uri, CommandHandling handling)
         => this.ComputeHMAC(new Uri(uri, UriKind.RelativeOrAbsolute), handling);
 
     /// <summary>
@@ -105,7 +104,7 @@ public string ComputeHMAC(string uri, CommandHandling handling)
     /// <param name="uri">The uri to compute the code from.</param>
     /// <param name="handling">The command collection handling.</param>
     /// <returns>The computed HMAC.</returns>
-    public Task<string> ComputeHMACAsync(string uri, CommandHandling handling)
+    public Task<string?> ComputeHMACAsync(string uri, CommandHandling handling)
         => this.ComputeHMACAsync(new Uri(uri, UriKind.RelativeOrAbsolute), handling);
 
     /// <summary>
@@ -114,7 +113,7 @@ public Task<string> ComputeHMACAsync(string uri, CommandHandling handling)
     /// <param name="uri">The uri to compute the code from.</param>
     /// <param name="handling">The command collection handling.</param>
     /// <returns>The computed HMAC.</returns>
-    public string ComputeHMAC(Uri uri, CommandHandling handling)
+    public string? ComputeHMAC(Uri uri, CommandHandling handling)
     {
         ToComponents(
             uri,
@@ -131,7 +130,7 @@ public string ComputeHMAC(Uri uri, CommandHandling handling)
     /// <param name="uri">The uri to compute the code from.</param>
     /// <param name="handling">The command collection handling.</param>
     /// <returns>The computed HMAC.</returns>
-    public Task<string> ComputeHMACAsync(Uri uri, CommandHandling handling)
+    public Task<string?> ComputeHMACAsync(Uri uri, CommandHandling handling)
     {
         ToComponents(
             uri,
@@ -150,7 +149,7 @@ public Task<string> ComputeHMACAsync(Uri uri, CommandHandling handling)
     /// <param name="queryString">The querystring.</param>
     /// <param name="handling">The command collection handling.</param>
     /// <returns>The computed HMAC.</returns>
-    public string ComputeHMAC(HostString host, PathString path, QueryString queryString, CommandHandling handling)
+    public string? ComputeHMAC(HostString host, PathString path, QueryString queryString, CommandHandling handling)
         => this.ComputeHMAC(host, path, queryString, new(QueryHelpers.ParseQuery(queryString.Value)), handling);
 
     /// <summary>
@@ -161,7 +160,7 @@ public string ComputeHMAC(HostString host, PathString path, QueryString queryStr
     /// <param name="queryString">The querystring.</param>
     /// <param name="handling">The command collection handling.</param>
     /// <returns>The computed HMAC.</returns>
-    public Task<string> ComputeHMACAsync(HostString host, PathString path, QueryString queryString, CommandHandling handling)
+    public Task<string?> ComputeHMACAsync(HostString host, PathString path, QueryString queryString, CommandHandling handling)
         => this.ComputeHMACAsync(host, path, queryString, new(QueryHelpers.ParseQuery(queryString.Value)), handling);
 
     /// <summary>
@@ -173,7 +172,7 @@ public Task<string> ComputeHMACAsync(HostString host, PathString path, QueryStri
     /// <param name="query">The query collection.</param>
     /// <param name="handling">The command collection handling.</param>
     /// <returns>The computed HMAC.</returns>
-    public string ComputeHMAC(HostString host, PathString path, QueryString queryString, QueryCollection query, CommandHandling handling)
+    public string? ComputeHMAC(HostString host, PathString path, QueryString queryString, QueryCollection query, CommandHandling handling)
         => this.ComputeHMAC(this.ToHttpContext(host, path, queryString, query), handling);
 
     /// <summary>
@@ -185,7 +184,7 @@ public string ComputeHMAC(HostString host, PathString path, QueryString queryStr
     /// <param name="query">The query collection.</param>
     /// <param name="handling">The command collection handling.</param>
     /// <returns>The computed HMAC.</returns>
-    public Task<string> ComputeHMACAsync(HostString host, PathString path, QueryString queryString, QueryCollection query, CommandHandling handling)
+    public Task<string?> ComputeHMACAsync(HostString host, PathString path, QueryString queryString, QueryCollection query, CommandHandling handling)
         => this.ComputeHMACAsync(this.ToHttpContext(host, path, queryString, query), handling);
 
     /// <summary>
@@ -194,7 +193,7 @@ public Task<string> ComputeHMACAsync(HostString host, PathString path, QueryStri
     /// <param name="context">The request HTTP context.</param>
     /// <param name="handling">The command collection handling.</param>
     /// <returns>The computed HMAC.</returns>
-    public string ComputeHMAC(HttpContext context, CommandHandling handling)
+    public string? ComputeHMAC(HttpContext context, CommandHandling handling)
         => AsyncHelper.RunSync(() => this.ComputeHMACAsync(context, handling));
 
     /// <summary>
@@ -203,7 +202,7 @@ public string ComputeHMAC(HttpContext context, CommandHandling handling)
     /// <param name="context">The request HTTP context.</param>
     /// <param name="handling">The command collection handling.</param>
     /// <returns>The computed HMAC.</returns>
-    public async Task<string> ComputeHMACAsync(HttpContext context, CommandHandling handling)
+    public async Task<string?> ComputeHMACAsync(HttpContext context, CommandHandling handling)
     {
         byte[] secret = this.options.HMACSecretKey;
         if (secret is null || secret.Length == 0)
diff --git a/src/ImageSharp.Web/PathUtilities.cs b/src/ImageSharp.Web/PathUtilities.cs
index e3f6ef6b..719b2e27 100644
--- a/src/ImageSharp.Web/PathUtilities.cs
+++ b/src/ImageSharp.Web/PathUtilities.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 namespace SixLabors.ImageSharp.Web;
 

From 558e582726acd225fea0962e4d6b1c3221e97710 Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Wed, 1 Mar 2023 20:44:07 +0100
Subject: [PATCH 064/102] Remove nullable disable in Resolvers

---
 src/ImageSharp.Web/Resolvers/FileProviderImageResolver.cs       | 1 -
 src/ImageSharp.Web/Resolvers/IImageCacheResolver.cs             | 1 -
 src/ImageSharp.Web/Resolvers/IImageResolver.cs                  | 1 -
 src/ImageSharp.Web/Resolvers/PhysicalFileSystemCacheResolver.cs | 1 -
 4 files changed, 4 deletions(-)

diff --git a/src/ImageSharp.Web/Resolvers/FileProviderImageResolver.cs b/src/ImageSharp.Web/Resolvers/FileProviderImageResolver.cs
index af0c6bb0..d4d6f0f1 100644
--- a/src/ImageSharp.Web/Resolvers/FileProviderImageResolver.cs
+++ b/src/ImageSharp.Web/Resolvers/FileProviderImageResolver.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.Extensions.FileProviders;
 
diff --git a/src/ImageSharp.Web/Resolvers/IImageCacheResolver.cs b/src/ImageSharp.Web/Resolvers/IImageCacheResolver.cs
index 2d2b784a..b629bb86 100644
--- a/src/ImageSharp.Web/Resolvers/IImageCacheResolver.cs
+++ b/src/ImageSharp.Web/Resolvers/IImageCacheResolver.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 namespace SixLabors.ImageSharp.Web.Resolvers;
 
diff --git a/src/ImageSharp.Web/Resolvers/IImageResolver.cs b/src/ImageSharp.Web/Resolvers/IImageResolver.cs
index 935702b9..72d6dfb0 100644
--- a/src/ImageSharp.Web/Resolvers/IImageResolver.cs
+++ b/src/ImageSharp.Web/Resolvers/IImageResolver.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 namespace SixLabors.ImageSharp.Web.Resolvers;
 
diff --git a/src/ImageSharp.Web/Resolvers/PhysicalFileSystemCacheResolver.cs b/src/ImageSharp.Web/Resolvers/PhysicalFileSystemCacheResolver.cs
index 6494079b..ab6f4936 100644
--- a/src/ImageSharp.Web/Resolvers/PhysicalFileSystemCacheResolver.cs
+++ b/src/ImageSharp.Web/Resolvers/PhysicalFileSystemCacheResolver.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.Web.Caching;

From d38cf39fa6e1685788e477ac23ebfc6b6c0188da Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Wed, 1 Mar 2023 20:44:20 +0100
Subject: [PATCH 065/102] Remove nullable disable in providers

---
 src/ImageSharp.Web/Providers/FileProviderImageProvider.cs  | 7 +++----
 src/ImageSharp.Web/Providers/IImageProvider.cs             | 3 +--
 src/ImageSharp.Web/Providers/PhysicalFileSystemProvider.cs | 1 -
 .../Providers/PhysicalFileSystemProviderOptions.cs         | 3 +--
 src/ImageSharp.Web/Providers/WebRootImageProvider.cs       | 1 -
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs b/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs
index c7dc3a5b..2e0cb6d4 100644
--- a/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs
+++ b/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
@@ -51,14 +50,14 @@ public virtual bool IsValidRequest(HttpContext context)
         => this.formatUtilities.TryGetExtensionFromUri(context.Request.GetDisplayUrl(), out _);
 
     /// <inheritdoc/>
-    public Task<IImageResolver> GetAsync(HttpContext context)
+    public Task<IImageResolver?> GetAsync(HttpContext context)
     {
         IFileInfo fileInfo = this.fileProvider.GetFileInfo(context.Request.Path.Value);
         if (!fileInfo.Exists)
         {
-            return Task.FromResult<IImageResolver>(null);
+            return Task.FromResult<IImageResolver?>(null);
         }
 
-        return Task.FromResult<IImageResolver>(new FileProviderImageResolver(fileInfo));
+        return Task.FromResult<IImageResolver?>(new FileProviderImageResolver(fileInfo));
     }
 }
diff --git a/src/ImageSharp.Web/Providers/IImageProvider.cs b/src/ImageSharp.Web/Providers/IImageProvider.cs
index a25e7525..6de0c68d 100644
--- a/src/ImageSharp.Web/Providers/IImageProvider.cs
+++ b/src/ImageSharp.Web/Providers/IImageProvider.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Resolvers;
@@ -36,5 +35,5 @@ public interface IImageProvider
     /// </summary>
     /// <param name="context">The current HTTP request context.</param>
     /// <returns>The <see cref="IImageResolver"/>.</returns>
-    Task<IImageResolver> GetAsync(HttpContext context);
+    Task<IImageResolver?> GetAsync(HttpContext context);
 }
diff --git a/src/ImageSharp.Web/Providers/PhysicalFileSystemProvider.cs b/src/ImageSharp.Web/Providers/PhysicalFileSystemProvider.cs
index dddfe2f2..7634e20f 100644
--- a/src/ImageSharp.Web/Providers/PhysicalFileSystemProvider.cs
+++ b/src/ImageSharp.Web/Providers/PhysicalFileSystemProvider.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.FileProviders;
diff --git a/src/ImageSharp.Web/Providers/PhysicalFileSystemProviderOptions.cs b/src/ImageSharp.Web/Providers/PhysicalFileSystemProviderOptions.cs
index f7b6f42e..57aaa99f 100644
--- a/src/ImageSharp.Web/Providers/PhysicalFileSystemProviderOptions.cs
+++ b/src/ImageSharp.Web/Providers/PhysicalFileSystemProviderOptions.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 namespace SixLabors.ImageSharp.Web.Providers;
 
@@ -21,7 +20,7 @@ public class PhysicalFileSystemProviderOptions
     /// application content files; commonly 'wwwroot'.
     /// </para>
     /// </summary>
-    public string ProviderRootPath { get; set; }
+    public string? ProviderRootPath { get; set; }
 
     /// <summary>
     /// Gets or sets the processing behavior. Defaults to <see cref="ProcessingBehavior.CommandOnly"/>.
diff --git a/src/ImageSharp.Web/Providers/WebRootImageProvider.cs b/src/ImageSharp.Web/Providers/WebRootImageProvider.cs
index 5c928dc3..a469dd11 100644
--- a/src/ImageSharp.Web/Providers/WebRootImageProvider.cs
+++ b/src/ImageSharp.Web/Providers/WebRootImageProvider.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.AspNetCore.Hosting;
 

From 5942354d267d89c2823027667e691348a2f03a6a Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Wed, 1 Mar 2023 20:52:09 +0100
Subject: [PATCH 066/102] Remove nullable disable from Processors

---
 src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs      | 1 -
 src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs | 1 -
 src/ImageSharp.Web/Processors/FormatWebProcessor.cs          | 3 +--
 src/ImageSharp.Web/Processors/IImageWebProcessor.cs          | 1 -
 src/ImageSharp.Web/Processors/QualityWebProcessor.cs         | 1 -
 src/ImageSharp.Web/Processors/ResizeWebProcessor.cs          | 5 ++---
 src/ImageSharp.Web/Processors/WebProcessingExtensions.cs     | 1 -
 7 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs b/src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs
index 9c3c4867..fc081169 100644
--- a/src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using Microsoft.Extensions.Logging;
diff --git a/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs b/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs
index 79668e09..549fa716 100644
--- a/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using Microsoft.Extensions.Logging;
diff --git a/src/ImageSharp.Web/Processors/FormatWebProcessor.cs b/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
index 0117e9b6..b4e94e9c 100644
--- a/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using Microsoft.Extensions.Logging;
@@ -53,7 +52,7 @@ public FormattedImage Process(
         string extension = commands.GetValueOrDefault(Format);
 
         if (!string.IsNullOrWhiteSpace(extension)
-            && this.options.Configuration.ImageFormatsManager.TryFindFormatByFileExtension(extension, out IImageFormat format))
+            && this.options.Configuration.ImageFormatsManager.TryFindFormatByFileExtension(extension, out IImageFormat? format))
         {
             image.Format = format;
         }
diff --git a/src/ImageSharp.Web/Processors/IImageWebProcessor.cs b/src/ImageSharp.Web/Processors/IImageWebProcessor.cs
index 6e1f8a85..df0cdb22 100644
--- a/src/ImageSharp.Web/Processors/IImageWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/IImageWebProcessor.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using Microsoft.Extensions.Logging;
diff --git a/src/ImageSharp.Web/Processors/QualityWebProcessor.cs b/src/ImageSharp.Web/Processors/QualityWebProcessor.cs
index 84af1804..37d8e9da 100644
--- a/src/ImageSharp.Web/Processors/QualityWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/QualityWebProcessor.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using Microsoft.Extensions.Logging;
diff --git a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
index d4c1b2de..dbad7950 100644
--- a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using System.Numerics;
@@ -86,7 +85,7 @@ public FormattedImage Process(
         CommandParser parser,
         CultureInfo culture)
     {
-        ResizeOptions options = GetResizeOptions(image, commands, parser, culture);
+        ResizeOptions? options = GetResizeOptions(image, commands, parser, culture);
 
         if (options != null)
         {
@@ -106,7 +105,7 @@ public FormattedImage Process(
     /// The <see cref="CultureInfo"/> to use as the current parsing culture.
     /// </param>
     /// <returns>The <see cref="ResizeOptions"/>.</returns>
-    internal static ResizeOptions GetResizeOptions(
+    internal static ResizeOptions? GetResizeOptions(
         FormattedImage image,
         CommandCollection commands,
         CommandParser parser,
diff --git a/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs b/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs
index 4c568b0a..ada16b3d 100644
--- a/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs
+++ b/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using Microsoft.Extensions.Logging;

From d80b750fda752f1dc5305596f93fd414d976695a Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Wed, 1 Mar 2023 21:02:44 +0100
Subject: [PATCH 067/102] Remove nullable disable from Middleware

---
 .../Middleware/ImageCommandContext.cs         |  1 -
 src/ImageSharp.Web/Middleware/ImageContext.cs |  3 +--
 .../Middleware/ImageProcessingContext.cs      |  1 -
 .../Middleware/ImageSharpMiddleware.cs        | 27 ++++++++++---------
 .../Middleware/ImageSharpMiddlewareOptions.cs |  1 -
 .../Middleware/ImageWorkerResult.cs           |  5 ++--
 .../Middleware/LoggerExtensions.cs            |  9 +++----
 7 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/ImageSharp.Web/Middleware/ImageCommandContext.cs b/src/ImageSharp.Web/Middleware/ImageCommandContext.cs
index 0bb06af9..228347f0 100644
--- a/src/ImageSharp.Web/Middleware/ImageCommandContext.cs
+++ b/src/ImageSharp.Web/Middleware/ImageCommandContext.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using Microsoft.AspNetCore.Http;
diff --git a/src/ImageSharp.Web/Middleware/ImageContext.cs b/src/ImageSharp.Web/Middleware/ImageContext.cs
index f34058b1..697dc5e7 100644
--- a/src/ImageSharp.Web/Middleware/ImageContext.cs
+++ b/src/ImageSharp.Web/Middleware/ImageContext.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
@@ -23,7 +22,7 @@ internal struct ImageContext
 
     private DateTimeOffset fileLastModified;
     private long fileLength;
-    private EntityTagHeaderValue fileEtag;
+    private EntityTagHeaderValue? fileEtag;
 
     private PreconditionState ifMatchState;
     private PreconditionState ifNoneMatchState;
diff --git a/src/ImageSharp.Web/Middleware/ImageProcessingContext.cs b/src/ImageSharp.Web/Middleware/ImageProcessingContext.cs
index a03a5508..53c0c3d1 100644
--- a/src/ImageSharp.Web/Middleware/ImageProcessingContext.cs
+++ b/src/ImageSharp.Web/Middleware/ImageProcessingContext.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Commands;
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
index 02424756..9b9e9b2b 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Diagnostics;
 using System.Globalization;
@@ -33,7 +32,7 @@ private static readonly ConcurrentTLruCache<string, ImageMetadata> SourceMetadat
     /// <summary>
     /// Used to temporarily store cache resolver reads to reduce the overhead of cache lookups.
     /// </summary>
-    private static readonly ConcurrentTLruCache<string, (IImageCacheResolver, ImageCacheMetadata)> CacheResolverLru
+    private static readonly ConcurrentTLruCache<string, (IImageCacheResolver?, ImageCacheMetadata)> CacheResolverLru
         = new(1024, TimeSpan.FromSeconds(30));
 
     /// <summary>
@@ -186,7 +185,7 @@ public ImageSharpMiddleware(
     private async Task Invoke(HttpContext httpContext, bool retry)
     {
         // Get the correct provider for the request
-        IImageProvider provider = null;
+        IImageProvider? provider = null;
         foreach (IImageProvider resolver in this.providers)
         {
             if (resolver.Match(httpContext))
@@ -208,7 +207,7 @@ private async Task Invoke(HttpContext httpContext, bool retry)
         // First check for a HMAC token and capture before the command is stripped out.
         byte[] secret = this.options.HMACSecretKey;
         bool checkHMAC = false;
-        string token = null;
+        string? token = null;
         if (secret?.Length > 0)
         {
             checkHMAC = true;
@@ -219,7 +218,7 @@ private async Task Invoke(HttpContext httpContext, bool retry)
         ImageCommandContext imageCommandContext = new(httpContext, commands, this.commandParser, this.parserCulture);
 
         // At this point we know that this is an image request so should attempt to compute a validating HMAC.
-        string hmac = null;
+        string? hmac = null;
         if (checkHMAC && token != null)
         {
             // Generate and cache a HMAC to validate against based upon the current valid commands from the request.
@@ -254,7 +253,7 @@ private async Task Invoke(HttpContext httpContext, bool retry)
             }
         }
 
-        IImageResolver sourceImageResolver = await provider.GetAsync(httpContext);
+        IImageResolver? sourceImageResolver = await provider.GetAsync(httpContext);
 
         if (sourceImageResolver is null)
         {
@@ -312,7 +311,7 @@ private async Task ProcessRequestAsync(
 
         // Enter an asynchronous write worker which prevents multiple writes and delays any reads for the same request.
         // This reduces the overheads of unnecessary processing.
-        RecyclableMemoryStream outStream = null;
+        RecyclableMemoryStream? outStream = null;
         try
         {
             Task<IDisposable> takeLockTask = this.asyncKeyLock.WriterLockAsync(key);
@@ -360,7 +359,7 @@ private async Task ProcessRequestAsync(
                             }
                             else
                             {
-                                FormattedImage image = null;
+                                FormattedImage? image = null;
                                 try
                                 {
                                     // Now we can finally process the image.
@@ -442,7 +441,7 @@ private async Task ProcessRequestAsync(
         }
     }
 
-    private static ValueTask StreamDisposeAsync(Stream stream)
+    private static ValueTask StreamDisposeAsync(Stream? stream)
     {
         if (stream is null)
         {
@@ -464,12 +463,12 @@ private async Task<ImageWorkerResult> IsNewOrUpdatedAsync(
 
         // Check to see if the cache contains this image.
         // If not, we return early. No further checks necessary.
-        (IImageCacheResolver ImageCacheResolver, ImageCacheMetadata ImageCacheMetadata) cachedImage = await
+        (IImageCacheResolver? ImageCacheResolver, ImageCacheMetadata ImageCacheMetadata) cachedImage = await
             CacheResolverLru.GetOrAddAsync(
                 key,
                 async k =>
                 {
-                    IImageCacheResolver resolver = await this.cache.GetAsync(k);
+                    IImageCacheResolver? resolver = await this.cache.GetAsync(k);
                     ImageCacheMetadata metadata = default;
                     if (resolver != null)
                     {
@@ -507,8 +506,8 @@ private async Task SendResponseAsync(
         ImageContext imageContext,
         string key,
         ImageCacheMetadata metadata,
-        IImageCacheResolver cacheResolver,
-        Stream stream,
+        IImageCacheResolver? cacheResolver,
+        Stream? stream,
         bool retry)
     {
         imageContext.ComprehendRequestHeaders(metadata.CacheLastWriteTimeUtc, metadata.ContentLength);
@@ -535,6 +534,8 @@ private async Task SendResponseAsync(
                 {
                     try
                     {
+                        Guard.NotNull(cacheResolver);
+
                         using Stream cacheStream = await cacheResolver.OpenReadAsync();
                         await imageContext.SendAsync(cacheStream, metadata);
                     }
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
index 6c7bfd6e..a1753f35 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using Microsoft.AspNetCore.Http;
diff --git a/src/ImageSharp.Web/Middleware/ImageWorkerResult.cs b/src/ImageSharp.Web/Middleware/ImageWorkerResult.cs
index f15a66a4..ee25c663 100644
--- a/src/ImageSharp.Web/Middleware/ImageWorkerResult.cs
+++ b/src/ImageSharp.Web/Middleware/ImageWorkerResult.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using SixLabors.ImageSharp.Web.Resolvers;
 
@@ -27,7 +26,7 @@ public ImageWorkerResult(ImageMetadata sourceImageMetadata, ImageCacheMetadata c
         this.Resolver = resolver;
     }
 
-    public ImageWorkerResult(ImageCacheMetadata cacheImageMetadata, IImageCacheResolver resolver)
+    public ImageWorkerResult(ImageCacheMetadata cacheImageMetadata, IImageCacheResolver? resolver)
     {
         this.IsNewOrUpdated = false;
         this.SourceImageMetadata = default;
@@ -41,5 +40,5 @@ public ImageWorkerResult(ImageCacheMetadata cacheImageMetadata, IImageCacheResol
 
     public ImageCacheMetadata CacheImageMetadata { get; }
 
-    public IImageCacheResolver Resolver { get; }
+    public IImageCacheResolver? Resolver { get; }
 }
diff --git a/src/ImageSharp.Web/Middleware/LoggerExtensions.cs b/src/ImageSharp.Web/Middleware/LoggerExtensions.cs
index 84195f02..7f158e8a 100644
--- a/src/ImageSharp.Web/Middleware/LoggerExtensions.cs
+++ b/src/ImageSharp.Web/Middleware/LoggerExtensions.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.Extensions.Logging;
 
@@ -12,10 +11,10 @@ namespace SixLabors.ImageSharp.Web.Middleware;
 internal static class LoggerExtensions
 {
     private static readonly Action<ILogger, string, Exception> LogProcessingErrorAction;
-    private static readonly Action<ILogger, string, Exception> LogResolveFailedAction;
-    private static readonly Action<ILogger, string, string, Exception> LogServedAction;
-    private static readonly Action<ILogger, string, Exception> LogPathNotModifiedAction;
-    private static readonly Action<ILogger, string, Exception> LogPreconditionFailedAction;
+    private static readonly Action<ILogger, string, Exception?> LogResolveFailedAction;
+    private static readonly Action<ILogger, string, string, Exception?> LogServedAction;
+    private static readonly Action<ILogger, string, Exception?> LogPathNotModifiedAction;
+    private static readonly Action<ILogger, string, Exception?> LogPreconditionFailedAction;
 
     /// <summary>
     /// Initializes static members of the <see cref="LoggerExtensions"/> class.

From 844a4dc59eb3691235e623ee9f65e31b55ffb642 Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Wed, 1 Mar 2023 21:05:39 +0100
Subject: [PATCH 068/102] Remove nullable disable from DependencyInjection

---
 .../DependencyInjection/ApplicationBuilderExtensions.cs  | 1 -
 .../DependencyInjection/IImageSharpBuilder.cs            | 1 -
 .../DependencyInjection/ImageSharpBuilder.cs             | 1 -
 .../DependencyInjection/ImageSharpBuilderExtensions.cs   | 9 ++++-----
 .../DependencyInjection/ServiceCollectionExtensions.cs   | 1 -
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/ImageSharp.Web/DependencyInjection/ApplicationBuilderExtensions.cs b/src/ImageSharp.Web/DependencyInjection/ApplicationBuilderExtensions.cs
index e3bdaf9c..e2f896dc 100644
--- a/src/ImageSharp.Web/DependencyInjection/ApplicationBuilderExtensions.cs
+++ b/src/ImageSharp.Web/DependencyInjection/ApplicationBuilderExtensions.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.AspNetCore.Builder;
 using SixLabors.ImageSharp.Web.Middleware;
diff --git a/src/ImageSharp.Web/DependencyInjection/IImageSharpBuilder.cs b/src/ImageSharp.Web/DependencyInjection/IImageSharpBuilder.cs
index 34a2701d..f1935af9 100644
--- a/src/ImageSharp.Web/DependencyInjection/IImageSharpBuilder.cs
+++ b/src/ImageSharp.Web/DependencyInjection/IImageSharpBuilder.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/src/ImageSharp.Web/DependencyInjection/ImageSharpBuilder.cs b/src/ImageSharp.Web/DependencyInjection/ImageSharpBuilder.cs
index ac44dfe8..58da1137 100644
--- a/src/ImageSharp.Web/DependencyInjection/ImageSharpBuilder.cs
+++ b/src/ImageSharp.Web/DependencyInjection/ImageSharpBuilder.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/src/ImageSharp.Web/DependencyInjection/ImageSharpBuilderExtensions.cs b/src/ImageSharp.Web/DependencyInjection/ImageSharpBuilderExtensions.cs
index d696f015..8c4a17bb 100644
--- a/src/ImageSharp.Web/DependencyInjection/ImageSharpBuilderExtensions.cs
+++ b/src/ImageSharp.Web/DependencyInjection/ImageSharpBuilderExtensions.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -205,7 +204,7 @@ public static IImageSharpBuilder InsertProvider<TProvider>(this IImageSharpBuild
     public static IImageSharpBuilder RemoveProvider<TProvider>(this IImageSharpBuilder builder)
         where TProvider : class, IImageProvider
     {
-        ServiceDescriptor descriptor = builder.Services.FirstOrDefault(x => x.ServiceType == typeof(IImageProvider) && x.GetImplementationType() == typeof(TProvider));
+        ServiceDescriptor? descriptor = builder.Services.FirstOrDefault(x => x.ServiceType == typeof(IImageProvider) && x.GetImplementationType() == typeof(TProvider));
         if (descriptor != null)
         {
             builder.Services.Remove(descriptor);
@@ -264,7 +263,7 @@ public static IImageSharpBuilder AddProcessor<TProcessor>(this IImageSharpBuilde
     public static IImageSharpBuilder RemoveProcessor<TProcessor>(this IImageSharpBuilder builder)
         where TProcessor : class, IImageWebProcessor
     {
-        ServiceDescriptor descriptor = builder.Services.FirstOrDefault(x => x.ServiceType == typeof(IImageWebProcessor) && x.GetImplementationType() == typeof(TProcessor));
+        ServiceDescriptor? descriptor = builder.Services.FirstOrDefault(x => x.ServiceType == typeof(IImageWebProcessor) && x.GetImplementationType() == typeof(TProcessor));
         if (descriptor != null)
         {
             builder.Services.Remove(descriptor);
@@ -323,7 +322,7 @@ public static IImageSharpBuilder AddConverter<TConverter>(this IImageSharpBuilde
     public static IImageSharpBuilder RemoveConverter<TConverter>(this IImageSharpBuilder builder)
         where TConverter : class, ICommandConverter
     {
-        ServiceDescriptor descriptor = builder.Services.FirstOrDefault(x => x.ServiceType == typeof(ICommandConverter) && x.GetImplementationType() == typeof(TConverter));
+        ServiceDescriptor? descriptor = builder.Services.FirstOrDefault(x => x.ServiceType == typeof(ICommandConverter) && x.GetImplementationType() == typeof(TConverter));
         if (descriptor != null)
         {
             builder.Services.Remove(descriptor);
@@ -374,7 +373,7 @@ public static IImageSharpBuilder Configure<TOptions>(this IImageSharpBuilder bui
         return builder;
     }
 
-    private static Type GetImplementationType(this ServiceDescriptor descriptor)
+    private static Type? GetImplementationType(this ServiceDescriptor descriptor)
         => descriptor.ImplementationType
         ?? descriptor.ImplementationInstance?.GetType()
         ?? descriptor.ImplementationFactory?.GetType().GenericTypeArguments[1];
diff --git a/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs b/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs
index 31fcd6ac..92729e1f 100644
--- a/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs
+++ b/src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.Extensions.DependencyInjection;
 using SixLabors.ImageSharp.Web.Caching;

From bd96955e1ecfd76b5fe5d7d2ddb38549115567cb Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Wed, 1 Mar 2023 21:10:12 +0100
Subject: [PATCH 069/102] Remove nullable disable from Commands

---
 src/ImageSharp.Web/Commands/CommandCollection.cs           | 7 ++++---
 src/ImageSharp.Web/Commands/CommandCollectionExtensions.cs | 1 -
 src/ImageSharp.Web/Commands/CommandParser.cs               | 5 ++---
 src/ImageSharp.Web/Commands/IRequestParser.cs              | 1 -
 .../Commands/PresetOnlyQueryCollectionRequestParser.cs     | 3 +--
 .../PresetOnlyQueryCollectionRequestParserOptions.cs       | 1 -
 .../Commands/QueryCollectionRequestParser.cs               | 1 -
 src/ImageSharp.Web/Commands/TypeConstants.cs               | 1 -
 8 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/ImageSharp.Web/Commands/CommandCollection.cs b/src/ImageSharp.Web/Commands/CommandCollection.cs
index 1718384e..b81ada58 100644
--- a/src/ImageSharp.Web/Commands/CommandCollection.cs
+++ b/src/ImageSharp.Web/Commands/CommandCollection.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 
 namespace SixLabors.ImageSharp.Web.Commands;
@@ -54,7 +54,7 @@ public IEnumerable<string> Keys
     {
         get
         {
-            if (!this.TryGetValue(key, out string value))
+            if (!this.TryGetValue(key, out string? value))
             {
                 ThrowKeyNotFound();
             }
@@ -107,7 +107,7 @@ public IEnumerable<string> Keys
     /// an element with the specified key; otherwise, <see langword="false"/>.
     /// </returns>
     /// <exception cref="ArgumentNullException"><paramref name="key"/> is null.</exception>
-    public bool TryGetValue(string key, out string value)
+    public bool TryGetValue(string key, [NotNullWhen(true)] out string? value)
     {
         if (this.TryGetValue(key, out KeyValuePair<string, string> keyValue))
         {
@@ -175,5 +175,6 @@ public int IndexOf(string key)
     protected override string GetKeyForItem(KeyValuePair<string, string> item) => item.Key;
 
     [MethodImpl(MethodImplOptions.NoInlining)]
+    [DoesNotReturn]
     private static void ThrowKeyNotFound() => throw new KeyNotFoundException();
 }
diff --git a/src/ImageSharp.Web/Commands/CommandCollectionExtensions.cs b/src/ImageSharp.Web/Commands/CommandCollectionExtensions.cs
index 6d6752ca..66c5e1fe 100644
--- a/src/ImageSharp.Web/Commands/CommandCollectionExtensions.cs
+++ b/src/ImageSharp.Web/Commands/CommandCollectionExtensions.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 namespace SixLabors.ImageSharp.Web.Commands;
 
diff --git a/src/ImageSharp.Web/Commands/CommandParser.cs b/src/ImageSharp.Web/Commands/CommandParser.cs
index e527510a..c7c39e1c 100644
--- a/src/ImageSharp.Web/Commands/CommandParser.cs
+++ b/src/ImageSharp.Web/Commands/CommandParser.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using System.Net;
@@ -36,12 +35,12 @@ public CommandParser(IEnumerable<ICommandConverter> converters)
     /// </typeparam>
     /// <returns>The converted instance or the default.</returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public T ParseValue<T>(string value, CultureInfo culture)
+    public T? ParseValue<T>(string value, CultureInfo culture)
     {
         DebugGuard.NotNull(culture, nameof(culture));
 
         Type type = typeof(T);
-        ICommandConverter converter = Array.Find(this.converters, x => x.Type.Equals(type));
+        ICommandConverter? converter = Array.Find(this.converters, x => x.Type.Equals(type));
 
         if (converter != null)
         {
diff --git a/src/ImageSharp.Web/Commands/IRequestParser.cs b/src/ImageSharp.Web/Commands/IRequestParser.cs
index 4d4d418a..73aede92 100644
--- a/src/ImageSharp.Web/Commands/IRequestParser.cs
+++ b/src/ImageSharp.Web/Commands/IRequestParser.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.AspNetCore.Http;
 
diff --git a/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs b/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs
index f4215369..15f7a4e1 100644
--- a/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs
+++ b/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.WebUtilities;
@@ -42,7 +41,7 @@ public CommandCollection ParseRequestCommands(HttpContext context)
 
         StringValues query = queryCollection[QueryKey];
         string requestedPreset = query[query.Count - 1];
-        if (this.presets.TryGetValue(requestedPreset, out CommandCollection collection))
+        if (this.presets.TryGetValue(requestedPreset, out CommandCollection? collection))
         {
             return collection;
         }
diff --git a/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParserOptions.cs b/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParserOptions.cs
index f12934f3..7c40e8a4 100644
--- a/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParserOptions.cs
+++ b/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParserOptions.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 namespace SixLabors.ImageSharp.Web.Commands;
 
diff --git a/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs b/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs
index 9edf4ea4..c4ac88c9 100644
--- a/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs
+++ b/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;
diff --git a/src/ImageSharp.Web/Commands/TypeConstants.cs b/src/ImageSharp.Web/Commands/TypeConstants.cs
index e7a0d2b6..c6460de5 100644
--- a/src/ImageSharp.Web/Commands/TypeConstants.cs
+++ b/src/ImageSharp.Web/Commands/TypeConstants.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 namespace SixLabors.ImageSharp.Web.Commands;
 

From 1422dd09684e0f69876edbbef239bd233aaa6fc6 Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Wed, 1 Mar 2023 21:22:47 +0100
Subject: [PATCH 070/102] Remove nullable disable from converters

---
 src/ImageSharp.Web/Commands/CommandCollection.cs | 16 ++++++++--------
 .../Commands/CommandCollectionExtensions.cs      |  4 ++--
 src/ImageSharp.Web/Commands/CommandParser.cs     |  6 ++++--
 .../Commands/Converters/ArrayConverter{T}.cs     |  5 ++---
 .../Commands/Converters/ColorConverter.cs        |  9 ++++-----
 .../Commands/Converters/EnumConverter.cs         |  5 ++---
 .../Commands/Converters/ICommandConverter.cs     |  3 +--
 .../Converters/IntegralNumberConverter{T}.cs     |  3 +--
 .../Commands/Converters/ListConverter{T}.cs      |  5 ++---
 .../Converters/SimpleCommandConverter{T}.cs      |  7 +++----
 .../Processors/FormatWebProcessor.cs             |  2 +-
 .../Processors/ResizeWebProcessor.cs             |  9 +++++++--
 12 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/ImageSharp.Web/Commands/CommandCollection.cs b/src/ImageSharp.Web/Commands/CommandCollection.cs
index b81ada58..16747d48 100644
--- a/src/ImageSharp.Web/Commands/CommandCollection.cs
+++ b/src/ImageSharp.Web/Commands/CommandCollection.cs
@@ -10,7 +10,7 @@ namespace SixLabors.ImageSharp.Web.Commands;
 /// <summary>
 /// Represents an ordered collection of processing commands.
 /// </summary>
-public sealed class CommandCollection : KeyedCollection<string, KeyValuePair<string, string>>
+public sealed class CommandCollection : KeyedCollection<string, KeyValuePair<string, string?>>
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="CommandCollection"/> class.
@@ -32,7 +32,7 @@ public IEnumerable<string> Keys
     {
         get
         {
-            foreach (KeyValuePair<string, string> item in this)
+            foreach (KeyValuePair<string, string?> item in this)
             {
                 yield return this.GetKeyForItem(item);
             }
@@ -64,7 +64,7 @@ public IEnumerable<string> Keys
 
         set
         {
-            if (this.TryGetValue(key, out KeyValuePair<string, string> item))
+            if (this.TryGetValue(key, out KeyValuePair<string, string?> item))
             {
                 this.SetItem(this.IndexOf(item), new(key, value));
             }
@@ -109,10 +109,10 @@ public IEnumerable<string> Keys
     /// <exception cref="ArgumentNullException"><paramref name="key"/> is null.</exception>
     public bool TryGetValue(string key, [NotNullWhen(true)] out string? value)
     {
-        if (this.TryGetValue(key, out KeyValuePair<string, string> keyValue))
+        if (this.TryGetValue(key, out KeyValuePair<string, string?> keyValue))
         {
             value = keyValue.Value;
-            return true;
+            return value is not null;
         }
 
         value = default;
@@ -138,7 +138,7 @@ public int FindIndex(Predicate<string> match)
         Guard.NotNull(match, nameof(match));
 
         int index = 0;
-        foreach (KeyValuePair<string, string> item in this)
+        foreach (KeyValuePair<string, string?> item in this)
         {
             if (match(item.Key))
             {
@@ -162,7 +162,7 @@ public int FindIndex(Predicate<string> match)
     /// </returns>
     public int IndexOf(string key)
     {
-        if (this.TryGetValue(key, out KeyValuePair<string, string> item))
+        if (this.TryGetValue(key, out KeyValuePair<string, string?> item))
         {
             return this.IndexOf(item);
         }
@@ -172,7 +172,7 @@ public int IndexOf(string key)
 
     /// <inheritdoc/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected override string GetKeyForItem(KeyValuePair<string, string> item) => item.Key;
+    protected override string GetKeyForItem(KeyValuePair<string, string?> item) => item.Key;
 
     [MethodImpl(MethodImplOptions.NoInlining)]
     [DoesNotReturn]
diff --git a/src/ImageSharp.Web/Commands/CommandCollectionExtensions.cs b/src/ImageSharp.Web/Commands/CommandCollectionExtensions.cs
index 66c5e1fe..126c990a 100644
--- a/src/ImageSharp.Web/Commands/CommandCollectionExtensions.cs
+++ b/src/ImageSharp.Web/Commands/CommandCollectionExtensions.cs
@@ -14,9 +14,9 @@ public static class CommandCollectionExtensions
     /// <param name="collection">The collection instance.</param>
     /// <param name="key">The key of the value to get.</param>
     /// <returns>The value associated with the specified key or the default value.</returns>
-    public static string GetValueOrDefault(this CommandCollection collection, string key)
+    public static string? GetValueOrDefault(this CommandCollection collection, string key)
     {
-        collection.TryGetValue(key, out KeyValuePair<string, string> result);
+        collection.TryGetValue(key, out KeyValuePair<string, string?> result);
         return result.Value;
     }
 }
diff --git a/src/ImageSharp.Web/Commands/CommandParser.cs b/src/ImageSharp.Web/Commands/CommandParser.cs
index c7c39e1c..19704159 100644
--- a/src/ImageSharp.Web/Commands/CommandParser.cs
+++ b/src/ImageSharp.Web/Commands/CommandParser.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Net;
 using System.Runtime.CompilerServices;
@@ -35,7 +36,7 @@ public CommandParser(IEnumerable<ICommandConverter> converters)
     /// </typeparam>
     /// <returns>The converted instance or the default.</returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public T? ParseValue<T>(string value, CultureInfo culture)
+    public T? ParseValue<T>(string? value, CultureInfo culture)
     {
         DebugGuard.NotNull(culture, nameof(culture));
 
@@ -58,7 +59,7 @@ public CommandParser(IEnumerable<ICommandConverter> converters)
             converter = Array.Find(this.converters, x => x.Type.Equals(typeof(Enum)));
             if (converter != null)
             {
-                return (T)((ICommandConverter<object>)converter).ConvertFrom(
+                return (T?)((ICommandConverter<object>)converter).ConvertFrom(
                     this,
                     culture,
                     WebUtility.UrlDecode(value),
@@ -73,6 +74,7 @@ public CommandParser(IEnumerable<ICommandConverter> converters)
     }
 
     [MethodImpl(MethodImplOptions.NoInlining)]
+    [DoesNotReturn]
     private static void ThrowNotSupported(Type type)
         => throw new NotSupportedException($"Cannot convert to {type.FullName}.");
 }
diff --git a/src/ImageSharp.Web/Commands/Converters/ArrayConverter{T}.cs b/src/ImageSharp.Web/Commands/Converters/ArrayConverter{T}.cs
index 0616e18e..bb7e70c5 100644
--- a/src/ImageSharp.Web/Commands/Converters/ArrayConverter{T}.cs
+++ b/src/ImageSharp.Web/Commands/Converters/ArrayConverter{T}.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using System.Runtime.CompilerServices;
@@ -21,7 +20,7 @@ public sealed class ArrayConverter<T> : ICommandConverter<T[]>
     public T[] ConvertFrom(
         CommandParser parser,
         CultureInfo culture,
-        string value,
+        string? value,
         Type propertyType)
     {
         if (string.IsNullOrWhiteSpace(value))
@@ -32,7 +31,7 @@ public T[] ConvertFrom(
         var result = new List<T>();
         foreach (string pill in GetStringArray(value, culture))
         {
-            T item = parser.ParseValue<T>(pill, culture);
+            T? item = parser.ParseValue<T>(pill, culture);
             if (item != null)
             {
                 result.Add(item);
diff --git a/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs b/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs
index eba6b37e..6bab4625 100644
--- a/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs
+++ b/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using System.Reflection;
@@ -35,7 +34,7 @@ public sealed class ColorConverter : ICommandConverter<Color>
 
     /// <inheritdoc/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public Color ConvertFrom(CommandParser parser, CultureInfo culture, string value, Type propertyType)
+    public Color ConvertFrom(CommandParser parser, CultureInfo culture, string? value, Type propertyType)
     {
         if (string.IsNullOrWhiteSpace(value))
         {
@@ -60,9 +59,9 @@ public Color ConvertFrom(CommandParser parser, CultureInfo culture, string value
 
             if (convert)
             {
-                List<byte> rgba = parser.ParseValue<List<byte>>(value, culture);
+                List<byte>? rgba = parser.ParseValue<List<byte>>(value, culture);
 
-                return rgba.Count switch
+                return rgba?.Count switch
                 {
                     4 => Color.FromRgba(rgba[0], rgba[1], rgba[2], rgba[3]),
                     3 => Color.FromRgb(rgba[0], rgba[1], rgba[2]),
@@ -90,7 +89,7 @@ private static IDictionary<string, Color> InitializeColorConstantsTable()
         {
             if (field.FieldType == typeof(Color))
             {
-                table[field.Name] = (Color)field.GetValue(null);
+                table[field.Name] = (Color)field.GetValue(null)!;
             }
         }
 
diff --git a/src/ImageSharp.Web/Commands/Converters/EnumConverter.cs b/src/ImageSharp.Web/Commands/Converters/EnumConverter.cs
index 764a68a3..5c34505e 100644
--- a/src/ImageSharp.Web/Commands/Converters/EnumConverter.cs
+++ b/src/ImageSharp.Web/Commands/Converters/EnumConverter.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using System.Runtime.CompilerServices;
@@ -22,10 +21,10 @@ public sealed class EnumConverter : ICommandConverter<object>
     /// This allows us to reuse the same converter for infinite enum types.
     /// </remarks>
     [MethodImpl(MethodImplOptions.NoInlining)]
-    public object ConvertFrom(
+    public object? ConvertFrom(
         CommandParser parser,
         CultureInfo culture,
-        string value,
+        string? value,
         Type propertyType)
     {
         if (string.IsNullOrWhiteSpace(value))
diff --git a/src/ImageSharp.Web/Commands/Converters/ICommandConverter.cs b/src/ImageSharp.Web/Commands/Converters/ICommandConverter.cs
index 7b7e750a..f81c75e5 100644
--- a/src/ImageSharp.Web/Commands/Converters/ICommandConverter.cs
+++ b/src/ImageSharp.Web/Commands/Converters/ICommandConverter.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 
@@ -35,5 +34,5 @@ public interface ICommandConverter<T> : ICommandConverter
     /// <param name="value">The <see cref="string"/> to convert. </param>
     /// <param name="propertyType">The property type that the converter will convert to.</param>
     /// <exception cref="NotSupportedException">The conversion cannot be performed.</exception>
-    T ConvertFrom(CommandParser parser, CultureInfo culture, string value, Type propertyType);
+    T? ConvertFrom(CommandParser parser, CultureInfo culture, string? value, Type propertyType);
 }
diff --git a/src/ImageSharp.Web/Commands/Converters/IntegralNumberConverter{T}.cs b/src/ImageSharp.Web/Commands/Converters/IntegralNumberConverter{T}.cs
index 5c49e141..3fb27fb4 100644
--- a/src/ImageSharp.Web/Commands/Converters/IntegralNumberConverter{T}.cs
+++ b/src/ImageSharp.Web/Commands/Converters/IntegralNumberConverter{T}.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 
@@ -20,7 +19,7 @@ public sealed class IntegralNumberConverter<T> : ICommandConverter<T>
     public T ConvertFrom(
         CommandParser parser,
         CultureInfo culture,
-        string value,
+        string? value,
         Type propertyType)
     {
         if (string.IsNullOrWhiteSpace(value)
diff --git a/src/ImageSharp.Web/Commands/Converters/ListConverter{T}.cs b/src/ImageSharp.Web/Commands/Converters/ListConverter{T}.cs
index 4b2fdd3a..cf4a14a7 100644
--- a/src/ImageSharp.Web/Commands/Converters/ListConverter{T}.cs
+++ b/src/ImageSharp.Web/Commands/Converters/ListConverter{T}.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using System.Runtime.CompilerServices;
@@ -21,7 +20,7 @@ public sealed class ListConverter<T> : ICommandConverter<List<T>>
     public List<T> ConvertFrom(
         CommandParser parser,
         CultureInfo culture,
-        string value,
+        string? value,
         Type propertyType)
     {
         var result = new List<T>();
@@ -32,7 +31,7 @@ public List<T> ConvertFrom(
 
         foreach (string pill in GetStringArray(value, culture))
         {
-            T item = parser.ParseValue<T>(pill, culture);
+            T? item = parser.ParseValue<T>(pill, culture);
             if (item != null)
             {
                 result.Add(item);
diff --git a/src/ImageSharp.Web/Commands/Converters/SimpleCommandConverter{T}.cs b/src/ImageSharp.Web/Commands/Converters/SimpleCommandConverter{T}.cs
index d02359a9..399e3120 100644
--- a/src/ImageSharp.Web/Commands/Converters/SimpleCommandConverter{T}.cs
+++ b/src/ImageSharp.Web/Commands/Converters/SimpleCommandConverter{T}.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using System.Runtime.CompilerServices;
@@ -19,10 +18,10 @@ public sealed class SimpleCommandConverter<T> : ICommandConverter<T>
 
     /// <inheritdoc/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public T ConvertFrom(
+    public T? ConvertFrom(
         CommandParser parser,
         CultureInfo culture,
-        string value,
+        string? value,
         Type propertyType)
     {
         if (string.IsNullOrWhiteSpace(value))
@@ -31,7 +30,7 @@ public T ConvertFrom(
         }
 
         Type t = typeof(T);
-        Type u = Nullable.GetUnderlyingType(t);
+        Type? u = Nullable.GetUnderlyingType(t);
 
         if (u != null)
         {
diff --git a/src/ImageSharp.Web/Processors/FormatWebProcessor.cs b/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
index b4e94e9c..f8093018 100644
--- a/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
@@ -49,7 +49,7 @@ public FormattedImage Process(
         CommandParser parser,
         CultureInfo culture)
     {
-        string extension = commands.GetValueOrDefault(Format);
+        string? extension = commands.GetValueOrDefault(Format);
 
         if (!string.IsNullOrWhiteSpace(extension)
             && this.options.Configuration.ImageFormatsManager.TryFindFormatByFileExtension(extension, out IImageFormat? format))
diff --git a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
index dbad7950..7e00ff59 100644
--- a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
@@ -163,7 +163,12 @@ private static Size ParseSize(
         CommandParser parser,
         CultureInfo culture)
     {
-        float[] coordinates = parser.ParseValue<float[]>(commands.GetValueOrDefault(Xy), culture);
+        float[]? coordinates = parser.ParseValue<float[]>(commands.GetValueOrDefault(Xy), culture);
+
+        if (coordinates is null)
+        {
+            return null;
+        }
 
         if (coordinates.Length != 2)
         {
@@ -198,7 +203,7 @@ private static bool GetCompandMode(
 
     private static IResampler GetSampler(CommandCollection commands)
     {
-        string sampler = commands.GetValueOrDefault(Sampler);
+        string? sampler = commands.GetValueOrDefault(Sampler);
 
         if (sampler != null)
         {

From 5b6086d261ee6aa1d7c70c23b72f21948a3a0781 Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Wed, 1 Mar 2023 21:33:38 +0100
Subject: [PATCH 071/102] Remove nullable disable from caching

---
 src/ImageSharp.Web/Caching/HexEncoder.cs      |  1 -
 src/ImageSharp.Web/Caching/ICacheHash.cs      |  1 -
 src/ImageSharp.Web/Caching/ICacheKey.cs       |  1 -
 src/ImageSharp.Web/Caching/IImageCache.cs     |  3 +--
 .../Caching/LegacyV1CacheKey.cs               |  1 -
 .../ConcurrentTLruCache{TKey,TValue}.cs       | 25 ++++++++++---------
 .../LongTickCountLruItem{TKey,TValue}.cs      |  1 -
 .../TLruLongTicksPolicy{TKey,TValue}.cs       |  1 -
 .../Caching/PhysicalFileSystemCache.cs        | 11 ++++----
 .../Caching/PhysicalFileSystemCacheOptions.cs |  3 +--
 src/ImageSharp.Web/Caching/SHA256CacheHash.cs |  3 +--
 .../Caching/UriAbsoluteCacheKey.cs            |  1 -
 .../UriAbsoluteLowerInvariantCacheKey.cs      |  1 -
 .../Caching/UriRelativeCacheKey.cs            |  1 -
 .../UriRelativeLowerInvariantCacheKey.cs      |  1 -
 15 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/src/ImageSharp.Web/Caching/HexEncoder.cs b/src/ImageSharp.Web/Caching/HexEncoder.cs
index 7687cc3f..acf72787 100644
--- a/src/ImageSharp.Web/Caching/HexEncoder.cs
+++ b/src/ImageSharp.Web/Caching/HexEncoder.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
diff --git a/src/ImageSharp.Web/Caching/ICacheHash.cs b/src/ImageSharp.Web/Caching/ICacheHash.cs
index bf262d0e..26324709 100644
--- a/src/ImageSharp.Web/Caching/ICacheHash.cs
+++ b/src/ImageSharp.Web/Caching/ICacheHash.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 namespace SixLabors.ImageSharp.Web.Caching;
 
diff --git a/src/ImageSharp.Web/Caching/ICacheKey.cs b/src/ImageSharp.Web/Caching/ICacheKey.cs
index 2a23d42a..d7d3ae43 100644
--- a/src/ImageSharp.Web/Caching/ICacheKey.cs
+++ b/src/ImageSharp.Web/Caching/ICacheKey.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Commands;
diff --git a/src/ImageSharp.Web/Caching/IImageCache.cs b/src/ImageSharp.Web/Caching/IImageCache.cs
index bdd22c6b..1ac8e5cd 100644
--- a/src/ImageSharp.Web/Caching/IImageCache.cs
+++ b/src/ImageSharp.Web/Caching/IImageCache.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using SixLabors.ImageSharp.Web.Resolvers;
 
@@ -17,7 +16,7 @@ public interface IImageCache
     /// </summary>
     /// <param name="key">The cache key.</param>
     /// <returns>The <see cref="IImageResolver"/>.</returns>
-    Task<IImageCacheResolver> GetAsync(string key);
+    Task<IImageCacheResolver?> GetAsync(string key);
 
     /// <summary>
     /// Sets the value associated with the specified key.
diff --git a/src/ImageSharp.Web/Caching/LegacyV1CacheKey.cs b/src/ImageSharp.Web/Caching/LegacyV1CacheKey.cs
index e3abe213..64b56e0b 100644
--- a/src/ImageSharp.Web/Caching/LegacyV1CacheKey.cs
+++ b/src/ImageSharp.Web/Caching/LegacyV1CacheKey.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using System.Text;
diff --git a/src/ImageSharp.Web/Caching/LruCache/ConcurrentTLruCache{TKey,TValue}.cs b/src/ImageSharp.Web/Caching/LruCache/ConcurrentTLruCache{TKey,TValue}.cs
index 8e9e7494..dbb1cf16 100644
--- a/src/ImageSharp.Web/Caching/LruCache/ConcurrentTLruCache{TKey,TValue}.cs
+++ b/src/ImageSharp.Web/Caching/LruCache/ConcurrentTLruCache{TKey,TValue}.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 
 namespace SixLabors.ImageSharp.Web.Caching;
@@ -26,6 +26,7 @@ namespace SixLabors.ImageSharp.Web.Caching;
 /// 6. When cold is full, cold tail is moved to warm head or removed from dictionary on depending on WasAccessed.
 /// </remarks>
 internal class ConcurrentTLruCache<TKey, TValue>
+    where TKey : notnull
 {
     private readonly ConcurrentDictionary<TKey, LongTickCountLruItem<TKey, TValue>> dictionary;
 
@@ -97,9 +98,9 @@ public ConcurrentTLruCache(int concurrencyLevel, int capacity, IEqualityComparer
     /// <param name="key">The key of the value to get.</param>
     /// <param name="value">When this method returns, contains the object from the cache that has the specified key, or the default value of the type if the operation failed.</param>
     /// <returns><see langword="true"/> if the key was found in the cache; otherwise, <see langword="false"/>.</returns>
-    public bool TryGet(TKey key, out TValue value)
+    public bool TryGet(TKey key, [NotNullWhen(true)] out TValue? value)
     {
-        if (this.dictionary.TryGetValue(key, out LongTickCountLruItem<TKey, TValue> item))
+        if (this.dictionary.TryGetValue(key, out LongTickCountLruItem<TKey, TValue>? item))
         {
             return this.GetOrDiscard(item, out value);
         }
@@ -111,7 +112,7 @@ public bool TryGet(TKey key, out TValue value)
     // AggressiveInlining forces the JIT to inline policy.ShouldDiscard(). For LRU policy
     // the first branch is completely eliminated due to JIT time constant propogation.
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private bool GetOrDiscard(LongTickCountLruItem<TKey, TValue> item, out TValue value)
+    private bool GetOrDiscard(LongTickCountLruItem<TKey, TValue> item, out TValue? value)
     {
         if (this.policy.ShouldDiscard(item))
         {
@@ -135,7 +136,7 @@ private bool GetOrDiscard(LongTickCountLruItem<TKey, TValue> item, out TValue va
     /// in the cache, or the new value if the key was not in the dictionary.</returns>
     public TValue GetOrAdd(TKey key, Func<TKey, TValue> valueFactory)
     {
-        if (this.TryGet(key, out TValue value))
+        if (this.TryGet(key, out TValue? value))
         {
             return value;
         }
@@ -164,7 +165,7 @@ public TValue GetOrAdd(TKey key, Func<TKey, TValue> valueFactory)
     /// <returns>A task that represents the asynchronous <see cref="GetOrAdd(TKey, Func{TKey, TValue})"/> operation.</returns>
     public async Task<TValue> GetOrAddAsync(TKey key, Func<TKey, Task<TValue>> valueFactory)
     {
-        if (this.TryGet(key, out TValue value))
+        if (this.TryGet(key, out TValue? value))
         {
             return value;
         }
@@ -202,7 +203,7 @@ public bool TryRemove(TKey key)
         // and it will not be marked as removed. If key 1 is fetched while LruItem1* is still in the queue, there will
         // be two queue entries for key 1, and neither is marked as removed. Thus when LruItem1 * ages out, it will
         // incorrectly remove 1 from the dictionary, and this cycle can repeat.
-        if (this.dictionary.TryGetValue(key, out LongTickCountLruItem<TKey, TValue> existing))
+        if (this.dictionary.TryGetValue(key, out LongTickCountLruItem<TKey, TValue>? existing))
         {
             if (existing.WasRemoved)
             {
@@ -219,7 +220,7 @@ public bool TryRemove(TKey key)
                 existing.WasRemoved = true;
             }
 
-            if (this.dictionary.TryRemove(key, out LongTickCountLruItem<TKey, TValue> removedItem))
+            if (this.dictionary.TryRemove(key, out LongTickCountLruItem<TKey, TValue>? removedItem))
             {
                 // Mark as not accessed, it will later be cycled out of the queues because it can never be fetched
                 // from the dictionary. Note: Hot/Warm/Cold count will reflect the removed item until it is cycled
@@ -261,7 +262,7 @@ private void CycleHot()
         {
             Interlocked.Decrement(ref this.hotCount);
 
-            if (this.hotQueue.TryDequeue(out LongTickCountLruItem<TKey, TValue> item))
+            if (this.hotQueue.TryDequeue(out LongTickCountLruItem<TKey, TValue>? item))
             {
                 ItemDestination where = this.policy.RouteHot(item);
                 this.Move(item, where);
@@ -279,7 +280,7 @@ private void CycleWarm()
         {
             Interlocked.Decrement(ref this.warmCount);
 
-            if (this.warmQueue.TryDequeue(out LongTickCountLruItem<TKey, TValue> item))
+            if (this.warmQueue.TryDequeue(out LongTickCountLruItem<TKey, TValue>? item))
             {
                 ItemDestination where = this.policy.RouteWarm(item);
 
@@ -308,7 +309,7 @@ private void CycleCold()
         {
             Interlocked.Decrement(ref this.coldCount);
 
-            if (this.coldQueue.TryDequeue(out LongTickCountLruItem<TKey, TValue> item))
+            if (this.coldQueue.TryDequeue(out LongTickCountLruItem<TKey, TValue>? item))
             {
                 ItemDestination where = this.policy.RouteCold(item);
 
@@ -354,7 +355,7 @@ private void Move(LongTickCountLruItem<TKey, TValue> item, ItemDestination where
                             break;
                         }
 
-                        if (this.dictionary.TryRemove(item.Key, out LongTickCountLruItem<TKey, TValue> removedItem))
+                        if (this.dictionary.TryRemove(item.Key, out LongTickCountLruItem<TKey, TValue>? removedItem))
                         {
                             item.WasRemoved = true;
                             if (removedItem.Value is IDisposable d)
diff --git a/src/ImageSharp.Web/Caching/LruCache/LongTickCountLruItem{TKey,TValue}.cs b/src/ImageSharp.Web/Caching/LruCache/LongTickCountLruItem{TKey,TValue}.cs
index 7bd0a76d..58cb46eb 100644
--- a/src/ImageSharp.Web/Caching/LruCache/LongTickCountLruItem{TKey,TValue}.cs
+++ b/src/ImageSharp.Web/Caching/LruCache/LongTickCountLruItem{TKey,TValue}.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 namespace SixLabors.ImageSharp.Web.Caching;
 
diff --git a/src/ImageSharp.Web/Caching/LruCache/TLruLongTicksPolicy{TKey,TValue}.cs b/src/ImageSharp.Web/Caching/LruCache/TLruLongTicksPolicy{TKey,TValue}.cs
index 30f28b4f..d6994ec5 100644
--- a/src/ImageSharp.Web/Caching/LruCache/TLruLongTicksPolicy{TKey,TValue}.cs
+++ b/src/ImageSharp.Web/Caching/LruCache/TLruLongTicksPolicy{TKey,TValue}.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
diff --git a/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs b/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs
index ff0847e0..34fe94a3 100644
--- a/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs
+++ b/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -77,17 +76,17 @@ internal static string GetCacheRoot(PhysicalFileSystemCacheOptions cacheOptions,
     }
 
     /// <inheritdoc/>
-    public Task<IImageCacheResolver> GetAsync(string key)
+    public Task<IImageCacheResolver?> GetAsync(string key)
     {
         string path = Path.Combine(this.cacheRootPath, ToFilePath(key, this.cacheFolderDepth));
 
         FileInfo metaFileInfo = new(ToMetaDataFilePath(path));
         if (!metaFileInfo.Exists)
         {
-            return Task.FromResult<IImageCacheResolver>(null);
+            return Task.FromResult<IImageCacheResolver?>(null);
         }
 
-        return Task.FromResult<IImageCacheResolver>(new PhysicalFileSystemCacheResolver(metaFileInfo, this.formatUtilities));
+        return Task.FromResult<IImageCacheResolver?>(new PhysicalFileSystemCacheResolver(metaFileInfo, this.formatUtilities));
     }
 
     /// <inheritdoc/>
@@ -96,10 +95,10 @@ public async Task SetAsync(string key, Stream stream, ImageCacheMetadata metadat
         string path = Path.Combine(this.cacheRootPath, ToFilePath(key, this.cacheFolderDepth));
         string imagePath = this.ToImageFilePath(path, metadata);
         string metaPath = ToMetaDataFilePath(path);
-        string directory = Path.GetDirectoryName(path);
+        string? directory = Path.GetDirectoryName(path);
 
         // Ensure cache directory is created before creating files
-        if (!Directory.Exists(directory))
+        if (!Directory.Exists(directory) && directory is not null)
         {
             Directory.CreateDirectory(directory);
         }
diff --git a/src/ImageSharp.Web/Caching/PhysicalFileSystemCacheOptions.cs b/src/ImageSharp.Web/Caching/PhysicalFileSystemCacheOptions.cs
index ad09f177..ec2d2410 100644
--- a/src/ImageSharp.Web/Caching/PhysicalFileSystemCacheOptions.cs
+++ b/src/ImageSharp.Web/Caching/PhysicalFileSystemCacheOptions.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 namespace SixLabors.ImageSharp.Web.Caching;
 
@@ -21,7 +20,7 @@ public class PhysicalFileSystemCacheOptions
     /// application content files; commonly 'wwwroot'.
     /// </para>
     /// </summary>
-    public string CacheRootPath { get; set; }
+    public string? CacheRootPath { get; set; }
 
     /// <summary>
     /// Gets or sets the cache folder name.
diff --git a/src/ImageSharp.Web/Caching/SHA256CacheHash.cs b/src/ImageSharp.Web/Caching/SHA256CacheHash.cs
index f0d3f16d..7eeae17a 100644
--- a/src/ImageSharp.Web/Caching/SHA256CacheHash.cs
+++ b/src/ImageSharp.Web/Caching/SHA256CacheHash.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Buffers;
 using System.Runtime.CompilerServices;
@@ -33,7 +32,7 @@ public SHA256CacheHash(IOptions<ImageSharpMiddlewareOptions> options)
     public string Create(string value, uint length)
     {
         int byteCount = Encoding.ASCII.GetByteCount(value);
-        byte[] buffer = null;
+        byte[]? buffer = null;
 
         try
         {
diff --git a/src/ImageSharp.Web/Caching/UriAbsoluteCacheKey.cs b/src/ImageSharp.Web/Caching/UriAbsoluteCacheKey.cs
index 74ed4c59..ea9f126a 100644
--- a/src/ImageSharp.Web/Caching/UriAbsoluteCacheKey.cs
+++ b/src/ImageSharp.Web/Caching/UriAbsoluteCacheKey.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Commands;
diff --git a/src/ImageSharp.Web/Caching/UriAbsoluteLowerInvariantCacheKey.cs b/src/ImageSharp.Web/Caching/UriAbsoluteLowerInvariantCacheKey.cs
index 1c78b30f..2e3069d4 100644
--- a/src/ImageSharp.Web/Caching/UriAbsoluteLowerInvariantCacheKey.cs
+++ b/src/ImageSharp.Web/Caching/UriAbsoluteLowerInvariantCacheKey.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Commands;
diff --git a/src/ImageSharp.Web/Caching/UriRelativeCacheKey.cs b/src/ImageSharp.Web/Caching/UriRelativeCacheKey.cs
index cefe8dd0..01d08740 100644
--- a/src/ImageSharp.Web/Caching/UriRelativeCacheKey.cs
+++ b/src/ImageSharp.Web/Caching/UriRelativeCacheKey.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Commands;
diff --git a/src/ImageSharp.Web/Caching/UriRelativeLowerInvariantCacheKey.cs b/src/ImageSharp.Web/Caching/UriRelativeLowerInvariantCacheKey.cs
index 1071c333..77e423eb 100644
--- a/src/ImageSharp.Web/Caching/UriRelativeLowerInvariantCacheKey.cs
+++ b/src/ImageSharp.Web/Caching/UriRelativeLowerInvariantCacheKey.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Commands;

From 603f3e53c3a02bc066d57c145b82243073e98dd9 Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Fri, 3 Mar 2023 10:44:29 +0100
Subject: [PATCH 072/102] Remove x + y from targetrectangle

---
 .../Processors/ResizeWebProcessor.cs          | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
index f85447a7..b94d436d 100644
--- a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
@@ -62,16 +62,6 @@ public class ResizeWebProcessor : IImageWebProcessor
     /// </summary>
     public const string Compand = "compand";
 
-    /// <summary>
-    /// The command constant for the resize TargetRectangle X
-    /// </summary>
-    public const string TargetRectangleX = "targetrectanglex";
-
-    /// <summary>
-    /// The command constant for the resize TargetRectangle X
-    /// </summary>
-    public const string TargetRectangleY = "targetrectangley";
-
     /// <summary>
     /// The command constant for the resize TargetRectangle X
     /// </summary>
@@ -196,15 +186,7 @@ private static Size ParseSize(
         int width = (int)parser.ParseValue<uint>(commands.GetValueOrDefault(TargetRectangleWidth), culture);
         int height = (int)parser.ParseValue<uint>(commands.GetValueOrDefault(TargetRectangleHeight), culture);
 
-        if (!commands.Contains(TargetRectangleX) || !commands.Contains(TargetRectangleY))
-        {
-            return new Rectangle(0, 0, width, height);
-        }
-
-        int x = (int)parser.ParseValue<uint>(commands.GetValueOrDefault(TargetRectangleX), culture);
-        int y = (int)parser.ParseValue<uint>(commands.GetValueOrDefault(TargetRectangleY), culture);
-
-        return new Rectangle(x, y, width, height);
+        return new Rectangle(0, 0, width, height);
     }
 
     private static PointF? GetCenter(

From e83c10cba1665d31c72dbdc9217aa59eda274243 Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Fri, 3 Mar 2023 15:20:55 +0100
Subject: [PATCH 073/102] Only create rectangle when mode = manual

---
 .../Processors/ResizeWebProcessor.cs          | 33 ++-----------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
index b94d436d..80956798 100644
--- a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
@@ -62,16 +62,6 @@ public class ResizeWebProcessor : IImageWebProcessor
     /// </summary>
     public const string Compand = "compand";
 
-    /// <summary>
-    /// The command constant for the resize TargetRectangle X
-    /// </summary>
-    public const string TargetRectangleWidth = "targetrectanglewidth";
-
-    /// <summary>
-    /// The command constant for the resize TargetRectangle X
-    /// </summary>
-    public const string TargetRectangleHeight = "targetrectangleheight";
-
     private static readonly IEnumerable<string> ResizeCommands
         = new[]
         {
@@ -137,18 +127,18 @@ internal static ResizeOptions GetResizeOptions(
             return null;
         }
 
-        Rectangle? targetRectangle = ParseRectangle(commands, parser, culture);
+        ResizeMode mode = GetMode(commands, parser, culture);
 
         return new()
         {
             Size = size,
             CenterCoordinates = GetCenter(orientation, commands, parser, culture),
             Position = GetAnchor(orientation, commands, parser, culture),
-            Mode = GetMode(commands, parser, culture),
+            Mode = mode,
             Compand = GetCompandMode(commands, parser, culture),
             Sampler = GetSampler(commands),
             PadColor = parser.ParseValue<Color>(commands.GetValueOrDefault(Color), culture),
-            TargetRectangle = targetRectangle
+            TargetRectangle = mode is ResizeMode.Manual ? new Rectangle(0, 0, size.Width, size.Height) : null
         };
     }
 
@@ -172,23 +162,6 @@ private static Size ParseSize(
         return ExifOrientationUtilities.Transform(new Size(width, height), orientation);
     }
 
-    private static Rectangle? ParseRectangle(
-        CommandCollection commands,
-        CommandParser parser,
-        CultureInfo culture)
-    {
-        if (!commands.Contains(TargetRectangleWidth) || !commands.Contains(TargetRectangleHeight))
-        {
-            return null;
-        }
-
-        // The command parser will reject negative numbers as it clamps values to ranges.
-        int width = (int)parser.ParseValue<uint>(commands.GetValueOrDefault(TargetRectangleWidth), culture);
-        int height = (int)parser.ParseValue<uint>(commands.GetValueOrDefault(TargetRectangleHeight), culture);
-
-        return new Rectangle(0, 0, width, height);
-    }
-
     private static PointF? GetCenter(
         ushort orientation,
         CommandCollection commands,

From f349ad19dad6ddff1e127cc8491dc0549889df52 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sun, 5 Mar 2023 16:16:44 +1000
Subject: [PATCH 074/102] Cleanup return

---
 src/ImageSharp.Web/Commands/CommandParser.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/ImageSharp.Web/Commands/CommandParser.cs b/src/ImageSharp.Web/Commands/CommandParser.cs
index 19704159..4bd0f534 100644
--- a/src/ImageSharp.Web/Commands/CommandParser.cs
+++ b/src/ImageSharp.Web/Commands/CommandParser.cs
@@ -67,14 +67,10 @@ public CommandParser(IEnumerable<ICommandConverter> converters)
             }
         }
 
-        // We don't actually return here.
-        // The compiler just cannot see our exception.
-        ThrowNotSupported(type);
-        return default;
+        return ThrowNotSupported<T>(type);
     }
 
-    [MethodImpl(MethodImplOptions.NoInlining)]
     [DoesNotReturn]
-    private static void ThrowNotSupported(Type type)
+    private static T ThrowNotSupported<T>(Type type)
         => throw new NotSupportedException($"Cannot convert to {type.FullName}.");
 }

From 5ee6d62cc8f92fda2d139015a71a404d0ce29e6a Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sun, 5 Mar 2023 16:18:49 +1000
Subject: [PATCH 075/102] Optimize ColorConverter

---
 .../Commands/Converters/ColorConverter.cs     | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs b/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs
index 6bab4625..6d21a828 100644
--- a/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs
+++ b/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs
@@ -41,9 +41,21 @@ public Color ConvertFrom(CommandParser parser, CultureInfo culture, string? valu
             return default;
         }
 
+        // Hex colors rgb, rrggbb, rrggbbaa
+        if (HexColorRegex.IsMatch(value))
+        {
+            return Color.ParseHex(value);
+        }
+
+        // Named colors
+        IDictionary<string, Color> table = ColorConstantsTable.Value;
+        if (table.TryGetValue(value, out Color color))
+        {
+            return color;
+        }
+
         // Numeric r,g,b - r,g,b,a
         char separator = culture.TextInfo.ListSeparator[0];
-
         if (value.IndexOf(separator) != -1)
         {
             string[] components = value.Split(separator);
@@ -70,15 +82,7 @@ public Color ConvertFrom(CommandParser parser, CultureInfo culture, string? valu
             }
         }
 
-        // Hex colors rgb, rrggbb, rrggbbaa
-        if (HexColorRegex.IsMatch(value))
-        {
-            return Color.ParseHex(value);
-        }
-
-        // Named colors
-        IDictionary<string, Color> table = ColorConstantsTable.Value;
-        return table.TryGetValue(value, out Color color) ? color : default;
+        return default;
     }
 
     private static IDictionary<string, Color> InitializeColorConstantsTable()

From 885e25948154c42d203c1e890ff314bd7b634bcd Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sun, 5 Mar 2023 16:23:32 +1000
Subject: [PATCH 076/102] Cleanup

---
 src/ImageSharp.Web/Commands/Converters/ArrayConverter{T}.cs | 4 ++--
 src/ImageSharp.Web/Commands/Converters/ListConverter{T}.cs  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ImageSharp.Web/Commands/Converters/ArrayConverter{T}.cs b/src/ImageSharp.Web/Commands/Converters/ArrayConverter{T}.cs
index bb7e70c5..58f7f835 100644
--- a/src/ImageSharp.Web/Commands/Converters/ArrayConverter{T}.cs
+++ b/src/ImageSharp.Web/Commands/Converters/ArrayConverter{T}.cs
@@ -28,11 +28,11 @@ public T[] ConvertFrom(
             return Array.Empty<T>();
         }
 
-        var result = new List<T>();
+        List<T> result = new();
         foreach (string pill in GetStringArray(value, culture))
         {
             T? item = parser.ParseValue<T>(pill, culture);
-            if (item != null)
+            if (item is not null)
             {
                 result.Add(item);
             }
diff --git a/src/ImageSharp.Web/Commands/Converters/ListConverter{T}.cs b/src/ImageSharp.Web/Commands/Converters/ListConverter{T}.cs
index cf4a14a7..a390b78e 100644
--- a/src/ImageSharp.Web/Commands/Converters/ListConverter{T}.cs
+++ b/src/ImageSharp.Web/Commands/Converters/ListConverter{T}.cs
@@ -23,7 +23,7 @@ public List<T> ConvertFrom(
         string? value,
         Type propertyType)
     {
-        var result = new List<T>();
+        List<T> result = new();
         if (string.IsNullOrWhiteSpace(value))
         {
             return result;
@@ -32,7 +32,7 @@ public List<T> ConvertFrom(
         foreach (string pill in GetStringArray(value, culture))
         {
             T? item = parser.ParseValue<T>(pill, culture);
-            if (item != null)
+            if (item is not null)
             {
                 result.Add(item);
             }

From 2821506d55916dde02cb91d7665166dc3b2644bf Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sun, 5 Mar 2023 21:16:17 +1000
Subject: [PATCH 077/102] .NET 7 fixes

Update ImageSharp.Web.csproj
---
 .../Commands/PresetOnlyQueryCollectionRequestParser.cs | 10 +++++++---
 .../Commands/QueryCollectionRequestParser.cs           |  6 +++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs b/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs
index 15f7a4e1..6386ee7d 100644
--- a/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs
+++ b/src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs
@@ -40,8 +40,8 @@ public CommandCollection ParseRequestCommands(HttpContext context)
         }
 
         StringValues query = queryCollection[QueryKey];
-        string requestedPreset = query[query.Count - 1];
-        if (this.presets.TryGetValue(requestedPreset, out CommandCollection? collection))
+        string? requestedPreset = query[^1];
+        if (requestedPreset is not null && this.presets.TryGetValue(requestedPreset, out CommandCollection? collection))
         {
             return collection;
         }
@@ -65,7 +65,11 @@ private static CommandCollection ParsePreset(string unparsedPresetValue)
         foreach (KeyValuePair<string, StringValues> pair in parsed)
         {
             // Use the indexer for both set and query. This replaces any previously parsed values.
-            transformed[pair.Key] = pair.Value[pair.Value.Count - 1];
+            string? value = pair.Value[^1];
+            if (value is not null)
+            {
+                transformed[pair.Key] = value;
+            }
         }
 
         return transformed;
diff --git a/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs b/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs
index c4ac88c9..420fc019 100644
--- a/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs
+++ b/src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs
@@ -25,7 +25,11 @@ public CommandCollection ParseRequestCommands(HttpContext context)
         foreach (KeyValuePair<string, StringValues> pair in query)
         {
             // Use the indexer for both set and query. This replaces any previously parsed values.
-            transformed[pair.Key] = pair.Value[pair.Value.Count - 1];
+            string? value = pair.Value[^1];
+            if (value is not null)
+            {
+                transformed[pair.Key] = value;
+            }
         }
 
         return transformed;

From 5535823f29cb2166d3e3cbf7f21ab6e23a0fc5fa Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sun, 5 Mar 2023 21:26:26 +1000
Subject: [PATCH 078/102] Fix last nullable issues

---
 src/ImageSharp.Web/FormattedImage.cs          | 19 +++++++++----------
 .../Providers/FileProviderImageProvider.cs    | 12 ++++++++----
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/ImageSharp.Web/FormattedImage.cs b/src/ImageSharp.Web/FormattedImage.cs
index 0ea5abbb..65c82df2 100644
--- a/src/ImageSharp.Web/FormattedImage.cs
+++ b/src/ImageSharp.Web/FormattedImage.cs
@@ -1,8 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
-using System.Runtime.CompilerServices;
+using System.Diagnostics.CodeAnalysis;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Metadata.Profiles.Exif;
@@ -40,14 +39,15 @@ private FormattedImage(Image image, IImageFormat format, bool keepOpen)
     {
         this.Image = image;
         this.imageFormatsManager = image.GetConfiguration().ImageFormatsManager;
-        this.Format = format;
+        this.format = format;
+        this.encoder = this.imageFormatsManager.GetEncoder(format);
         this.keepOpen = keepOpen;
     }
 
     /// <summary>
     /// Gets the decoded image.
     /// </summary>
-    public Image Image { get; private set; }
+    public Image Image { get; }
 
     /// <summary>
     /// Gets or sets the format.
@@ -105,7 +105,7 @@ internal static async Task<FormattedImage> LoadAsync<TPixel>(DecoderOptions opti
         // For example. If a resize command has been passed with no extra resampling options
         // then we should apply those changes on decode. This will allow memory savings and performance improvements.
         Image<TPixel> image = await Image.LoadAsync<TPixel>(options, source);
-        return new FormattedImage(image, image.Metadata.DecodedImageFormat, false);
+        return new FormattedImage(image, image.Metadata.DecodedImageFormat!, false);
     }
 
     /// <summary>
@@ -117,7 +117,7 @@ internal static async Task<FormattedImage> LoadAsync<TPixel>(DecoderOptions opti
     internal static async Task<FormattedImage> LoadAsync(DecoderOptions options, Stream source)
     {
         Image image = await Image.LoadAsync(options, source);
-        return new FormattedImage(image, image.Metadata.DecodedImageFormat, false);
+        return new FormattedImage(image, image.Metadata.DecodedImageFormat!, false);
     }
 
     /// <summary>
@@ -143,7 +143,7 @@ public bool TryGetExifOrientation(out ushort value)
         value = ExifOrientationMode.Unknown;
         if (this.Image.Metadata.ExifProfile != null)
         {
-            if (!this.Image.Metadata.ExifProfile.TryGetValue(ExifTag.Orientation, out IExifValue<ushort> orientation))
+            if (!this.Image.Metadata.ExifProfile.TryGetValue(ExifTag.Orientation, out IExifValue<ushort>? orientation))
             {
                 return false;
             }
@@ -172,13 +172,12 @@ public void Dispose()
         if (!this.keepOpen)
         {
             this.Image?.Dispose();
-            this.Image = null;
         }
     }
 
-    [MethodImpl(MethodImplOptions.NoInlining)]
+    [DoesNotReturn]
     private static void ThrowNull(string name) => throw new ArgumentNullException(name);
 
-    [MethodImpl(MethodImplOptions.NoInlining)]
+    [DoesNotReturn]
     private static void ThrowInvalid(string name) => throw new ArgumentException(name);
 }
diff --git a/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs b/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs
index 2e0cb6d4..96f55441 100644
--- a/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs
+++ b/src/ImageSharp.Web/Providers/FileProviderImageProvider.cs
@@ -52,12 +52,16 @@ public virtual bool IsValidRequest(HttpContext context)
     /// <inheritdoc/>
     public Task<IImageResolver?> GetAsync(HttpContext context)
     {
-        IFileInfo fileInfo = this.fileProvider.GetFileInfo(context.Request.Path.Value);
-        if (!fileInfo.Exists)
+        string? path = context.Request.Path.Value;
+        if (path is not null)
         {
-            return Task.FromResult<IImageResolver?>(null);
+            IFileInfo fileInfo = this.fileProvider.GetFileInfo(path);
+            if (fileInfo.Exists)
+            {
+                return Task.FromResult<IImageResolver?>(new FileProviderImageResolver(fileInfo));
+            }
         }
 
-        return Task.FromResult<IImageResolver?>(new FileProviderImageResolver(fileInfo));
+        return Task.FromResult<IImageResolver?>(null);
     }
 }

From 40529581d255baa79b2616a98c6de2fb26f6cc93 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sun, 5 Mar 2023 21:29:08 +1000
Subject: [PATCH 079/102] Fix readme and workflow

---
 .github/workflows/build-and-test.yml | 14 ++++++++++----
 README.md                            |  6 +++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 97aafb97..78220623 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -189,9 +189,15 @@ jobs:
         shell: pwsh
         run: ./ci-pack.ps1
 
-      - name: MyGet Publish
+      - name: Feedz Publish
         shell: pwsh
         run: |
-          dotnet nuget push .\artifacts\*.nupkg -k ${{secrets.MYGET_TOKEN}} -s https://www.myget.org/F/sixlabors/api/v2/package
-          dotnet nuget push .\artifacts\*.snupkg -k ${{secrets.MYGET_TOKEN}} -s https://www.myget.org/F/sixlabors/api/v3/index.json
-        # TODO: If github.ref starts with 'refs/tags' then it was tag push and we can optionally push out package to nuget.org
+          dotnet nuget push .\artifacts\*.nupkg -k ${{secrets.FEEDZ_TOKEN}} -s https://f.feedz.io/sixlabors/sixlabors/nuget/index.json --skip-duplicate
+          dotnet nuget push .\artifacts\*.snupkg -k ${{secrets.FEEDZ_TOKEN}} -s https://f.feedz.io/sixlabors/sixlabors/symbols --skip-duplicate
+
+      - name: NuGet Publish
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        shell: pwsh
+        run: |
+          dotnet nuget push .\artifacts\*.nupkg -k ${{secrets.NUGET_TOKEN}} -s https://api.nuget.org/v3/index.json --skip-duplicate
+          dotnet nuget push .\artifacts\*.snupkg -k ${{secrets.NUGET_TOKEN}} -s https://api.nuget.org/v3/index.json --skip-duplicate
diff --git a/README.md b/README.md
index 0ded0990..189b9788 100644
--- a/README.md
+++ b/README.md
@@ -45,11 +45,11 @@ For more information, see the [.NET Foundation Code of Conduct](https://dotnetfo
 
 ### Installation
 
-Install stable releases via Nuget; development releases are available via MyGet.
+Install stable releases via Nuget; development releases are available via Feedz.io.
 
-| Package Name                   | Release (NuGet) | Nightly (MyGet) |
+| Package Name                   | Release (NuGet) | Nightly (Feedz.io) |
 |--------------------------------|-----------------|-----------------|
-| `SixLabors.ImageSharp.Web`         | [![NuGet](https://img.shields.io/nuget/v/SixLabors.ImageSharp.Web.svg)](https://www.nuget.org/packages/SixLabors.ImageSharp.Web/) | [![MyGet](https://img.shields.io/myget/sixlabors/vpre/SixLabors.ImageSharp.Web.svg)](https://www.myget.org/feed/sixlabors/package/nuget/SixLabors.ImageSharp.Web) |
+| `SixLabors.ImageSharp.Web`         | [![NuGet](https://img.shields.io/nuget/v/SixLabors.ImageSharp.Web.svg)](https://www.nuget.org/packages/SixLabors.ImageSharp.Web/) | [![feedz.io](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fsixlabors%2Fsixlabors%2Fshield%2FSixLabors.ImageSharp.Web%2Flatest)](https://f.feedz.io/sixlabors/sixlabors/nuget/index.json) |
 
 ## Manual build
 

From bc1e92372d6a678883dcf013fe4d9ea7ac33c0c0 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sun, 5 Mar 2023 21:55:42 +1000
Subject: [PATCH 080/102] Fix color converter

---
 .../Commands/Converters/ArrayConverter{T}.cs  |  5 ++++-
 .../Commands/Converters/ColorConverter.cs     | 16 ++++++++--------
 .../Commands/Converters/ConverterUtility.cs   | 19 +++++++++++++++++++
 .../Commands/Converters/EnumConverter.cs      |  5 ++++-
 .../Commands/Converters/ListConverter{T}.cs   |  5 ++++-
 5 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 src/ImageSharp.Web/Commands/Converters/ConverterUtility.cs

diff --git a/src/ImageSharp.Web/Commands/Converters/ArrayConverter{T}.cs b/src/ImageSharp.Web/Commands/Converters/ArrayConverter{T}.cs
index 58f7f835..426da7e3 100644
--- a/src/ImageSharp.Web/Commands/Converters/ArrayConverter{T}.cs
+++ b/src/ImageSharp.Web/Commands/Converters/ArrayConverter{T}.cs
@@ -44,7 +44,10 @@ public T[] ConvertFrom(
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static string[] GetStringArray(string input, CultureInfo culture)
     {
-        char separator = culture.TextInfo.ListSeparator[0];
+        char separator = ConverterUtility.GetListSeparator(culture);
+
+        // TODO: Can we use StringSplit Enumerator here?
+        // https://github.com/dotnet/runtime/issues/934
         return input.Split(separator).Select(s => s.Trim()).ToArray();
     }
 }
diff --git a/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs b/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs
index 6d21a828..31a1fd67 100644
--- a/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs
+++ b/src/ImageSharp.Web/Commands/Converters/ColorConverter.cs
@@ -17,7 +17,7 @@ public sealed class ColorConverter : ICommandConverter<Color>
     /// The web color hexadecimal regex. Matches strings arranged
     /// in rgb, rgba, rrggbb, or rrggbbaa format to match web syntax.
     /// </summary>
-    private static readonly Regex HexColorRegex = new("([0-9a-fA-F]{3}){1,2}", RegexOptions.Compiled);
+    private static readonly Regex HexColorRegex = new("([0-9a-fA-F][^,;.-]\\B{3}){1,2}", RegexOptions.Compiled);
 
     /// <summary>
     /// The number color regex.
@@ -41,12 +41,6 @@ public Color ConvertFrom(CommandParser parser, CultureInfo culture, string? valu
             return default;
         }
 
-        // Hex colors rgb, rrggbb, rrggbbaa
-        if (HexColorRegex.IsMatch(value))
-        {
-            return Color.ParseHex(value);
-        }
-
         // Named colors
         IDictionary<string, Color> table = ColorConstantsTable.Value;
         if (table.TryGetValue(value, out Color color))
@@ -55,7 +49,7 @@ public Color ConvertFrom(CommandParser parser, CultureInfo culture, string? valu
         }
 
         // Numeric r,g,b - r,g,b,a
-        char separator = culture.TextInfo.ListSeparator[0];
+        char separator = ConverterUtility.GetListSeparator(culture);
         if (value.IndexOf(separator) != -1)
         {
             string[] components = value.Split(separator);
@@ -82,6 +76,12 @@ public Color ConvertFrom(CommandParser parser, CultureInfo culture, string? valu
             }
         }
 
+        // Hex colors rgb, rrggbb, rrggbbaa
+        if (HexColorRegex.IsMatch(value))
+        {
+            return Color.ParseHex(value);
+        }
+
         return default;
     }
 
diff --git a/src/ImageSharp.Web/Commands/Converters/ConverterUtility.cs b/src/ImageSharp.Web/Commands/Converters/ConverterUtility.cs
new file mode 100644
index 00000000..c924e35c
--- /dev/null
+++ b/src/ImageSharp.Web/Commands/Converters/ConverterUtility.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Six Labors.
+// Licensed under the Six Labors Split License.
+
+using System.Globalization;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace SixLabors.ImageSharp.Web.Commands.Converters;
+internal static class ConverterUtility
+{
+    /// <summary>
+    /// Gets the <see cref="char"/> that is used by the given culture to separate items in a list.
+    /// </summary>
+    /// <param name="culture">The culture.</param>
+    /// <returns>The <see cref="char"/>.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static char GetListSeparator(CultureInfo culture)
+        => MemoryMarshal.GetReference<char>(culture.TextInfo.ListSeparator);
+}
diff --git a/src/ImageSharp.Web/Commands/Converters/EnumConverter.cs b/src/ImageSharp.Web/Commands/Converters/EnumConverter.cs
index 5c34505e..b74ae4d5 100644
--- a/src/ImageSharp.Web/Commands/Converters/EnumConverter.cs
+++ b/src/ImageSharp.Web/Commands/Converters/EnumConverter.cs
@@ -34,7 +34,7 @@ public sealed class EnumConverter : ICommandConverter<object>
 
         try
         {
-            char separator = culture.TextInfo.ListSeparator[0];
+            char separator = ConverterUtility.GetListSeparator(culture);
             if (value.IndexOf(separator) != -1)
             {
                 long convertedValue = 0;
@@ -63,5 +63,8 @@ public sealed class EnumConverter : ICommandConverter<object>
     /// <returns>The <see cref="T:String[]"/>.</returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static string[] GetStringArray(string input, char separator)
+
+        // TODO: Can we use StringSplit Enumerator here?
+        // https://github.com/dotnet/runtime/issues/934
         => input.Split(separator).Select(s => s.Trim()).ToArray();
 }
diff --git a/src/ImageSharp.Web/Commands/Converters/ListConverter{T}.cs b/src/ImageSharp.Web/Commands/Converters/ListConverter{T}.cs
index a390b78e..5a1e35ca 100644
--- a/src/ImageSharp.Web/Commands/Converters/ListConverter{T}.cs
+++ b/src/ImageSharp.Web/Commands/Converters/ListConverter{T}.cs
@@ -44,7 +44,10 @@ public List<T> ConvertFrom(
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static string[] GetStringArray(string input, CultureInfo culture)
     {
-        char separator = culture.TextInfo.ListSeparator[0];
+        char separator = ConverterUtility.GetListSeparator(culture);
+
+        // TODO: Can we use StringSplit Enumerator here?
+        // https://github.com/dotnet/runtime/issues/934
         return input.Split(separator).Select(s => s.Trim()).ToArray();
     }
 }

From 6f691a6b492181141007229840dddf715d030db3 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sun, 5 Mar 2023 22:29:05 +1000
Subject: [PATCH 081/102] Update ImageTagHelper.cs

---
 src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
index aa2dfc0e..bb6a3c1b 100644
--- a/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
+++ b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using System.Text;
@@ -10,7 +9,6 @@
 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;
@@ -90,7 +88,7 @@ public ImageTagHelper(
     /// Passed through to the generated HTML in all cases.
     /// </remarks>
     [HtmlAttributeName(SrcAttributeName)]
-    public string Src { get; set; }
+    public string? Src { get; set; }
 
     /// <summary>
     /// Gets or sets the width in pixel units.
@@ -198,7 +196,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
         Guard.NotNull(context, nameof(context));
         Guard.NotNull(output, nameof(output));
 
-        string src = output.Attributes[SrcAttributeName]?.Value as string ?? this.Src;
+        string? src = output.Attributes[SrcAttributeName]?.Value as string ?? this.Src;
         if (string.IsNullOrWhiteSpace(src) || src.StartsWith("data", StringComparison.OrdinalIgnoreCase))
         {
             base.Process(context, output);
@@ -220,7 +218,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
             src = output.Attributes[SrcAttributeName].Value as string;
             if (secret?.Length > 0)
             {
-                string hash = this.authorizationUtilities.ComputeHMAC(src, commands, secret);
+                string hash = this.authorizationUtilities.ComputeHMAC(src!, commands, secret);
                 commands.Add(RequestAuthorizationUtilities.TokenCommand, hash);
             }
 
@@ -256,7 +254,7 @@ private void AddResizeCommands(TagHelperOutput output, CommandCollection command
         // If no explicit width/height has been set on the image, set the attributes to match the
         // width/height from the process commands if present.
         int? width = output.Attributes.ContainsName(ResizeWebProcessor.Width)
-            ? int.Parse(output.Attributes[ResizeWebProcessor.Width].Value.ToString(), this.parserCulture)
+            ? int.Parse(output.Attributes[ResizeWebProcessor.Width].Value.ToString()!, this.parserCulture)
             : null;
 
         if (this.Width.HasValue)
@@ -266,7 +264,7 @@ private void AddResizeCommands(TagHelperOutput output, CommandCollection command
         }
 
         int? height = output.Attributes.ContainsName(ResizeWebProcessor.Height)
-            ? int.Parse(output.Attributes[ResizeWebProcessor.Height].Value.ToString(), this.parserCulture)
+            ? int.Parse(output.Attributes[ResizeWebProcessor.Height].Value.ToString()!, this.parserCulture)
             : null;
 
         if (this.Height.HasValue)
@@ -365,7 +363,7 @@ private static string AddQueryString(
         StringBuilder sb = new();
         sb.Append(uriToBeAppended);
 
-        foreach (KeyValuePair<string, string> parameter in commands)
+        foreach (KeyValuePair<string, string?> parameter in commands)
         {
             if (parameter.Value is null)
             {

From a9b1cd32fb1bff4856b59bbbb8646f8eefe6350f Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sun, 5 Mar 2023 22:47:35 +1000
Subject: [PATCH 082/102] Update HMACUtilities.cs

---
 src/ImageSharp.Web/HMACUtilities.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/ImageSharp.Web/HMACUtilities.cs b/src/ImageSharp.Web/HMACUtilities.cs
index f90d8c52..ee128aff 100644
--- a/src/ImageSharp.Web/HMACUtilities.cs
+++ b/src/ImageSharp.Web/HMACUtilities.cs
@@ -30,8 +30,7 @@ public static class HMACUtilities
     /// <returns>The hashed <see cref="string"/>.</returns>
     public static unsafe string ComputeHMACSHA256(string value, byte[] secret)
     {
-        // TODO: In .NET 6 we can use single instance versions
-        using var hmac = new HMACSHA256(secret);
+        using HMACSHA256 hmac = new(secret);
         return CreateHMAC(value, hmac);
     }
 
@@ -46,7 +45,7 @@ public static unsafe string ComputeHMACSHA256(string value, byte[] secret)
     /// <returns>The hashed <see cref="string"/>.</returns>
     public static unsafe string ComputeHMACSHA384(string value, byte[] secret)
     {
-        using var hmac = new HMACSHA384(secret);
+        using HMACSHA384 hmac = new(secret);
         return CreateHMAC(value, hmac);
     }
 
@@ -61,7 +60,7 @@ public static unsafe string ComputeHMACSHA384(string value, byte[] secret)
     /// <returns>The hashed <see cref="string"/>.</returns>
     public static unsafe string ComputeHMACSHA512(string value, byte[] secret)
     {
-        using var hmac = new HMACSHA512(secret);
+        using HMACSHA512 hmac = new(secret);
         return CreateHMAC(value, hmac);
     }
 

From 05fd0e53310faa6fe87c3db6c6aa2c56e1f7d49f Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sun, 5 Mar 2023 22:49:12 +1000
Subject: [PATCH 083/102] Update CaseHandlingUriBuilder.cs

---
 src/ImageSharp.Web/CaseHandlingUriBuilder.cs | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/ImageSharp.Web/CaseHandlingUriBuilder.cs b/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
index e3418820..6c5b4343 100644
--- a/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
+++ b/src/ImageSharp.Web/CaseHandlingUriBuilder.cs
@@ -156,14 +156,12 @@ public static string Encode(CaseHandling handling, Uri uri)
                 pathBase: PathString.FromUriComponent(uri),
                 query: QueryString.FromUriComponent(uri));
         }
-        else
-        {
-            Uri faux = new(FallbackBaseUri, uri);
-            return BuildRelative(
-                handling,
-                path: PathString.FromUriComponent(faux),
-                query: QueryString.FromUriComponent(faux));
-        }
+
+        Uri faux = new(FallbackBaseUri, uri);
+        return BuildRelative(
+            handling,
+            path: PathString.FromUriComponent(faux),
+            query: QueryString.FromUriComponent(faux));
     }
 
     /// <summary>
@@ -202,12 +200,12 @@ private static void InitializeAbsoluteUriString(Span<char> buffer, (bool Lower,
         int index = 0;
         ReadOnlySpan<char> pathBaseSpan = uriParts.PathBase.AsSpan();
 
-        if (uriParts.Path.Length > 0 && pathBaseSpan.Length > 0 && pathBaseSpan[pathBaseSpan.Length - 1] == '/')
+        if (uriParts.Path.Length > 0 && pathBaseSpan.Length > 0 && pathBaseSpan[^1] == '/')
         {
             // If the path string has a trailing slash and the other string has a leading slash, we need
             // to trim one of them.
             // Trim the last slash from pathBase. The total length was decremented before the call to string.Create.
-            pathBaseSpan = pathBaseSpan.Slice(0, pathBaseSpan.Length - 1);
+            pathBaseSpan = pathBaseSpan[..^1];
         }
 
         if (uriParts.Scheme.Length > 0)

From 85e76ace20019a6530bb1dd41b1dbccecb6778d7 Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Sun, 5 Mar 2023 16:42:04 +0100
Subject: [PATCH 084/102] Remove nullable disable from azure

* Removed all Nullable disable from the azure providers
* Removed IAzureBlobContainerClientOptions because it wasn't used just for declaration
* Added convenience DI methods for Adding the cache or image provider. Leaving out the initialization was on purpose to not run that code on startup because it could throw an exception so the app won't start..
---
 .../Caching/AzureBlobStorageCache.cs          |  3 +-
 .../Caching/AzureBlobStorageCacheOptions.cs   |  7 ++--
 .../IAzureBlobContainerClientOptions.cs       | 24 -------------
 .../AzureBlobStorageImageProvider.cs          | 35 +++++++++++--------
 .../AzureBlobStorageImageProviderOptions.cs   |  7 ++--
 .../AzureBlobStorageCacheResolver.cs          |  1 -
 .../AzureBlobStorageImageResolver.cs          |  3 +-
 .../SeviceCollectionExtensions.cs             | 32 +++++++++++++++++
 8 files changed, 60 insertions(+), 52 deletions(-)
 delete mode 100644 src/ImageSharp.Web.Providers.Azure/IAzureBlobContainerClientOptions.cs
 create mode 100644 src/ImageSharp.Web.Providers.Azure/SeviceCollectionExtensions.cs

diff --git a/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCache.cs b/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCache.cs
index d147b217..053a947a 100644
--- a/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCache.cs
+++ b/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCache.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Azure;
 using Azure.Storage.Blobs;
@@ -31,7 +30,7 @@ public AzureBlobStorageCache(IOptions<AzureBlobStorageCacheOptions> cacheOptions
     }
 
     /// <inheritdoc/>
-    public async Task<IImageCacheResolver> GetAsync(string key)
+    public async Task<IImageCacheResolver?> GetAsync(string key)
     {
         BlobClient blob = this.container.GetBlobClient(key);
 
diff --git a/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCacheOptions.cs b/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCacheOptions.cs
index 640b5fc6..0a11ea45 100644
--- a/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCacheOptions.cs
+++ b/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCacheOptions.cs
@@ -1,17 +1,16 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 namespace SixLabors.ImageSharp.Web.Caching.Azure;
 
 /// <summary>
 /// Configuration options for the <see cref="AzureBlobStorageCache"/>.
 /// </summary>
-public class AzureBlobStorageCacheOptions : IAzureBlobContainerClientOptions
+public class AzureBlobStorageCacheOptions
 {
     /// <inheritdoc/>
-    public string ConnectionString { get; set; }
+    public string ConnectionString { get; set; } = null!;
 
     /// <inheritdoc/>
-    public string ContainerName { get; set; }
+    public string ContainerName { get; set; } = null!;
 }
diff --git a/src/ImageSharp.Web.Providers.Azure/IAzureBlobContainerClientOptions.cs b/src/ImageSharp.Web.Providers.Azure/IAzureBlobContainerClientOptions.cs
deleted file mode 100644
index b3ee1e1d..00000000
--- a/src/ImageSharp.Web.Providers.Azure/IAzureBlobContainerClientOptions.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-#nullable disable
-
-namespace SixLabors.ImageSharp.Web;
-
-/// <summary>
-/// Provides a common interface for Azure Blob Container Options.
-/// </summary>
-internal interface IAzureBlobContainerClientOptions
-{
-    /// <summary>
-    /// Gets or sets the Azure Blob Storage connection string.
-    /// <see href="https://docs.microsoft.com/en-us/azure/storage/common/storage-configure-connection-string."/>
-    /// </summary>
-    public string ConnectionString { get; set; }
-
-    /// <summary>
-    /// Gets or sets the Azure Blob Storage container name.
-    /// Must conform to Azure Blob Storage container naming guidlines.
-    /// <see href="https://docs.microsoft.com/en-us/rest/api/storageservices/naming-and-referencing-containers--blobs--and-metadata#container-names"/>
-    /// </summary>
-    public string ContainerName { get; set; }
-}
diff --git a/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProvider.cs b/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProvider.cs
index 32d4ca19..02c48797 100644
--- a/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProvider.cs
+++ b/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProvider.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Azure.Storage.Blobs;
 using Microsoft.AspNetCore.Http;
@@ -27,11 +26,6 @@ public class AzureBlobStorageImageProvider : IImageProvider
     private readonly Dictionary<string, BlobContainerClient> containers
         = new();
 
-    /// <summary>
-    /// The blob storage options.
-    /// </summary>
-    private readonly AzureBlobStorageImageProviderOptions storageOptions;
-
     /// <summary>
     /// Contains various helper methods based on the current configuration.
     /// </summary>
@@ -40,7 +34,7 @@ private readonly Dictionary<string, BlobContainerClient> containers
     /// <summary>
     /// A match function used by the resolver to identify itself as the correct resolver to use.
     /// </summary>
-    private Func<HttpContext, bool> match;
+    private Func<HttpContext, bool>? match;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AzureBlobStorageImageProvider"/> class.
@@ -53,13 +47,12 @@ public AzureBlobStorageImageProvider(
     {
         Guard.NotNull(storageOptions, nameof(storageOptions));
 
-        this.storageOptions = storageOptions.Value;
         this.formatUtilities = formatUtilities;
 
-        foreach (AzureBlobContainerClientOptions container in this.storageOptions.BlobContainers)
+        foreach (AzureBlobContainerClientOptions container in storageOptions.Value.BlobContainers)
         {
             this.containers.Add(
-                container.ContainerName,
+                container.ContainerName!,
                 new BlobContainerClient(container.ConnectionString, container.ContainerName));
         }
     }
@@ -75,19 +68,25 @@ public Func<HttpContext, bool> Match
     }
 
     /// <inheritdoc/>
-    public async Task<IImageResolver> GetAsync(HttpContext context)
+    public async Task<IImageResolver?> GetAsync(HttpContext context)
     {
         // Strip the leading slash and container name from the HTTP request path and treat
         // the remaining path string as the blob name.
         // Path has already been correctly parsed before here.
         string containerName = string.Empty;
-        BlobContainerClient container = null;
+        BlobContainerClient? container = null;
 
         // We want an exact match here to ensure that container names starting with
         // the same prefix are not mixed up.
-        string path = context.Request.Path.Value.TrimStart(SlashChars);
+        string? path = context.Request.Path.Value?.TrimStart(SlashChars);
+
+        if (path is null)
+        {
+            return null;
+        }
+
         int index = path.IndexOfAny(SlashChars);
-        string nameToMatch = index != -1 ? path.Substring(0, index) : path;
+        string nameToMatch = index != -1 ? path[..index] : path;
 
         foreach (string key in this.containers.Keys)
         {
@@ -131,7 +130,13 @@ private bool IsMatch(HttpContext context)
     {
         // Only match loosly here for performance.
         // Path matching conflicts should be dealt with by configuration.
-        string path = context.Request.Path.Value.TrimStart(SlashChars);
+        string? path = context.Request.Path.Value?.TrimStart(SlashChars);
+
+        if (path is null)
+        {
+            return false;
+        }
+
         foreach (string container in this.containers.Keys)
         {
             if (path.StartsWith(container, StringComparison.OrdinalIgnoreCase))
diff --git a/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProviderOptions.cs b/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProviderOptions.cs
index a5d8e92c..0334b9dd 100644
--- a/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProviderOptions.cs
+++ b/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProviderOptions.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 namespace SixLabors.ImageSharp.Web.Providers.Azure;
 
@@ -18,11 +17,11 @@ public class AzureBlobStorageImageProviderOptions
 /// <summary>
 /// Represents a single Azure Blob Storage connection and container.
 /// </summary>
-public class AzureBlobContainerClientOptions : IAzureBlobContainerClientOptions
+public class AzureBlobContainerClientOptions
 {
     /// <inheritdoc/>
-    public string ConnectionString { get; set; }
+    public string? ConnectionString { get; set; }
 
     /// <inheritdoc/>
-    public string ContainerName { get; set; }
+    public string? ContainerName { get; set; }
 }
diff --git a/src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageCacheResolver.cs b/src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageCacheResolver.cs
index 708dc899..cdfad480 100644
--- a/src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageCacheResolver.cs
+++ b/src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageCacheResolver.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
diff --git a/src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageImageResolver.cs b/src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageImageResolver.cs
index dfb79c3f..3b22d794 100644
--- a/src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageImageResolver.cs
+++ b/src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageImageResolver.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Net.Http.Headers;
 using Azure.Storage.Blobs;
@@ -32,7 +31,7 @@ public async Task<ImageMetadata> GetMetaDataAsync()
         // Try to parse the max age from the source. If it's not zero then we pass it along
         // to set the cache control headers for the response.
         TimeSpan maxAge = TimeSpan.MinValue;
-        if (CacheControlHeaderValue.TryParse(properties.CacheControl, out CacheControlHeaderValue cacheControl))
+        if (CacheControlHeaderValue.TryParse(properties.CacheControl, out CacheControlHeaderValue? cacheControl))
         {
             // Weirdly passing null to TryParse returns true.
             if (cacheControl?.MaxAge.HasValue == true)
diff --git a/src/ImageSharp.Web.Providers.Azure/SeviceCollectionExtensions.cs b/src/ImageSharp.Web.Providers.Azure/SeviceCollectionExtensions.cs
new file mode 100644
index 00000000..e98420b0
--- /dev/null
+++ b/src/ImageSharp.Web.Providers.Azure/SeviceCollectionExtensions.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Six Labors.
+// Licensed under the Six Labors Split License.
+
+using Microsoft.Extensions.DependencyInjection;
+using SixLabors.ImageSharp.Web.Caching.Azure;
+using SixLabors.ImageSharp.Web.DependencyInjection;
+using SixLabors.ImageSharp.Web.Providers.Azure;
+
+namespace SixLabors.ImageSharp.Web;
+
+public static class SeviceCollectionExtensions
+{
+    /// <summary>
+    /// Adds AzureBlobStorage as Cache provider.
+    /// </summary>
+    /// <param name="imageSharpBuilder">The builder</param>
+    /// <param name="setupAction">The setup action</param>
+    /// <returns>An <see cref="IImageSharpBuilder"/> that can be used to further configure the ImageSharp services.</returns>
+    public static IImageSharpBuilder AddAzureBlobCache(this IImageSharpBuilder imageSharpBuilder, Action<AzureBlobStorageCacheOptions> setupAction) =>
+        imageSharpBuilder.Configure(setupAction)
+            .SetCache<AzureBlobStorageCache>();
+
+    /// <summary>
+    /// Adds the AzureBlobStorageImageProvider.
+    /// </summary>
+    /// <param name="imageSharpBuilder">The builder</param>
+    /// <param name="setupAction">The setup action</param>
+    /// <returns>An <see cref="IImageSharpBuilder"/> that can be used to further configure the ImageSharp services.</returns>
+    public static IImageSharpBuilder AddAzureBlobImageProvider(this IImageSharpBuilder imageSharpBuilder, Action<AzureBlobStorageImageProviderOptions> setupAction) =>
+        imageSharpBuilder.Configure(setupAction)
+            .AddProvider<AzureBlobStorageImageProvider>();
+}

From 11cc34ce0c18c33bcc9431db7b7b9ada65eb4b27 Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Sun, 5 Mar 2023 16:54:35 +0100
Subject: [PATCH 085/102] Add missing comment

---
 .../Caching/AzureBlobStorageCacheOptions.cs           | 11 +++++++++--
 .../Providers/AzureBlobStorageImageProviderOptions.cs | 11 +++++++++--
 .../SeviceCollectionExtensions.cs                     |  3 +++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCacheOptions.cs b/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCacheOptions.cs
index 0a11ea45..f44bba41 100644
--- a/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCacheOptions.cs
+++ b/src/ImageSharp.Web.Providers.Azure/Caching/AzureBlobStorageCacheOptions.cs
@@ -8,9 +8,16 @@ namespace SixLabors.ImageSharp.Web.Caching.Azure;
 /// </summary>
 public class AzureBlobStorageCacheOptions
 {
-    /// <inheritdoc/>
+    /// <summary>
+    /// Gets or sets the Azure Blob Storage connection string.
+    /// <see href="https://docs.microsoft.com/en-us/azure/storage/common/storage-configure-connection-string."/>
+    /// </summary>
     public string ConnectionString { get; set; } = null!;
 
-    /// <inheritdoc/>
+    /// <summary>
+    /// Gets or sets the Azure Blob Storage container name.
+    /// Must conform to Azure Blob Storage container naming guidlines.
+    /// <see href="https://docs.microsoft.com/en-us/rest/api/storageservices/naming-and-referencing-containers--blobs--and-metadata#container-names"/>
+    /// </summary>
     public string ContainerName { get; set; } = null!;
 }
diff --git a/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProviderOptions.cs b/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProviderOptions.cs
index 0334b9dd..58743d83 100644
--- a/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProviderOptions.cs
+++ b/src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProviderOptions.cs
@@ -19,9 +19,16 @@ public class AzureBlobStorageImageProviderOptions
 /// </summary>
 public class AzureBlobContainerClientOptions
 {
-    /// <inheritdoc/>
+    /// <summary>
+    /// Gets or sets the Azure Blob Storage connection string.
+    /// <see href="https://docs.microsoft.com/en-us/azure/storage/common/storage-configure-connection-string."/>
+    /// </summary>
     public string? ConnectionString { get; set; }
 
-    /// <inheritdoc/>
+    /// <summary>
+    /// Gets or sets the Azure Blob Storage container name.
+    /// Must conform to Azure Blob Storage container naming guidlines.
+    /// <see href="https://docs.microsoft.com/en-us/rest/api/storageservices/naming-and-referencing-containers--blobs--and-metadata#container-names"/>
+    /// </summary>
     public string? ContainerName { get; set; }
 }
diff --git a/src/ImageSharp.Web.Providers.Azure/SeviceCollectionExtensions.cs b/src/ImageSharp.Web.Providers.Azure/SeviceCollectionExtensions.cs
index e98420b0..7d30f328 100644
--- a/src/ImageSharp.Web.Providers.Azure/SeviceCollectionExtensions.cs
+++ b/src/ImageSharp.Web.Providers.Azure/SeviceCollectionExtensions.cs
@@ -8,6 +8,9 @@
 
 namespace SixLabors.ImageSharp.Web;
 
+/// <summary>
+/// Extension methods for <see cref="IServiceCollection"/> to simplify middleware service registration.
+/// </summary>
 public static class SeviceCollectionExtensions
 {
     /// <summary>

From bae419e425fe6197787fdfa4be15251c24aacc49 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 6 Mar 2023 20:56:20 +1000
Subject: [PATCH 086/102] Delete SeviceCollectionExtensions.cs

---
 .../SeviceCollectionExtensions.cs             | 35 -------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 src/ImageSharp.Web.Providers.Azure/SeviceCollectionExtensions.cs

diff --git a/src/ImageSharp.Web.Providers.Azure/SeviceCollectionExtensions.cs b/src/ImageSharp.Web.Providers.Azure/SeviceCollectionExtensions.cs
deleted file mode 100644
index 7d30f328..00000000
--- a/src/ImageSharp.Web.Providers.Azure/SeviceCollectionExtensions.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using Microsoft.Extensions.DependencyInjection;
-using SixLabors.ImageSharp.Web.Caching.Azure;
-using SixLabors.ImageSharp.Web.DependencyInjection;
-using SixLabors.ImageSharp.Web.Providers.Azure;
-
-namespace SixLabors.ImageSharp.Web;
-
-/// <summary>
-/// Extension methods for <see cref="IServiceCollection"/> to simplify middleware service registration.
-/// </summary>
-public static class SeviceCollectionExtensions
-{
-    /// <summary>
-    /// Adds AzureBlobStorage as Cache provider.
-    /// </summary>
-    /// <param name="imageSharpBuilder">The builder</param>
-    /// <param name="setupAction">The setup action</param>
-    /// <returns>An <see cref="IImageSharpBuilder"/> that can be used to further configure the ImageSharp services.</returns>
-    public static IImageSharpBuilder AddAzureBlobCache(this IImageSharpBuilder imageSharpBuilder, Action<AzureBlobStorageCacheOptions> setupAction) =>
-        imageSharpBuilder.Configure(setupAction)
-            .SetCache<AzureBlobStorageCache>();
-
-    /// <summary>
-    /// Adds the AzureBlobStorageImageProvider.
-    /// </summary>
-    /// <param name="imageSharpBuilder">The builder</param>
-    /// <param name="setupAction">The setup action</param>
-    /// <returns>An <see cref="IImageSharpBuilder"/> that can be used to further configure the ImageSharp services.</returns>
-    public static IImageSharpBuilder AddAzureBlobImageProvider(this IImageSharpBuilder imageSharpBuilder, Action<AzureBlobStorageImageProviderOptions> setupAction) =>
-        imageSharpBuilder.Configure(setupAction)
-            .AddProvider<AzureBlobStorageImageProvider>();
-}

From 884f76e0b069fcdfc2793219c5f50b7d99a6220e Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 6 Mar 2023 22:25:14 +1000
Subject: [PATCH 087/102] Split out HMAC helper, remove HMAC from request with
 no commands

---
 .../ImageSharp.Web.Sample/Pages/Index.cshtml  |    6 +-
 .../Middleware/ImageSharpMiddleware.cs        |    9 +-
 .../RequestAuthorizationUtilities.cs          |   30 +-
 .../TagHelpers/HmacTokenTagHelper.cs          |  120 ++
 .../TagHelpers/ImageTagHelper.cs              |   53 +-
 .../TagHelpers/HmacTokenTagHelperTests.cs     |  259 +++
 .../TagHelpers/ImageTagHelperTests.cs         | 1538 ++++++++---------
 7 files changed, 1160 insertions(+), 855 deletions(-)
 create mode 100644 src/ImageSharp.Web/TagHelpers/HmacTokenTagHelper.cs
 create mode 100644 tests/ImageSharp.Web.Tests/TagHelpers/HmacTokenTagHelperTests.cs

diff --git a/samples/ImageSharp.Web.Sample/Pages/Index.cshtml b/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
index 2c9d2911..c492abf4 100644
--- a/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
+++ b/samples/ImageSharp.Web.Sample/Pages/Index.cshtml
@@ -60,13 +60,13 @@
         </div>
     </section>
         <section>
-        <h2>HMAC - No Commands</h2>
+        <h2>No Commands</h2>
         <div>
             <p>
-                <code>sixlabors.imagesharp.web.png?hmac=...</code>
+                <code>sixlabors.imagesharp.web.png</code>
             </p>
             <p>
-                <img src="sixlabors.imagesharp.web.png" width="300" imagesharp-hmac />
+                <img src="sixlabors.imagesharp.web.png" width="300" />
             </p>
         </div>
     </section>
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
index ac9f3f3f..d7b71a35 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
@@ -244,13 +244,10 @@ private async Task Invoke(HttpContext httpContext, bool retry)
 
         // At this point we know that this is an image request designed for processing via this middleware.
         // Check for a token if required and reject if invalid.
-        if (checkHMAC)
+        if (checkHMAC && hmac != token)
         {
-            if (token == null || hmac != token)
-            {
-                SetBadRequest(httpContext);
-                return;
-            }
+            SetBadRequest(httpContext);
+            return;
         }
 
         IImageResolver? sourceImageResolver = await provider.GetAsync(httpContext);
diff --git a/src/ImageSharp.Web/RequestAuthorizationUtilities.cs b/src/ImageSharp.Web/RequestAuthorizationUtilities.cs
index 10e1f795..6c4849bc 100644
--- a/src/ImageSharp.Web/RequestAuthorizationUtilities.cs
+++ b/src/ImageSharp.Web/RequestAuthorizationUtilities.cs
@@ -216,22 +216,13 @@ public void StripUnknownCommands(CommandCollection commands)
             this.StripUnknownCommands(commands);
         }
 
-        ImageCommandContext imageCommandContext = new(context, commands, this.commandParser, this.parserCulture);
-        return await this.options.OnComputeHMACAsync(imageCommandContext, secret);
-    }
-
-    internal string ComputeHMAC(string uri, CommandCollection commands, byte[] secret)
-    {
-        ToComponents(
-            new Uri(uri, UriKind.RelativeOrAbsolute),
-            out HostString host,
-            out PathString path,
-            out QueryString queryString);
+        if (commands.Count == 0)
+        {
+            return null;
+        }
 
-        HttpContext context = this.ToHttpContext(host, path, queryString, new(QueryHelpers.ParseQuery(queryString.Value)));
         ImageCommandContext imageCommandContext = new(context, commands, this.commandParser, this.parserCulture);
-
-        return AsyncHelper.RunSync(() => this.options.OnComputeHMACAsync(imageCommandContext, secret));
+        return await this.options.OnComputeHMACAsync(imageCommandContext, secret);
     }
 
     /// <summary>
@@ -243,8 +234,15 @@ internal string ComputeHMAC(string uri, CommandCollection commands, byte[] secre
     /// </remarks>
     /// <param name="context">Contains information about the current image request and parsed commands.</param>
     /// <returns>The computed HMAC.</returns>
-    internal Task<string> ComputeHMACAsync(ImageCommandContext context)
-        => this.options.OnComputeHMACAsync(context, this.options.HMACSecretKey);
+    internal async Task<string?> ComputeHMACAsync(ImageCommandContext context)
+    {
+        if (context.Commands.Count == 0)
+        {
+            return null;
+        }
+
+        return await this.options.OnComputeHMACAsync(context, this.options.HMACSecretKey);
+    }
 
     private static void ToComponents(
         Uri uri,
diff --git a/src/ImageSharp.Web/TagHelpers/HmacTokenTagHelper.cs b/src/ImageSharp.Web/TagHelpers/HmacTokenTagHelper.cs
new file mode 100644
index 00000000..3aef7500
--- /dev/null
+++ b/src/ImageSharp.Web/TagHelpers/HmacTokenTagHelper.cs
@@ -0,0 +1,120 @@
+// Copyright (c) Six Labors.
+// Licensed under the Six Labors Split License.
+
+using System.Text;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Options;
+using SixLabors.ImageSharp.Web.Middleware;
+
+namespace SixLabors.ImageSharp.Web.TagHelpers;
+
+/// <summary>
+/// A <see cref="TagHelper"/> implementation targeting &lt;img&gt; element that allows the automatic generation of HMAC image processing protection tokens.
+/// </summary>
+[HtmlTargetElement("img", Attributes = SrcAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+public class HmacTokenTagHelper : UrlResolutionTagHelper
+{
+    private const string SrcAttributeName = "src";
+
+    private readonly ImageSharpMiddlewareOptions options;
+    private readonly RequestAuthorizationUtilities authorizationUtilities;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="HmacTokenTagHelper" /> class.
+    /// </summary>
+    /// <param name="options">The middleware configuration options.</param>
+    /// <param name="authorizationUtilities">Contains helpers that allow authorization of image requests.</param>
+    /// <param name="urlHelperFactory">The URL helper factory.</param>
+    /// <param name="htmlEncoder">The HTML encorder.</param>
+    public HmacTokenTagHelper(
+        IOptions<ImageSharpMiddlewareOptions> options,
+        RequestAuthorizationUtilities authorizationUtilities,
+        IUrlHelperFactory urlHelperFactory,
+        HtmlEncoder htmlEncoder)
+        : base(urlHelperFactory, htmlEncoder)
+    {
+        Guard.NotNull(options, nameof(options));
+        Guard.NotNull(authorizationUtilities, nameof(authorizationUtilities));
+
+        this.options = options.Value;
+        this.authorizationUtilities = authorizationUtilities;
+    }
+
+    /// <inheritdoc/>
+    public override int Order => 2;
+
+    /// <summary>
+    /// Gets or sets the source of the image.
+    /// </summary>
+    /// <remarks>
+    /// Passed through to the generated HTML in all cases.
+    /// </remarks>
+    [HtmlAttributeName(SrcAttributeName)]
+    public string? Src { get; set; }
+
+    /// <inheritdoc />
+    public override void Process(TagHelperContext context, TagHelperOutput output)
+    {
+        Guard.NotNull(context, nameof(context));
+        Guard.NotNull(output, nameof(output));
+
+        output.CopyHtmlAttribute(SrcAttributeName, context);
+        this.ProcessUrlAttribute(SrcAttributeName, output);
+
+        byte[] secret = this.options.HMACSecretKey;
+        if (secret is null || secret.Length == 0)
+        {
+            return;
+        }
+
+        // Retrieve the TagHelperOutput variation of the "src" attribute in case other TagHelpers in the
+        // pipeline have touched the value. If the value is already encoded this ImageTagHelper may
+        // not function properly.
+        string? src = output.Attributes[SrcAttributeName]?.Value as string;
+        if (string.IsNullOrWhiteSpace(src))
+        {
+            return;
+        }
+
+        string? hmac = this.authorizationUtilities.ComputeHMAC(src, CommandHandling.Sanitize);
+        if (hmac is not null)
+        {
+            this.Src = AddQueryString(src, hmac);
+            output.Attributes.SetAttribute(SrcAttributeName, this.Src);
+        }
+    }
+
+    private static string AddQueryString(
+        ReadOnlySpan<char> uri,
+        string hmac)
+    {
+        ReadOnlySpan<char> uriToBeAppended = uri;
+        ReadOnlySpan<char> anchorText = default;
+
+        // If there is an anchor, then the query string must be inserted before its first occurrence.
+        int anchorIndex = uri.IndexOf('#');
+        if (anchorIndex != -1)
+        {
+            anchorText = uri[anchorIndex..];
+            uriToBeAppended = uri[..anchorIndex];
+        }
+
+        int queryIndex = uriToBeAppended.IndexOf('?');
+        bool hasQuery = queryIndex != -1;
+
+        StringBuilder sb = new();
+
+        sb.Append(uriToBeAppended)
+          .Append(hasQuery ? '&' : '?')
+          .Append(UrlEncoder.Default.Encode(RequestAuthorizationUtilities.TokenCommand))
+          .Append('=')
+          .Append(UrlEncoder.Default.Encode(hmac))
+          .Append(anchorText);
+
+        return sb.ToString();
+    }
+}
diff --git a/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
index bb6a3c1b..49fe91dd 100644
--- a/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
+++ b/src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
@@ -16,21 +16,20 @@
 namespace SixLabors.ImageSharp.Web.TagHelpers;
 
 /// <summary>
-/// A TagHelper implementation targeting &lt;img&gt; element that allows the automatic generation of HMAC protected processing commands.
+/// A <see cref="TagHelper"/> implementation targeting &lt;img&gt; element that allows the automatic generation image processing commands.
 /// </summary>
 [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + WidthAttributeName, TagStructure = TagStructure.WithoutEndTag)]
 [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + HeightAttributeName, TagStructure = TagStructure.WithoutEndTag)]
 [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + AnchorAttributeName, TagStructure = TagStructure.WithoutEndTag)]
-[HtmlTargetElement("img", Attributes = SrcAttributeName + "," + RModeAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+[HtmlTargetElement("img", Attributes = SrcAttributeName + "," + ModeAttributeName, TagStructure = TagStructure.WithoutEndTag)]
 [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + XyAttributeName, TagStructure = TagStructure.WithoutEndTag)]
-[HtmlTargetElement("img", Attributes = SrcAttributeName + "," + RColorAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+[HtmlTargetElement("img", Attributes = SrcAttributeName + "," + ColorAttributeName, TagStructure = TagStructure.WithoutEndTag)]
 [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + CompandAttributeName, TagStructure = TagStructure.WithoutEndTag)]
 [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + OrientAttributeName, TagStructure = TagStructure.WithoutEndTag)]
 [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + AutoOrientAttributeName, TagStructure = TagStructure.WithoutEndTag)]
 [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + FormatAttributeName, TagStructure = TagStructure.WithoutEndTag)]
 [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + BgColorAttributeName, TagStructure = TagStructure.WithoutEndTag)]
 [HtmlTargetElement("img", Attributes = SrcAttributeName + "," + QualityAttributeName, TagStructure = TagStructure.WithoutEndTag)]
-[HtmlTargetElement("img", Attributes = SrcAttributeName + "," + HMACAttributeName, TagStructure = TagStructure.WithoutEndTag)]
 public class ImageTagHelper : UrlResolutionTagHelper
 {
     private const string SrcAttributeName = "src";
@@ -38,9 +37,9 @@ public class ImageTagHelper : UrlResolutionTagHelper
     private const string WidthAttributeName = AttributePrefix + ResizeWebProcessor.Width;
     private const string HeightAttributeName = AttributePrefix + ResizeWebProcessor.Height;
     private const string AnchorAttributeName = AttributePrefix + ResizeWebProcessor.Anchor;
-    private const string RModeAttributeName = AttributePrefix + ResizeWebProcessor.Mode;
+    private const string ModeAttributeName = AttributePrefix + ResizeWebProcessor.Mode;
     private const string XyAttributeName = AttributePrefix + ResizeWebProcessor.Xy;
-    private const string RColorAttributeName = AttributePrefix + ResizeWebProcessor.Color;
+    private const string ColorAttributeName = AttributePrefix + ResizeWebProcessor.Color;
     private const string CompandAttributeName = AttributePrefix + ResizeWebProcessor.Compand;
     private const string OrientAttributeName = AttributePrefix + ResizeWebProcessor.Orient;
     private const string SamplerAttributeName = AttributePrefix + ResizeWebProcessor.Sampler;
@@ -48,12 +47,10 @@ public class ImageTagHelper : UrlResolutionTagHelper
     private const string FormatAttributeName = AttributePrefix + FormatWebProcessor.Format;
     private const string BgColorAttributeName = AttributePrefix + BackgroundColorWebProcessor.Color;
     private const string QualityAttributeName = AttributePrefix + QualityWebProcessor.Quality;
-    private const string HMACAttributeName = AttributePrefix + RequestAuthorizationUtilities.TokenCommand;
 
     private readonly ImageSharpMiddlewareOptions options;
     private readonly CultureInfo parserCulture;
     private readonly char separator;
-    private readonly RequestAuthorizationUtilities authorizationUtilities;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ImageTagHelper"/> class.
@@ -77,10 +74,11 @@ public ImageTagHelper(
             ? CultureInfo.InvariantCulture
             : CultureInfo.CurrentCulture;
         this.separator = this.parserCulture.TextInfo.ListSeparator[0];
-
-        this.authorizationUtilities = authorizationUtilities;
     }
 
+    /// <inheritdoc/>
+    public override int Order => 1;
+
     /// <summary>
     /// Gets or sets the src.
     /// </summary>
@@ -111,7 +109,7 @@ public ImageTagHelper(
     /// <summary>
     /// Gets or sets the resize mode.
     /// </summary>
-    [HtmlAttributeName(RModeAttributeName)]
+    [HtmlAttributeName(ModeAttributeName)]
     public ResizeMode? ResizeMode { get; set; }
 
     /// <summary>
@@ -129,7 +127,7 @@ public ImageTagHelper(
     /// <summary>
     /// Gets or sets the color to use as a background when padding an image.
     /// </summary>
-    [HtmlAttributeName(RColorAttributeName)]
+    [HtmlAttributeName(ColorAttributeName)]
     public Color? PadColor { get; set; }
 
     /// <summary>
@@ -180,16 +178,6 @@ public ImageTagHelper(
     [HtmlAttributeName(QualityAttributeName)]
     public int? Quality { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether to append a HMAC token to the request.
-    /// This value is always <see langword="true"/>. HMAC token usage is controlled by populating the
-    /// <see cref="ImageSharpMiddlewareOptions.HMACSecretKey"/> property.
-    /// </summary>
-    [HtmlAttributeName(HMACAttributeName)]
-#pragma warning disable CA1822 // Mark members as static
-    public bool AppendHMAC { get => true; set => _ = true; }
-#pragma warning restore CA1822 // Mark members as static
-
     /// <inheritdoc />
     public override void Process(TagHelperContext context, TagHelperOutput output)
     {
@@ -197,7 +185,10 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
         Guard.NotNull(output, nameof(output));
 
         string? src = output.Attributes[SrcAttributeName]?.Value as string ?? this.Src;
-        if (string.IsNullOrWhiteSpace(src) || src.StartsWith("data", StringComparison.OrdinalIgnoreCase))
+        if (string.IsNullOrWhiteSpace(src)
+            || src.StartsWith("http", StringComparison.OrdinalIgnoreCase)
+            || src.StartsWith("ftp", StringComparison.OrdinalIgnoreCase)
+            || src.StartsWith("data", StringComparison.OrdinalIgnoreCase))
         {
             base.Process(context, output);
             return;
@@ -209,24 +200,16 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
         CommandCollection commands = new();
         this.AddProcessingCommands(context, output, commands, this.parserCulture);
 
-        byte[] secret = this.options.HMACSecretKey;
-        if (commands.Count > 0 || secret?.Length > 0)
+        if (commands.Count > 0)
         {
             // Retrieve the TagHelperOutput variation of the "src" attribute in case other TagHelpers in the
             // pipeline have touched the value. If the value is already encoded this helper may
             // not function properly.
-            src = output.Attributes[SrcAttributeName].Value as string;
-            if (secret?.Length > 0)
-            {
-                string hash = this.authorizationUtilities.ComputeHMAC(src!, commands, secret);
-                commands.Add(RequestAuthorizationUtilities.TokenCommand, hash);
-            }
-
+            src = output.Attributes[SrcAttributeName]?.Value as string;
             src = AddQueryString(src, commands);
+            output.Attributes.SetAttribute(SrcAttributeName, src);
+            this.Src = src;
         }
-
-        this.Src = src;
-        output.Attributes.SetAttribute(SrcAttributeName, src);
     }
 
     /// <summary>
diff --git a/tests/ImageSharp.Web.Tests/TagHelpers/HmacTokenTagHelperTests.cs b/tests/ImageSharp.Web.Tests/TagHelpers/HmacTokenTagHelperTests.cs
new file mode 100644
index 00000000..62f15d53
--- /dev/null
+++ b/tests/ImageSharp.Web.Tests/TagHelpers/HmacTokenTagHelperTests.cs
@@ -0,0 +1,259 @@
+// Copyright (c) Six Labors.
+// Licensed under the Six Labors Split License.
+
+using System.Collections;
+using System.Diagnostics.CodeAnalysis;
+using System.Text;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Extensions.WebEncoders.Testing;
+using SixLabors.ImageSharp.Web.DependencyInjection;
+using SixLabors.ImageSharp.Web.Middleware;
+using SixLabors.ImageSharp.Web.TagHelpers;
+
+namespace SixLabors.ImageSharp.Web.Tests.TagHelpers;
+
+public sealed class HmacTokenTagHelperTests : IDisposable
+{
+    public HmacTokenTagHelperTests()
+    {
+        ServiceCollection services = new();
+        services.AddSingleton<IWebHostEnvironment, FakeWebHostEnvironment>();
+        services.AddImageSharp(options => options.HMACSecretKey = new byte[] { 1, 2, 3, 4, 5 });
+        this.Provider = services.BuildServiceProvider();
+    }
+
+    public ServiceProvider Provider { get; }
+
+    [Fact]
+    public void RendersHmacTokenTag_SrcIncludes_HMAC()
+    {
+        // Arrange
+        TagHelperContext context = MakeTagHelperContext(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", "testimage.png?width=50" },
+                { "width", 50 }
+            });
+
+        TagHelperOutput output = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "width", 50 }
+            });
+
+        TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", "testimage.png?width=50&hmac=54edff059ad28d0f0ec2494de1dce0e6152e8d26e53e2efb249cdae93e30acbc" },
+                { "width", 50 }
+            });
+
+        HmacTokenTagHelper helper = this.GetHelper();
+        helper.Src = "testimage.png?width=50";
+
+        // Act
+        helper.Process(context, output);
+
+        // Assert
+        Assert.Equal(expectedOutput.TagName, output.TagName);
+        Assert.Equal(2, output.Attributes.Count);
+
+        for (int i = 0; i < expectedOutput.Attributes.Count; i++)
+        {
+            TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+            TagHelperAttribute actualAttribute = output.Attributes[i];
+            Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+            Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
+        }
+    }
+
+    private HmacTokenTagHelper GetHelper(
+        IUrlHelperFactory urlHelperFactory = null,
+        ViewContext viewContext = null)
+    {
+        urlHelperFactory ??= new FakeUrlHelperFactory();
+        viewContext ??= MakeViewContext();
+
+        return new HmacTokenTagHelper(
+            this.Provider.GetRequiredService<IOptions<ImageSharpMiddlewareOptions>>(),
+            this.Provider.GetRequiredService<RequestAuthorizationUtilities>(),
+            urlHelperFactory,
+            new HtmlTestEncoder())
+        {
+            ViewContext = viewContext,
+        };
+    }
+
+    private static TagHelperContext MakeTagHelperContext(
+        TagHelperAttributeList attributes)
+        => new(
+            tagName: "image",
+            allAttributes: attributes,
+            items: new Dictionary<object, object>(),
+            uniqueId: Guid.NewGuid().ToString("N"));
+
+    private static TagHelperOutput MakeImageTagHelperOutput(TagHelperAttributeList attributes)
+    {
+        attributes ??= new TagHelperAttributeList();
+
+        return new TagHelperOutput(
+            "img",
+            attributes,
+            getChildContentAsync: (useCachedResult, encoder) =>
+            {
+                var tagHelperContent = new DefaultTagHelperContent();
+                tagHelperContent.SetContent(default);
+                return Task.FromResult<TagHelperContent>(tagHelperContent);
+            });
+    }
+
+    private static ViewContext MakeViewContext(string requestPathBase = null)
+    {
+        var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+        if (requestPathBase != null)
+        {
+            actionContext.HttpContext.Request.PathBase = new PathString(requestPathBase);
+        }
+
+        var metadataProvider = new EmptyModelMetadataProvider();
+        var viewData = new ViewDataDictionary(metadataProvider, new ModelStateDictionary());
+        return new ViewContext(
+            actionContext,
+            new FakeView(),
+            viewData,
+            new FakeTempDataDictionary(),
+            TextWriter.Null,
+            new HtmlHelperOptions());
+    }
+
+    public void Dispose() => this.Provider.Dispose();
+
+    private class FakeView : IView
+    {
+        public string Path { get; }
+
+        public Task RenderAsync(ViewContext context) => throw new NotSupportedException();
+    }
+
+    private class FakeTempDataDictionary : Dictionary<string, object>, ITempDataDictionary
+    {
+        public void Keep() => throw new NotSupportedException();
+
+        public void Keep(string key) => throw new NotSupportedException();
+
+        public void Load() => throw new NotSupportedException();
+
+        public object Peek(string key) => throw new NotSupportedException();
+
+        public void Save() => throw new NotSupportedException();
+    }
+
+    private class FakeWebHostEnvironment : IWebHostEnvironment
+    {
+        public string WebRootPath { get; set; }
+
+        public IFileProvider WebRootFileProvider { get; set; } = new FakeFileProvider();
+
+        public string ApplicationName { get; set; }
+
+        public IFileProvider ContentRootFileProvider { get; set; }
+
+        public string ContentRootPath { get; set; }
+
+        public string EnvironmentName { get; set; }
+    }
+
+    private class FakeFileProvider : IFileProvider
+    {
+        public IDirectoryContents GetDirectoryContents(string subpath) => new FakeDirectoryContents();
+
+        public IFileInfo GetFileInfo(string subpath) => new FakeFileInfo();
+
+        public IChangeToken Watch(string filter) => new FakeFileChangeToken();
+    }
+
+    private class FakeFileChangeToken : IChangeToken
+    {
+        public FakeFileChangeToken(string filter = "") => this.Filter = filter;
+
+        public bool ActiveChangeCallbacks => false;
+
+        public bool HasChanged { get; set; }
+
+        public string Filter { get; }
+
+        public IDisposable RegisterChangeCallback(Action<object> callback, object state) => new NullDisposable();
+
+        private sealed class NullDisposable : IDisposable
+        {
+            public void Dispose()
+            {
+            }
+        }
+
+        public override string ToString() => this.Filter;
+    }
+
+    private class FakeDirectoryContents : IDirectoryContents
+    {
+        public bool Exists { get; }
+
+        public IEnumerator<IFileInfo> GetEnumerator() => Enumerable.Empty<IFileInfo>().GetEnumerator();
+
+        IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+    }
+
+    private class FakeFileInfo : IFileInfo
+    {
+        public bool Exists { get; } = true;
+
+        public bool IsDirectory { get; }
+
+        public DateTimeOffset LastModified { get; }
+
+        public long Length { get; }
+
+        public string Name { get; }
+
+        public string PhysicalPath { get; }
+
+        public Stream CreateReadStream() => new MemoryStream(Encoding.UTF8.GetBytes("Hello World!"));
+    }
+
+    private class FakeUrlHelperFactory : IUrlHelperFactory
+    {
+        public IUrlHelper GetUrlHelper(ActionContext context) => new FakeUrlHelper() { ActionContext = context };
+    }
+
+    private class FakeUrlHelper : IUrlHelper
+    {
+        public ActionContext ActionContext { get; set; }
+
+        public string Action(UrlActionContext actionContext) => throw new NotSupportedException();
+
+        // Ensure expanded path does not look like an absolute path on Linux, avoiding
+        // https://github.com/aspnet/External/issues/21
+        [return: NotNullIfNotNull("contentPath")]
+        public string Content(string contentPath) => contentPath.Replace("~/", "virtualRoot/");
+
+        public bool IsLocalUrl([NotNullWhen(true)] string url) => throw new NotSupportedException();
+
+        public string Link(string routeName, object values) => throw new NotSupportedException();
+
+        public string RouteUrl(UrlRouteContext routeContext) => throw new NotSupportedException();
+    }
+}
diff --git a/tests/ImageSharp.Web.Tests/TagHelpers/ImageTagHelperTests.cs b/tests/ImageSharp.Web.Tests/TagHelpers/ImageTagHelperTests.cs
index 07143c52..9f8acd02 100644
--- a/tests/ImageSharp.Web.Tests/TagHelpers/ImageTagHelperTests.cs
+++ b/tests/ImageSharp.Web.Tests/TagHelpers/ImageTagHelperTests.cs
@@ -1,14 +1,9 @@
 // Copyright (c) Six Labors.
-// Licensed under the Apache License, Version 2.0.
+// Licensed under the Six Labors Split License.
 
-using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Http;
@@ -31,900 +26,853 @@
 using SixLabors.ImageSharp.Web.Middleware;
 using SixLabors.ImageSharp.Web.Processors;
 using SixLabors.ImageSharp.Web.TagHelpers;
-using Xunit;
 
-namespace SixLabors.ImageSharp.Web.Tests.TagHelpers
+namespace SixLabors.ImageSharp.Web.Tests.TagHelpers;
+
+public sealed class ImageTagHelperTests : IDisposable
 {
-    public sealed class ImageTagHelperTests : IDisposable
+    public ImageTagHelperTests()
     {
-        public ImageTagHelperTests()
-        {
-            ServiceCollection services = new();
-            services.AddSingleton<IWebHostEnvironment, FakeWebHostEnvironment>();
-            services.AddImageSharp();
-            this.Provider = services.BuildServiceProvider();
-        }
+        ServiceCollection services = new();
+        services.AddSingleton<IWebHostEnvironment, FakeWebHostEnvironment>();
+        services.AddImageSharp();
+        this.Provider = services.BuildServiceProvider();
+    }
 
-        public ServiceProvider Provider { get; }
-
-        [Theory]
-        [InlineData(null, "test.jpg", "test.jpg")]
-        [InlineData("abcd.jpg", "test.jpg", "test.jpg")]
-        [InlineData(null, "~/test.jpg", "virtualRoot/test.jpg")]
-        [InlineData("abcd.jpg", "~/test.jpg", "virtualRoot/test.jpg")]
-        public void Process_SrcDefaultsToTagHelperOutputSrcAttributeAddedByOtherTagHelper(
-            string src,
-            string srcOutput,
-            string expectedSrcPrefix)
-        {
-            // Arrange
-            var allAttributes = new TagHelperAttributeList(
-                new TagHelperAttributeList
-                {
-                    { "alt", new HtmlString("Testing") },
-                    { "width", 100 },
-                });
-            TagHelperContext context = MakeTagHelperContext(allAttributes);
-            var outputAttributes = new TagHelperAttributeList
-                {
-                    { "alt", new HtmlString("Testing") },
-                    { "src", srcOutput },
-                };
-            var output = new TagHelperOutput(
-                "img",
-                outputAttributes,
-                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
-                    new DefaultTagHelperContent()));
-
-            var urlHelperFactory = new FakeUrlHelperFactory();
-
-            ImageTagHelper helper = this.GetHelper(urlHelperFactory: urlHelperFactory);
-            helper.Src = src;
-            helper.Width = 100;
-
-            // Act
-            helper.Process(context, output);
-
-            // Assert
-            Assert.Equal(
-                expectedSrcPrefix + "?width=100",
-                (string)output.Attributes["src"].Value,
-                StringComparer.Ordinal);
-        }
+    public ServiceProvider Provider { get; }
+
+    [Theory]
+    [InlineData(null, "test.jpg", "test.jpg")]
+    [InlineData("abcd.jpg", "test.jpg", "test.jpg")]
+    [InlineData(null, "~/test.jpg", "virtualRoot/test.jpg")]
+    [InlineData("abcd.jpg", "~/test.jpg", "virtualRoot/test.jpg")]
+    public void Process_SrcDefaultsToTagHelperOutputSrcAttributeAddedByOtherTagHelper(
+        string src,
+        string srcOutput,
+        string expectedSrcPrefix)
+    {
+        // Arrange
+        TagHelperAttributeList allAttributes = new(
+            new TagHelperAttributeList
+            {
+                { "alt", new HtmlString("Testing") },
+                { "width", 100 },
+            });
 
-        [Fact]
-        public void PreservesOrderOfSourceAttributesWhenRun()
+        TagHelperContext context = MakeTagHelperContext(allAttributes);
+        TagHelperAttributeList outputAttributes = new()
         {
-            // Arrange
-            TagHelperContext context = MakeTagHelperContext(
-                attributes: new TagHelperAttributeList
-                {
-                    { "alt", new HtmlString("alt text") },
-                    { "data-extra", new HtmlString("something") },
-                    { "title", new HtmlString("Image title") },
-                    { "src", "testimage.png" },
-                    { "width", "50" },
-                    { "height", 60 }
-                });
-
-            TagHelperOutput output = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "alt", new HtmlString("alt text") },
-                    { "data-extra", new HtmlString("something") },
-                    { "title", new HtmlString("Image title") },
-                    { "width", "50" },
-                    { "height", 60 }
-                });
-
-            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "alt", new HtmlString("alt text") },
-                    { "data-extra", new HtmlString("something") },
-                    { "title", new HtmlString("Image title") },
-                    { "src", "testimage.png?width=100&height=120" },
-                    { "width", "50" },
-                    { "height", 60 }
-                });
-
-            ImageTagHelper helper = this.GetHelper();
-            helper.Src = "testimage.png";
-            helper.Width = 100;
-            helper.Height = 120;
-
-            // Act
-            helper.Process(context, output);
-
-            // Assert
-            Assert.Equal(expectedOutput.TagName, output.TagName);
-            Assert.Equal(6, output.Attributes.Count);
-
-            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
-            {
-                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
-                TagHelperAttribute actualAttribute = output.Attributes[i];
-                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
-                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString());
-            }
-        }
+                { "alt", new HtmlString("Testing") },
+                { "src", srcOutput },
+        };
 
-        [Fact]
-        public void RendersImageTag_AddsAttributes_WithRequestPathBase()
-        {
-            // Arrange
-            TagHelperContext context = MakeTagHelperContext(
-                attributes: new TagHelperAttributeList
-                {
-                    { "alt", new HtmlString("alt text") },
-                    { "src", "/bar/images/image.jpg" },
-                    { "width", 100 },
-                    { "height", 200 },
-                });
-            TagHelperOutput output = MakeImageTagHelperOutput(attributes: new TagHelperAttributeList
+        TagHelperOutput output = new(
+            "img",
+            outputAttributes,
+            getChildContentAsync: (_, _) => Task.FromResult<TagHelperContent>(
+                new DefaultTagHelperContent()));
+
+        ImageTagHelper helper = this.GetHelper();
+        helper.Src = src;
+        helper.Width = 100;
+
+        // Act
+        helper.Process(context, output);
+
+        // Assert
+        Assert.Equal(
+            expectedSrcPrefix + "?width=100",
+            (string)output.Attributes["src"].Value,
+            StringComparer.Ordinal);
+    }
+
+    [Fact]
+    public void PreservesOrderOfSourceAttributesWhenRun()
+    {
+        // Arrange
+        TagHelperContext context = MakeTagHelperContext(
+            attributes: new TagHelperAttributeList
+            {
+                { "alt", new HtmlString("alt text") },
+                { "data-extra", new HtmlString("something") },
+                { "title", new HtmlString("Image title") },
+                { "src", "testimage.png" },
+                { "width", "50" },
+                { "height", 60 }
+            });
+
+        TagHelperOutput output = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
             {
                 { "alt", new HtmlString("alt text") },
+                { "data-extra", new HtmlString("something") },
+                { "title", new HtmlString("Image title") },
+                { "width", "50" },
+                { "height", 60 }
             });
 
-            ViewContext viewContext = MakeViewContext("/bar");
+        TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "alt", new HtmlString("alt text") },
+                { "data-extra", new HtmlString("something") },
+                { "title", new HtmlString("Image title") },
+                { "src", "testimage.png?width=100&height=120" },
+                { "width", "50" },
+                { "height", 60 }
+            });
 
-            ImageTagHelper helper = this.GetHelper();
-            helper.Src = "/bar/images/image.jpg";
-            helper.Width = 100;
-            helper.Height = 200;
+        ImageTagHelper helper = this.GetHelper();
+        helper.Src = "testimage.png";
+        helper.Width = 100;
+        helper.Height = 120;
 
-            // Act
-            helper.Process(context, output);
+        // Act
+        helper.Process(context, output);
 
-            // Assert
-            Assert.True(output.Content.GetContent().Length == 0);
-            Assert.Equal("img", output.TagName);
-            Assert.Equal(4, output.Attributes.Count);
-            TagHelperAttribute srcAttribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("src"));
-            Assert.Equal("/bar/images/image.jpg?width=100&height=200", srcAttribute.Value);
-        }
+        // Assert
+        Assert.Equal(expectedOutput.TagName, output.TagName);
+        Assert.Equal(6, output.Attributes.Count);
 
-        [Fact]
-        public void RendersImageTag_SrcIncludes_ResizeMode()
+        for (int i = 0; i < expectedOutput.Attributes.Count; i++)
         {
-            // Arrange
-            TagHelperContext context = MakeTagHelperContext(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", "testimage.png" },
-                    { "width", "50" }
-                });
-
-            TagHelperOutput output = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "width", "50" }
-                });
-
-            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", $"testimage.png?width=100&{ResizeWebProcessor.Mode}={nameof(ResizeMode.Stretch)}" },
-                    { "width", "50" }
-                });
-
-            ImageTagHelper helper = this.GetHelper();
-            helper.Src = "testimage.png";
-            helper.Width = 100;
-            helper.ResizeMode = ResizeMode.Stretch;
-
-            // Act
-            helper.Process(context, output);
-
-            // Assert
-            Assert.Equal(expectedOutput.TagName, output.TagName);
-            Assert.Equal(2, output.Attributes.Count);
-
-            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
-            {
-                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
-                TagHelperAttribute actualAttribute = output.Attributes[i];
-                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
-                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
-            }
+            TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+            TagHelperAttribute actualAttribute = output.Attributes[i];
+            Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+            Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString());
         }
+    }
 
-        [Fact]
-        public void RendersImageTag_SrcIncludes_ResizePosition()
+    [Fact]
+    public void RendersImageTag_AddsAttributes_WithRequestPathBase()
+    {
+        // Arrange
+        TagHelperContext context = MakeTagHelperContext(
+            attributes: new TagHelperAttributeList
+            {
+                { "alt", new HtmlString("alt text") },
+                { "src", "/bar/images/image.jpg" },
+                { "width", 100 },
+                { "height", 200 },
+            });
+        TagHelperOutput output = MakeImageTagHelperOutput(attributes: new TagHelperAttributeList
         {
-            // Arrange
-            TagHelperContext context = MakeTagHelperContext(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", "testimage.png" },
-                    { "width", "50" }
-                });
-
-            TagHelperOutput output = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "width", "50" }
-                });
-
-            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", $"testimage.png?width=100&{ResizeWebProcessor.Xy}=20,50" },
-                    { "width", "50" }
-                });
-
-            ImageTagHelper helper = this.GetHelper();
-            helper.Src = "testimage.png";
-            helper.Width = 100;
-            helper.Center = new(20, 50);
-
-            // Act
-            helper.Process(context, output);
-
-            // Assert
-            Assert.Equal(expectedOutput.TagName, output.TagName);
-            Assert.Equal(2, output.Attributes.Count);
-
-            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
-            {
-                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
-                TagHelperAttribute actualAttribute = output.Attributes[i];
-                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
-                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
-            }
-        }
+            { "alt", new HtmlString("alt text") },
+        });
+
+        ViewContext viewContext = MakeViewContext("/bar");
+
+        ImageTagHelper helper = this.GetHelper();
+        helper.Src = "/bar/images/image.jpg";
+        helper.Width = 100;
+        helper.Height = 200;
+
+        // Act
+        helper.Process(context, output);
+
+        // Assert
+        Assert.True(output.Content.GetContent().Length == 0);
+        Assert.Equal("img", output.TagName);
+        Assert.Equal(4, output.Attributes.Count);
+        TagHelperAttribute srcAttribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("src", StringComparison.Ordinal));
+        Assert.Equal("/bar/images/image.jpg?width=100&height=200", srcAttribute.Value);
+    }
+
+    [Fact]
+    public void RendersImageTag_SrcIncludes_ResizeMode()
+    {
+        // Arrange
+        TagHelperContext context = MakeTagHelperContext(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", "testimage.png" },
+                { "width", "50" }
+            });
+
+        TagHelperOutput output = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "width", "50" }
+            });
+
+        TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", $"testimage.png?width=100&{ResizeWebProcessor.Mode}={nameof(ResizeMode.Stretch)}" },
+                { "width", "50" }
+            });
+
+        ImageTagHelper helper = this.GetHelper();
+        helper.Src = "testimage.png";
+        helper.Width = 100;
+        helper.ResizeMode = ResizeMode.Stretch;
+
+        // Act
+        helper.Process(context, output);
+
+        // Assert
+        Assert.Equal(expectedOutput.TagName, output.TagName);
+        Assert.Equal(2, output.Attributes.Count);
 
-        [Fact]
-        public void RendersImageTag_SrcIncludes_ResizeAnchor()
+        for (int i = 0; i < expectedOutput.Attributes.Count; i++)
         {
-            // Arrange
-            TagHelperContext context = MakeTagHelperContext(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", "testimage.png" },
-                    { "width", "50" }
-                });
-
-            TagHelperOutput output = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "width", "50" }
-                });
-
-            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", $"testimage.png?width=100&{ResizeWebProcessor.Anchor}={nameof(AnchorPositionMode.Top)}" },
-                    { "width", "50" }
-                });
-
-            ImageTagHelper helper = this.GetHelper();
-            helper.Src = "testimage.png";
-            helper.Width = 100;
-            helper.AnchorPosition = AnchorPositionMode.Top;
-
-            // Act
-            helper.Process(context, output);
-
-            // Assert
-            Assert.Equal(expectedOutput.TagName, output.TagName);
-            Assert.Equal(2, output.Attributes.Count);
-
-            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
-            {
-                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
-                TagHelperAttribute actualAttribute = output.Attributes[i];
-                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
-                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
-            }
+            TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+            TagHelperAttribute actualAttribute = output.Attributes[i];
+            Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+            Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
         }
+    }
+
+    [Fact]
+    public void RendersImageTag_SrcIncludes_ResizePosition()
+    {
+        // Arrange
+        TagHelperContext context = MakeTagHelperContext(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", "testimage.png" },
+                { "width", "50" }
+            });
+
+        TagHelperOutput output = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "width", "50" }
+            });
+
+        TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", $"testimage.png?width=100&{ResizeWebProcessor.Xy}=20,50" },
+                { "width", "50" }
+            });
 
-        [Fact]
-        public void RendersImageTag_SrcIncludes_ResizePadColor()
+        ImageTagHelper helper = this.GetHelper();
+        helper.Src = "testimage.png";
+        helper.Width = 100;
+        helper.Center = new(20, 50);
+
+        // Act
+        helper.Process(context, output);
+
+        // Assert
+        Assert.Equal(expectedOutput.TagName, output.TagName);
+        Assert.Equal(2, output.Attributes.Count);
+
+        for (int i = 0; i < expectedOutput.Attributes.Count; i++)
         {
-            // Arrange
-            TagHelperContext context = MakeTagHelperContext(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", "testimage.png" },
-                    { "width", "50" }
-                });
-
-            TagHelperOutput output = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "width", "50" }
-                });
-
-            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", $"testimage.png?width=100&{ResizeWebProcessor.Color}={Color.LimeGreen.ToHex()}" },
-                    { "width", "50" }
-                });
-
-            ImageTagHelper helper = this.GetHelper();
-            helper.Src = "testimage.png";
-            helper.Width = 100;
-            helper.PadColor = Color.LimeGreen;
-
-            // Act
-            helper.Process(context, output);
-
-            // Assert
-            Assert.Equal(expectedOutput.TagName, output.TagName);
-            Assert.Equal(2, output.Attributes.Count);
-
-            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
-            {
-                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
-                TagHelperAttribute actualAttribute = output.Attributes[i];
-                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
-                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
-            }
+            TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+            TagHelperAttribute actualAttribute = output.Attributes[i];
+            Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+            Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
         }
+    }
+
+    [Fact]
+    public void RendersImageTag_SrcIncludes_ResizeAnchor()
+    {
+        // Arrange
+        TagHelperContext context = MakeTagHelperContext(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", "testimage.png" },
+                { "width", "50" }
+            });
+
+        TagHelperOutput output = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "width", "50" }
+            });
+
+        TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", $"testimage.png?width=100&{ResizeWebProcessor.Anchor}={nameof(AnchorPositionMode.Top)}" },
+                { "width", "50" }
+            });
+
+        ImageTagHelper helper = this.GetHelper();
+        helper.Src = "testimage.png";
+        helper.Width = 100;
+        helper.AnchorPosition = AnchorPositionMode.Top;
 
-        [Fact]
-        public void RendersImageTag_SrcIncludes_ResizeCompand()
+        // Act
+        helper.Process(context, output);
+
+        // Assert
+        Assert.Equal(expectedOutput.TagName, output.TagName);
+        Assert.Equal(2, output.Attributes.Count);
+
+        for (int i = 0; i < expectedOutput.Attributes.Count; i++)
         {
-            // Arrange
-            TagHelperContext context = MakeTagHelperContext(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", "testimage.png" },
-                    { "width", "50" }
-                });
-
-            TagHelperOutput output = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "width", "50" }
-                });
-
-            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", $"testimage.png?width=100&{ResizeWebProcessor.Compand}={bool.TrueString}" },
-                    { "width", "50" }
-                });
-
-            ImageTagHelper helper = this.GetHelper();
-            helper.Src = "testimage.png";
-            helper.Width = 100;
-            helper.Compand = true;
-
-            // Act
-            helper.Process(context, output);
-
-            // Assert
-            Assert.Equal(expectedOutput.TagName, output.TagName);
-            Assert.Equal(2, output.Attributes.Count);
-
-            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
-            {
-                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
-                TagHelperAttribute actualAttribute = output.Attributes[i];
-                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
-                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
-            }
+            TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+            TagHelperAttribute actualAttribute = output.Attributes[i];
+            Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+            Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
         }
+    }
+
+    [Fact]
+    public void RendersImageTag_SrcIncludes_ResizePadColor()
+    {
+        // Arrange
+        TagHelperContext context = MakeTagHelperContext(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", "testimage.png" },
+                { "width", "50" }
+            });
+
+        TagHelperOutput output = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "width", "50" }
+            });
+
+        TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", $"testimage.png?width=100&{ResizeWebProcessor.Color}={Color.LimeGreen.ToHex()}" },
+                { "width", "50" }
+            });
+
+        ImageTagHelper helper = this.GetHelper();
+        helper.Src = "testimage.png";
+        helper.Width = 100;
+        helper.PadColor = Color.LimeGreen;
+
+        // Act
+        helper.Process(context, output);
 
-        [Fact]
-        public void RendersImageTag_SrcIncludes_ResizeOrient()
+        // Assert
+        Assert.Equal(expectedOutput.TagName, output.TagName);
+        Assert.Equal(2, output.Attributes.Count);
+
+        for (int i = 0; i < expectedOutput.Attributes.Count; i++)
         {
-            // Arrange
-            TagHelperContext context = MakeTagHelperContext(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", "testimage.png" },
-                    { "width", "50" }
-                });
-
-            TagHelperOutput output = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "width", "50" }
-                });
-
-            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", $"testimage.png?width=100&{ResizeWebProcessor.Orient}={bool.TrueString}" },
-                    { "width", "50" }
-                });
-
-            ImageTagHelper helper = this.GetHelper();
-            helper.Src = "testimage.png";
-            helper.Width = 100;
-            helper.Orient = true;
-
-            // Act
-            helper.Process(context, output);
-
-            // Assert
-            Assert.Equal(expectedOutput.TagName, output.TagName);
-            Assert.Equal(2, output.Attributes.Count);
-
-            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
-            {
-                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
-                TagHelperAttribute actualAttribute = output.Attributes[i];
-                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
-                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
-            }
+            TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+            TagHelperAttribute actualAttribute = output.Attributes[i];
+            Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+            Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
         }
+    }
 
-        public static TheoryData<ResamplerCommand> ResamplerCommands { get; } = new()
-        {
-            { Resampler.Bicubic },
-            { Resampler.Box },
-            { Resampler.CatmullRom },
-            { Resampler.Hermite },
-            { Resampler.Lanczos2 },
-            { Resampler.Lanczos3 },
-            { Resampler.Lanczos5 },
-            { Resampler.Lanczos8 },
-            { Resampler.MitchellNetravali },
-            { Resampler.NearestNeighbor },
-            { Resampler.Robidoux },
-            { Resampler.RobidouxSharp },
-            { Resampler.Spline },
-            { Resampler.Triangle },
-            { Resampler.Welch }
-        };
+    [Fact]
+    public void RendersImageTag_SrcIncludes_ResizeCompand()
+    {
+        // Arrange
+        TagHelperContext context = MakeTagHelperContext(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", "testimage.png" },
+                { "width", "50" }
+            });
+
+        TagHelperOutput output = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "width", "50" }
+            });
+
+        TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", $"testimage.png?width=100&{ResizeWebProcessor.Compand}={bool.TrueString}" },
+                { "width", "50" }
+            });
+
+        ImageTagHelper helper = this.GetHelper();
+        helper.Src = "testimage.png";
+        helper.Width = 100;
+        helper.Compand = true;
+
+        // Act
+        helper.Process(context, output);
 
-        [Theory]
-        [MemberData(nameof(ResamplerCommands))]
-        public void RendersImageTag_SrcIncludes_Resampler(ResamplerCommand resampler)
+        // Assert
+        Assert.Equal(expectedOutput.TagName, output.TagName);
+        Assert.Equal(2, output.Attributes.Count);
+
+        for (int i = 0; i < expectedOutput.Attributes.Count; i++)
         {
-            // Arrange
-            TagHelperContext context = MakeTagHelperContext(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", "testimage.png" },
-                    { "width", "50" }
-                });
-
-            TagHelperOutput output = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "width", "50" }
-                });
-
-            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", $"testimage.png?width=100&{ResizeWebProcessor.Sampler}={resampler.Name}" },
-                    { "width", "50" }
-                });
-
-            ImageTagHelper helper = this.GetHelper();
-            helper.Src = "testimage.png";
-            helper.Width = 100;
-            helper.Sampler = resampler;
-
-            // Act
-            helper.Process(context, output);
-
-            // Assert
-            Assert.Equal(expectedOutput.TagName, output.TagName);
-            Assert.Equal(2, output.Attributes.Count);
-
-            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
-            {
-                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
-                TagHelperAttribute actualAttribute = output.Attributes[i];
-                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
-                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
-            }
+            TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+            TagHelperAttribute actualAttribute = output.Attributes[i];
+            Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+            Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
         }
+    }
+
+    [Fact]
+    public void RendersImageTag_SrcIncludes_ResizeOrient()
+    {
+        // Arrange
+        TagHelperContext context = MakeTagHelperContext(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", "testimage.png" },
+                { "width", "50" }
+            });
+
+        TagHelperOutput output = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "width", "50" }
+            });
+
+        TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", $"testimage.png?width=100&{ResizeWebProcessor.Orient}={bool.TrueString}" },
+                { "width", "50" }
+            });
+
+        ImageTagHelper helper = this.GetHelper();
+        helper.Src = "testimage.png";
+        helper.Width = 100;
+        helper.Orient = true;
+
+        // Act
+        helper.Process(context, output);
+
+        // Assert
+        Assert.Equal(expectedOutput.TagName, output.TagName);
+        Assert.Equal(2, output.Attributes.Count);
 
-        [Fact]
-        public void RendersImageTag_SrcIncludes_AutoOrient()
+        for (int i = 0; i < expectedOutput.Attributes.Count; i++)
         {
-            // Arrange
-            TagHelperContext context = MakeTagHelperContext(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", "testimage.png" },
-                    { "width", "50" }
-                });
-
-            TagHelperOutput output = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "width", "50" }
-                });
-
-            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", $"testimage.png?{AutoOrientWebProcessor.AutoOrient}={bool.TrueString}" },
-                    { "width", "50" }
-                });
-
-            ImageTagHelper helper = this.GetHelper();
-            helper.Src = "testimage.png";
-            helper.AutoOrient = true;
-
-            // Act
-            helper.Process(context, output);
-
-            // Assert
-            Assert.Equal(expectedOutput.TagName, output.TagName);
-            Assert.Equal(2, output.Attributes.Count);
-
-            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
-            {
-                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
-                TagHelperAttribute actualAttribute = output.Attributes[i];
-                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
-                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
-            }
+            TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+            TagHelperAttribute actualAttribute = output.Attributes[i];
+            Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+            Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
         }
+    }
 
-        public static TheoryData<FormatCommand> FormatCommands { get; } = new()
-        {
-            { Format.Bmp },
-            { Format.Gif },
-            { Format.Jpg },
-            { Format.Png },
-            { Format.Tga },
-            { Format.WebP }
-        };
+    public static TheoryData<ResamplerCommand> ResamplerCommands { get; } = new()
+    {
+        { Resampler.Bicubic },
+        { Resampler.Box },
+        { Resampler.CatmullRom },
+        { Resampler.Hermite },
+        { Resampler.Lanczos2 },
+        { Resampler.Lanczos3 },
+        { Resampler.Lanczos5 },
+        { Resampler.Lanczos8 },
+        { Resampler.MitchellNetravali },
+        { Resampler.NearestNeighbor },
+        { Resampler.Robidoux },
+        { Resampler.RobidouxSharp },
+        { Resampler.Spline },
+        { Resampler.Triangle },
+        { Resampler.Welch }
+    };
+
+    [Theory]
+    [MemberData(nameof(ResamplerCommands))]
+    public void RendersImageTag_SrcIncludes_Resampler(ResamplerCommand resampler)
+    {
+        // Arrange
+        TagHelperContext context = MakeTagHelperContext(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", "testimage.png" },
+                { "width", "50" }
+            });
+
+        TagHelperOutput output = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "width", "50" }
+            });
+
+        TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", $"testimage.png?width=100&{ResizeWebProcessor.Sampler}={resampler.Name}" },
+                { "width", "50" }
+            });
+
+        ImageTagHelper helper = this.GetHelper();
+        helper.Src = "testimage.png";
+        helper.Width = 100;
+        helper.Sampler = resampler;
+
+        // Act
+        helper.Process(context, output);
 
-        [Theory]
-        [MemberData(nameof(FormatCommands))]
-        public void RendersImageTag_SrcIncludes_Format(FormatCommand format)
+        // Assert
+        Assert.Equal(expectedOutput.TagName, output.TagName);
+        Assert.Equal(2, output.Attributes.Count);
+
+        for (int i = 0; i < expectedOutput.Attributes.Count; i++)
         {
-            // Arrange
-            TagHelperContext context = MakeTagHelperContext(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", "testimage.png" },
-                    { "width", "50" }
-                });
-
-            TagHelperOutput output = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "width", "50" }
-                });
-
-            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", $"testimage.png?{FormatWebProcessor.Format}={format.Name}" },
-                    { "width", "50" }
-                });
-
-            ImageTagHelper helper = this.GetHelper();
-            helper.Src = "testimage.png";
-            helper.Format = format;
-
-            // Act
-            helper.Process(context, output);
-
-            // Assert
-            Assert.Equal(expectedOutput.TagName, output.TagName);
-            Assert.Equal(2, output.Attributes.Count);
-
-            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
-            {
-                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
-                TagHelperAttribute actualAttribute = output.Attributes[i];
-                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
-                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
-            }
+            TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+            TagHelperAttribute actualAttribute = output.Attributes[i];
+            Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+            Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
         }
+    }
+
+    [Fact]
+    public void RendersImageTag_SrcIncludes_AutoOrient()
+    {
+        // Arrange
+        TagHelperContext context = MakeTagHelperContext(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", "testimage.png" },
+                { "width", "50" }
+            });
+
+        TagHelperOutput output = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "width", "50" }
+            });
+
+        TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", $"testimage.png?{AutoOrientWebProcessor.AutoOrient}={bool.TrueString}" },
+                { "width", "50" }
+            });
+
+        ImageTagHelper helper = this.GetHelper();
+        helper.Src = "testimage.png";
+        helper.AutoOrient = true;
+
+        // Act
+        helper.Process(context, output);
+
+        // Assert
+        Assert.Equal(expectedOutput.TagName, output.TagName);
+        Assert.Equal(2, output.Attributes.Count);
 
-        [Fact]
-        public void RendersImageTag_SrcIncludes_BackgroundColor()
+        for (int i = 0; i < expectedOutput.Attributes.Count; i++)
         {
-            // Arrange
-            TagHelperContext context = MakeTagHelperContext(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", "testimage.png" },
-                    { "width", "50" }
-                });
-
-            TagHelperOutput output = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "width", "50" }
-                });
-
-            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", $"testimage.png?{BackgroundColorWebProcessor.Color}={Color.Red.ToHex()}" },
-                    { "width", "50" }
-                });
-
-            ImageTagHelper helper = this.GetHelper();
-            helper.Src = "testimage.png";
-            helper.BackgroundColor = Color.Red;
-
-            // Act
-            helper.Process(context, output);
-
-            // Assert
-            Assert.Equal(expectedOutput.TagName, output.TagName);
-            Assert.Equal(2, output.Attributes.Count);
-
-            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
-            {
-                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
-                TagHelperAttribute actualAttribute = output.Attributes[i];
-                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
-                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
-            }
+            TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+            TagHelperAttribute actualAttribute = output.Attributes[i];
+            Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+            Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
         }
+    }
+
+    public static TheoryData<FormatCommand> FormatCommands { get; } = new()
+    {
+        { Format.Bmp },
+        { Format.Gif },
+        { Format.Jpg },
+        { Format.Png },
+        { Format.Tga },
+        { Format.WebP }
+    };
+
+    [Theory]
+    [MemberData(nameof(FormatCommands))]
+    public void RendersImageTag_SrcIncludes_Format(FormatCommand format)
+    {
+        // Arrange
+        TagHelperContext context = MakeTagHelperContext(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", "testimage.png" },
+                { "width", "50" }
+            });
+
+        TagHelperOutput output = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "width", "50" }
+            });
+
+        TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", $"testimage.png?{FormatWebProcessor.Format}={format.Name}" },
+                { "width", "50" }
+            });
+
+        ImageTagHelper helper = this.GetHelper();
+        helper.Src = "testimage.png";
+        helper.Format = format;
+
+        // Act
+        helper.Process(context, output);
+
+        // Assert
+        Assert.Equal(expectedOutput.TagName, output.TagName);
+        Assert.Equal(2, output.Attributes.Count);
 
-        [Fact]
-        public void RendersImageTag_SrcIncludes_Quality()
+        for (int i = 0; i < expectedOutput.Attributes.Count; i++)
         {
-            // Arrange
-            TagHelperContext context = MakeTagHelperContext(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", "testimage.png" },
-                    { "width", "50" }
-                });
-
-            TagHelperOutput output = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "width", "50" }
-                });
-
-            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", $"testimage.png?{QualityWebProcessor.Quality}={42}" },
-                    { "width", "50" }
-                });
-
-            ImageTagHelper helper = this.GetHelper();
-            helper.Src = "testimage.png";
-            helper.Quality = 42;
-
-            // Act
-            helper.Process(context, output);
-
-            // Assert
-            Assert.Equal(expectedOutput.TagName, output.TagName);
-            Assert.Equal(2, output.Attributes.Count);
-
-            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
-            {
-                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
-                TagHelperAttribute actualAttribute = output.Attributes[i];
-                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
-                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
-            }
+            TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+            TagHelperAttribute actualAttribute = output.Attributes[i];
+            Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+            Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
         }
+    }
+
+    [Fact]
+    public void RendersImageTag_SrcIncludes_BackgroundColor()
+    {
+        // Arrange
+        TagHelperContext context = MakeTagHelperContext(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", "testimage.png" },
+                { "width", "50" }
+            });
+
+        TagHelperOutput output = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "width", "50" }
+            });
+
+        TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", $"testimage.png?{BackgroundColorWebProcessor.Color}={Color.Red.ToHex()}" },
+                { "width", "50" }
+            });
 
-        [Fact]
-        public void RendersImageTag_SrcIncludes_HMAC()
+        ImageTagHelper helper = this.GetHelper();
+        helper.Src = "testimage.png";
+        helper.BackgroundColor = Color.Red;
+
+        // Act
+        helper.Process(context, output);
+
+        // Assert
+        Assert.Equal(expectedOutput.TagName, output.TagName);
+        Assert.Equal(2, output.Attributes.Count);
+
+        for (int i = 0; i < expectedOutput.Attributes.Count; i++)
         {
-            // Arrange
-            TagHelperContext context = MakeTagHelperContext(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", "testimage.png" },
-                    { "width", "50" },
-                    { "imagesharp-hmac", true }
-                });
-
-            TagHelperOutput output = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "width", "50" }
-                });
-
-            TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
-                attributes: new TagHelperAttributeList
-                {
-                    { "src", "testimage.png?hmac=ef09cd10210025e6d588fc2c12b91bf609c3e45f6d5d05dd650b8e6746cba288" },
-                    { "width", "50" }
-                });
-
-            ImageTagHelper helper = this.GetHelper(hmac: true);
-            helper.Src = "testimage.png";
-
-            // Act
-            helper.Process(context, output);
-
-            // Assert
-            Assert.Equal(expectedOutput.TagName, output.TagName);
-            Assert.Equal(2, output.Attributes.Count);
-
-            for (int i = 0; i < expectedOutput.Attributes.Count; i++)
-            {
-                TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
-                TagHelperAttribute actualAttribute = output.Attributes[i];
-                Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
-                Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
-            }
+            TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+            TagHelperAttribute actualAttribute = output.Attributes[i];
+            Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+            Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
         }
+    }
 
-        private ImageTagHelper GetHelper(
-            IUrlHelperFactory urlHelperFactory = null,
-            ViewContext viewContext = null,
-            bool hmac = false)
-        {
-            urlHelperFactory ??= new FakeUrlHelperFactory();
-            viewContext ??= MakeViewContext();
+    [Fact]
+    public void RendersImageTag_SrcIncludes_Quality()
+    {
+        // Arrange
+        TagHelperContext context = MakeTagHelperContext(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", "testimage.png" },
+                { "width", "50" }
+            });
 
-            return new ImageTagHelper(
-                Options.Create<ImageSharpMiddlewareOptions>(new() { HMACSecretKey = hmac ? new byte[] { 1, 2, 3, 4, 5 } : null }),
-                this.Provider.GetRequiredService<RequestAuthorizationUtilities>(),
-                urlHelperFactory,
-                new HtmlTestEncoder())
+        TagHelperOutput output = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
             {
-                ViewContext = viewContext,
-            };
-        }
+                { "width", "50" }
+            });
+
+        TagHelperOutput expectedOutput = MakeImageTagHelperOutput(
+            attributes: new TagHelperAttributeList
+            {
+                { "src", $"testimage.png?{QualityWebProcessor.Quality}={42}" },
+                { "width", "50" }
+            });
+
+        ImageTagHelper helper = this.GetHelper();
+        helper.Src = "testimage.png";
+        helper.Quality = 42;
+
+        // Act
+        helper.Process(context, output);
 
-        private static TagHelperContext MakeTagHelperContext(
-            TagHelperAttributeList attributes)
-            => new(
-                tagName: "image",
-                allAttributes: attributes,
-                items: new Dictionary<object, object>(),
-                uniqueId: Guid.NewGuid().ToString("N"));
+        // Assert
+        Assert.Equal(expectedOutput.TagName, output.TagName);
+        Assert.Equal(2, output.Attributes.Count);
 
-        private static TagHelperOutput MakeImageTagHelperOutput(TagHelperAttributeList attributes)
+        for (int i = 0; i < expectedOutput.Attributes.Count; i++)
         {
-            attributes ??= new TagHelperAttributeList();
-
-            return new TagHelperOutput(
-                "img",
-                attributes,
-                getChildContentAsync: (useCachedResult, encoder) =>
-                {
-                    var tagHelperContent = new DefaultTagHelperContent();
-                    tagHelperContent.SetContent(default);
-                    return Task.FromResult<TagHelperContent>(tagHelperContent);
-                });
+            TagHelperAttribute expectedAttribute = expectedOutput.Attributes[i];
+            TagHelperAttribute actualAttribute = output.Attributes[i];
+            Assert.Equal(expectedAttribute.Name, actualAttribute.Name);
+            Assert.Equal(expectedAttribute.Value.ToString(), actualAttribute.Value.ToString(), ignoreCase: true);
         }
+    }
 
-        private static ViewContext MakeViewContext(string requestPathBase = null)
+    private ImageTagHelper GetHelper(
+        IUrlHelperFactory urlHelperFactory = null,
+        ViewContext viewContext = null)
+    {
+        urlHelperFactory ??= new FakeUrlHelperFactory();
+        viewContext ??= MakeViewContext();
+
+        return new ImageTagHelper(
+            this.Provider.GetRequiredService<IOptions<ImageSharpMiddlewareOptions>>(),
+            this.Provider.GetRequiredService<RequestAuthorizationUtilities>(),
+            urlHelperFactory,
+            new HtmlTestEncoder())
         {
-            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
-            if (requestPathBase != null)
+            ViewContext = viewContext,
+        };
+    }
+
+    private static TagHelperContext MakeTagHelperContext(
+        TagHelperAttributeList attributes)
+        => new(
+            tagName: "image",
+            allAttributes: attributes,
+            items: new Dictionary<object, object>(),
+            uniqueId: Guid.NewGuid().ToString("N"));
+
+    private static TagHelperOutput MakeImageTagHelperOutput(TagHelperAttributeList attributes)
+    {
+        attributes ??= new TagHelperAttributeList();
+
+        return new TagHelperOutput(
+            "img",
+            attributes,
+            getChildContentAsync: (_, _) =>
             {
-                actionContext.HttpContext.Request.PathBase = new PathString(requestPathBase);
-            }
+                DefaultTagHelperContent tagHelperContent = new();
+                tagHelperContent.SetContent(default);
+                return Task.FromResult<TagHelperContent>(tagHelperContent);
+            });
+    }
 
-            var metadataProvider = new EmptyModelMetadataProvider();
-            var viewData = new ViewDataDictionary(metadataProvider, new ModelStateDictionary());
-            return new ViewContext(
-                actionContext,
-                new FakeView(),
-                viewData,
-                new FakeTempDataDictionary(),
-                TextWriter.Null,
-                new HtmlHelperOptions());
+    private static ViewContext MakeViewContext(string requestPathBase = null)
+    {
+        ActionContext actionContext = new(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+        if (requestPathBase != null)
+        {
+            actionContext.HttpContext.Request.PathBase = new PathString(requestPathBase);
         }
 
-        public void Dispose() => this.Provider.Dispose();
+        EmptyModelMetadataProvider metadataProvider = new();
+        ViewDataDictionary viewData = new(metadataProvider, new ModelStateDictionary());
+        return new ViewContext(
+            actionContext,
+            new FakeView(),
+            viewData,
+            new FakeTempDataDictionary(),
+            TextWriter.Null,
+            new HtmlHelperOptions());
+    }
 
-        private class FakeView : IView
-        {
-            public string Path { get; }
+    public void Dispose() => this.Provider.Dispose();
 
-            public Task RenderAsync(ViewContext context) => throw new NotSupportedException();
-        }
+    private class FakeView : IView
+    {
+        public string Path { get; }
 
-        private class FakeTempDataDictionary : Dictionary<string, object>, ITempDataDictionary
-        {
-            public void Keep() => throw new NotSupportedException();
+        public Task RenderAsync(ViewContext context) => throw new NotSupportedException();
+    }
+
+    private class FakeTempDataDictionary : Dictionary<string, object>, ITempDataDictionary
+    {
+        public void Keep() => throw new NotSupportedException();
 
-            public void Keep(string key) => throw new NotSupportedException();
+        public void Keep(string key) => throw new NotSupportedException();
 
-            public void Load() => throw new NotSupportedException();
+        public void Load() => throw new NotSupportedException();
 
-            public object Peek(string key) => throw new NotSupportedException();
+        public object Peek(string key) => throw new NotSupportedException();
 
-            public void Save() => throw new NotSupportedException();
-        }
+        public void Save() => throw new NotSupportedException();
+    }
 
-        private class FakeWebHostEnvironment : IWebHostEnvironment
-        {
-            public string WebRootPath { get; set; }
+    private class FakeWebHostEnvironment : IWebHostEnvironment
+    {
+        public string WebRootPath { get; set; }
 
-            public IFileProvider WebRootFileProvider { get; set; } = new FakeFileProvider();
+        public IFileProvider WebRootFileProvider { get; set; } = new FakeFileProvider();
 
-            public string ApplicationName { get; set; }
+        public string ApplicationName { get; set; }
 
-            public IFileProvider ContentRootFileProvider { get; set; }
+        public IFileProvider ContentRootFileProvider { get; set; }
 
-            public string ContentRootPath { get; set; }
+        public string ContentRootPath { get; set; }
 
-            public string EnvironmentName { get; set; }
-        }
+        public string EnvironmentName { get; set; }
+    }
 
-        private class FakeFileProvider : IFileProvider
-        {
-            public IDirectoryContents GetDirectoryContents(string subpath) => new FakeDirectoryContents();
+    private class FakeFileProvider : IFileProvider
+    {
+        public IDirectoryContents GetDirectoryContents(string subpath) => new FakeDirectoryContents();
 
-            public IFileInfo GetFileInfo(string subpath) => new FakeFileInfo();
+        public IFileInfo GetFileInfo(string subpath) => new FakeFileInfo();
 
-            public IChangeToken Watch(string filter) => new FakeFileChangeToken();
-        }
+        public IChangeToken Watch(string filter) => new FakeFileChangeToken();
+    }
 
-        private class FakeFileChangeToken : IChangeToken
-        {
-            public FakeFileChangeToken(string filter = "") => this.Filter = filter;
+    private class FakeFileChangeToken : IChangeToken
+    {
+        public FakeFileChangeToken(string filter = "") => this.Filter = filter;
 
-            public bool ActiveChangeCallbacks => false;
+        public bool ActiveChangeCallbacks => false;
 
-            public bool HasChanged { get; set; }
+        public bool HasChanged { get; set; }
 
-            public string Filter { get; }
+        public string Filter { get; }
 
-            public IDisposable RegisterChangeCallback(Action<object> callback, object state) => new NullDisposable();
+        public IDisposable RegisterChangeCallback(Action<object> callback, object state) => new NullDisposable();
 
-            private sealed class NullDisposable : IDisposable
+        private sealed class NullDisposable : IDisposable
+        {
+            public void Dispose()
             {
-                public void Dispose()
-                {
-                }
             }
-
-            public override string ToString() => this.Filter;
         }
 
-        private class FakeDirectoryContents : IDirectoryContents
-        {
-            public bool Exists { get; }
+        public override string ToString() => this.Filter;
+    }
 
-            public IEnumerator<IFileInfo> GetEnumerator() => Enumerable.Empty<IFileInfo>().GetEnumerator();
+    private class FakeDirectoryContents : IDirectoryContents
+    {
+        public bool Exists { get; }
 
-            IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
-        }
+        public IEnumerator<IFileInfo> GetEnumerator() => Enumerable.Empty<IFileInfo>().GetEnumerator();
 
-        private class FakeFileInfo : IFileInfo
-        {
-            public bool Exists { get; } = true;
+        IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+    }
 
-            public bool IsDirectory { get; }
+    private class FakeFileInfo : IFileInfo
+    {
+        public bool Exists { get; } = true;
 
-            public DateTimeOffset LastModified { get; }
+        public bool IsDirectory { get; }
 
-            public long Length { get; }
+        public DateTimeOffset LastModified { get; }
 
-            public string Name { get; }
+        public long Length { get; }
 
-            public string PhysicalPath { get; }
+        public string Name { get; }
 
-            public Stream CreateReadStream() => new MemoryStream(Encoding.UTF8.GetBytes("Hello World!"));
-        }
+        public string PhysicalPath { get; }
 
-        private class FakeUrlHelperFactory : IUrlHelperFactory
-        {
-            public IUrlHelper GetUrlHelper(ActionContext context) => new FakeUrlHelper() { ActionContext = context };
-        }
+        public Stream CreateReadStream() => new MemoryStream(Encoding.UTF8.GetBytes("Hello World!"));
+    }
 
-        private class FakeUrlHelper : IUrlHelper
-        {
-            public ActionContext ActionContext { get; set; }
+    private class FakeUrlHelperFactory : IUrlHelperFactory
+    {
+        public IUrlHelper GetUrlHelper(ActionContext context) => new FakeUrlHelper() { ActionContext = context };
+    }
+
+    private class FakeUrlHelper : IUrlHelper
+    {
+        public ActionContext ActionContext { get; set; }
 
-            public string Action(UrlActionContext actionContext) => throw new NotSupportedException();
+        public string Action(UrlActionContext actionContext) => throw new NotSupportedException();
 
-            // Ensure expanded path does not look like an absolute path on Linux, avoiding
-            // https://github.com/aspnet/External/issues/21
-            [return: NotNullIfNotNull("contentPath")]
-            public string Content(string contentPath) => contentPath.Replace("~/", "virtualRoot/");
+        // Ensure expanded path does not look like an absolute path on Linux, avoiding
+        // https://github.com/aspnet/External/issues/21
+        [return: NotNullIfNotNull("contentPath")]
+        public string Content(string contentPath) => contentPath.Replace("~/", "virtualRoot/");
 
-            public bool IsLocalUrl([NotNullWhen(true)] string url) => throw new NotSupportedException();
+        public bool IsLocalUrl([NotNullWhen(true)] string url) => throw new NotSupportedException();
 
-            public string Link(string routeName, object values) => throw new NotSupportedException();
+        public string Link(string routeName, object values) => throw new NotSupportedException();
 
-            public string RouteUrl(UrlRouteContext routeContext) => throw new NotSupportedException();
-        }
+        public string RouteUrl(UrlRouteContext routeContext) => throw new NotSupportedException();
     }
 }

From fe2ea267f593284b9c3e0b1a8f09f1fe55dc8042 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 6 Mar 2023 22:39:04 +1000
Subject: [PATCH 088/102] Fix null handling and ensure requirement

---
 src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
index d7b71a35..b9837291 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
@@ -38,7 +38,7 @@ private static readonly ConcurrentTLruCache<string, ImageMetadata> SourceMetadat
     /// <summary>
     /// Used to temporarily store cached HMAC-s to reduce the overhead of HMAC token generation.
     /// </summary>
-    private static readonly ConcurrentTLruCache<string, string> HMACTokenLru
+    private static readonly ConcurrentTLruCache<string, string?> HMACTokenLru
         = new(1024, TimeSpan.FromSeconds(30));
 
     /// <summary>
@@ -244,7 +244,7 @@ private async Task Invoke(HttpContext httpContext, bool retry)
 
         // At this point we know that this is an image request designed for processing via this middleware.
         // Check for a token if required and reject if invalid.
-        if (checkHMAC && hmac != token)
+        if (checkHMAC && (hmac != token || (hmac is null && commands.Count > 0)))
         {
             SetBadRequest(httpContext);
             return;

From 68a82b589d25837b91d3299f96cd7002d7294108 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 6 Mar 2023 22:54:26 +1000
Subject: [PATCH 089/102] Consistant casing

---
 src/ImageSharp.Web/Format.cs    | 12 ++++++------
 src/ImageSharp.Web/Resampler.cs | 32 +++++++++++++++-----------------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/ImageSharp.Web/Format.cs b/src/ImageSharp.Web/Format.cs
index fa564487..6d91a67a 100644
--- a/src/ImageSharp.Web/Format.cs
+++ b/src/ImageSharp.Web/Format.cs
@@ -11,30 +11,30 @@ public static class Format
     /// <summary>
     /// Gets the Bmp encoding format.
     /// </summary>
-    public static FormatCommand Bmp { get; } = new(nameof(Bmp));
+    public static FormatCommand Bmp { get; } = new("bmp");
 
     /// <summary>
     /// Gets the Gif encoding format.
     /// </summary>
-    public static FormatCommand Gif { get; } = new(nameof(Gif));
+    public static FormatCommand Gif { get; } = new("gif");
 
     /// <summary>
     /// Gets the Jpg encoding format.
     /// </summary>
-    public static FormatCommand Jpg { get; } = new(nameof(Jpg));
+    public static FormatCommand Jpg { get; } = new("jpg");
 
     /// <summary>
     /// Gets the Png encoding format.
     /// </summary>
-    public static FormatCommand Png { get; } = new(nameof(Png));
+    public static FormatCommand Png { get; } = new("png");
 
     /// <summary>
     /// Gets the Tga encoding format.
     /// </summary>
-    public static FormatCommand Tga { get; } = new(nameof(Tga));
+    public static FormatCommand Tga { get; } = new("tga");
 
     /// <summary>
     /// Gets the WebP encoding format.
     /// </summary>
-    public static FormatCommand WebP { get; } = new(nameof(WebP));
+    public static FormatCommand WebP { get; } = new("webp");
 }
diff --git a/src/ImageSharp.Web/Resampler.cs b/src/ImageSharp.Web/Resampler.cs
index 732a9efe..febeecc7 100644
--- a/src/ImageSharp.Web/Resampler.cs
+++ b/src/ImageSharp.Web/Resampler.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using SixLabors.ImageSharp.Processing;
-
 namespace SixLabors.ImageSharp.Web;
 
 /// <summary>
@@ -11,47 +9,47 @@ namespace SixLabors.ImageSharp.Web;
 public static class Resampler
 {
     /// <inheritdoc cref="KnownResamplers.Bicubic"/>
-    public static ResamplerCommand Bicubic { get; } = new(nameof(Bicubic));
+    public static ResamplerCommand Bicubic { get; } = new("bicubic");
 
     /// <inheritdoc cref="KnownResamplers.Box"/>
-    public static ResamplerCommand Box { get; } = new(nameof(Box));
+    public static ResamplerCommand Box { get; } = new("box");
 
     /// <inheritdoc cref="KnownResamplers.CatmullRom"/>
-    public static ResamplerCommand CatmullRom { get; } = new(nameof(CatmullRom));
+    public static ResamplerCommand CatmullRom { get; } = new("catmullrom");
 
     /// <inheritdoc cref="KnownResamplers.Hermite"/>
-    public static ResamplerCommand Hermite { get; } = new(nameof(Hermite));
+    public static ResamplerCommand Hermite { get; } = new("hermite");
 
     /// <inheritdoc cref="KnownResamplers.Lanczos2"/>
-    public static ResamplerCommand Lanczos2 { get; } = new(nameof(Lanczos2));
+    public static ResamplerCommand Lanczos2 { get; } = new("lanczos2");
 
     /// <inheritdoc cref="KnownResamplers.Lanczos3"/>
-    public static ResamplerCommand Lanczos3 { get; } = new(nameof(Lanczos3));
+    public static ResamplerCommand Lanczos3 { get; } = new("lanczos3");
 
     /// <inheritdoc cref="KnownResamplers.Lanczos5"/>
-    public static ResamplerCommand Lanczos5 { get; } = new(nameof(Lanczos5));
+    public static ResamplerCommand Lanczos5 { get; } = new("lanczos5");
 
     /// <inheritdoc cref="KnownResamplers.Lanczos8"/>
-    public static ResamplerCommand Lanczos8 { get; } = new(nameof(Lanczos8));
+    public static ResamplerCommand Lanczos8 { get; } = new("lanczos8");
 
     /// <inheritdoc cref="KnownResamplers.MitchellNetravali"/>
-    public static ResamplerCommand MitchellNetravali { get; } = new(nameof(MitchellNetravali));
+    public static ResamplerCommand MitchellNetravali { get; } = new("mitchellnetravali");
 
     /// <inheritdoc cref="KnownResamplers.NearestNeighbor"/>
-    public static ResamplerCommand NearestNeighbor { get; } = new(nameof(NearestNeighbor));
+    public static ResamplerCommand NearestNeighbor { get; } = new("nearestneighbor");
 
     /// <inheritdoc cref="KnownResamplers.Robidoux"/>
-    public static ResamplerCommand Robidoux { get; } = new(nameof(Robidoux));
+    public static ResamplerCommand Robidoux { get; } = new("robidoux");
 
     /// <inheritdoc cref="KnownResamplers.RobidouxSharp"/>
-    public static ResamplerCommand RobidouxSharp { get; } = new(nameof(RobidouxSharp));
+    public static ResamplerCommand RobidouxSharp { get; } = new("robidouxsharp");
 
     /// <inheritdoc cref="KnownResamplers.Spline"/>
-    public static ResamplerCommand Spline { get; } = new(nameof(Spline));
+    public static ResamplerCommand Spline { get; } = new("spline");
 
     /// <inheritdoc cref="KnownResamplers.Triangle"/>
-    public static ResamplerCommand Triangle { get; } = new(nameof(Triangle));
+    public static ResamplerCommand Triangle { get; } = new("triangle");
 
     /// <inheritdoc cref="KnownResamplers.Welch"/>
-    public static ResamplerCommand Welch { get; } = new(nameof(Welch));
+    public static ResamplerCommand Welch { get; } = new("welch");
 }

From 65fb7bb01d0d7a3b76a0b3b8c2b7abf63fd00a6d Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Mon, 6 Mar 2023 17:58:50 +0100
Subject: [PATCH 090/102] Remove nullable disable from aws

---
 .../AmazonS3ClientFactory.cs                  |  3 +--
 .../Caching/AWSS3StorageCache.cs              | 11 ++++-----
 .../Caching/AWSS3StorageCacheOptions.cs       | 11 ++++-----
 .../IAWSS3BucketClientOptions.cs              |  9 ++++----
 .../Providers/AWSS3StorageImageProvider.cs    | 23 ++++++++++++++-----
 .../AWSS3StorageImageProviderOptions.cs       | 11 ++++-----
 .../Resolvers/AWSS3StorageCacheResolver.cs    |  1 -
 .../Resolvers/AWSS3StorageImageResolver.cs    |  3 +--
 8 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs b/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs
index e311ae86..a2885292 100644
--- a/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs
+++ b/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Amazon;
 using Amazon.Runtime;
@@ -33,7 +32,7 @@ public static AmazonS3Client CreateClient(IAWSS3BucketClientOptions options)
         else if (!string.IsNullOrWhiteSpace(options.AccessKey))
         {
             // AccessSecret can be empty.
-            Guard.NotNullOrWhiteSpace(options.Region, nameof(options.Region));
+            Guard.NotNullOrWhiteSpace(options.Region!, nameof(options.Region));
             RegionEndpoint region = RegionEndpoint.GetBySystemName(options.Region);
             AmazonS3Config config = new() { RegionEndpoint = region, UseAccelerateEndpoint = options.UseAccelerateEndpoint };
             SetTimeout(config, options.Timeout);
diff --git a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs
index c3d2644a..76dced53 100644
--- a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using Amazon.S3;
@@ -17,7 +16,7 @@ namespace SixLabors.ImageSharp.Web.Caching.AWS;
 public class AWSS3StorageCache : IImageCache
 {
     private readonly IAmazonS3 amazonS3Client;
-    private readonly string bucket;
+    private readonly string? bucket;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AWSS3StorageCache"/> class.
@@ -32,14 +31,14 @@ public AWSS3StorageCache(IOptions<AWSS3StorageCacheOptions> cacheOptions)
     }
 
     /// <inheritdoc/>
-    public async Task<IImageCacheResolver> GetAsync(string key)
+    public async Task<IImageCacheResolver?> GetAsync(string key)
     {
         GetObjectMetadataRequest request = new() { BucketName = this.bucket, Key = key };
         try
         {
             // HEAD request throws a 404 if not found.
             MetadataCollection metadata = (await this.amazonS3Client.GetObjectMetadataAsync(request)).Metadata;
-            return new AWSS3StorageCacheResolver(this.amazonS3Client, this.bucket, key, metadata);
+            return new AWSS3StorageCacheResolver(this.amazonS3Client, this.bucket!, key, metadata);
         }
         catch
         {
@@ -82,12 +81,12 @@ public Task SetAsync(string key, Stream stream, ImageCacheMetadata metadata)
     /// If the bucket does not already exist, a <see cref="PutBucketResponse"/> describing the newly
     /// created bucket. If the container already exists, <see langword="null"/>.
     /// </returns>
-    public static PutBucketResponse CreateIfNotExists(
+    public static PutBucketResponse? CreateIfNotExists(
         AWSS3StorageCacheOptions options,
         S3CannedACL acl)
         => AsyncHelper.RunSync(() => CreateIfNotExistsAsync(options, acl));
 
-    private static async Task<PutBucketResponse> CreateIfNotExistsAsync(
+    private static async Task<PutBucketResponse?> CreateIfNotExistsAsync(
         AWSS3StorageCacheOptions options,
         S3CannedACL acl)
     {
diff --git a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs
index f2845385..672d16fd 100644
--- a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 namespace SixLabors.ImageSharp.Web.Caching.AWS;
 
@@ -10,19 +9,19 @@ namespace SixLabors.ImageSharp.Web.Caching.AWS;
 public class AWSS3StorageCacheOptions : IAWSS3BucketClientOptions
 {
     /// <inheritdoc/>
-    public string Region { get; set; }
+    public string? Region { get; set; }
 
     /// <inheritdoc/>
-    public string BucketName { get; set; }
+    public string BucketName { get; set; } = null!;
 
     /// <inheritdoc/>
-    public string AccessKey { get; set; }
+    public string? AccessKey { get; set; }
 
     /// <inheritdoc/>
-    public string AccessSecret { get; set; }
+    public string? AccessSecret { get; set; }
 
     /// <inheritdoc/>
-    public string Endpoint { get; set; }
+    public string? Endpoint { get; set; }
 
     /// <inheritdoc/>
     public bool UseAccelerateEndpoint { get; set; }
diff --git a/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs b/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs
index 6a1f285f..10adb383 100644
--- a/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs
+++ b/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 namespace SixLabors.ImageSharp.Web;
 
@@ -12,7 +11,7 @@ internal interface IAWSS3BucketClientOptions
     /// <summary>
     /// Gets or sets the AWS region endpoint (us-east-1/us-west-1/ap-southeast-2).
     /// </summary>
-    string Region { get; set; }
+    string? Region { get; set; }
 
     /// <summary>
     /// Gets or sets the AWS bucket name.
@@ -24,20 +23,20 @@ internal interface IAWSS3BucketClientOptions
     /// If deploying inside an EC2 instance AWS keys will already be available via environment
     /// variables and don't need to be specified. Follow AWS best security practices on  <see href="https://docs.aws.amazon.com/general/latest/gr/aws-access-keys-best-practices.html"/>.
     /// </summary>
-    string AccessKey { get; set; }
+    string? AccessKey { get; set; }
 
     /// <summary>
     /// Gets or sets the AWS secret - Can be used to override keys provided by the environment.
     /// If deploying inside an EC2 instance AWS keys will already be available via environment
     /// variables and don't need to be specified. Follow AWS best security practices on  <see href="https://docs.aws.amazon.com/general/latest/gr/aws-access-keys-best-practices.html"/>.
     /// </summary>
-    string AccessSecret { get; set; }
+    string? AccessSecret { get; set; }
 
     /// <summary>
     /// Gets or sets the AWS endpoint - used for testing to over region endpoint allowing it
     /// to be set to localhost.
     /// </summary>
-    string Endpoint { get; set; }
+    string? Endpoint { get; set; }
 
     /// <summary>
     /// Gets or sets a value indicating whether the S3 accelerate endpoint is used.
diff --git a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs
index dec40df1..b2af4593 100644
--- a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Amazon.S3;
 using Amazon.S3.Model;
@@ -29,7 +28,7 @@ private readonly Dictionary<string, AmazonS3Client> buckets
         = new();
 
     private readonly AWSS3StorageImageProviderOptions storageOptions;
-    private Func<HttpContext, bool> match;
+    private Func<HttpContext, bool>? match;
 
     /// <summary>
     /// Contains various helper methods based on the current configuration.
@@ -70,17 +69,23 @@ public bool IsValidRequest(HttpContext context)
         => this.formatUtilities.TryGetExtensionFromUri(context.Request.GetDisplayUrl(), out _);
 
     /// <inheritdoc />
-    public async Task<IImageResolver> GetAsync(HttpContext context)
+    public async Task<IImageResolver?> GetAsync(HttpContext context)
     {
         // Strip the leading slash and bucket name from the HTTP request path and treat
         // the remaining path string as the key.
         // Path has already been correctly parsed before here.
         string bucketName = string.Empty;
-        IAmazonS3 s3Client = null;
+        IAmazonS3? s3Client = null;
 
         // We want an exact match here to ensure that bucket names starting with
         // the same prefix are not mixed up.
-        string path = context.Request.Path.Value.TrimStart(SlashChars);
+        string? path = context.Request.Path.Value?.TrimStart(SlashChars);
+
+        if (path is null)
+        {
+            return null;
+        }
+
         int index = path.IndexOfAny(SlashChars);
         string nameToMatch = index != -1 ? path.Substring(0, index) : path;
 
@@ -120,7 +125,13 @@ private bool IsMatch(HttpContext context)
     {
         // Only match loosly here for performance.
         // Path matching conflicts should be dealt with by configuration.
-        string path = context.Request.Path.Value.TrimStart(SlashChars);
+        string? path = context.Request.Path.Value?.TrimStart(SlashChars);
+
+        if (path is null)
+        {
+            return false;
+        }
+
         foreach (string bucket in this.buckets.Keys)
         {
             if (path.StartsWith(bucket, StringComparison.OrdinalIgnoreCase))
diff --git a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs
index 14eac3e6..f0c3a201 100644
--- a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 namespace SixLabors.ImageSharp.Web.Providers.AWS;
 
@@ -21,19 +20,19 @@ public class AWSS3StorageImageProviderOptions
 public class AWSS3BucketClientOptions : IAWSS3BucketClientOptions
 {
     /// <inheritdoc/>
-    public string Region { get; set; }
+    public string? Region { get; set; }
 
     /// <inheritdoc/>
-    public string BucketName { get; set; }
+    public string BucketName { get; set; } = null!;
 
     /// <inheritdoc/>
-    public string AccessKey { get; set; }
+    public string? AccessKey { get; set; }
 
     /// <inheritdoc/>
-    public string AccessSecret { get; set; }
+    public string? AccessSecret { get; set; }
 
     /// <inheritdoc/>
-    public string Endpoint { get; set; }
+    public string? Endpoint { get; set; }
 
     /// <inheritdoc/>
     public bool UseAccelerateEndpoint { get; set; }
diff --git a/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageCacheResolver.cs b/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageCacheResolver.cs
index 7fbf750e..6e83f892 100644
--- a/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageCacheResolver.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageCacheResolver.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Amazon.S3;
 using Amazon.S3.Model;
diff --git a/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs b/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs
index f58930ed..8ef517c8 100644
--- a/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Net.Http.Headers;
 using Amazon.S3;
@@ -38,7 +37,7 @@ public async Task<ImageMetadata> GetMetaDataAsync()
         // Try to parse the max age from the source. If it's not zero then we pass it along
         // to set the cache control headers for the response.
         TimeSpan maxAge = TimeSpan.MinValue;
-        if (CacheControlHeaderValue.TryParse(metadata.Headers.CacheControl, out CacheControlHeaderValue cacheControl))
+        if (CacheControlHeaderValue.TryParse(metadata.Headers.CacheControl, out CacheControlHeaderValue? cacheControl))
         {
             // Weirdly passing null to TryParse returns true.
             if (cacheControl?.MaxAge.HasValue == true)

From b93a90b7c1ea529ce00dba178edb90a68bf41d0b Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Tue, 7 Mar 2023 08:56:35 +1000
Subject: [PATCH 091/102] Fix #311

---
 ImageSharp.Web.sln | 17 +++++++++--------
 README.md          |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ImageSharp.Web.sln b/ImageSharp.Web.sln
index 85ae2295..71cf37d3 100644
--- a/ImageSharp.Web.sln
+++ b/ImageSharp.Web.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.452
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33424.131
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_root", "_root", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}"
 	ProjectSection(SolutionItems) = preProject
@@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_root", "_root", "{C317F1B1
 		.github\CONTRIBUTING.md = .github\CONTRIBUTING.md
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
+		LICENSE = LICENSE
 		README.md = README.md
 		shared-infrastructure\SixLabors.ruleset = shared-infrastructure\SixLabors.ruleset
 		shared-infrastructure\SixLabors.Tests.ruleset = shared-infrastructure\SixLabors.Tests.ruleset
@@ -67,12 +68,6 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Web.Sample", "samples\ImageSharp.Web.Sample\ImageSharp.Web.Sample.csproj", "{8F40DEC6-A97F-4002-A504-13E188665A98}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{2f1b36e2-5d92-4442-b816-d2a978246435}*SharedItemsImports = 5
-		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{68a8cc40-6aed-4e96-b524-31b1158fdeea}*SharedItemsImports = 13
-		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{e2a545ec-b909-4ead-b95f-397f68588be3}*SharedItemsImports = 5
-		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{e631d300-acd5-40ea-a6bb-08e22092ec76}*SharedItemsImports = 5
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
@@ -173,4 +168,10 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C5B38B65-A19E-4359-859C-5B2205429BD1}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{2f1b36e2-5d92-4442-b816-d2a978246435}*SharedItemsImports = 5
+		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{68a8cc40-6aed-4e96-b524-31b1158fdeea}*SharedItemsImports = 13
+		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{e2a545ec-b909-4ead-b95f-397f68588be3}*SharedItemsImports = 5
+		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{e631d300-acd5-40ea-a6bb-08e22092ec76}*SharedItemsImports = 5
+	EndGlobalSection
 EndGlobal
diff --git a/README.md b/README.md
index 189b9788..7ebdd348 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ SixLabors.ImageSharp.Web
 
 ## License
   
-- ImageSharp.Web is licensed under the [Six Labors Split License, Version 1.0](https://github.com/SixLabors/ImageSharp/blob/main/LICEN
+- ImageSharp.Web is licensed under the [Six Labors Split License, Version 1.0](https://github.com/SixLabors/ImageSharp.Web/blob/main/LICENSE)
 
 ## Support Six Labors
 

From 2f9904dd89d887925eb80ec1682d00e0165a8ce7 Mon Sep 17 00:00:00 2001
From: Maxime Dupras <maxime.dupras@getmaintainx.com>
Date: Wed, 15 Mar 2023 15:10:26 -0400
Subject: [PATCH 092/102] Updated the `KeyExists` from aws keep the response
 metadata in the image resolver.

---
 .../Providers/AWSS3StorageImageProvider.cs    | 51 ++++++++++++-------
 .../Resolvers/AWSS3StorageImageResolver.cs    | 10 ++--
 2 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs
index dec40df1..067aa56d 100644
--- a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Amazon.S3;
 using Amazon.S3.Model;
@@ -29,7 +28,7 @@ private readonly Dictionary<string, AmazonS3Client> buckets
         = new();
 
     private readonly AWSS3StorageImageProviderOptions storageOptions;
-    private Func<HttpContext, bool> match;
+    private Func<HttpContext, bool>? match;
 
     /// <summary>
     /// Contains various helper methods based on the current configuration.
@@ -70,17 +69,23 @@ public bool IsValidRequest(HttpContext context)
         => this.formatUtilities.TryGetExtensionFromUri(context.Request.GetDisplayUrl(), out _);
 
     /// <inheritdoc />
-    public async Task<IImageResolver> GetAsync(HttpContext context)
+    public async Task<IImageResolver?> GetAsync(HttpContext context)
     {
         // Strip the leading slash and bucket name from the HTTP request path and treat
         // the remaining path string as the key.
         // Path has already been correctly parsed before here.
         string bucketName = string.Empty;
-        IAmazonS3 s3Client = null;
+        IAmazonS3? s3Client = null;
 
         // We want an exact match here to ensure that bucket names starting with
         // the same prefix are not mixed up.
-        string path = context.Request.Path.Value.TrimStart(SlashChars);
+        string? path = context.Request.Path.Value?.TrimStart(SlashChars);
+
+        if (path is null)
+        {
+            return null;
+        }
+
         int index = path.IndexOfAny(SlashChars);
         string nameToMatch = index != -1 ? path.Substring(0, index) : path;
 
@@ -108,19 +113,26 @@ public async Task<IImageResolver> GetAsync(HttpContext context)
             return null;
         }
 
-        if (!await KeyExists(s3Client, bucketName, key))
+        KeyExistsResult keyExists = await KeyExists(s3Client, bucketName, key);
+        if (!keyExists.Exists)
         {
             return null;
         }
 
-        return new AWSS3StorageImageResolver(s3Client, bucketName, key);
+        return new AWSS3StorageImageResolver(s3Client, bucketName, key, keyExists.Metadata);
     }
 
     private bool IsMatch(HttpContext context)
     {
         // Only match loosly here for performance.
         // Path matching conflicts should be dealt with by configuration.
-        string path = context.Request.Path.Value.TrimStart(SlashChars);
+        string? path = context.Request.Path.Value?.TrimStart(SlashChars);
+
+        if (path is null)
+        {
+            return false;
+        }
+
         foreach (string bucket in this.buckets.Keys)
         {
             if (path.StartsWith(bucket, StringComparison.OrdinalIgnoreCase))
@@ -133,39 +145,40 @@ private bool IsMatch(HttpContext context)
     }
 
     // ref https://github.com/aws/aws-sdk-net/blob/master/sdk/src/Services/S3/Custom/_bcl/IO/S3FileInfo.cs#L118
-    private static async Task<bool> KeyExists(IAmazonS3 s3Client, string bucketName, string key)
+    private static async Task<KeyExistsResult> KeyExists(IAmazonS3 s3Client, string bucketName, string key)
     {
         try
         {
-            GetObjectMetadataRequest request = new()
-            {
-                BucketName = bucketName,
-                Key = key
-            };
+            GetObjectMetadataRequest request = new() { BucketName = bucketName, Key = key };
 
             // If the object doesn't exist then a "NotFound" will be thrown
-            await s3Client.GetObjectMetadataAsync(request);
-            return true;
+            GetObjectMetadataResponse metadata = await s3Client.GetObjectMetadataAsync(request);
+            return new KeyExistsResult(metadata);
         }
         catch (AmazonS3Exception e)
         {
             if (string.Equals(e.ErrorCode, "NoSuchBucket", StringComparison.Ordinal))
             {
-                return false;
+                return default;
             }
 
             if (string.Equals(e.ErrorCode, "NotFound", StringComparison.Ordinal))
             {
-                return false;
+                return default;
             }
 
             // If the object exists but the client is not authorized to access it, then a "Forbidden" will be thrown.
             if (string.Equals(e.ErrorCode, "Forbidden", StringComparison.Ordinal))
             {
-                return false;
+                return default;
             }
 
             throw;
         }
     }
+
+    private readonly record struct KeyExistsResult(GetObjectMetadataResponse? Metadata)
+    {
+        public bool Exists => this.Metadata is not null;
+    }
 }
diff --git a/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs b/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs
index f58930ed..dd7c2b4e 100644
--- a/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Net.Http.Headers;
 using Amazon.S3;
@@ -16,6 +15,7 @@ public class AWSS3StorageImageResolver : IImageResolver
     private readonly IAmazonS3 amazonS3;
     private readonly string bucketName;
     private readonly string imagePath;
+    private readonly GetObjectMetadataResponse? metadataResponse;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AWSS3StorageImageResolver"/> class.
@@ -23,22 +23,24 @@ public class AWSS3StorageImageResolver : IImageResolver
     /// <param name="amazonS3">The Amazon S3 Client</param>
     /// <param name="bucketName">The bucket name.</param>
     /// <param name="imagePath">The image path.</param>
-    public AWSS3StorageImageResolver(IAmazonS3 amazonS3, string bucketName, string imagePath)
+    /// <param name="metadataResponse">Optional metadata response.</param>
+    public AWSS3StorageImageResolver(IAmazonS3 amazonS3, string bucketName, string imagePath, GetObjectMetadataResponse? metadataResponse = null)
     {
         this.amazonS3 = amazonS3;
         this.bucketName = bucketName;
         this.imagePath = imagePath;
+        this.metadataResponse = metadataResponse;
     }
 
     /// <inheritdoc />
     public async Task<ImageMetadata> GetMetaDataAsync()
     {
-        GetObjectMetadataResponse metadata = await this.amazonS3.GetObjectMetadataAsync(this.bucketName, this.imagePath);
+        GetObjectMetadataResponse metadata = this.metadataResponse ?? await this.amazonS3.GetObjectMetadataAsync(this.bucketName, this.imagePath);
 
         // Try to parse the max age from the source. If it's not zero then we pass it along
         // to set the cache control headers for the response.
         TimeSpan maxAge = TimeSpan.MinValue;
-        if (CacheControlHeaderValue.TryParse(metadata.Headers.CacheControl, out CacheControlHeaderValue cacheControl))
+        if (CacheControlHeaderValue.TryParse(metadata.Headers.CacheControl, out CacheControlHeaderValue? cacheControl))
         {
             // Weirdly passing null to TryParse returns true.
             if (cacheControl?.MaxAge.HasValue == true)

From 2acb0013f798462dafa333689cd9644d4dd75904 Mon Sep 17 00:00:00 2001
From: Maxime Dupras <maxdupras@gmail.com>
Date: Sat, 18 Mar 2023 01:04:55 -0400
Subject: [PATCH 093/102] Reverted nullable changes on S3 provider and resolver
 files

---
 .../Providers/AWSS3StorageImageProvider.cs    | 25 ++++++-------------
 .../Resolvers/AWSS3StorageImageResolver.cs    |  7 +++---
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs
index 067aa56d..d5c818fd 100644
--- a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
+#nullable disable
 
 using Amazon.S3;
 using Amazon.S3.Model;
@@ -28,7 +29,7 @@ private readonly Dictionary<string, AmazonS3Client> buckets
         = new();
 
     private readonly AWSS3StorageImageProviderOptions storageOptions;
-    private Func<HttpContext, bool>? match;
+    private Func<HttpContext, bool> match;
 
     /// <summary>
     /// Contains various helper methods based on the current configuration.
@@ -69,23 +70,17 @@ public bool IsValidRequest(HttpContext context)
         => this.formatUtilities.TryGetExtensionFromUri(context.Request.GetDisplayUrl(), out _);
 
     /// <inheritdoc />
-    public async Task<IImageResolver?> GetAsync(HttpContext context)
+    public async Task<IImageResolver> GetAsync(HttpContext context)
     {
         // Strip the leading slash and bucket name from the HTTP request path and treat
         // the remaining path string as the key.
         // Path has already been correctly parsed before here.
         string bucketName = string.Empty;
-        IAmazonS3? s3Client = null;
+        IAmazonS3 s3Client = null;
 
         // We want an exact match here to ensure that bucket names starting with
         // the same prefix are not mixed up.
-        string? path = context.Request.Path.Value?.TrimStart(SlashChars);
-
-        if (path is null)
-        {
-            return null;
-        }
-
+        string path = context.Request.Path.Value.TrimStart(SlashChars);
         int index = path.IndexOfAny(SlashChars);
         string nameToMatch = index != -1 ? path.Substring(0, index) : path;
 
@@ -126,13 +121,7 @@ private bool IsMatch(HttpContext context)
     {
         // Only match loosly here for performance.
         // Path matching conflicts should be dealt with by configuration.
-        string? path = context.Request.Path.Value?.TrimStart(SlashChars);
-
-        if (path is null)
-        {
-            return false;
-        }
-
+        string path = context.Request.Path.Value.TrimStart(SlashChars);
         foreach (string bucket in this.buckets.Keys)
         {
             if (path.StartsWith(bucket, StringComparison.OrdinalIgnoreCase))
@@ -177,7 +166,7 @@ private static async Task<KeyExistsResult> KeyExists(IAmazonS3 s3Client, string
         }
     }
 
-    private readonly record struct KeyExistsResult(GetObjectMetadataResponse? Metadata)
+    private readonly record struct KeyExistsResult(GetObjectMetadataResponse Metadata)
     {
         public bool Exists => this.Metadata is not null;
     }
diff --git a/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs b/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs
index dd7c2b4e..edca9f5a 100644
--- a/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
+#nullable disable
 
 using System.Net.Http.Headers;
 using Amazon.S3;
@@ -15,7 +16,7 @@ public class AWSS3StorageImageResolver : IImageResolver
     private readonly IAmazonS3 amazonS3;
     private readonly string bucketName;
     private readonly string imagePath;
-    private readonly GetObjectMetadataResponse? metadataResponse;
+    private readonly GetObjectMetadataResponse metadataResponse;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AWSS3StorageImageResolver"/> class.
@@ -24,7 +25,7 @@ public class AWSS3StorageImageResolver : IImageResolver
     /// <param name="bucketName">The bucket name.</param>
     /// <param name="imagePath">The image path.</param>
     /// <param name="metadataResponse">Optional metadata response.</param>
-    public AWSS3StorageImageResolver(IAmazonS3 amazonS3, string bucketName, string imagePath, GetObjectMetadataResponse? metadataResponse = null)
+    public AWSS3StorageImageResolver(IAmazonS3 amazonS3, string bucketName, string imagePath, GetObjectMetadataResponse metadataResponse = null)
     {
         this.amazonS3 = amazonS3;
         this.bucketName = bucketName;
@@ -40,7 +41,7 @@ public async Task<ImageMetadata> GetMetaDataAsync()
         // Try to parse the max age from the source. If it's not zero then we pass it along
         // to set the cache control headers for the response.
         TimeSpan maxAge = TimeSpan.MinValue;
-        if (CacheControlHeaderValue.TryParse(metadata.Headers.CacheControl, out CacheControlHeaderValue? cacheControl))
+        if (CacheControlHeaderValue.TryParse(metadata.Headers.CacheControl, out CacheControlHeaderValue cacheControl))
         {
             // Weirdly passing null to TryParse returns true.
             if (cacheControl?.MaxAge.HasValue == true)

From 737eb5924050a70463ce6387bcd91bbba41804d6 Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Mon, 20 Mar 2023 06:46:23 +0100
Subject: [PATCH 094/102] Update to latest shared-infrastructure

---
 shared-infrastructure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared-infrastructure b/shared-infrastructure
index 9a6cf00d..f0d7ed20 160000
--- a/shared-infrastructure
+++ b/shared-infrastructure
@@ -1 +1 @@
-Subproject commit 9a6cf00d9a3d482bb08211dd8309f4724a2735cb
+Subproject commit f0d7ed20b36ab1f9e379ca3bee528e6efd991b00

From 5341d87f539e89858d8cd037dbb275e6bfeb65e8 Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Mon, 20 Mar 2023 06:59:00 +0100
Subject: [PATCH 095/102] Resolve review

---
 .../AmazonS3ClientFactory.cs                  |  2 +-
 .../Caching/AWSS3StorageCacheOptions.cs       | 14 +++++-----
 .../IAWSS3BucketClientOptions.cs              | 28 +++++++++----------
 .../AWSS3StorageImageProviderOptions.cs       | 14 +++++-----
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs b/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs
index a2885292..d3589384 100644
--- a/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs
+++ b/src/ImageSharp.Web.Providers.AWS/AmazonS3ClientFactory.cs
@@ -32,7 +32,7 @@ public static AmazonS3Client CreateClient(IAWSS3BucketClientOptions options)
         else if (!string.IsNullOrWhiteSpace(options.AccessKey))
         {
             // AccessSecret can be empty.
-            Guard.NotNullOrWhiteSpace(options.Region!, nameof(options.Region));
+            Guard.NotNullOrWhiteSpace(options.Region, nameof(options.Region));
             RegionEndpoint region = RegionEndpoint.GetBySystemName(options.Region);
             AmazonS3Config config = new() { RegionEndpoint = region, UseAccelerateEndpoint = options.UseAccelerateEndpoint };
             SetTimeout(config, options.Timeout);
diff --git a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs
index 672d16fd..8d67827a 100644
--- a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs
@@ -9,23 +9,23 @@ namespace SixLabors.ImageSharp.Web.Caching.AWS;
 public class AWSS3StorageCacheOptions : IAWSS3BucketClientOptions
 {
     /// <inheritdoc/>
-    public string? Region { get; set; }
+    public string? Region { get; init; }
 
     /// <inheritdoc/>
-    public string BucketName { get; set; } = null!;
+    public string BucketName { get; init; } = null!;
 
     /// <inheritdoc/>
-    public string? AccessKey { get; set; }
+    public string? AccessKey { get; init; }
 
     /// <inheritdoc/>
-    public string? AccessSecret { get; set; }
+    public string? AccessSecret { get; init; }
 
     /// <inheritdoc/>
-    public string? Endpoint { get; set; }
+    public string? Endpoint { get; init; }
 
     /// <inheritdoc/>
-    public bool UseAccelerateEndpoint { get; set; }
+    public bool UseAccelerateEndpoint { get; init; }
 
     /// <inheritdoc/>
-    public TimeSpan? Timeout { get; set; }
+    public TimeSpan? Timeout { get; init; }
 }
diff --git a/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs b/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs
index 10adb383..68f4c8e1 100644
--- a/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs
+++ b/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs
@@ -9,44 +9,44 @@ namespace SixLabors.ImageSharp.Web;
 internal interface IAWSS3BucketClientOptions
 {
     /// <summary>
-    /// Gets or sets the AWS region endpoint (us-east-1/us-west-1/ap-southeast-2).
+    /// Gets the AWS region endpoint (us-east-1/us-west-1/ap-southeast-2).
     /// </summary>
-    string? Region { get; set; }
+    string? Region { get; init; }
 
     /// <summary>
-    /// Gets or sets the AWS bucket name.
+    /// Gets the AWS bucket name.
     /// </summary>
-    string BucketName { get; set; }
+    string BucketName { get; init; }
 
     /// <summary>
-    /// Gets or sets the AWS key - Can be used to override keys provided by the environment.
+    /// Gets the AWS key - Can be used to override keys provided by the environment.
     /// If deploying inside an EC2 instance AWS keys will already be available via environment
     /// variables and don't need to be specified. Follow AWS best security practices on  <see href="https://docs.aws.amazon.com/general/latest/gr/aws-access-keys-best-practices.html"/>.
     /// </summary>
-    string? AccessKey { get; set; }
+    string? AccessKey { get; init; }
 
     /// <summary>
-    /// Gets or sets the AWS secret - Can be used to override keys provided by the environment.
+    /// Gets the AWS endpoint - used to override the default service endpoint.
     /// If deploying inside an EC2 instance AWS keys will already be available via environment
     /// variables and don't need to be specified. Follow AWS best security practices on  <see href="https://docs.aws.amazon.com/general/latest/gr/aws-access-keys-best-practices.html"/>.
     /// </summary>
-    string? AccessSecret { get; set; }
+    string? AccessSecret { get; init; }
 
     /// <summary>
-    /// Gets or sets the AWS endpoint - used for testing to over region endpoint allowing it
+    /// Gets the AWS endpoint - used for testing to over region endpoint allowing it
     /// to be set to localhost.
     /// </summary>
-    string? Endpoint { get; set; }
+    string? Endpoint { get; init; }
 
     /// <summary>
-    /// Gets or sets a value indicating whether the S3 accelerate endpoint is used.
+    /// Gets a value indicating whether the S3 accelerate endpoint is used.
     /// The feature must be enabled on the bucket. Follow AWS instruction on <see href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/transfer-acceleration.html"/>.
     /// </summary>
-    bool UseAccelerateEndpoint { get; set; }
+    bool UseAccelerateEndpoint { get; init; }
 
     /// <summary>
-    /// Gets or sets a value indicating the timeout for the S3 client.
+    /// Gets a value indicating the timeout for the S3 client.
     /// If the value is set, the value is assigned to the Timeout property of the HttpWebRequest/HttpClient object used to send requests.
     /// </summary>
-    TimeSpan? Timeout { get; set; }
+    TimeSpan? Timeout { get; init; }
 }
diff --git a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs
index f0c3a201..95be84ad 100644
--- a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs
@@ -20,23 +20,23 @@ public class AWSS3StorageImageProviderOptions
 public class AWSS3BucketClientOptions : IAWSS3BucketClientOptions
 {
     /// <inheritdoc/>
-    public string? Region { get; set; }
+    public string? Region { get; init; }
 
     /// <inheritdoc/>
-    public string BucketName { get; set; } = null!;
+    public string BucketName { get; init; } = null!;
 
     /// <inheritdoc/>
-    public string? AccessKey { get; set; }
+    public string? AccessKey { get; init; }
 
     /// <inheritdoc/>
-    public string? AccessSecret { get; set; }
+    public string? AccessSecret { get; init; }
 
     /// <inheritdoc/>
-    public string? Endpoint { get; set; }
+    public string? Endpoint { get; init; }
 
     /// <inheritdoc/>
-    public bool UseAccelerateEndpoint { get; set; }
+    public bool UseAccelerateEndpoint { get; init; }
 
     /// <inheritdoc/>
-    public TimeSpan? Timeout { get; set; }
+    public TimeSpan? Timeout { get; init; }
 }

From a61e19d4b5e8e9b773b5cbb7683f4ab320909745 Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Mon, 20 Mar 2023 06:59:47 +0100
Subject: [PATCH 096/102] Fix error after updating to latest

---
 .../Resolvers/AWSS3StorageImageResolver.cs                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs b/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs
index a7ffd934..dd7c2b4e 100644
--- a/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs
@@ -15,7 +15,7 @@ public class AWSS3StorageImageResolver : IImageResolver
     private readonly IAmazonS3 amazonS3;
     private readonly string bucketName;
     private readonly string imagePath;
-    private readonly GetObjectMetadataResponse metadataResponse;
+    private readonly GetObjectMetadataResponse? metadataResponse;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AWSS3StorageImageResolver"/> class.
@@ -24,7 +24,7 @@ public class AWSS3StorageImageResolver : IImageResolver
     /// <param name="bucketName">The bucket name.</param>
     /// <param name="imagePath">The image path.</param>
     /// <param name="metadataResponse">Optional metadata response.</param>
-    public AWSS3StorageImageResolver(IAmazonS3 amazonS3, string bucketName, string imagePath, GetObjectMetadataResponse metadataResponse = null)
+    public AWSS3StorageImageResolver(IAmazonS3 amazonS3, string bucketName, string imagePath, GetObjectMetadataResponse? metadataResponse = null)
     {
         this.amazonS3 = amazonS3;
         this.bucketName = bucketName;

From 7ee9e162032e924fc41d573f55857828ae203d51 Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Mon, 20 Mar 2023 07:04:16 +0100
Subject: [PATCH 097/102] The ClientOptions can not be get; init;

---
 .../Caching/AWSS3StorageCache.cs              |  2 +-
 .../Caching/AWSS3StorageCacheOptions.cs       | 14 +++++-----
 .../IAWSS3BucketClientOptions.cs              | 28 +++++++++----------
 .../AWSS3StorageImageProviderOptions.cs       | 14 +++++-----
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs
index 76dced53..b8e77b4d 100644
--- a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Web.Caching.AWS;
 public class AWSS3StorageCache : IImageCache
 {
     private readonly IAmazonS3 amazonS3Client;
-    private readonly string? bucket;
+    private readonly string bucket;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AWSS3StorageCache"/> class.
diff --git a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs
index 8d67827a..672d16fd 100644
--- a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs
@@ -9,23 +9,23 @@ namespace SixLabors.ImageSharp.Web.Caching.AWS;
 public class AWSS3StorageCacheOptions : IAWSS3BucketClientOptions
 {
     /// <inheritdoc/>
-    public string? Region { get; init; }
+    public string? Region { get; set; }
 
     /// <inheritdoc/>
-    public string BucketName { get; init; } = null!;
+    public string BucketName { get; set; } = null!;
 
     /// <inheritdoc/>
-    public string? AccessKey { get; init; }
+    public string? AccessKey { get; set; }
 
     /// <inheritdoc/>
-    public string? AccessSecret { get; init; }
+    public string? AccessSecret { get; set; }
 
     /// <inheritdoc/>
-    public string? Endpoint { get; init; }
+    public string? Endpoint { get; set; }
 
     /// <inheritdoc/>
-    public bool UseAccelerateEndpoint { get; init; }
+    public bool UseAccelerateEndpoint { get; set; }
 
     /// <inheritdoc/>
-    public TimeSpan? Timeout { get; init; }
+    public TimeSpan? Timeout { get; set; }
 }
diff --git a/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs b/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs
index 68f4c8e1..1d15448d 100644
--- a/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs
+++ b/src/ImageSharp.Web.Providers.AWS/IAWSS3BucketClientOptions.cs
@@ -9,44 +9,44 @@ namespace SixLabors.ImageSharp.Web;
 internal interface IAWSS3BucketClientOptions
 {
     /// <summary>
-    /// Gets the AWS region endpoint (us-east-1/us-west-1/ap-southeast-2).
+    /// Gets or sets the AWS region endpoint (us-east-1/us-west-1/ap-southeast-2).
     /// </summary>
-    string? Region { get; init; }
+    string? Region { get; set; }
 
     /// <summary>
-    /// Gets the AWS bucket name.
+    /// Gets or sets the AWS bucket name.
     /// </summary>
-    string BucketName { get; init; }
+    string BucketName { get; set; }
 
     /// <summary>
-    /// Gets the AWS key - Can be used to override keys provided by the environment.
+    /// Gets or sets the AWS key - Can be used to override keys provided by the environment.
     /// If deploying inside an EC2 instance AWS keys will already be available via environment
     /// variables and don't need to be specified. Follow AWS best security practices on  <see href="https://docs.aws.amazon.com/general/latest/gr/aws-access-keys-best-practices.html"/>.
     /// </summary>
-    string? AccessKey { get; init; }
+    string? AccessKey { get; set; }
 
     /// <summary>
-    /// Gets the AWS endpoint - used to override the default service endpoint.
+    /// Gets or sets the AWS endpoint - used to override the default service endpoint.
     /// If deploying inside an EC2 instance AWS keys will already be available via environment
     /// variables and don't need to be specified. Follow AWS best security practices on  <see href="https://docs.aws.amazon.com/general/latest/gr/aws-access-keys-best-practices.html"/>.
     /// </summary>
-    string? AccessSecret { get; init; }
+    string? AccessSecret { get; set; }
 
     /// <summary>
-    /// Gets the AWS endpoint - used for testing to over region endpoint allowing it
+    /// Gets or sets the AWS endpoint - used for testing to over region endpoint allowing it
     /// to be set to localhost.
     /// </summary>
-    string? Endpoint { get; init; }
+    string? Endpoint { get; set; }
 
     /// <summary>
-    /// Gets a value indicating whether the S3 accelerate endpoint is used.
+    /// Gets or sets a value indicating whether the S3 accelerate endpoint is used.
     /// The feature must be enabled on the bucket. Follow AWS instruction on <see href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/transfer-acceleration.html"/>.
     /// </summary>
-    bool UseAccelerateEndpoint { get; init; }
+    bool UseAccelerateEndpoint { get; set; }
 
     /// <summary>
-    /// Gets a value indicating the timeout for the S3 client.
+    /// Gets or sets a value indicating the timeout for the S3 client.
     /// If the value is set, the value is assigned to the Timeout property of the HttpWebRequest/HttpClient object used to send requests.
     /// </summary>
-    TimeSpan? Timeout { get; init; }
+    TimeSpan? Timeout { get; set; }
 }
diff --git a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs
index 95be84ad..f0c3a201 100644
--- a/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProviderOptions.cs
@@ -20,23 +20,23 @@ public class AWSS3StorageImageProviderOptions
 public class AWSS3BucketClientOptions : IAWSS3BucketClientOptions
 {
     /// <inheritdoc/>
-    public string? Region { get; init; }
+    public string? Region { get; set; }
 
     /// <inheritdoc/>
-    public string BucketName { get; init; } = null!;
+    public string BucketName { get; set; } = null!;
 
     /// <inheritdoc/>
-    public string? AccessKey { get; init; }
+    public string? AccessKey { get; set; }
 
     /// <inheritdoc/>
-    public string? AccessSecret { get; init; }
+    public string? AccessSecret { get; set; }
 
     /// <inheritdoc/>
-    public string? Endpoint { get; init; }
+    public string? Endpoint { get; set; }
 
     /// <inheritdoc/>
-    public bool UseAccelerateEndpoint { get; init; }
+    public bool UseAccelerateEndpoint { get; set; }
 
     /// <inheritdoc/>
-    public TimeSpan? Timeout { get; init; }
+    public TimeSpan? Timeout { get; set; }
 }

From bbf7f47c11dc4acb1f0fcc17497150b30532c18f Mon Sep 17 00:00:00 2001
From: Stefan Nikolei <stefan@nikolei.eu>
Date: Mon, 20 Mar 2023 07:45:25 +0100
Subject: [PATCH 098/102] Rename bucket to bucketname

---
 .../Caching/AWSS3StorageCache.cs                       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs
index b8e77b4d..79e12a04 100644
--- a/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs
+++ b/src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Web.Caching.AWS;
 public class AWSS3StorageCache : IImageCache
 {
     private readonly IAmazonS3 amazonS3Client;
-    private readonly string bucket;
+    private readonly string bucketName;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AWSS3StorageCache"/> class.
@@ -26,19 +26,19 @@ public AWSS3StorageCache(IOptions<AWSS3StorageCacheOptions> cacheOptions)
     {
         Guard.NotNull(cacheOptions, nameof(cacheOptions));
         AWSS3StorageCacheOptions options = cacheOptions.Value;
-        this.bucket = options.BucketName;
+        this.bucketName = options.BucketName;
         this.amazonS3Client = AmazonS3ClientFactory.CreateClient(options);
     }
 
     /// <inheritdoc/>
     public async Task<IImageCacheResolver?> GetAsync(string key)
     {
-        GetObjectMetadataRequest request = new() { BucketName = this.bucket, Key = key };
+        GetObjectMetadataRequest request = new() { BucketName = this.bucketName, Key = key };
         try
         {
             // HEAD request throws a 404 if not found.
             MetadataCollection metadata = (await this.amazonS3Client.GetObjectMetadataAsync(request)).Metadata;
-            return new AWSS3StorageCacheResolver(this.amazonS3Client, this.bucket!, key, metadata);
+            return new AWSS3StorageCacheResolver(this.amazonS3Client, this.bucketName, key, metadata);
         }
         catch
         {
@@ -51,7 +51,7 @@ public Task SetAsync(string key, Stream stream, ImageCacheMetadata metadata)
     {
         PutObjectRequest request = new()
         {
-            BucketName = this.bucket,
+            BucketName = this.bucketName,
             Key = key,
             ContentType = metadata.ContentType,
             InputStream = stream,

From 9c20f9ea6bc3700fa5ed508c6f7cb0934d720148 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Tue, 4 Apr 2023 21:44:23 +1000
Subject: [PATCH 099/102] Update ImageSharp.Web.csproj

---
 src/ImageSharp.Web/ImageSharp.Web.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ImageSharp.Web/ImageSharp.Web.csproj b/src/ImageSharp.Web/ImageSharp.Web.csproj
index f76f6f32..f6d9b001 100644
--- a/src/ImageSharp.Web/ImageSharp.Web.csproj
+++ b/src/ImageSharp.Web/ImageSharp.Web.csproj
@@ -45,8 +45,8 @@
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.2.0" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.0-alpha.0.106" />
+    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
   </ItemGroup>
 
   <Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />

From 0cc033cc6cd394ca78bd86c777dcfc23e6c5273c Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Wed, 5 Apr 2023 14:09:44 +1000
Subject: [PATCH 100/102] Update AWS and Azure dependencies

---
 .../ImageSharp.Web.Providers.AWS.csproj                         | 2 +-
 .../ImageSharp.Web.Providers.Azure.csproj                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj b/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj
index ad497fff..a899bc38 100644
--- a/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj
+++ b/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj
@@ -43,7 +43,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.S3" Version="3.7.8.8" />
+    <PackageReference Include="AWSSDK.S3" Version="3.7.103.42" />
   </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
index de6b2d6e..90be6e45 100644
--- a/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj
+++ b/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj
@@ -43,7 +43,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.13.0" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.15.1" />
   </ItemGroup>
 
   <ItemGroup>

From d924b21ddcb1da09b7b8a51a917cc9e4f2e86c18 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Wed, 5 Apr 2023 14:25:39 +1000
Subject: [PATCH 101/102] Use a single pipeline for images.

---
 .../Middleware/ImageSharpMiddleware.cs        | 85 +++++++++----------
 .../Middleware/ImageSharpMiddlewareOptions.cs |  4 +-
 .../TestUtilities/TestServerFixture.cs        |  2 +-
 3 files changed, 41 insertions(+), 50 deletions(-)

diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
index b9837291..07c3bf51 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
@@ -262,10 +262,9 @@ private async Task Invoke(HttpContext httpContext, bool retry)
         }
 
         await this.ProcessRequestAsync(
-            httpContext,
+            imageCommandContext,
             sourceImageResolver,
             new ImageContext(httpContext, this.options),
-            commands,
             retry);
     }
 
@@ -278,12 +277,14 @@ private static void SetBadRequest(HttpContext httpContext)
     }
 
     private async Task ProcessRequestAsync(
-        HttpContext httpContext,
+        ImageCommandContext imageCommandContext,
         IImageResolver sourceImageResolver,
         ImageContext imageContext,
-        CommandCollection commands,
         bool retry)
     {
+        HttpContext httpContext = imageCommandContext.Context;
+        CommandCollection commands = imageCommandContext.Commands;
+
         // Create a hashed cache key
         string key = this.cacheHash.Create(
             this.cacheKey.Create(httpContext, commands),
@@ -344,55 +345,45 @@ private async Task ProcessRequestAsync(
                         {
                             DecoderOptions decoderOptions = new() { Configuration = this.options.Configuration };
 
-                            // TODO: We need some way to set options based upon processors.
-                            await this.options.OnBeforeLoadAsync.Invoke(httpContext, decoderOptions);
+                            // TODO: Do we need some way to set options based upon processors?
+                            await this.options.OnBeforeLoadAsync.Invoke(imageCommandContext, decoderOptions);
 
-                            // No commands? We simply copy the stream across.
-                            if (commands.Count == 0)
+                            FormattedImage? image = null;
+                            try
                             {
-                                await inStream.CopyToAsync(outStream);
-                                outStream.Position = 0;
-                                format = await Image.DetectFormatAsync(decoderOptions, outStream);
-                            }
-                            else
-                            {
-                                FormattedImage? image = null;
-                                try
+                                // Now we can finally process the image.
+                                // We first sort the processor collection by command order then use that collection to determine whether the decoded image pixel format
+                                // explicitly requires an alpha component in order to allow correct processing.
+                                //
+                                // The non-generic variant will decode to the correct pixel format based upon the encoded image metadata which can yield
+                                // massive memory savings.
+                                IReadOnlyList<(int Index, IImageWebProcessor Processor)> sortedProcessors = this.processors.OrderBySupportedCommands(commands);
+                                bool requiresAlpha = sortedProcessors.RequiresTrueColorPixelFormat(commands, this.commandParser, this.parserCulture);
+
+                                if (requiresAlpha)
                                 {
-                                    // Now we can finally process the image.
-                                    // We first sort the processor collection by command order then use that collection to determine whether the decoded image pixel format
-                                    // explicitly requires an alpha component in order to allow correct processing.
-                                    //
-                                    // The non-generic variant will decode to the correct pixel format based upon the encoded image metadata which can yield
-                                    // massive memory savings.
-                                    IReadOnlyList<(int Index, IImageWebProcessor Processor)> sortedProcessors = this.processors.OrderBySupportedCommands(commands);
-                                    bool requiresAlpha = sortedProcessors.RequiresTrueColorPixelFormat(commands, this.commandParser, this.parserCulture);
-
-                                    if (requiresAlpha)
-                                    {
-                                        image = await FormattedImage.LoadAsync<Rgba32>(decoderOptions, inStream);
-                                    }
-                                    else
-                                    {
-                                        image = await FormattedImage.LoadAsync(decoderOptions, inStream);
-                                    }
-
-                                    image.Process(
-                                        this.logger,
-                                        sortedProcessors,
-                                        commands,
-                                        this.commandParser,
-                                        this.parserCulture);
-
-                                    await this.options.OnBeforeSaveAsync.Invoke(image);
-
-                                    image.Save(outStream);
-                                    format = image.Format;
+                                    image = await FormattedImage.LoadAsync<Rgba32>(decoderOptions, inStream);
                                 }
-                                finally
+                                else
                                 {
-                                    image?.Dispose();
+                                    image = await FormattedImage.LoadAsync(decoderOptions, inStream);
                                 }
+
+                                image.Process(
+                                    this.logger,
+                                    sortedProcessors,
+                                    commands,
+                                    this.commandParser,
+                                    this.parserCulture);
+
+                                await this.options.OnBeforeSaveAsync.Invoke(image);
+
+                                image.Save(outStream);
+                                format = image.Format;
+                            }
+                            finally
+                            {
+                                image?.Dispose();
                             }
                         }
 
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
index a1753f35..8b10dc9d 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs
@@ -27,7 +27,7 @@ public class ImageSharpMiddlewareOptions
     };
 
     private Func<ImageCommandContext, Task> onParseCommandsAsync = _ => Task.CompletedTask;
-    private Func<HttpContext, DecoderOptions, Task> onBeforeLoadAsync = (_, _) => Task.CompletedTask;
+    private Func<ImageCommandContext, DecoderOptions, Task> onBeforeLoadAsync = (_, _) => Task.CompletedTask;
     private Func<FormattedImage, Task> onBeforeSaveAsync = _ => Task.CompletedTask;
     private Func<ImageProcessingContext, Task> onProcessedAsync = _ => Task.CompletedTask;
     private Func<HttpContext, Task> onPrepareResponseAsync = _ => Task.CompletedTask;
@@ -118,7 +118,7 @@ public Func<ImageCommandContext, Task> OnParseCommandsAsync
     /// Gets or sets the method that can be used to used to augment decoder options.
     /// This is called before the image is decoded and loaded for processing.
     /// </summary>
-    public Func<HttpContext, DecoderOptions, Task> OnBeforeLoadAsync
+    public Func<ImageCommandContext, DecoderOptions, Task> OnBeforeLoadAsync
     {
         get => this.onBeforeLoadAsync;
 
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs b/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs
index a9f68eed..4db2c263 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs
@@ -68,7 +68,7 @@ protected void ConfigureServices(IServiceCollection services)
                 return onParseCommandsAsync.Invoke(context);
             };
 
-            Func<HttpContext, DecoderOptions, Task> onBeforeLoadAsync = options.OnBeforeLoadAsync;
+            Func<ImageCommandContext, DecoderOptions, Task> onBeforeLoadAsync = options.OnBeforeLoadAsync;
 
             options.OnBeforeLoadAsync = (context, decoderOptions) =>
             {

From 4fdc00030dcba96016d3185d879ccec41389de3a Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Wed, 5 Apr 2023 15:06:30 +1000
Subject: [PATCH 102/102] Cleanup issue template etc.

---
 .../ISSUE_TEMPLATE/commercial-bug-report.yml  | 56 -------------------
 .github/ISSUE_TEMPLATE/oss-bug-report.yml     |  6 +-
 CODE_OF_CONDUCT.md                            |  3 +-
 ImageSharp.Web.sln                            | 11 +++-
 4 files changed, 12 insertions(+), 64 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/commercial-bug-report.yml

diff --git a/.github/ISSUE_TEMPLATE/commercial-bug-report.yml b/.github/ISSUE_TEMPLATE/commercial-bug-report.yml
deleted file mode 100644
index fe8f7439..00000000
--- a/.github/ISSUE_TEMPLATE/commercial-bug-report.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-name: "Commercial License : Bug Report"
-description: |
-  Create a report to help us improve the project. For Commercial License holders only.
-  Please contact help@sixlabors.com for issues requiring private support.
-labels: ["commercial", "needs triage"]
-body:
-- type: checkboxes
-  attributes:
-    label: Prerequisites
-    options:
-      - label: I have bought a Commercial License
-        required: true
-      - label: I have written a descriptive issue title
-        required: true
-      - label: I have verified that I am running the latest version of ImageSharp.Web
-        required: true
-      - label: I have verified if the problem exist in both `DEBUG` and `RELEASE` mode
-        required: true
-      - label: I have searched [open](https://github.com/SixLabors/ImageSharp.Web/issues) and [closed](https://github.com/SixLabors/ImageSharp.Web/issues?q=is%3Aissue+is%3Aclosed) issues to ensure it has not already been reported
-        required: true
-- type: input
-  attributes:
-    label: ImageSharp.Web version
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: Other Six Labors packages and versions
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: Environment (Operating system, version and so on)
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: .NET Framework version
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Description
-    description: A description of the bug
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Steps to Reproduce
-    description: List of steps, sample code, failing test or link to a project that reproduces the behavior. Make sure you place a stack trace inside a code (```) block to avoid linking unrelated issues.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Images
-    description: Please upload images that can be used to reproduce issues in the area below. If the file type is not supported the file can be zipped and then uploaded instead.
diff --git a/.github/ISSUE_TEMPLATE/oss-bug-report.yml b/.github/ISSUE_TEMPLATE/oss-bug-report.yml
index 8ba2861f..020bef57 100644
--- a/.github/ISSUE_TEMPLATE/oss-bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/oss-bug-report.yml
@@ -1,5 +1,5 @@
-name: "OSS : Bug Report"
-description: Create a report to help us improve the project. OSS Issues are not guaranteed to be triaged.
+name: "Bug Report"
+description: Create a report to help us improve the project. Issues are not guaranteed to be triaged.
 labels: ["needs triage"]
 body:
 - type: checkboxes
@@ -31,7 +31,7 @@ body:
     required: true
 - type: input
   attributes:
-    label: .NET Framework version
+    label: .NET version
   validations:
     required: true
 - type: textarea
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index b34bbb41..365f69e2 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,3 +1,2 @@
-# Code of Conduct  
+# Code of Conduct  
 This project has adopted the code of conduct defined by the [Contributor Covenant](https://contributor-covenant.org/) to clarify expected behavior in our community.
-For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
\ No newline at end of file
diff --git a/ImageSharp.Web.sln b/ImageSharp.Web.sln
index 71cf37d3..4e1781f8 100644
--- a/ImageSharp.Web.sln
+++ b/ImageSharp.Web.sln
@@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_root", "_root", "{C317F1B1
 		ci-build.ps1 = ci-build.ps1
 		ci-pack.ps1 = ci-pack.ps1
 		ci-test.ps1 = ci-test.ps1
-		.github\CONTRIBUTING.md = .github\CONTRIBUTING.md
+		CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		LICENSE = LICENSE
@@ -44,14 +44,19 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Web.Providers.AWS", "src\ImageSharp.Web.Providers.AWS\ImageSharp.Web.Providers.AWS.csproj", "{E631D300-ACD5-40EA-A6BB-08E22092EC76}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{B8152C86-B657-4967-B297-42F89A10D23A}"
+	ProjectSection(SolutionItems) = preProject
+		.github\CONTRIBUTING.md = .github\CONTRIBUTING.md
+		.github\dependabot.yml = .github\dependabot.yml
+		.github\FUNDING.yml = .github\FUNDING.yml
+		.github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md
+	EndProjectSection
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SharedInfrastructure", "shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.shproj", "{68A8CC40-6AED-4E96-B524-31B1158FDEEA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{04955CD1-F249-4899-9F61-6C7487BEECE1}"
 	ProjectSection(SolutionItems) = preProject
-		.github\ISSUE_TEMPLATE\commercial-bug-report.md = .github\ISSUE_TEMPLATE\commercial-bug-report.md
 		.github\ISSUE_TEMPLATE\config.yml = .github\ISSUE_TEMPLATE\config.yml
-		.github\ISSUE_TEMPLATE\oss-bug-report.md = .github\ISSUE_TEMPLATE\oss-bug-report.md
+		.github\ISSUE_TEMPLATE\oss-bug-report.yml = .github\ISSUE_TEMPLATE\oss-bug-report.yml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{2A5EF4AC-E228-42C1-970B-35630A9AF250}"