From e121a0c0de9eb70fe2111a7139d627d41a309e69 Mon Sep 17 00:00:00 2001 From: Marius Juscius Date: Thu, 20 Nov 2025 13:48:57 +0100 Subject: [PATCH 1/4] Extended build-and-test pipeline for net10 support --- .github/workflows/build-and-test.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 217ccd3..d4fbaae 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -11,6 +11,9 @@ on: jobs: build-and-test: runs-on: ubuntu-latest + strategy: + matrix: + dotnet-version: ['8.0.x', '10.0.x'] env: config: 'Release' @@ -25,10 +28,10 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Setup .NET 8 + - name: Setup .NET ${{ matrix.dotnet-version }} uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: ${{ matrix.dotnet-version }} - name: Clean run: dotnet clean ./FuncSharp.sln --configuration $config && dotnet nuget locals all --clear @@ -46,7 +49,7 @@ jobs: uses: dorny/test-reporter@v1 if: success() || failure() with: - name: Mews.FuncSharp Tests report + name: Mews.FuncSharp Tests report (.NET ${{ matrix.dotnet-version }}) path: "**/test-results.trx" reporter: dotnet-trx fail-on-error: true From 57b47148bc0dfe03c90b55b14a32483e961a71d1 Mon Sep 17 00:00:00 2001 From: Marius Juscius Date: Thu, 20 Nov 2025 14:28:31 +0100 Subject: [PATCH 2/4] Removed matrix setup --- .github/workflows/build-and-test.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index d4fbaae..f23dc0e 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -11,9 +11,6 @@ on: jobs: build-and-test: runs-on: ubuntu-latest - strategy: - matrix: - dotnet-version: ['8.0.x', '10.0.x'] env: config: 'Release' @@ -28,10 +25,10 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Setup .NET ${{ matrix.dotnet-version }} + - name: Setup .NET 10 uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ matrix.dotnet-version }} + dotnet-version: 10.0.x - name: Clean run: dotnet clean ./FuncSharp.sln --configuration $config && dotnet nuget locals all --clear @@ -49,7 +46,7 @@ jobs: uses: dorny/test-reporter@v1 if: success() || failure() with: - name: Mews.FuncSharp Tests report (.NET ${{ matrix.dotnet-version }}) + name: Mews.FuncSharp Tests report path: "**/test-results.trx" reporter: dotnet-trx fail-on-error: true From 4f5d2e52b7724ef04a9791dea97d3a11d487b45c Mon Sep 17 00:00:00 2001 From: Marius Juscius Date: Thu, 20 Nov 2025 14:45:52 +0100 Subject: [PATCH 3/4] Added additional step for net8/10 testing --- .github/workflows/build-and-test.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index f23dc0e..0824002 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -39,14 +39,17 @@ jobs: - name: Build run: dotnet build --configuration $config --no-restore - - name: Test - run: dotnet test --no-restore --no-build --configuration $config --logger "trx;LogFileName=test-results.trx" || true + - name: Test (.NET 8) + run: dotnet test --no-restore --no-build --configuration $config --framework net8.0 --logger "trx;LogFileName=test-results-net8.trx" || true + + - name: Test (.NET 10) + run: dotnet test --no-restore --no-build --configuration $config --framework net10.0 --logger "trx;LogFileName=test-results-net10.trx" || true - name: Test Report uses: dorny/test-reporter@v1 if: success() || failure() with: name: Mews.FuncSharp Tests report - path: "**/test-results.trx" + path: "**/test-results-*.trx" reporter: dotnet-trx fail-on-error: true From 86c3e440a0b9f2acc41c792ff918241bc2901e6a Mon Sep 17 00:00:00 2001 From: Marius Juscius Date: Thu, 20 Nov 2025 14:54:04 +0100 Subject: [PATCH 4/4] Bumped package versions --- .github/workflows/build-and-test.yml | 9 +++------ src/FuncSharp.Tests/FuncSharp.Tests.csproj | 5 +++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 0824002..f23dc0e 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -39,17 +39,14 @@ jobs: - name: Build run: dotnet build --configuration $config --no-restore - - name: Test (.NET 8) - run: dotnet test --no-restore --no-build --configuration $config --framework net8.0 --logger "trx;LogFileName=test-results-net8.trx" || true - - - name: Test (.NET 10) - run: dotnet test --no-restore --no-build --configuration $config --framework net10.0 --logger "trx;LogFileName=test-results-net10.trx" || true + - name: Test + run: dotnet test --no-restore --no-build --configuration $config --logger "trx;LogFileName=test-results.trx" || true - name: Test Report uses: dorny/test-reporter@v1 if: success() || failure() with: name: Mews.FuncSharp Tests report - path: "**/test-results-*.trx" + path: "**/test-results.trx" reporter: dotnet-trx fail-on-error: true diff --git a/src/FuncSharp.Tests/FuncSharp.Tests.csproj b/src/FuncSharp.Tests/FuncSharp.Tests.csproj index c5e87d9..862fec5 100644 --- a/src/FuncSharp.Tests/FuncSharp.Tests.csproj +++ b/src/FuncSharp.Tests/FuncSharp.Tests.csproj @@ -7,8 +7,9 @@ - - + + +