Fixed various analyzer errors (#8417)

glen-84 · web-flow · commit 0e9d78ff5273 · 2025-07-03T11:33:11.000+02:00
diff --git a/src/GreenDonut/src/GreenDonut/DataLoaderBase.cs b/src/GreenDonut/src/GreenDonut/DataLoaderBase.cs
@@ -30,7 +30,11 @@ public abstract partial class DataLoaderBase<TKey, TValue>
     private readonly int _maxBatchSize;
     private readonly IDataLoaderDiagnosticEvents _diagnosticEvents;
     private ImmutableDictionary<string, IDataLoader> _branches =
+#if NET10_0_OR_GREATER
+        [];
+#else
         ImmutableDictionary<string, IDataLoader>.Empty;
+#endif
     private Batch<TKey>? _currentBatch;
 
     /// <summary>
diff --git a/src/HotChocolate/Core/src/Execution.Abstractions/Collections/Immutable/ImmutableOrderedDictionary.cs b/src/HotChocolate/Core/src/Execution.Abstractions/Collections/Immutable/ImmutableOrderedDictionary.cs
@@ -37,7 +37,11 @@ private ImmutableOrderedDictionary(ImmutableList<TKey> keys, ImmutableDictionary
     /// </summary>
     /// <value>An empty immutable ordered dictionary.</value>
     public static ImmutableOrderedDictionary<TKey, TValue> Empty { get; } =
+#if NET10_0_OR_GREATER
+        new([], []);
+#else
         new([], ImmutableDictionary<TKey, TValue>.Empty);
+#endif
 
     /// <summary>
     /// Gets the number of key/value pairs in the immutable ordered dictionary.
diff --git a/src/HotChocolate/Core/src/Execution.Abstractions/Execution/OperationResultBuilder.cs b/src/HotChocolate/Core/src/Execution.Abstractions/Execution/OperationResultBuilder.cs
@@ -76,7 +76,11 @@ public OperationResultBuilder SetExtensions(IReadOnlyDictionary<string, object?>
         }
         else if (extensions is not null)
         {
+#if NET9_0_OR_GREATER
             _extensionData = new OrderedDictionary<string, object?>(extensions);
+#else
+            _extensionData = [];
+#endif
         }
         else
         {
@@ -188,7 +192,11 @@ public static OperationResultBuilder FromResult(IOperationResult result)
         }
         else if (result.Extensions is not null)
         {
+#if NET9_0_OR_GREATER
             builder._extensionData = new OrderedDictionary<string, object?>(result.Extensions);
+#else
+            builder._extensionData = [];
+#endif
         }
 
         if (result.ContextData is Dictionary<string, object?> cd)
diff --git a/src/HotChocolate/Core/src/Execution/Processing/MiddlewareContext.Pooling.cs b/src/HotChocolate/Core/src/Execution/Processing/MiddlewareContext.Pooling.cs
@@ -5,7 +5,11 @@ namespace HotChocolate.Execution.Processing;
 internal partial class MiddlewareContext
 {
     private static readonly ImmutableDictionary<string, object?> s_emptyLocalContextData =
+#if NET10_0_OR_GREATER
+        [];
+#else
         ImmutableDictionary<string, object?>.Empty;
+#endif
 
     public MiddlewareContext()
     {
diff --git a/src/HotChocolate/Core/src/Execution/Processing/Operation.cs b/src/HotChocolate/Core/src/Execution/Processing/Operation.cs
@@ -12,7 +12,12 @@ internal sealed class Operation : IOperation
     private readonly object _writeLock = new();
     private SelectionVariants[] _selectionVariants = [];
     private IncludeCondition[] _includeConditions = [];
-    private ImmutableDictionary<string, object?> _contextData = ImmutableDictionary<string, object?>.Empty;
+    private ImmutableDictionary<string, object?> _contextData =
+#if NET10_0_OR_GREATER
+        [];
+#else
+        ImmutableDictionary<string, object?>.Empty;
+#endif
     private bool _sealed;
 
     public Operation(
diff --git a/src/HotChocolate/Core/src/Types.Abstractions/Polyfills/OrderedDictionary.cs b/src/HotChocolate/Core/src/Types.Abstractions/Polyfills/OrderedDictionary.cs
@@ -24,7 +24,7 @@ public class OrderedDictionary<TKey, TValue>
     /// </summary>
     public OrderedDictionary()
     {
-        _map = new Dictionary<TKey, TValue>();
+        _map = [];
     }
 
     /// <summary>
@@ -36,7 +36,7 @@ public OrderedDictionary(IEnumerable<KeyValuePair<TKey, TValue>> collection)
     {
         ArgumentNullException.ThrowIfNull(collection);
 
-        _map = new Dictionary<TKey, TValue>();
+        _map = [];
 
         foreach (var (key, value) in collection)
         {
diff --git a/src/HotChocolate/Core/src/Types/Configuration/Features/TypeSystemConventionFeature.cs b/src/HotChocolate/Core/src/Types/Configuration/Features/TypeSystemConventionFeature.cs
@@ -7,5 +7,9 @@ namespace HotChocolate.Configuration;
 internal sealed class TypeSystemConventionFeature
 {
     public ImmutableDictionary<ConventionKey, ImmutableList<ConventionRegistration>> Conventions { get; set; } =
+#if NET10_0_OR_GREATER
+        [];
+#else
         ImmutableDictionary<ConventionKey, ImmutableList<ConventionRegistration>>.Empty;
+#endif
 }
diff --git a/src/HotChocolate/Core/src/Types/Configuration/Features/TypeSystemFeature.cs b/src/HotChocolate/Core/src/Types/Configuration/Features/TypeSystemFeature.cs
@@ -15,6 +15,16 @@ internal sealed class TypeSystemFeature
     public Dictionary<string, Type> ScalarNameOverrides { get; } = [];
     public List<Action<ISchemaTypeDescriptor>> SchemaTypeOptions { get; } = [];
     public List<SchemaDocumentInfo> SchemaDocuments { get; } = [];
+#if NET10_0_OR_GREATER
+    public ImmutableDictionary<string, IReadOnlyList<DirectiveNode>> ScalarDirectives { get; set; } =
+        [];
+    public ImmutableDictionary<Type, RuntimeTypeBinding> RuntimeTypeBindings { get; set; } =
+        [];
+    public ImmutableDictionary<Type, RuntimeTypeNameBinding> RuntimeTypeNameBindings { get; set; } =
+        [];
+    public ImmutableDictionary<string, RuntimeTypeNameBinding> NameRuntimeTypeBinding { get; set; } =
+        [];
+#else
     public ImmutableDictionary<string, IReadOnlyList<DirectiveNode>> ScalarDirectives { get; set; } =
         ImmutableDictionary<string, IReadOnlyList<DirectiveNode>>.Empty;
     public ImmutableDictionary<Type, RuntimeTypeBinding> RuntimeTypeBindings { get; set; } =
@@ -23,4 +33,5 @@ internal sealed class TypeSystemFeature
         ImmutableDictionary<Type, RuntimeTypeNameBinding>.Empty;
     public ImmutableDictionary<string, RuntimeTypeNameBinding> NameRuntimeTypeBinding { get; set; } =
         ImmutableDictionary<string, RuntimeTypeNameBinding>.Empty;
+#endif
 }
diff --git a/src/HotChocolate/Core/src/Types/SchemaErrorBuilder.Error.cs b/src/HotChocolate/Core/src/Types/SchemaErrorBuilder.Error.cs
@@ -33,7 +33,11 @@ private sealed class Error : ISchemaError
         IReadOnlyCollection<ISyntaxNode> ISchemaError.SyntaxNodes => SyntaxNodes;
 
         public ImmutableDictionary<string, object> Extensions { get; set; }
+#if NET10_0_OR_GREATER
+            = [];
+#else
             = ImmutableDictionary<string, object>.Empty;
+#endif
 
         IReadOnlyDictionary<string, object> ISchemaError.Extensions => Extensions;
 
diff --git a/src/HotChocolate/Core/src/Types/Types/Factories/SchemaFirstTypeInterceptor.cs b/src/HotChocolate/Core/src/Types/Types/Factories/SchemaFirstTypeInterceptor.cs
@@ -13,7 +13,11 @@ namespace HotChocolate.Types.Factories;
 internal sealed class SchemaFirstTypeInterceptor : TypeInterceptor
 {
     private ImmutableDictionary<string, IReadOnlyList<DirectiveNode>> _directives =
+#if NET10_0_OR_GREATER
+        [];
+#else
         ImmutableDictionary<string, IReadOnlyList<DirectiveNode>>.Empty;
+#endif
 
     internal override void InitializeContext(
         IDescriptorContext context,
diff --git a/src/HotChocolate/Core/src/Types/Types/Factories/SchemaSyntaxVisitorContext.cs b/src/HotChocolate/Core/src/Types/Types/Factories/SchemaSyntaxVisitorContext.cs
@@ -13,7 +13,11 @@ internal class SchemaSyntaxVisitorContext(IDescriptorContext descriptorContext)
     public IReadOnlyCollection<DirectiveNode>? Directives { get; set; }
 
     public ImmutableDictionary<string, IReadOnlyList<DirectiveNode>> ScalarDirectives { get; set; } =
+#if NET10_0_OR_GREATER
+        [];
+#else
         ImmutableDictionary<string, IReadOnlyList<DirectiveNode>>.Empty;
+#endif
 
     public string? QueryTypeName { get; set; }
 
diff --git a/src/HotChocolate/Core/test/Types.Tests/SchemaBuilderTests.cs b/src/HotChocolate/Core/test/Types.Tests/SchemaBuilderTests.cs
@@ -1032,7 +1032,7 @@ public void AddInterceptor_TypeIsNull_ArgumentException()
         // arrange
         // act
         Action action = () => SchemaBuilder.New()
-            .TryAddTypeInterceptor((Type)null);
+            .TryAddTypeInterceptor(null);
 
         // assert
         Assert.Throws<ArgumentNullException>(action);
@@ -1104,7 +1104,7 @@ public void AddConvention_TypeIsNullConcreteIsSet_ArgumentException()
     {
         // arrange
         // act
-        Action action = () => SchemaBuilder.New() .AddConvention(null!, new TestConvention());
+        Action action = () => SchemaBuilder.New().AddConvention(null!, new TestConvention());
 
         // assert
         Assert.Throws<ArgumentNullException>(action);
@@ -1115,7 +1115,7 @@ public void AddConvention_ConventionIsNull_ArgumentException()
     {
         // arrange
         // act
-        Action action = () => SchemaBuilder.New() .AddConvention(typeof(IConvention), default(TestConvention)!);
+        Action action = () => SchemaBuilder.New().AddConvention(typeof(IConvention), default(TestConvention)!);
 
         // assert
         Assert.Throws<ArgumentNullException>(action);
@@ -1126,7 +1126,7 @@ public void AddConvention_ConventionTypeIsNull_ArgumentException()
     {
         // arrange
         // act
-        Action action = () => SchemaBuilder.New() .AddConvention(null!, typeof(IConvention));
+        Action action = () => SchemaBuilder.New().AddConvention(null!, typeof(IConvention));
 
         // assert
         Assert.Throws<ArgumentNullException>(action);
diff --git a/src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Planning/OperationPlanStep.cs b/src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Planning/OperationPlanStep.cs
@@ -18,7 +18,11 @@ public record OperationPlanStep : PlanStep
     public ImmutableHashSet<int> Dependents { get; init; } = [];
 
     public ImmutableDictionary<string, OperationRequirement> Requirements { get; init; }
+#if NET10_0_OR_GREATER
+        = [];
+#else
         = ImmutableDictionary<string, OperationRequirement>.Empty;
+#endif
 
     public bool DependsOn(OperationPlanStep otherStep, ImmutableList<PlanStep> allSteps)
         => DependsOnRecursive(otherStep, Id, allSteps, []);

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,11 @@ public OperationResultBuilder SetExtensions(IReadOnlyDictionary<string, object?>`
`76`	`76`	`}`
`77`	`77`	`else if (extensions is not null)`
`78`	`78`	`{`
	`79`	`+#if NET9_0_OR_GREATER`
`79`	`80`	`_extensionData = new OrderedDictionary<string, object?>(extensions);`
	`81`	`+#else`
	`82`	`+ _extensionData = [];`
	`83`	`+#endif`
`80`	`84`	`}`
`81`	`85`	`else`
`82`	`86`	`{`
`@@ -188,7 +192,11 @@ public static OperationResultBuilder FromResult(IOperationResult result)`
`188`	`192`	`}`
`189`	`193`	`else if (result.Extensions is not null)`
`190`	`194`	`{`
	`195`	`+#if NET9_0_OR_GREATER`
`191`	`196`	`builder._extensionData = new OrderedDictionary<string, object?>(result.Extensions);`
	`197`	`+#else`
	`198`	`+ builder._extensionData = [];`
	`199`	`+#endif`
`192`	`200`	`}`
`193`	`201`
`194`	`202`	`if (result.ContextData is Dictionary<string, object?> cd)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,11 @@ namespace HotChocolate.Execution.Processing;`
`5`	`5`	`internal partial class MiddlewareContext`
`6`	`6`	`{`
`7`	`7`	`private static readonly ImmutableDictionary<string, object?> s_emptyLocalContextData =`
	`8`	`+#if NET10_0_OR_GREATER`
	`9`	`+ [];`
	`10`	`+#else`
`8`	`11`	`ImmutableDictionary<string, object?>.Empty;`
	`12`	`+#endif`
`9`	`13`
`10`	`14`	`public MiddlewareContext()`
`11`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class OrderedDictionary<TKey, TValue>`
`24`	`24`	`/// </summary>`
`25`	`25`	`public OrderedDictionary()`
`26`	`26`	`{`
`27`		`- _map = new Dictionary<TKey, TValue>();`
	`27`	`+ _map = [];`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`/// <summary>`
`@@ -36,7 +36,7 @@ public OrderedDictionary(IEnumerable<KeyValuePair<TKey, TValue>> collection)`
`36`	`36`	`{`
`37`	`37`	`ArgumentNullException.ThrowIfNull(collection);`
`38`	`38`
`39`		`- _map = new Dictionary<TKey, TValue>();`
	`39`	`+ _map = [];`
`40`	`40`
`41`	`41`	`foreach (var (key, value) in collection)`
`42`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,9 @@ namespace HotChocolate.Configuration;`
`7`	`7`	`internal sealed class TypeSystemConventionFeature`
`8`	`8`	`{`
`9`	`9`	`public ImmutableDictionary<ConventionKey, ImmutableList<ConventionRegistration>> Conventions { get; set; } =`
	`10`	`+#if NET10_0_OR_GREATER`
	`11`	`+ [];`
	`12`	`+#else`
`10`	`13`	`ImmutableDictionary<ConventionKey, ImmutableList<ConventionRegistration>>.Empty;`
	`14`	`+#endif`
`11`	`15`	`}`