Merge branch 'main' into redis-topic-prefix

Author: michaelstaib

.editorconfig

@@ -12,10 +12,12 @@ rulers = 120
 # ReSharper properties
 resharper_align_multiline_statement_conditions = false
 resharper_braces_for_ifelse = not_required
-resharper_wrap_object_and_collection_initializer_style = chop_always
+resharper_keep_existing_initializer_arrangement = false
+resharper_trailing_comma_in_multiline_lists = false
+resharper_wrap_object_and_collection_initializer_style = wrap_if_long
 
 # Microsoft .NET properties
-csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_object_initializers = false
 
 [*.md]
 trim_trailing_whitespace = false

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Release
+name: 🚀 Release
 
 on:
   push:
@@ -7,51 +7,130 @@ on:
 
 jobs:
   release:
+    name: 📦 Build & Publish NuGet Packages
     runs-on: ubuntu-22.04
     permissions:
       contents: write
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        show-progress: false
-
-    - name: Install .NET
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: |
-          8.x
-          9.x
-
-    - name: Get the version
-      id: get_version
-      run: echo "GIT_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-
-    - name: Build Packages
-      run: |
-        ./build.sh pack --SemVersion ${{ env.GIT_TAG }} --Configuration Release
-
-    - name: Push Packages
-      run: |
-        ./build.cmd publish --skip
-      env:
-        NuGetApiKey: ${{ secrets.NUGETAPIKEY }}
-
-    - name: Get release
-      id: get_release
-      run: |
-        RELEASE_ID=$(gh api repos/ChilliCream/graphql-platform/releases/tags/${{ env.GIT_TAG }} --jq '.id')
-        UPLOAD_URL=$(gh api repos/ChilliCream/graphql-platform/releases/$RELEASE_ID --jq '.upload_url')
-        echo "RELEASE_ID=$RELEASE_ID" >> $GITHUB_ENV
-        echo "UPLOAD_URL=${UPLOAD_URL}" >> $GITHUB_ENV
-      env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Upload Release Assets
-      run: |
-        for file in ./output/packages/*.nupkg; do
-          echo "Uploading $file"
-          gh release upload ${{ env.GIT_TAG }} "$file" --repo ChilliCream/graphql-platform
-        done
-      env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: 📦 Checkout
+        uses: actions/checkout@v4
+        with:
+          show-progress: false
+
+      - name: 🛠 Install .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            8.x
+            9.x
+
+      - name: 🏷 Get the version from tag
+        id: get_version
+        run: echo "GIT_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+
+      - name: 📦 Build NuGet Packages
+        run: |
+          ./build.sh pack --SemVersion ${{ env.GIT_TAG }} --Configuration Release
+
+      - name: 🚀 Push Packages to NuGet
+        run: |
+          ./build.cmd publish --skip
+        env:
+          NuGetApiKey: ${{ secrets.NUGETAPIKEY }}
+
+      - name: 🔎 Get GitHub Release Info
+        id: get_release
+        run: |
+          RELEASE_ID=$(gh api repos/ChilliCream/graphql-platform/releases/tags/${{ env.GIT_TAG }} --jq '.id')
+          UPLOAD_URL=$(gh api repos/ChilliCream/graphql-platform/releases/$RELEASE_ID --jq '.upload_url')
+          echo "RELEASE_ID=$RELEASE_ID" >> $GITHUB_ENV
+          echo "UPLOAD_URL=${UPLOAD_URL}" >> $GITHUB_ENV
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: 📤 Upload .nupkg Release Assets
+        run: |
+          for file in ./output/packages/*.nupkg; do
+            echo "📤 Uploading $file"
+            gh release upload ${{ env.GIT_TAG }} "$file" --repo ChilliCream/graphql-platform
+          done
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  build-aot:
+    name: 🧱 Build and Publish Fusion Tooling
+    runs-on: ${{ matrix.os }}
+    permissions:
+      contents: write
+    strategy:
+      matrix:
+        include:
+          # Linux (x64)
+          - os: ubuntu-22.04
+            rid: linux-x64
+            ext: ""
+          - os: ubuntu-22.04
+            rid: linux-musl-x64
+            ext: ""
+          # Linux (arm64 on ARM runner!)
+          - os: ubuntu-24.04-arm
+            rid: linux-arm64
+            ext: ""
+          # macOS
+          - os: macos-15
+            rid: osx-x64
+            ext: ""
+          - os: macos-15
+            rid: osx-arm64
+            ext: ""
+          # Windows
+          - os: windows-2025
+            rid: win-x64
+            ext: ".exe"
+          - os: windows-2025
+            rid: win-x86
+            ext: ".exe"
+          # Windows (arm64 on ARM runner!)
+          - os: windows-11-arm
+            rid: win-arm64
+            ext: ".exe"
+
+    steps:
+      - name: 📦 Checkout
+        uses: actions/checkout@v4
+
+      - name: 🛠 Install .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.x
+
+      - name: 🧩 Publish AOT Binary for ${{ matrix.rid }}
+        shell: bash
+        run: |
+          dotnet publish ./src/HotChocolate/Fusion-vnext/src/Fusion.CommandLine \
+            -c Release \
+            -r ${{ matrix.rid }} \
+            -f net9.0 \
+            --self-contained true \
+            -p:PublishAot=true \
+            -p:TargetFrameworks=NET9.0 \
+            -o ./publish
+
+      - name: 📦 Zip Binary (Windows)
+        if: runner.os == 'Windows'
+        run: Compress-Archive -Path publish/fusion.exe -DestinationPath fusion-${{ matrix.rid }}.zip
+        shell: pwsh
+
+      - name: 📦 Zip Binary (Unix)
+        if: runner.os != 'Windows'
+        run: |
+          cd publish
+          zip ../fusion-${{ matrix.rid }}.zip fusion${{ matrix.ext }}
+        shell: bash
+
+      - name: 📤 Upload Zipped AOT Binary
+        shell: bash
+        run: |
+          gh release upload ${{ github.ref_name }} fusion-${{ matrix.rid }}.zip --repo ${{ github.repository }}
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.markdownlint.yml

@@ -27,3 +27,4 @@ MD033:
     - u
     - Video
 MD036: false # Rationale: Possibly too strict, used frequently in documentation.
+MD059: false # Rationale: Already used in many places in the documentation.

src/All.slnx

@@ -67,9 +67,11 @@
   <Folder Name="/HotChocolate/Caching/" />
   <Folder Name="/HotChocolate/Caching/src/">
     <Project Path="HotChocolate/Caching/src/Caching/HotChocolate.Caching.csproj" />
+    <Project Path="HotChocolate/Caching/src/Caching.Memory/HotChocolate.Caching.Memory.csproj" />
   </Folder>
   <Folder Name="/HotChocolate/Caching/test/">
     <Project Path="HotChocolate/Caching/test/Caching.Tests/HotChocolate.Caching.Tests.csproj" />
+    <Project Path="HotChocolate/Caching/test/Caching.Memory.Tests/HotChocolate.Caching.Memory.Tests.csproj" />
   </Folder>
   <Folder Name="/HotChocolate/Core/" />
   <Folder Name="/HotChocolate/Core/src/">
@@ -143,12 +145,10 @@
   </Folder>
   <Folder Name="/HotChocolate/Data/" />
   <Folder Name="/HotChocolate/Data/src/">
-    <Project Path="HotChocolate/Data/src/AutoMapper/HotChocolate.Data.AutoMapper.csproj" />
     <Project Path="HotChocolate/Data/src/Data/HotChocolate.Data.csproj" />
     <Project Path="HotChocolate/Data/src/EntityFramework/HotChocolate.Data.EntityFramework.csproj" />
   </Folder>
   <Folder Name="/HotChocolate/Data/test/">
-    <Project Path="HotChocolate/Data/test/Data.AutoMapper.Tests/HotChocolate.Data.AutoMapper.Tests.csproj" />
     <Project Path="HotChocolate/Data/test/Data.EntityFramework.Pagination.Tests/HotChocolate.Data.EntityFramework.Pagination.Tests.csproj" />
     <Project Path="HotChocolate/Data/test/Data.EntityFramework.Tests/HotChocolate.Data.EntityFramework.Tests.csproj" />
     <Project Path="HotChocolate/Data/test/Data.Filters.InMemory.Tests/HotChocolate.Data.Filters.InMemory.Tests.csproj" />

src/Directory.Packages.props

@@ -9,7 +9,6 @@
     <PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="8.0.0" />
     <PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="8.0.0" />
     <PackageVersion Include="Aspire.Hosting.Redis" Version="8.0.0" />
-    <PackageVersion Include="AutoMapper" Version="10.1.1" />
     <PackageVersion Include="Azure.Storage.Blobs" Version="12.23.0" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.7.8" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net90" Version="1.7.8" />

src/GreenDonut/src/GreenDonut.Data.EntityFramework/Expressions/ExtractSelectExpressionVisitor.cs

@@ -12,7 +12,7 @@ protected override Expression VisitMethodCall(MethodCallExpression node)
     {
         if (node.Method.Name == _selectMethod && node.Arguments.Count == 2)
         {
-            var lambda = StripQuotes(node.Arguments[1]);
+            var lambda = ConvertToLambda(node.Arguments[1]);
             if (lambda.Type.IsGenericType
                 && lambda.Type.GetGenericTypeDefinition() == typeof(Func<,>))
             {
@@ -29,13 +29,20 @@ protected override Expression VisitMethodCall(MethodCallExpression node)
         return base.VisitMethodCall(node);
     }
 
-    private static LambdaExpression StripQuotes(Expression e)
+    private static LambdaExpression ConvertToLambda(Expression e)
     {
         while (e.NodeType == ExpressionType.Quote)
         {
             e = ((UnaryExpression)e).Operand;
         }
 
-        return (LambdaExpression)e;
+        if (e.NodeType != ExpressionType.MemberAccess)
+        {
+            return (LambdaExpression)e;
+        }
+
+        // Convert the property expression into a lambda expression
+        var typeArguments = e.Type.GetGenericArguments()[0].GetGenericArguments();
+        return Expression.Lambda(e,  Expression.Parameter(typeArguments[0]));
     }
 }

src/GreenDonut/src/GreenDonut.Data/Extensions/GreenDonutPageExtensions.cs

@@ -112,7 +112,7 @@ public static ImmutableArray<PageCursor> CreateRelativeForwardCursors<T>(this Pa
             return [];
         }
 
-        var totalPages = (page.TotalCount ?? 0) / (page.RequestedSize ?? 10);
+        var totalPages = Math.Ceiling((double)(page.TotalCount ?? 0) / (page.RequestedSize ?? 10));
 
         if (page.Index >= totalPages)
         {

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/PagingHelperIntegrationTests.cs

@@ -1,3 +1,4 @@
+using System.Linq.Expressions;
 using GreenDonut.Data.TestContext;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
@@ -178,6 +179,45 @@ await CreateSnapshot()
             .MatchMarkdownAsync();
     }
 
+    [Fact]
+    public async Task Paging_WithChildCollectionProjectionExpression_First_5()
+    {
+        // Arrange
+        var connectionString = CreateConnectionString();
+        await SeedAsync(connectionString);
+        using var capture = new CapturePagingQueryInterceptor();
+
+        // Act
+        await using var context = new CatalogContext(connectionString);
+
+        var pagingArgs = new PagingArguments
+        {
+            First = 5
+        };
+
+        var result = await context.Brands
+            .Select(BrandWithProductsDto.Projection)
+            .OrderBy(t => t.Name)
+            .ThenBy(t => t.Id)
+            .ToPageAsync(pagingArgs);
+
+        // Assert
+        await CreateSnapshot()
+            .AddQueries(capture.Queries)
+            .Add(
+                new
+                {
+                    result.HasNextPage,
+                    result.HasPreviousPage,
+                    First = result.First?.Id,
+                    FirstCursor = result.First is not null ? result.CreateCursor(result.First) : null,
+                    Last = result.Last?.Id,
+                    LastCursor = result.Last is not null ? result.CreateCursor(result.Last) : null
+                })
+            .Add(result.Items)
+            .MatchMarkdownAsync();
+    }
+
     [Fact]
     public async Task BatchPaging_First_5()
     {
@@ -351,6 +391,37 @@ public BrandDto(int id, string name)
         public string Name { get; }
     }
 
+    public class BrandWithProductsDto
+    {
+        public required int Id { get; init; }
+
+        public required string Name { get; init; }
+
+        public required IReadOnlyCollection<ProductDto> Products { get; init; }
+
+        public static Expression<Func<Brand, BrandWithProductsDto>> Projection
+            => brand => new BrandWithProductsDto
+            {
+                Id = brand.Id,
+                Name = brand.Name,
+                Products = brand.Products.AsQueryable().Select(ProductDto.Projection).ToList()
+            };
+    }
+
+    public class ProductDto
+    {
+        public required int Id { get; init; }
+
+        public required string Name { get; init; }
+
+        public static Expression<Func<Product, ProductDto>> Projection
+            => product => new ProductDto
+            {
+                Id = product.Id,
+                Name = product.Name
+            };
+    }
+
     public class ProductsByBrandDataLoader : StatefulBatchDataLoader<int, Page<Product>>
     {
         private readonly IServiceProvider _services;

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/RelativeCursorTests.cs

@@ -1222,6 +1222,23 @@ await ctx.Brands.Where(t => t.GroupId == 2).OrderBy(t => t.Name).ThenBy(t => t.I
         await Assert.ThrowsAsync<ArgumentException>(Error);
     }
 
+    [Fact]
+    public async Task RequestedSize_Not_Evenly_Divisible_By_TotalCount()
+    {
+        // Arrange
+        var connectionString = CreateConnectionString();
+        await SeedAsync(connectionString);
+        await using var context = new TestContext(connectionString);
+        var arguments = new PagingArguments(12) { EnableRelativeCursors = true };
+
+        // Act
+        var first = await context.Brands.OrderBy(t => t.Name).ThenBy(t => t.Id).ToPageAsync(arguments);
+
+        // Assert
+        Assert.Equal(20, first.TotalCount);
+        Assert.Single(first.CreateRelativeForwardCursors());
+    }
+
     private static async Task SeedAsync(string connectionString)
     {
         await using var context = new TestContext(connectionString);