Merge branch 'main' into 8775

Author: michaelstaib

.editorconfig

@@ -99,8 +99,6 @@ csharp_space_between_parentheses = false
 csharp_preserve_single_line_statements = false
 csharp_preserve_single_line_blocks = true
 
-dotnet_style_require_accessibility_modifiers = always
-
 # Public API
 dotnet_diagnostic.rs0016.severity = warning
 dotnet_diagnostic.rcs1194.severity = none
@@ -203,6 +201,9 @@ dotnet_diagnostic.IDE0028.severity = warning
 dotnet_diagnostic.IDE0036.severity = warning
 # Use inferred member names.
 dotnet_diagnostic.IDE0037.severity = warning
+# Add accessibility modifiers.
+dotnet_diagnostic.IDE0040.severity = warning
+dotnet_style_require_accessibility_modifiers = for_non_interface_members
 # Add readonly modifier.
 dotnet_diagnostic.IDE0044.severity = warning
 dotnet_diagnostic.RCS1169.severity = none

.github/workflows/ci.yml

@@ -148,7 +148,7 @@ jobs:
       - name: Install .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 10.x
+          dotnet-version: 10.0.100-rc.1.25451.107
 
       - name: Generate Test Matrix
         run: dotnet run --project ./.build -- GenerateMatrix
@@ -181,7 +181,7 @@ jobs:
           dotnet-version: |
             8.x
             9.x
-            10.x
+            10.0.100-rc.1.25451.107
 
       - name: Run Build
         id: run-build
@@ -252,7 +252,7 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           name: graphql-platform
-          files: './output/download/coverage-*/*/coverage.opencover.xml'
+          files: "./output/download/coverage-*/*/coverage.opencover.xml"
           disable_search: true
           flags: unittests
           fail_ci_if_error: true

.github/workflows/coverage.yml

@@ -6,7 +6,7 @@ on:
       - main
       - main-version-*
     paths:
-      - 'src/**'
+      - "src/**"
 
 concurrency:
   group: main-coverage
@@ -32,7 +32,7 @@ jobs:
           dotnet-version: |
             8.x
             9.x
-            10.x
+            10.0.100-rc.1.25451.107
 
       - name: Generate Test Matrix
         run: dotnet run --project ./.build -- GenerateMatrix
@@ -64,7 +64,7 @@ jobs:
           dotnet-version: |
             8.x
             9.x
-            10.x
+            10.0.100-rc.1.25451.107
 
       - name: Run Build
         id: run-build
@@ -137,7 +137,7 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           name: graphql-platform
-          files: './output/download/coverage-*/*/coverage.opencover.xml'
+          files: "./output/download/coverage-*/*/coverage.opencover.xml"
           disable_search: true
           flags: unittests
           fail_ci_if_error: true

.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
           dotnet-version: |
             8.x
             9.x
-            10.x
+            10.0.100-rc.1.25451.107
 
       - name: 🏷 Get the version from tag
         run: echo "GIT_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
@@ -104,7 +104,7 @@ jobs:
       - name: 🛠 Install .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 10.x
+          dotnet-version: 10.0.100-rc.1.25451.107
 
       - name: 🏷 Get the version from tag (Windows)
         if: runner.os == 'Windows'

src/All.slnx

@@ -47,7 +47,6 @@
     <Project Path="HotChocolate/AspNetCore/src/Transport.Sockets.Client/HotChocolate.Transport.Sockets.Client.csproj" />
     <Project Path="HotChocolate/AspNetCore/src/Transport.Sockets/HotChocolate.Transport.Sockets.csproj" />
   </Folder>
-  <Folder Name="/HotChocolate/AspNetCore/src/AspNetCore/" />
   <Folder Name="/HotChocolate/AspNetCore/test/">
     <Project Path="HotChocolate/AspNetCore/test/AspNetCore.Authorization.Opa.Tests/HotChocolate.AspNetCore.Authorization.Opa.Tests.csproj" />
     <Project Path="HotChocolate/AspNetCore/test/AspNetCore.Authorization.Tests/HotChocolate.AspNetCore.Authorization.Tests.csproj" />
@@ -108,6 +107,7 @@
     <Project Path="HotChocolate/Core/src/Types.Scalars.Upload/HotChocolate.Types.Scalars.Upload.csproj" />
     <Project Path="HotChocolate/Core/src/Types.Scalars/HotChocolate.Types.Scalars.csproj" />
     <Project Path="HotChocolate/Core/src/Types.Shared/HotChocolate.Types.Shared.csproj" />
+    <Project Path="HotChocolate/Core/src/Types.Validation/HotChocolate.Types.Validation.csproj" />
     <Project Path="HotChocolate/Core/src/Types/HotChocolate.Types.csproj" />
     <Project Path="HotChocolate/Core/src/Validation/HotChocolate.Validation.csproj" />
   </Folder>
@@ -137,6 +137,7 @@
     <Project Path="HotChocolate/Core/test/Types.Scalars.Tests/HotChocolate.Types.Scalars.Tests.csproj" />
     <Project Path="HotChocolate/Core/test/Types.Tests.Documentation/HotChocolate.Types.Tests.Documentation.csproj" />
     <Project Path="HotChocolate/Core/test/Types.Tests/HotChocolate.Types.Tests.csproj" />
+    <Project Path="HotChocolate/Core/test/Types.Validation.Tests/HotChocolate.Types.Validation.Tests.csproj" />
     <Project Path="HotChocolate/Core/test/Utilities/HotChocolate.Tests.Utilities.csproj" />
     <Project Path="HotChocolate/Core/test/Validation.Tests/HotChocolate.Validation.Tests.csproj" />
   </Folder>
@@ -175,6 +176,9 @@
     <Project Path="HotChocolate/Diagnostics/test/Diagnostics.Tests/HotChocolate.Diagnostics.Tests.csproj" />
   </Folder>
   <Folder Name="/HotChocolate/Fusion-vnext/" />
+  <Folder Name="/HotChocolate/Fusion-vnext/benchmarks/">
+    <Project Path="HotChocolate/Fusion-vnext/benchmarks/Fusion.Execution.Benchmarks/Fusion.Execution.Benchmarks.csproj" />
+  </Folder>
   <Folder Name="/HotChocolate/Fusion-vnext/src/">
     <Project Path="HotChocolate/Fusion-vnext/src/Fusion.Aspire/HotChocolate.Fusion.Aspire.csproj" />
     <Project Path="HotChocolate/Fusion-vnext/src/Fusion.AspNetCore/HotChocolate.Fusion.AspNetCore.csproj" />
@@ -188,12 +192,21 @@
   <Folder Name="/HotChocolate/Fusion-vnext/test/">
     <Project Path="HotChocolate/Fusion-vnext/test/Fusion.AspNetCore.Tests/HotChocolate.Fusion.AspNetCore.Tests.csproj" />
     <Project Path="HotChocolate/Fusion-vnext/test/Fusion.Composition.Tests/HotChocolate.Fusion.Composition.Tests.csproj" />
-    <Project Path="HotChocolate/Fusion-vnext/test/Fusion.Execution.Tests/HotChocolate.Fusion.Execution.Tests.csproj" />
     <Project Path="HotChocolate/Fusion-vnext/test/Fusion.EventSources.Tests/HotChocolate.Fusion.EventSources.Tests.csproj" />
+    <Project Path="HotChocolate/Fusion-vnext/test/Fusion.Execution.Tests/HotChocolate.Fusion.Execution.Tests.csproj" />
     <Project Path="HotChocolate/Fusion-vnext/test/Fusion.Language.Tests/HotChocolate.Fusion.Language.Tests.csproj" />
     <Project Path="HotChocolate/Fusion-vnext/test/Fusion.Packaging.Tests/HotChocolate.Fusion.Packaging.Tests.csproj" />
-    <Project Path="HotChocolate/Fusion-vnext/test/Fusion.Utilities.Tests/HotChocolate.Fusion.Utilities.Tests.csproj" />
     <Project Path="HotChocolate/Fusion-vnext/test/Fusion.Tests.Shared/HotChocolate.Fusion.Tests.Shared.csproj" />
+    <Project Path="HotChocolate/Fusion-vnext/test/Fusion.Utilities.Tests/HotChocolate.Fusion.Utilities.Tests.csproj" />
+  </Folder>
+  <Folder Name="/HotChocolate/Json/" />
+  <Folder Name="/HotChocolate/Json/src/" />
+  <Folder Name="/HotChocolate/Json/src/Json/">
+    <Project Path="HotChocolate/Json/src/Json/HotChocolate.Text.Json.csproj" />
+  </Folder>
+  <Folder Name="/HotChocolate/Json/test/" />
+  <Folder Name="/HotChocolate/Json/test/Json.Tests/">
+    <Project Path="HotChocolate/Json/test/Json.Tests/HotChocolate.Text.Json.Tests.csproj" />
   </Folder>
   <Folder Name="/HotChocolate/Language/" />
   <Folder Name="/HotChocolate/Language/src/">
@@ -288,12 +301,12 @@
   </Folder>
   <Folder Name="/HotChocolate/Utilities/" />
   <Folder Name="/HotChocolate/Utilities/src/">
+    <Project Path="HotChocolate/Utilities/src/Utilities.Base36/HotChocolate.Utilities.Base36.csproj" />
     <Project Path="HotChocolate/Utilities/src/Utilities.Buffers/HotChocolate.Utilities.Buffers.csproj" />
     <Project Path="HotChocolate/Utilities/src/Utilities.DependencyInjection/HotChocolate.Utilities.DependencyInjection.csproj" />
     <Project Path="HotChocolate/Utilities/src/Utilities.Introspection/HotChocolate.Utilities.Introspection.csproj" />
     <Project Path="HotChocolate/Utilities/src/Utilities.Tasks/HotChocolate.Utilities.Tasks.csproj" />
     <Project Path="HotChocolate/Utilities/src/Utilities/HotChocolate.Utilities.csproj" />
-    <Project Path="HotChocolate/Utilities/src/Utilities.Base36/HotChocolate.Utilities.Base36.csproj" />
   </Folder>
   <Folder Name="/HotChocolate/Utilities/test/">
     <Project Path="HotChocolate/Utilities/test/Utilities.Introspection.Tests/HotChocolate.Utilities.Introspection.Tests.csproj" />
@@ -353,4 +366,4 @@
   <Folder Name="/StrawberryShake/Tooling/test/">
     <Project Path="StrawberryShake/Tooling/test/Configuration.Tests/StrawberryShake.Tools.Configuration.Tests.csproj" />
   </Folder>
-</Solution>
+</Solution>

src/CookieCrumble/src/CookieCrumble/Extensions/SnapshotExtensions.cs

@@ -10,6 +10,45 @@ public static void MatchInlineSnapshot(
         ISnapshotValueFormatter? formatter = null)
         => Snapshot.Create().Add(value, formatter: formatter).MatchInline(snapshot);
 
+    public static void MatchInlineSnapshots(
+        this IEnumerable<object?> values,
+        IEnumerable<string> snapshots,
+        ISnapshotValueFormatter? formatter = null)
+    {
+        var valuesArray = values.ToArray();
+        var snapshotsArray = snapshots.ToArray();
+
+        if (valuesArray.Length != snapshotsArray.Length)
+        {
+            throw new ArgumentException(
+                $"The number of snapshots must be the same as the number of values ({valuesArray.Length}).",
+                nameof(snapshots));
+        }
+
+        var i = 0;
+        List<Exception> exceptions = [];
+
+        foreach (var value in valuesArray)
+        {
+            try
+            {
+                Snapshot
+                    .Create()
+                    .Add(value, formatter: formatter)
+                    .MatchInline(snapshotsArray[i++]);
+            }
+            catch (Exception ex)
+            {
+                exceptions.Add(ex);
+            }
+        }
+
+        if (exceptions.Count != 0)
+        {
+            throw new AggregateException(exceptions);
+        }
+    }
+
     public static void MatchSnapshot(this Snapshot value)
         => value.Match();
 

src/Directory.Packages.props

@@ -50,8 +50,8 @@
     <PackageVersion Include="RabbitMQ.Client" Version="6.4.0" />
     <PackageVersion Include="RavenDB.Client" Version="6.0.104" />
     <PackageVersion Include="Snapshooter.Xunit" Version="0.5.4" />
-    <PackageVersion Include="Spectre.Console.Json" Version="0.50.0" />
-    <PackageVersion Include="Spectre.Console" Version="0.50.0" />
+    <PackageVersion Include="Spectre.Console.Json" Version="0.52.0" />
+    <PackageVersion Include="Spectre.Console" Version="0.52.0" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
     <PackageVersion Include="SQLitePCLRaw.bundle_green" Version="2.1.11" />
     <PackageVersion Include="Squadron.AzureStorage" Version="0.25.0-preview.2" />

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/BuiltInTypesSharableTests.cs renamed to src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/BuiltInTypesShareableTests.cs

@@ -5,10 +5,10 @@
 
 namespace HotChocolate.ApolloFederation;
 
-public class BuiltInTypesSharableTests
+public class BuiltInTypesShareableTests
 {
     [Fact]
-    public async Task Ensure_PagingInfo_Is_Sharable()
+    public async Task Ensure_PagingInfo_Is_Shareable()
     {
         // arrange
         var schema = await new ServiceCollection()
@@ -22,7 +22,7 @@ public async Task Ensure_PagingInfo_Is_Sharable()
     }
 
     [Fact]
-    public async Task Ensure_PagingInfo_Is_Sharable_When_Sharable_Already_Registered()
+    public async Task Ensure_PagingInfo_Is_Shareable_When_Shareable_Already_Registered()
     {
         // arrange
         var schema = await new ServiceCollection()

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/EntitiesResolverForInterfaceTests.cs

@@ -309,7 +309,7 @@ public interface ITypeWithReferenceResolver
         string Id { get; set; }
         string SomeField { get; set; }
 
-        public static ITypeWithReferenceResolver Get([LocalState] ObjectValueNode data)
+        static ITypeWithReferenceResolver Get([LocalState] ObjectValueNode data)
         {
             return new TypeWithReferenceResolver { Id = "1", SomeField = "SomeField" };
         }
@@ -330,15 +330,15 @@ public static TypeWithReferenceResolver Get([LocalState] ObjectValueNode data)
     public interface IForeignType
     {
         [Key]
-        public string Id { get; }
+        string Id { get; }
 
         [External]
-        public string SomeExternalField { get; }
+        string SomeExternalField { get; }
 
-        public string InternalField => "InternalValue";
+        string InternalField => "InternalValue";
 
         [ReferenceResolver]
-        public static IForeignType GetById(string id, string someExternalField)
+        static IForeignType GetById(string id, string someExternalField)
             => new ForeignType(id, someExternalField);
     }
 
@@ -366,15 +366,15 @@ public static ForeignType GetById(string id, string someExternalField)
     public interface IMixedFieldTypes
     {
         [Key]
-        public string Id { get; }
+        string Id { get; }
 
         [External]
-        public int IntField { get; }
+        int IntField { get; }
 
-        public string InternalField { get; set; }
+        string InternalField { get; set; }
 
         [ReferenceResolver]
-        public static IMixedFieldTypes GetByExternal(string id, int intField)
+        static IMixedFieldTypes GetByExternal(string id, int intField)
             => new MixedFieldTypes(id, intField);
     }
 
@@ -407,7 +407,7 @@ public interface IFederatedType
         string SomeField { get; set; }
 
         [ReferenceResolver]
-        public static async Task<IFederatedType?> GetById(
+        static async Task<IFederatedType?> GetById(
             [LocalState] ObjectValueNode data,
             [Service] IFederatedTypeDataLoader loader)
         {
@@ -473,7 +473,7 @@ public interface IFederatedTypeWithRequiredDetail
         FederatedTypeDetail Detail { get; set; }
 
         [ReferenceResolver]
-        public static IFederatedTypeWithRequiredDetail ReferenceResolver([Map("detail.id")] string detailId)
+        static IFederatedTypeWithRequiredDetail ReferenceResolver([Map("detail.id")] string detailId)
             => new FederatedTypeWithRequiredDetail()
             {
                 Id = detailId,
@@ -509,7 +509,7 @@ public interface IFederatedTypeWithOptionalDetail
         FederatedTypeDetail? Detail { get; }
 
         [ReferenceResolver]
-        public static IFederatedTypeWithOptionalDetail ReferenceResolver([Map("detail.id")] string detailId)
+        static IFederatedTypeWithOptionalDetail ReferenceResolver([Map("detail.id")] string detailId)
             => new FederatedTypeWithOptionalDetail()
             {
                 Id = detailId,