Update shared infra and fix styles

Author: stefannikolei

.editorconfig

@@ -104,8 +104,8 @@ dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:war
 dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:warning
 dotnet_style_parentheses_in_other_operators = always_for_clarity:suggestion
 # Expression-level preferences
-dotnet_style_object_initializer = true:warning
-dotnet_style_collection_initializer = true:warning
+dotnet_style_object_initializer = true:error
+dotnet_style_collection_initializer = true:error
 dotnet_style_explicit_tuple_names = true:warning
 dotnet_style_prefer_inferred_tuple_names = true:warning
 dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning
@@ -135,9 +135,9 @@ csharp_style_prefer_null_check_over_type_check = true:warning
 # 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 = false:warning
-csharp_style_var_when_type_is_apparent = false:warning
-csharp_style_var_elsewhere = false:warning
+csharp_style_var_for_built_in_types = false:error
+csharp_style_var_when_type_is_apparent = false:error
+csharp_style_var_elsewhere = false:error
 # Expression-bodied members
 csharp_style_expression_bodied_methods = true:warning
 csharp_style_expression_bodied_constructors = true:warning
@@ -160,7 +160,10 @@ csharp_style_pattern_local_over_anonymous_function = true:warning
 csharp_style_deconstructed_variable_declaration = true:warning
 csharp_style_prefer_index_operator = true:warning
 csharp_style_prefer_range_operator = true:warning
-csharp_style_implicit_object_creation_when_type_is_apparent = true:warning
+csharp_style_implicit_object_creation_when_type_is_apparent = true:error
+# ReSharper inspection severities
+resharper_arrange_object_creation_when_type_evident_highlighting = error
+resharper_arrange_object_creation_when_type_not_evident_highlighting = error
 # "Null" checking preferences
 csharp_style_throw_expression = true:warning
 csharp_style_conditional_delegate_call = true:warning
@@ -172,6 +175,11 @@ dotnet_diagnostic.IDE0063.severity = suggestion
 csharp_using_directive_placement = outside_namespace:warning
 # Modifier preferences
 csharp_prefer_static_local_function = true:warning
+# Primary constructor preferences
+csharp_style_prefer_primary_constructors = false:none
+# Collection preferences
+dotnet_style_prefer_collection_expression = true:error
+resharper_use_collection_expression_highlighting =true:error
 
 ##########################################
 # Unnecessary Code Rules

shared-infrastructure

@@ -32,7 +32,7 @@ public static unsafe string Encode(ReadOnlySpan<byte> bytes)
         {
             return string.Create(bytes.Length * 2, (Ptr: (IntPtr)bytesPtr, bytes.Length), (chars, args) =>
             {
-                var ros = new ReadOnlySpan<byte>((byte*)args.Ptr, args.Length);
+                ReadOnlySpan<byte> ros = new((byte*)args.Ptr, args.Length);
                 EncodeToUtf16(ros, chars);
             });
         }

src/ImageSharp.Web/Caching/HexEncoder.cs

@@ -66,7 +66,7 @@ public IEnumerable<string> Keys
         {
             if (this.TryGetValue(key, out KeyValuePair<string, string?> item))
             {
-                this.SetItem(this.IndexOf(item), new(key, value));
+                this.SetItem(this.IndexOf(item), new KeyValuePair<string, string?>(key, value));
             }
             else
             {
@@ -81,7 +81,7 @@ public IEnumerable<string> Keys
     /// <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));
+    public void Add(string key, string value) => this.Add(new KeyValuePair<string, string?>(key, value));
 
     /// <summary>
     /// Inserts an element into the <see cref="CommandCollection"/> at the
@@ -91,7 +91,7 @@ public IEnumerable<string> Keys
     /// <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));
+    public void Insert(int index, string key, string value) => this.Insert(index, new KeyValuePair<string, string?>(key, value));
 
     /// <summary>
     /// Gets the value associated with the specified key.

src/ImageSharp.Web/Commands/CommandCollection.cs

@@ -6,6 +6,7 @@
 using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.Web.Commands.Converters;
+
 internal static class ConverterUtility
 {
     /// <summary>

src/ImageSharp.Web/Commands/Converters/ConverterUtility.cs

@@ -36,7 +36,7 @@ public CommandCollection ParseRequestCommands(HttpContext context)
             || !queryCollection.ContainsKey(QueryKey))
         {
             // We return new here and below to ensure the collection is still mutable via events.
-            return new();
+            return new CommandCollection();
         }
 
         StringValues query = queryCollection[QueryKey];
@@ -46,7 +46,7 @@ public CommandCollection ParseRequestCommands(HttpContext context)
             return collection;
         }
 
-        return new();
+        return new CommandCollection();
     }
 
     private static IDictionary<string, CommandCollection> ParsePresets(

src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs

@@ -18,7 +18,7 @@ public CommandCollection ParseRequestCommands(HttpContext context)
         if (query is null || query.Count == 0)
         {
             // We return new to ensure the collection is still mutable via events.
-            return new();
+            return new CommandCollection();
         }
 
         CommandCollection transformed = new();

src/ImageSharp.Web/Commands/QueryCollectionRequestParser.cs

@@ -164,7 +164,7 @@ public static IImageSharpBuilder AddProvider<TProvider>(this IImageSharpBuilder
     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();
+        List<ServiceDescriptor> descriptors = builder.Services.Where(x => x.ServiceType == typeof(IImageProvider)).ToList();
         descriptors.RemoveAll(x => x.GetImplementationType() == typeof(TProvider));
         descriptors.Insert(index, ServiceDescriptor.Singleton<IImageProvider, TProvider>());
 
@@ -185,7 +185,7 @@ public static IImageSharpBuilder InsertProvider<TProvider>(this IImageSharpBuild
     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();
+        List<ServiceDescriptor> descriptors = builder.Services.Where(x => x.ServiceType == typeof(IImageProvider)).ToList();
         descriptors.RemoveAll(x => x.GetImplementationType() == typeof(TProvider));
         descriptors.Insert(index, ServiceDescriptor.Singleton<IImageProvider>(implementationFactory));
 

src/ImageSharp.Web/DependencyInjection/ImageSharpBuilderExtensions.cs

@@ -346,7 +346,7 @@ private async Task ProcessRequestAsync(
                         {
                             // TODO: Do we need some way to set options based upon processors?
                             DecoderOptions decoderOptions = await this.options.OnBeforeLoadAsync.Invoke(imageCommandContext, this.options.Configuration)
-                                ?? new() { Configuration = this.options.Configuration };
+                                ?? new DecoderOptions { Configuration = this.options.Configuration };
 
                             FormattedImage? image = null;
                             try

src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs

@@ -41,7 +41,7 @@ public class ImageSharpMiddlewareOptions
     /// 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();
+    public RecyclableMemoryStreamManager MemoryStreamManager { get; set; } = new();
 
     /// <summary>
     /// Gets or sets a value indicating whether to use culture-independent (invariant)