Cleanup

Author: JimBobSquarePants

src/Directory.Build.targets

@@ -21,8 +21,7 @@
     <PackageReference Update="Azure.Storage.Blobs" Version="12.10.0" />
     <PackageReference Update="Microsoft.IO.RecyclableMemoryStream" Version="2.2.0" />
     <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
-    <PackageReference Update="MinVer" PrivateAssets="All" Version="2.3.0" />
-    <PackageReference Update="SixLabors.ImageSharp"  Version="2.0.0-alpha.0.156" />
+    <PackageReference Update="SixLabors.ImageSharp"  Version="2.0.0-alpha.0.165" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">

src/ImageSharp.Web/Caching/LegacyV1CacheKey.cs

@@ -9,7 +9,7 @@ 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="UriRelativeCacheKey"/>.
+    /// out as the V1 middleware. If possible, it is recommended to use the <see cref="UriRelativeLowerInvariantCacheKey"/>.
     /// </summary>
     public class LegacyV1CacheKey : ICacheKey
     {

src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs

@@ -58,7 +58,7 @@ public PhysicalFileSystemCache(
             Guard.NotNullOrWhiteSpace(environment.WebRootPath, nameof(environment.WebRootPath));
 
             // Allow configuration of the cache without having to register everything
-            PhysicalFileSystemCacheOptions cacheOptions = options != null ? options.Value : new PhysicalFileSystemCacheOptions();
+            PhysicalFileSystemCacheOptions cacheOptions = options != null ? options.Value : new();
             this.cacheRootPath = GetCacheRoot(cacheOptions, environment.WebRootPath, environment.ContentRootPath);
             this.cacheFolderDepth = (int)cacheOptions.CacheFolderDepth;
 
@@ -72,13 +72,13 @@ public PhysicalFileSystemCache(
         /// <summary>
         /// Determine the cache root path
         /// </summary>
-        /// <param name="cacheOptions">the cache options.</param>
-        /// <param name="webRootPath">the webRootPath.</param>
-        /// <param name="contentRootPath">the contentRootPath.</param>
-        /// <returns>root path.</returns>
+        /// <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)
         {
-            string cacheRoot = string.IsNullOrEmpty(cacheOptions.CacheRoot)
+            string cacheRoot = string.IsNullOrWhiteSpace(cacheOptions.CacheRoot)
                 ? webRootPath
                 : cacheOptions.CacheRoot;
 

src/ImageSharp.Web/DependencyInjection/ImageSharpBuilderExtensions.cs

@@ -7,7 +7,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Commands.Converters;
@@ -48,27 +47,6 @@ public static IImageSharpBuilder SetRequestParser(this IImageSharpBuilder builde
             return builder;
         }
 
-        /// <summary>
-        /// Sets the given <see cref="MemoryAllocator"/> 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="MemoryAllocator"/>.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        [Obsolete("Use ImageSharp.Configuration.MemoryAllocator. This will be removed in a future version.", true)]
-        public static IImageSharpBuilder SetMemoryAllocator(this IImageSharpBuilder builder, Func<IServiceProvider, MemoryAllocator> implementationFactory)
-            => builder;
-
-        /// <summary>
-        /// Sets the given <see cref="MemoryAllocator"/> adding it to the service collection.
-        /// </summary>
-        /// <typeparam name="TMemoryAllocator">The type of class implementing <see cref="MemoryAllocator"/>to add.</typeparam>
-        /// <param name="builder">The core builder.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        [Obsolete("Use ImageSharp.Configuration.MemoryAllocator. This will be removed in a future version.", true)]
-        public static IImageSharpBuilder SetMemoryAllocator<TMemoryAllocator>(this IImageSharpBuilder builder)
-            where TMemoryAllocator : MemoryAllocator
-            => builder;
-
         /// <summary>
         /// Sets the given <see cref="IImageCache"/> adding it to the service collection.
         /// </summary>

src/ImageSharp.Web/Middleware/ImageSharpMiddlewareOptions.cs

@@ -96,10 +96,7 @@ public class ImageSharpMiddlewareOptions
         /// </summary>
         public Func<ImageCommandContext, Task> OnParseCommandsAsync
         {
-            get
-            {
-                return this.onParseCommandsAsync;
-            }
+            get => this.onParseCommandsAsync;
 
             set
             {
@@ -115,10 +112,7 @@ public Func<ImageCommandContext, Task> OnParseCommandsAsync
         /// </summary>
         public Func<FormattedImage, Task> OnBeforeSaveAsync
         {
-            get
-            {
-                return this.onBeforeSaveAsync;
-            }
+            get => this.onBeforeSaveAsync;
 
             set
             {
@@ -134,10 +128,7 @@ public Func<FormattedImage, Task> OnBeforeSaveAsync
         /// </summary>
         public Func<ImageProcessingContext, Task> OnProcessedAsync
         {
-            get
-            {
-                return this.onProcessedAsync;
-            }
+            get => this.onProcessedAsync;
 
             set
             {
@@ -153,10 +144,7 @@ public Func<ImageProcessingContext, Task> OnProcessedAsync
         /// </summary>
         public Func<HttpContext, Task> OnPrepareResponseAsync
         {
-            get
-            {
-                return this.onPrepareResponseAsync;
-            }
+            get => this.onPrepareResponseAsync;
 
             set
             {

tests/ImageSharp.Web.Tests/Caching/PhysicialFileSystemCacheTests.cs

@@ -43,7 +43,7 @@ public void CacheRootFromOptions(string cacheFolder, string cacheRoot, string we
                 CacheRoot = cacheRoot
             };
 
-            var cacheRootResult = PhysicalFileSystemCache.GetCacheRoot(cacheOptions, webRootPath, contentRootPath);
+            string cacheRootResult = PhysicalFileSystemCache.GetCacheRoot(cacheOptions, webRootPath, contentRootPath);
 
             Assert.Equal(expected, cacheRootResult);
         }