diff --git a/.editorconfig b/.editorconfig
index 3f293cd3233..d41b1aebbba 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,7 +11,6 @@ rulers = 120
 
 # ReSharper properties
 resharper_align_multiline_statement_conditions = false
-resharper_braces_for_ifelse = not_required
 resharper_keep_existing_initializer_arrangement = false
 resharper_trailing_comma_in_multiline_lists = false
 resharper_wrap_object_and_collection_initializer_style = wrap_if_long
@@ -199,6 +198,8 @@ csharp_style_var_for_built_in_types = true
 csharp_style_var_when_type_is_apparent = true
 csharp_style_var_elsewhere = true
 dotnet_diagnostic.RCS1264.severity = none
+# Add braces.
+dotnet_diagnostic.IDE0011.severity = warning
 # Use collection initializers or expressions.
 dotnet_diagnostic.IDE0028.severity = warning
 # Order modifiers.
diff --git a/src/HotChocolate/Core/src/Types/Execution/Processing/DeferExecutionCoordinator.cs b/src/HotChocolate/Core/src/Types/Execution/Processing/DeferExecutionCoordinator.cs
index 774eb22f167..1ed1185aab8 100644
--- a/src/HotChocolate/Core/src/Types/Execution/Processing/DeferExecutionCoordinator.cs
+++ b/src/HotChocolate/Core/src/Types/Execution/Processing/DeferExecutionCoordinator.cs
@@ -1,5 +1,4 @@
 using System.Collections.Immutable;
-using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using HotChocolate.Fetching;
diff --git a/src/HotChocolate/Data/src/Data/Sorting/Context/SortingContext.cs b/src/HotChocolate/Data/src/Data/Sorting/Context/SortingContext.cs
index cb37a662267..3b147f47dd8 100644
--- a/src/HotChocolate/Data/src/Data/Sorting/Context/SortingContext.cs
+++ b/src/HotChocolate/Data/src/Data/Sorting/Context/SortingContext.cs
@@ -3,7 +3,6 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using GreenDonut.Data;
-using HotChocolate.Data.Projections.Expressions.Handlers;
 using HotChocolate.Language;
 using HotChocolate.Language.Visitors;
 using HotChocolate.Resolvers;
diff --git a/src/HotChocolate/Fusion-vnext/src/Fusion.Execution.Types/FusionSchemaDefinition.cs b/src/HotChocolate/Fusion-vnext/src/Fusion.Execution.Types/FusionSchemaDefinition.cs
index 68d8d929746..9d9b82f3a89 100644
--- a/src/HotChocolate/Fusion-vnext/src/Fusion.Execution.Types/FusionSchemaDefinition.cs
+++ b/src/HotChocolate/Fusion-vnext/src/Fusion.Execution.Types/FusionSchemaDefinition.cs
@@ -560,10 +560,7 @@ internal void Seal()
 
     internal void InitializePlannerTopologyCache()
     {
-        if (_plannerTopologyCache is null)
-        {
-            _plannerTopologyCache = PlannerTopologyCache.Build(this);
-        }
+        _plannerTopologyCache ??= PlannerTopologyCache.Build(this);
     }
 
     public override string ToString()
diff --git a/src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Planning/OperationPlanner.PlanBase.cs b/src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Planning/OperationPlanner.PlanBase.cs
index d5524bea979..197d8fc8a71 100644
--- a/src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Planning/OperationPlanner.PlanBase.cs
+++ b/src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Planning/OperationPlanner.PlanBase.cs
@@ -1,7 +1,6 @@
 using System.Collections.Immutable;
 using HotChocolate.Fusion.Execution.Nodes;
 using HotChocolate.Fusion.Planning.Partitioners;
-using HotChocolate.Fusion.Types;
 using HotChocolate.Language;
 
 namespace HotChocolate.Fusion.Planning;
diff --git a/src/HotChocolate/Fusion-vnext/test/Fusion.Execution.Tests/Execution/OperationPlanSingleFlightTests.cs b/src/HotChocolate/Fusion-vnext/test/Fusion.Execution.Tests/Execution/OperationPlanSingleFlightTests.cs
index adcafd4cbe6..4ce97c65cec 100644
--- a/src/HotChocolate/Fusion-vnext/test/Fusion.Execution.Tests/Execution/OperationPlanSingleFlightTests.cs
+++ b/src/HotChocolate/Fusion-vnext/test/Fusion.Execution.Tests/Execution/OperationPlanSingleFlightTests.cs
@@ -3,7 +3,6 @@
 using HotChocolate.Collections.Immutable;
 using HotChocolate.Execution;
 using HotChocolate.Fusion.Execution.Nodes;
-using HotChocolate.Fusion.Execution.Pipeline;
 using HotChocolate.Fusion.Planning;
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/src/HotChocolate/Fusion-vnext/test/Fusion.Execution.Tests/Planning/PlannerEventSourceTests.cs b/src/HotChocolate/Fusion-vnext/test/Fusion.Execution.Tests/Planning/PlannerEventSourceTests.cs
index 9e28c478aa1..4a29598e718 100644
--- a/src/HotChocolate/Fusion-vnext/test/Fusion.Execution.Tests/Planning/PlannerEventSourceTests.cs
+++ b/src/HotChocolate/Fusion-vnext/test/Fusion.Execution.Tests/Planning/PlannerEventSourceTests.cs
@@ -46,7 +46,7 @@ public void PlannerEventSource_Emits_Start_And_Stop_With_Perf_Metrics()
         var dequeueEvents = listener.ByEventId(PlannerEventSource.PlanDequeueEventId, operationId);
 
         Assert.True(elapsedMilliseconds >= 0);
-        Assert.Equal((int)plan.SearchSpace, searchSpace);
+        Assert.Equal(plan.SearchSpace, searchSpace);
         Assert.True(expandedNodes > 0);
         Assert.True(stepCount > 0);
         Assert.Equal(expandedNodes, dequeueEvents.Count);
diff --git a/src/HotChocolate/Language/src/Language.Utf8/WellKnownNames.cs b/src/HotChocolate/Language/src/Language.Utf8/WellKnownNames.cs
index 0ca26ede0a0..d895de42e96 100644
--- a/src/HotChocolate/Language/src/Language.Utf8/WellKnownNames.cs
+++ b/src/HotChocolate/Language/src/Language.Utf8/WellKnownNames.cs
@@ -1,4 +1,6 @@
+#if !NETSTANDARD2_0
 using System.Diagnostics.CodeAnalysis;
+#endif
 using System.Runtime.CompilerServices;
 
 namespace HotChocolate.Language;
diff --git a/src/HotChocolate/Language/test/Language.Tests/Parser/MultiSegmentReaderTests.cs b/src/HotChocolate/Language/test/Language.Tests/Parser/MultiSegmentReaderTests.cs
index 0cb4e277e71..5a1dcc5447c 100644
--- a/src/HotChocolate/Language/test/Language.Tests/Parser/MultiSegmentReaderTests.cs
+++ b/src/HotChocolate/Language/test/Language.Tests/Parser/MultiSegmentReaderTests.cs
@@ -373,7 +373,7 @@ public void MultiSegment_SingleSegment_Sequence_Parser()
     public void MultiSegment_EmptySequence_Throws()
     {
         // arrange
-        var sequence = new ReadOnlySequence<byte>(Array.Empty<byte>());
+        var sequence = new ReadOnlySequence<byte>([]);
 
         // act & assert
         Assert.Throws<ArgumentException>(() => new Utf8GraphQLReader(sequence));
diff --git a/src/HotChocolate/Language/test/Language.Tests/Parser/TestSequenceSegment.cs b/src/HotChocolate/Language/test/Language.Tests/Parser/TestSequenceSegment.cs
index d2e53316b50..3af6bda2852 100644
--- a/src/HotChocolate/Language/test/Language.Tests/Parser/TestSequenceSegment.cs
+++ b/src/HotChocolate/Language/test/Language.Tests/Parser/TestSequenceSegment.cs
@@ -26,10 +26,14 @@ public TestSequenceSegment Append(ReadOnlyMemory<byte> memory)
     public static ReadOnlySequence<byte> CreateMultiSegment(byte[] data, int chunkSize)
     {
         if (data.Length == 0)
+        {
             throw new ArgumentException("Data cannot be empty.", nameof(data));
+        }
 
         if (chunkSize <= 0)
+        {
             throw new ArgumentException("Chunk size must be positive.", nameof(chunkSize));
+        }
 
         if (chunkSize >= data.Length)
         {
@@ -58,14 +62,20 @@ public static ReadOnlySequence<byte> CreateMultiSegment(byte[] data, int chunkSi
     public static ReadOnlySequence<byte> CreateMultiSegment(byte[] data, params int[] splitPositions)
     {
         if (data.Length == 0)
+        {
             throw new ArgumentException("Data cannot be empty.", nameof(data));
+        }
 
         if (splitPositions.Length == 0)
+        {
             return new ReadOnlySequence<byte>(data);
+        }
 
         var positions = splitPositions.OrderBy(p => p).Where(p => p > 0 && p < data.Length).Distinct().ToArray();
         if (positions.Length == 0)
+        {
             return new ReadOnlySequence<byte>(data);
+        }
 
         var first = new TestSequenceSegment(
             new ReadOnlyMemory<byte>(data, 0, positions[0]), 0);