Fixed BuildErrors after updating to .net8

* removed the configure method. thats only syntactic sugar and aot is not happy with that method

Author: stefannikolei

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/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/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.
@@ -49,7 +49,7 @@ public CommandCollection ParseRequestCommands(HttpContext context)
         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/DependencyInjection/ImageSharpBuilderExtensions.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -23,7 +24,7 @@ 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)
+    public static IImageSharpBuilder SetRequestParser<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TParser>(this IImageSharpBuilder builder)
         where TParser : class, IRequestParser
     {
         builder.Services.Replace(ServiceDescriptor.Singleton<IRequestParser, TParser>());
@@ -50,7 +51,7 @@ public static IImageSharpBuilder SetRequestParser(this IImageSharpBuilder builde
     /// <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)
+    public static IImageSharpBuilder SetCache<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TCache>(this IImageSharpBuilder builder)
         where TCache : class, IImageCache
     {
         builder.Services.Replace(ServiceDescriptor.Singleton<IImageCache, TCache>());
@@ -77,7 +78,7 @@ public static IImageSharpBuilder SetCache(this IImageSharpBuilder builder, Func<
     /// <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)
+    public static IImageSharpBuilder SetCacheKey<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TCacheKey>(this IImageSharpBuilder builder)
         where TCacheKey : class, ICacheKey
     {
         builder.Services.Replace(ServiceDescriptor.Singleton<ICacheKey, TCacheKey>());
@@ -104,7 +105,7 @@ public static IImageSharpBuilder SetCacheKey(this IImageSharpBuilder builder, Fu
     /// <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)
+    public static IImageSharpBuilder SetCacheHash<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TCacheHash>(this IImageSharpBuilder builder)
         where TCacheHash : class, ICacheHash
     {
         builder.Services.Replace(ServiceDescriptor.Singleton<ICacheHash, TCacheHash>());
@@ -131,7 +132,7 @@ public static IImageSharpBuilder SetCacheHash(this IImageSharpBuilder builder, F
     /// <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)
+    public static IImageSharpBuilder AddProvider<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TProvider>(this IImageSharpBuilder builder)
         where TProvider : class, IImageProvider
     {
         builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IImageProvider, TProvider>());
@@ -161,7 +162,7 @@ public static IImageSharpBuilder AddProvider<TProvider>(this IImageSharpBuilder
     /// <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)
+    public static IImageSharpBuilder InsertProvider<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TProvider>(this IImageSharpBuilder builder, int index)
         where TProvider : class, IImageProvider
     {
         List<ServiceDescriptor> descriptors = builder.Services.Where(x => x.ServiceType == typeof(IImageProvider)).ToList();
@@ -231,7 +232,7 @@ public static IImageSharpBuilder ClearProviders(this IImageSharpBuilder builder)
     /// <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)
+    public static IImageSharpBuilder AddProcessor<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>(this IImageSharpBuilder builder)
         where T : class, IImageWebProcessor
     {
         builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IImageWebProcessor, T>());
@@ -290,7 +291,7 @@ public static IImageSharpBuilder ClearProcessors(this IImageSharpBuilder builder
     /// <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)
+    public static IImageSharpBuilder AddConverter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TConverter>(this IImageSharpBuilder builder)
         where TConverter : class, ICommandConverter
     {
         builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<ICommandConverter, TConverter>());
@@ -343,21 +344,6 @@ public static IImageSharpBuilder ClearConverters(this IImageSharpBuilder 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);
-
-        return builder;
-    }
-
     /// <summary>
     /// Registers an action used to configure a particular type of options.
     /// </summary>

src/ImageSharp.Web/RequestAuthorizationUtilities.cs

@@ -207,7 +207,7 @@ private static void ToComponents(
         }
     }
 
-    private HttpContext ToHttpContext(HostString host, PathString path, QueryString queryString, QueryCollection query)
+    private DefaultHttpContext ToHttpContext(HostString host, PathString path, QueryString queryString, QueryCollection query)
     {
         DefaultHttpContext context = new() { RequestServices = this.serviceProvider };
         HttpRequest request = context.Request;

src/ImageSharp.Web/Synchronization/RefCountedConcurrentDictionary.cs

@@ -222,12 +222,7 @@ public RefCountedValue(TValue value, int refCount)
             this.RefCount = refCount;
         }
 
-        public bool Equals(
-#if NET5_0_OR_GREATER
-            RefCountedValue? other)
-#else
-            [System.Diagnostics.CodeAnalysis.AllowNull] RefCountedValue other)
-#endif
+        public bool Equals(RefCountedValue? other)
             => (other != null) && (this.RefCount == other.RefCount) && EqualityComparer<TValue>.Default.Equals(this.Value, other.Value);
 
         public override bool Equals(object? obj)