Update shared infra and fix styles

.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

.github/workflows/build-and-test.yml

@@ -16,30 +16,37 @@ jobs:
       matrix:
         options:
           - os: ubuntu-latest
-            framework: net7.0
+            framework: net9.0
+            sdk: 9.0.x
             sdk-preview: true
             runtime: -x64
             codecov: false
           - os: macos-latest
-            framework: net7.0
+            framework: net9.0
+            sdk: 9.0.x
             sdk-preview: true
             runtime: -x64
             codecov: false
           - os: windows-latest
-            framework: net7.0
+            framework: net9.0
+            sdk: 9.0.x
             sdk-preview: true
             runtime: -x64
             codecov: true
+
           - os: ubuntu-latest
-            framework: net6.0
+            framework: net8.0
+            sdk: 8.0.x
             runtime: -x64
             codecov: false
           - os: macos-latest
-            framework: net6.0
+            framework: net8.0
+            sdk: 8.0.x
             runtime: -x64
             codecov: false
           - os: windows-latest
-            framework: net6.0
+            framework: net8.0
+            sdk: 8.0.x
             runtime: -x64
             codecov: false
 
@@ -112,11 +119,18 @@ jobs:
           s3rver -d . &
 
       - name: DotNet Setup
+        if: ${{ matrix.options.sdk-preview != true }}
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            8.0.x
+
+      - name: DotNet Setup Preview
+        if: ${{ matrix.options.sdk-preview == true }}
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            7.0.x
-            6.0.x
+            9.0.x
 
       - name: DotNet Build
         if: ${{ matrix.options.sdk-preview != true }}

samples/ImageSharp.Web.Sample/ImageSharp.Web.Sample.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>10</LangVersion>

src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs

@@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp.Web.Caching.AWS;
 /// </summary>
 public class AWSS3StorageCache : IImageCache
 {
-    private readonly IAmazonS3 amazonS3Client;
+    private readonly AmazonS3Client amazonS3Client;
     private readonly string bucketName;
     private readonly string cacheFolder;
 

src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj

@@ -27,12 +27,12 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net6.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>

src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj

@@ -27,12 +27,12 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net6.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>

src/ImageSharp.Web/Caching/HexEncoder.cs

@@ -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/Commands/CommandCollection.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/Converters/ColorConverter.cs

@@ -11,18 +11,18 @@ namespace SixLabors.ImageSharp.Web.Commands.Converters;
 /// <summary>
 /// Allows the conversion of strings into rgba32 pixel colors.
 /// </summary>
-public sealed class ColorConverter : ICommandConverter<Color>
+public sealed partial class ColorConverter : ICommandConverter<Color>
 {
     /// <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][^,;.-]\\B{3}){1,2}", RegexOptions.Compiled);
+    private static readonly Regex HexColorRegex = CreateHexColorRegex();
 
     /// <summary>
     /// The number color regex.
     /// </summary>
-    private static readonly Regex NumberRegex = new(@"\d+", RegexOptions.Compiled);
+    private static readonly Regex NumberRegex = CreateNumberRegex();
 
     /// <summary>
     /// The color constants table map.
@@ -85,9 +85,9 @@ public Color ConvertFrom(CommandParser parser, CultureInfo culture, string? valu
         return default;
     }
 
-    private static IDictionary<string, Color> InitializeColorConstantsTable()
+    private static Dictionary<string, Color> InitializeColorConstantsTable()
     {
-        IDictionary<string, Color> table = new Dictionary<string, Color>(StringComparer.OrdinalIgnoreCase);
+        Dictionary<string, Color> table = new(StringComparer.OrdinalIgnoreCase);
 
         foreach (FieldInfo field in typeof(Color).GetFields(BindingFlags.Public | BindingFlags.Static))
         {
@@ -99,4 +99,10 @@ private static IDictionary<string, Color> InitializeColorConstantsTable()
 
         return table;
     }
+
+    [GeneratedRegex(@"\d+", RegexOptions.Compiled)]
+    private static partial Regex CreateNumberRegex();
+
+    [GeneratedRegex("([0-9a-fA-F][^,;.-]\\B{3}){1,2}", RegexOptions.Compiled)]
+    private static partial Regex CreateHexColorRegex();
 }

src/ImageSharp.Web/Commands/Converters/ConverterUtility.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/EnumConverter.cs

@@ -29,7 +29,7 @@ public sealed class EnumConverter : ICommandConverter<object>
     {
         if (string.IsNullOrWhiteSpace(value))
         {
-            return Activator.CreateInstance(propertyType);
+            return Enum.ToObject(propertyType, 0);
         }
 
         try
@@ -51,7 +51,7 @@ public sealed class EnumConverter : ICommandConverter<object>
         catch
         {
             // Just return the default value
-            return Activator.CreateInstance(propertyType);
+            return Enum.ToObject(propertyType, 0);
         }
     }
 

src/ImageSharp.Web/Commands/PresetOnlyQueryCollectionRequestParser.cs

@@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.Web.Commands;
 /// </summary>
 public class PresetOnlyQueryCollectionRequestParser : IRequestParser
 {
-    private readonly IDictionary<string, CommandCollection> presets;
+    private readonly Dictionary<string, CommandCollection> presets;
 
     /// <summary>
     /// The command constant for the preset query parameter.
@@ -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,10 +46,10 @@ public CommandCollection ParseRequestCommands(HttpContext context)
             return collection;
         }
 
-        return new();
+        return new CommandCollection();
     }
 
-    private static IDictionary<string, CommandCollection> ParsePresets(
+    private static Dictionary<string, CommandCollection> ParsePresets(
         IDictionary<string, string> unparsedPresets) =>
         unparsedPresets
             .Select(keyValue =>

src/ImageSharp.Web/Commands/QueryCollectionRequestParser.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();