Merge pull request #187 from SixLabors/bp/updatesharedinfra

Update Shared infrastructure

Author: JimBobSquarePants

.editorconfig

@@ -75,7 +75,7 @@ indent_style = tab
 
 [*.{cs,csx,cake,vb,vbx}]
 # Default Severity for all .NET Code Style rules below
-dotnet_analyzer_diagnostic.severity = warning
+dotnet_analyzer_diagnostic.category-style.severity = warning
 
 ##########################################
 # Language Rules

shared-infrastructure

@@ -7,7 +7,6 @@
 using System.Security.Cryptography;
 using System.Text;
 using Microsoft.Extensions.Options;
-using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Web.Middleware;
 
 namespace SixLabors.ImageSharp.Web.Caching

src/ImageSharp.Web/Caching/CacheHash.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 namespace SixLabors.ImageSharp.Web.Caching
@@ -16,4 +16,4 @@ public interface ICacheHash
         /// <returns>The <see cref="string"/>.</returns>
         string Create(string value, uint length);
     }
-}
+}

src/ImageSharp.Web/Caching/ICacheHash.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using System.Collections.Generic;
@@ -24,4 +24,4 @@ public static TValue GetValueOrDefault<TValue, TKey>(this IDictionary<TKey, TVal
             return result;
         }
     }
-}
+}

src/ImageSharp.Web/Commands/DictionaryExtensions.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using System.Collections.Generic;
@@ -18,4 +18,4 @@ public interface IRequestParser
         /// <returns>The <see cref="IDictionary{TKey,TValue}"/>.</returns>
         IDictionary<string, string> ParseRequestCommands(HttpContext context);
     }
-}
+}

src/ImageSharp.Web/Commands/IRequestParser.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using Microsoft.AspNetCore.Builder;
@@ -23,4 +23,4 @@ public static IApplicationBuilder UseImageSharp(this IApplicationBuilder app)
             return app.UseMiddleware<ImageSharpMiddleware>();
         }
     }
-}
+}

src/ImageSharp.Web/DependencyInjection/ApplicationBuilderExtensions.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using Microsoft.Extensions.DependencyInjection;
@@ -14,12 +14,9 @@ internal class ImageSharpBuilder : IImageSharpBuilder
         /// 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;
-        }
+        public ImageSharpBuilder(IServiceCollection services) => this.Services = services;
 
         /// <inheritdoc/>
         public IServiceCollection Services { get; }
     }
-}
+}

src/ImageSharp.Web/DependencyInjection/ImageSharpBuilder.cs

@@ -32,25 +32,25 @@ public class ImageSharpMiddleware
         /// The write worker used for limiting identical requests.
         /// </summary>
         private static readonly ConcurrentDictionary<string, Task<ImageWorkerResult>> WriteWorkers
-            = new ConcurrentDictionary<string, Task<ImageWorkerResult>>(StringComparer.OrdinalIgnoreCase);
+            = new(StringComparer.OrdinalIgnoreCase);
 
         /// <summary>
         /// The read worker used for limiting identical requests.
         /// </summary>
         private static readonly ConcurrentDictionary<string, Task<ImageWorkerResult>> ReadWorkers
-            = new ConcurrentDictionary<string, Task<ImageWorkerResult>>(StringComparer.OrdinalIgnoreCase);
+            = new(StringComparer.OrdinalIgnoreCase);
 
         /// <summary>
         /// Used to temporarily store source metadata reads to reduce the overhead of cache lookups.
         /// </summary>
         private static readonly ConcurrentTLruCache<string, ImageMetadata> SourceMetadataLru
-            = new ConcurrentTLruCache<string, ImageMetadata>(1024, TimeSpan.FromMinutes(5));
+            = new(1024, TimeSpan.FromMinutes(5));
 
         /// <summary>
         /// Used to temporarily store cache resolver reads to reduce the overhead of cache lookups.
         /// </summary>
-        private static readonly ConcurrentTLruCache<string, ValueTuple<IImageCacheResolver, ImageCacheMetadata>> CacheResolverLru
-            = new ConcurrentTLruCache<string, ValueTuple<IImageCacheResolver, ImageCacheMetadata>>(1024, TimeSpan.FromMinutes(5));
+        private static readonly ConcurrentTLruCache<string, (IImageCacheResolver, ImageCacheMetadata)> CacheResolverLru
+            = new(1024, TimeSpan.FromMinutes(5));
 
         /// <summary>
         /// The function processing the Http request.
@@ -274,7 +274,7 @@ private async Task ProcessRequestAsync(
             ImageWorkerResult readResult = default;
             try
             {
-                readResult = await this.IsNewOrUpdatedAsync(sourceImageResolver, imageContext, key);
+                readResult = await this.IsNewOrUpdatedAsync(sourceImageResolver, key);
             }
             finally
             {
@@ -288,7 +288,7 @@ private async Task ProcessRequestAsync(
             }
 
             // Not cached, or is updated? Let's get it from the image resolver.
-            var sourceImageMetadata = readResult.SourceImageMetadata;
+            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.
@@ -433,7 +433,6 @@ private ValueTask StreamDisposeAsync(Stream stream)
 
         private async Task<ImageWorkerResult> IsNewOrUpdatedAsync(
             IImageResolver sourceImageResolver,
-            ImageContext imageContext,
             string key)
         {
             // Pause until the write has been completed.
@@ -514,7 +513,7 @@ private async Task SendResponseAsync(
                     this.logger.LogImageServed(imageContext.GetDisplayUrl(), key);
 
                     // When stream is null we're sending from the cache.
-                    using (var stream = await cacheResolver.OpenReadAsync())
+                    using (Stream stream = await cacheResolver.OpenReadAsync())
                     {
                         await imageContext.SendAsync(stream, metadata);
                     }

src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs

@@ -1,8 +1,7 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Resolvers;
@@ -40,4 +39,4 @@ public interface IImageProvider
         /// <returns>The <see cref="IImageResolver"/>.</returns>
         Task<IImageResolver> GetAsync(HttpContext context);
     }
-}
+}