From ba80b385c52565be3e694b23a76244d5aafcfd8c Mon Sep 17 00:00:00 2001 From: Charles d'Avernas Date: Fri, 14 Mar 2025 14:16:59 +0100 Subject: [PATCH 1/2] feat(Solution): Added support for dual .NET 8/9 support Signed-off-by: Charles d'Avernas --- .github/workflows/build-dotnet.yml | 4 +++- .github/workflows/publish.yml | 4 +++- .github/workflows/test-dotnet.yml | 5 +++-- .../ServerlessWorkflow.Sdk.Builders.csproj | 2 +- .../ServerlessWorkflow.Sdk.IO.csproj | 2 +- src/ServerlessWorkflow.Sdk/ServerlessWorkflow.Sdk.csproj | 8 ++++---- .../ServerlessWorkflow.Sdk.UnitTests.csproj | 8 ++++---- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-dotnet.yml b/.github/workflows/build-dotnet.yml index b8c1597..259647d 100644 --- a/.github/workflows/build-dotnet.yml +++ b/.github/workflows/build-dotnet.yml @@ -18,7 +18,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - dotnet-version: ['9.0.x' ] + dotnet-version: | + 8.0.x + 9.0.x steps: - name: Checkout diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ba4d95e..92fcc69 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -17,7 +17,9 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: 9.0.x + dotnet-version: | + 8.0.x + 9.0.x - name: Restore dependencies run: dotnet restore "${{ env.SOLUTION }}" - name: Build diff --git a/.github/workflows/test-dotnet.yml b/.github/workflows/test-dotnet.yml index c51309e..d9320c6 100644 --- a/.github/workflows/test-dotnet.yml +++ b/.github/workflows/test-dotnet.yml @@ -18,8 +18,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - dotnet-version: ['9.0.x' ] - + dotnet-version: | + 8.0.x + 9.0.x steps: - name: Checkout uses: actions/checkout@v3 diff --git a/src/ServerlessWorkflow.Sdk.Builders/ServerlessWorkflow.Sdk.Builders.csproj b/src/ServerlessWorkflow.Sdk.Builders/ServerlessWorkflow.Sdk.Builders.csproj index 2a6ef5e..ed83aa6 100644 --- a/src/ServerlessWorkflow.Sdk.Builders/ServerlessWorkflow.Sdk.Builders.csproj +++ b/src/ServerlessWorkflow.Sdk.Builders/ServerlessWorkflow.Sdk.Builders.csproj @@ -1,7 +1,7 @@ - net9.0 + net8.0;net9.0 enable enable 1.0.0 diff --git a/src/ServerlessWorkflow.Sdk.IO/ServerlessWorkflow.Sdk.IO.csproj b/src/ServerlessWorkflow.Sdk.IO/ServerlessWorkflow.Sdk.IO.csproj index 8c5fd34..3387104 100644 --- a/src/ServerlessWorkflow.Sdk.IO/ServerlessWorkflow.Sdk.IO.csproj +++ b/src/ServerlessWorkflow.Sdk.IO/ServerlessWorkflow.Sdk.IO.csproj @@ -1,7 +1,7 @@ - net9.0 + net8.0;net9.0 enable enable 1.0.0 diff --git a/src/ServerlessWorkflow.Sdk/ServerlessWorkflow.Sdk.csproj b/src/ServerlessWorkflow.Sdk/ServerlessWorkflow.Sdk.csproj index a26cddf..df91496 100644 --- a/src/ServerlessWorkflow.Sdk/ServerlessWorkflow.Sdk.csproj +++ b/src/ServerlessWorkflow.Sdk/ServerlessWorkflow.Sdk.csproj @@ -1,7 +1,7 @@ - net9.0 + net8.0;net9.0 enable enable 1.0.0 @@ -33,9 +33,9 @@ - - - + + + diff --git a/tests/ServerlessWorkflow.Sdk.UnitTests/ServerlessWorkflow.Sdk.UnitTests.csproj b/tests/ServerlessWorkflow.Sdk.UnitTests/ServerlessWorkflow.Sdk.UnitTests.csproj index 0264646..cb47d09 100644 --- a/tests/ServerlessWorkflow.Sdk.UnitTests/ServerlessWorkflow.Sdk.UnitTests.csproj +++ b/tests/ServerlessWorkflow.Sdk.UnitTests/ServerlessWorkflow.Sdk.UnitTests.csproj @@ -1,7 +1,7 @@ - net9.0 + net8.0;net9.0 enable enable @@ -14,10 +14,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 974334328db6f544786a0bc4c71441a8b5a391a1 Mon Sep 17 00:00:00 2001 From: Charles d'Avernas Date: Fri, 14 Mar 2025 14:22:59 +0100 Subject: [PATCH 2/2] fix(CICD): Fixed CICD pipelines Signed-off-by: Charles d'Avernas --- .github/workflows/build-dotnet.yml | 12 ++++-------- .github/workflows/test-dotnet.yml | 11 ++++------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-dotnet.yml b/.github/workflows/build-dotnet.yml index 259647d..4ad7306 100644 --- a/.github/workflows/build-dotnet.yml +++ b/.github/workflows/build-dotnet.yml @@ -16,12 +16,6 @@ env: jobs: build: runs-on: ubuntu-latest - strategy: - matrix: - dotnet-version: | - 8.0.x - 9.0.x - steps: - name: Checkout uses: actions/checkout@v3 @@ -34,10 +28,12 @@ jobs: git fetch git pull - - name: Setup .NET ${{ matrix.dotnet-version }} + - name: Setup .NET uses: actions/setup-dotnet@v2 with: - dotnet-version: ${{ matrix.dotnet-version }} + dotnet-version: | + 8.0.x + 9.0.x - name: Restore dependencies run: dotnet restore "${{ env.SOLUTION }}" diff --git a/.github/workflows/test-dotnet.yml b/.github/workflows/test-dotnet.yml index d9320c6..88a2a30 100644 --- a/.github/workflows/test-dotnet.yml +++ b/.github/workflows/test-dotnet.yml @@ -16,19 +16,16 @@ env: jobs: build: runs-on: ubuntu-latest - strategy: - matrix: - dotnet-version: | - 8.0.x - 9.0.x steps: - name: Checkout uses: actions/checkout@v3 - - name: Setup .NET ${{ matrix.dotnet-version }} + - name: Setup .NET uses: actions/setup-dotnet@v2 with: - dotnet-version: ${{ matrix.dotnet-version }} + dotnet-version: | + 8.0.x + 9.0.x - name: Restore dependencies run: dotnet restore "${{ env.SOLUTION }}"