From b0147e03f4a8d41c07b06d4d8dca900d21784001 Mon Sep 17 00:00:00 2001 From: lloyd Date: Mon, 24 Nov 2025 14:17:02 +0200 Subject: [PATCH 1/4] feat: allow multiple frameworks --- ...tackworx.EfCoreGraphQL.Abstractions.csproj | 4 +- ...rx.EfCoreGraphQL.Validation.XunitV3.csproj | 8 +-- .../Stackworx.EfCoreGraphQL.Validation.csproj | 16 +++-- .../Stackworx.EfCoreGraphQL.csproj | 18 ++++-- .../Stackworx.EfCoreGraphQL.Tests.csproj | 64 ++++++++++--------- ...worx.EfCoreGraphQL.Validation.Tests.csproj | 30 +++++---- 6 files changed, 78 insertions(+), 62 deletions(-) diff --git a/src/Stackworx.EfCoreGraphQL.Abstractions/Stackworx.EfCoreGraphQL.Abstractions.csproj b/src/Stackworx.EfCoreGraphQL.Abstractions/Stackworx.EfCoreGraphQL.Abstractions.csproj index 85fe2d4..3a33ae9 100644 --- a/src/Stackworx.EfCoreGraphQL.Abstractions/Stackworx.EfCoreGraphQL.Abstractions.csproj +++ b/src/Stackworx.EfCoreGraphQL.Abstractions/Stackworx.EfCoreGraphQL.Abstractions.csproj @@ -1,12 +1,12 @@  - net8.0 + net8.0;net9.0;net10.0 enable enable - 0.0.2-alpha + 0.0.3-alpha diff --git a/src/Stackworx.EfCoreGraphQL.Validation.XunitV3/Stackworx.EfCoreGraphQL.Validation.XunitV3.csproj b/src/Stackworx.EfCoreGraphQL.Validation.XunitV3/Stackworx.EfCoreGraphQL.Validation.XunitV3.csproj index 0c543b7..637e2d5 100644 --- a/src/Stackworx.EfCoreGraphQL.Validation.XunitV3/Stackworx.EfCoreGraphQL.Validation.XunitV3.csproj +++ b/src/Stackworx.EfCoreGraphQL.Validation.XunitV3/Stackworx.EfCoreGraphQL.Validation.XunitV3.csproj @@ -1,20 +1,20 @@  - net9.0 + net8.0;net9.0;net10.0 enable enable - 0.0.4-alpha + 0.0.5-alpha - + - + diff --git a/src/Stackworx.EfCoreGraphQL.Validation/Stackworx.EfCoreGraphQL.Validation.csproj b/src/Stackworx.EfCoreGraphQL.Validation/Stackworx.EfCoreGraphQL.Validation.csproj index 93a873e..ea2edbb 100644 --- a/src/Stackworx.EfCoreGraphQL.Validation/Stackworx.EfCoreGraphQL.Validation.csproj +++ b/src/Stackworx.EfCoreGraphQL.Validation/Stackworx.EfCoreGraphQL.Validation.csproj @@ -1,26 +1,28 @@  - net8.0 + net8.0;net9.0;net10.0 enable enable - 0.0.4-alpha + 0.0.5-alpha - - + + + + - - + + - + diff --git a/src/Stackworx.EfCoreGraphQL/Stackworx.EfCoreGraphQL.csproj b/src/Stackworx.EfCoreGraphQL/Stackworx.EfCoreGraphQL.csproj index dad5915..76fdbfb 100644 --- a/src/Stackworx.EfCoreGraphQL/Stackworx.EfCoreGraphQL.csproj +++ b/src/Stackworx.EfCoreGraphQL/Stackworx.EfCoreGraphQL.csproj @@ -1,27 +1,33 @@  - net8.0 + net8.0;net9.0;net10.0 enable enable - + - 0.0.9-alpha + 0.0.10-alpha - + + all + + + all + + all - + - + diff --git a/tests/Stackworx.EfCoreGraphQL.Tests/Stackworx.EfCoreGraphQL.Tests.csproj b/tests/Stackworx.EfCoreGraphQL.Tests/Stackworx.EfCoreGraphQL.Tests.csproj index d838496..5d0e512 100644 --- a/tests/Stackworx.EfCoreGraphQL.Tests/Stackworx.EfCoreGraphQL.Tests.csproj +++ b/tests/Stackworx.EfCoreGraphQL.Tests/Stackworx.EfCoreGraphQL.Tests.csproj @@ -1,38 +1,42 @@  - - enable - enable - Exe - Stackworx.EfCoreGraphQL.Tests - net8.0 - - + + enable + enable + Exe + Stackworx.EfCoreGraphQL.Tests + net8.0;net9.0;net10.0 + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + + + + + - - - + + + diff --git a/tests/Stackworx.EfCoreGraphQL.Validation.Tests/Stackworx.EfCoreGraphQL.Validation.Tests.csproj b/tests/Stackworx.EfCoreGraphQL.Validation.Tests/Stackworx.EfCoreGraphQL.Validation.Tests.csproj index 892669f..cd01e81 100644 --- a/tests/Stackworx.EfCoreGraphQL.Validation.Tests/Stackworx.EfCoreGraphQL.Validation.Tests.csproj +++ b/tests/Stackworx.EfCoreGraphQL.Validation.Tests/Stackworx.EfCoreGraphQL.Validation.Tests.csproj @@ -5,7 +5,7 @@ enable Exe Stackworx.EfCoreGraphQL.Validation.Tests - net8.0 + net8.0;net9.0;net10.0 - + + From 6c323ec48b86a5f7fe3c51aee23be76b44d0be1e Mon Sep 17 00:00:00 2001 From: lloyd Date: Mon, 24 Nov 2025 14:43:47 +0200 Subject: [PATCH 2/4] fix: dotnet 10 --- .github/workflows/dotnet.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 7fcd6dc..af62253 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -15,14 +15,14 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Setup .NET - uses: actions/setup-dotnet@v4 - with: - dotnet-version: 9.0.x - - name: Restore dependencies - run: dotnet restore - - name: Build - run: dotnet build --no-restore - - name: Test - run: dotnet test --no-build --verbosity normal + - uses: actions/checkout@v4 + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 10.0.x + - name: Restore dependencies + run: dotnet restore + - name: Build + run: dotnet build --no-restore + - name: Test + run: dotnet test --no-build --verbosity normal From 7732b2d8dd602cef0eb5a6fe2a3a2ce545cdba38 Mon Sep 17 00:00:00 2001 From: lloyd Date: Mon, 24 Nov 2025 14:46:09 +0200 Subject: [PATCH 3/4] fix: use 9.x rather --- .github/workflows/dotnet.yml | 2 +- sample/Sample/Sample.csproj | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index af62253..dba6d1b 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,7 +19,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 10.0.x + dotnet-version: 9.0.x - name: Restore dependencies run: dotnet restore - name: Build diff --git a/sample/Sample/Sample.csproj b/sample/Sample/Sample.csproj index 50d48ea..49e5ccf 100644 --- a/sample/Sample/Sample.csproj +++ b/sample/Sample/Sample.csproj @@ -9,12 +9,12 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + From fee8538def6ef289fa885a9a2a9a3afc02098842 Mon Sep 17 00:00:00 2001 From: lloyd Date: Mon, 24 Nov 2025 14:50:59 +0200 Subject: [PATCH 4/4] fix: use wildcards --- .../Stackworx.EfCoreGraphQL.Tests.csproj | 12 ++++++------ .../Stackworx.EfCoreGraphQL.Validation.Tests.csproj | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/Stackworx.EfCoreGraphQL.Tests/Stackworx.EfCoreGraphQL.Tests.csproj b/tests/Stackworx.EfCoreGraphQL.Tests/Stackworx.EfCoreGraphQL.Tests.csproj index 5d0e512..864e27f 100644 --- a/tests/Stackworx.EfCoreGraphQL.Tests/Stackworx.EfCoreGraphQL.Tests.csproj +++ b/tests/Stackworx.EfCoreGraphQL.Tests/Stackworx.EfCoreGraphQL.Tests.csproj @@ -24,12 +24,12 @@ - - - - - - + + + + + + diff --git a/tests/Stackworx.EfCoreGraphQL.Validation.Tests/Stackworx.EfCoreGraphQL.Validation.Tests.csproj b/tests/Stackworx.EfCoreGraphQL.Validation.Tests/Stackworx.EfCoreGraphQL.Validation.Tests.csproj index cd01e81..d403068 100644 --- a/tests/Stackworx.EfCoreGraphQL.Validation.Tests/Stackworx.EfCoreGraphQL.Validation.Tests.csproj +++ b/tests/Stackworx.EfCoreGraphQL.Validation.Tests/Stackworx.EfCoreGraphQL.Validation.Tests.csproj @@ -23,14 +23,14 @@ - - - + + + - - - + + +