From 3407b7c361dab595511c7e9b78dee1c6482c94db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Poul=20Kjeldager=20S=C3=B8rensen?= Date: Thu, 25 Apr 2024 18:36:33 +0200 Subject: [PATCH 1/5] fix: added .net 8 --- src/WorkflowEngine.Core/WorkflowEngine.Core.csproj | 10 +++++++--- .../WorkflowEngine.Hangfire.csproj | 7 +++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj b/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj index ff14cc0..8e663cd 100644 --- a/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj +++ b/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj @@ -1,7 +1,7 @@ - + - netcoreapp3.1;net6.0 + netcoreapp3.1;net6.0;net8.0 Delegate.WorkflowEngine.Core Delegate A/S @@ -23,5 +23,9 @@ - + + + + + diff --git a/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj b/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj index d31c18c..a44661c 100644 --- a/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj +++ b/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj @@ -1,7 +1,7 @@ - + - netcoreapp3.1;net6.0 + netcoreapp3.1;net6.0;net8.0 Delegate.WorkflowEngine.Hangfire Delegate A/S @@ -21,6 +21,9 @@ + + + From 40ccc4dbb10fb013e62c62e75e5d307d7b2ba0ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Poul=20Kjeldager=20S=C3=B8rensen?= Date: Thu, 25 Apr 2024 18:47:26 +0200 Subject: [PATCH 2/5] fix: fix build for .net 8 --- .github/workflows/build.yml | 23 ++++++++++++++++------- .github/workflows/release.yml | 14 +++++++++----- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 194dadf..6cf8583 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,31 +13,40 @@ jobs: name: Testing strategy: matrix: - dotnet: [ 'net6.0' ] + include: + - framework: "net6.0" + version: 6.0.x + - framework: net8.0 + version: 8.0.x + steps: - name: Checkout code base uses: actions/checkout@v2 - uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: ${{ matrix.version }} - name: Run tests - run: dotnet test --verbosity normal -f ${{ matrix.dotnet }} + run: dotnet test --verbosity normal -f ${{ matrix.framework }} build: runs-on: windows-latest name: Building strategy: matrix: - dotnet: ['net6.0'] + include: + - framework: "net6.0" + version: 6.0.x + - framework: net8.0 + version: 8.0.x steps: - name: Checkout code base uses: actions/checkout@v2 - uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: ${{ matrix.version }} - name: Cleaning run: dotnet clean @@ -46,12 +55,12 @@ jobs: run: dotnet restore WorkflowEngine.sln - name: Build solution - run: dotnet build -o ../build/${{ matrix.dotnet }} -c Release --no-restore -m:1 -f ${{ matrix.dotnet }} + run: dotnet build -o ../build/${{ matrix.dotnet }} -c Release --no-restore -m:1 -f ${{ matrix.framework }} - name: Archive build to artifacts uses: actions/upload-artifact@v2 with: name: build path: | - build/${{ matrix.dotnet }}/* + build/${{ matrix.framework }}/* retention-days: 5 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 176c339..3500f77 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,18 +11,22 @@ jobs: runs-on: windows-latest name: Testing strategy: - matrix: - dotnet: [ 'net6.0' ] + matrix: + include: + - framework: "net6.0" + version: 6.0.x + - framework: net8.0 + version: 8.0.x steps: - name: Checkout code base uses: actions/checkout@v2 - uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: ${{ matrix.version }} - name: Run tests - run: dotnet test --verbosity normal -f ${{ matrix.dotnet }} + run: dotnet test --verbosity normal -f ${{ matrix.framework }} release: @@ -42,7 +46,7 @@ jobs: - uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: '8.0.x' - name: Setup Node.js uses: actions/setup-node@v1 From 8ca2d036bb86fe2323403a5c4a78923591e95f21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Poul=20Kjeldager=20S=C3=B8rensen?= Date: Thu, 25 Apr 2024 18:55:01 +0200 Subject: [PATCH 3/5] fix: use 8.0 for sdk --- .github/workflows/build.yml | 12 ++++++------ .github/workflows/release.yml | 10 +++++----- .../WorkflowEngine.DemoApp.csproj | 2 +- src/WorkflowEngine.Core/WorkflowEngine.Core.csproj | 4 ++-- .../WorkflowEngine.Hangfire.csproj | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6cf8583..461dd84 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,11 +21,11 @@ jobs: steps: - name: Checkout code base - uses: actions/checkout@v2 + uses: actions/checkout@v4 - - uses: actions/setup-dotnet@v1 + - uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ matrix.version }} + dotnet-version: 8.0.x - name: Run tests run: dotnet test --verbosity normal -f ${{ matrix.framework }} @@ -42,11 +42,11 @@ jobs: version: 8.0.x steps: - name: Checkout code base - uses: actions/checkout@v2 + uses: actions/checkout@v4 - - uses: actions/setup-dotnet@v1 + - uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ matrix.version }} + dotnet-version: 8.0.x - name: Cleaning run: dotnet clean diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3500f77..cbc4188 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,11 +19,11 @@ jobs: version: 8.0.x steps: - name: Checkout code base - uses: actions/checkout@v2 + uses: actions/checkout@v4 - - uses: actions/setup-dotnet@v1 + - uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ matrix.version }} + dotnet-version: 8.0.x - name: Run tests run: dotnet test --verbosity normal -f ${{ matrix.framework }} @@ -36,7 +36,7 @@ jobs: - test steps: - name: Checkout repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Git for Windows' minimal SDK uses: git-for-windows/setup-git-for-windows-sdk@v1 @@ -44,7 +44,7 @@ jobs: - name: Print GIT verison run: git --version - - uses: actions/setup-dotnet@v1 + - uses: actions/setup-dotnet@v4 with: dotnet-version: '8.0.x' diff --git a/apps/WorkflowEngine.DemoApp/WorkflowEngine.DemoApp.csproj b/apps/WorkflowEngine.DemoApp/WorkflowEngine.DemoApp.csproj index 2bd5c6f..e2b75c8 100644 --- a/apps/WorkflowEngine.DemoApp/WorkflowEngine.DemoApp.csproj +++ b/apps/WorkflowEngine.DemoApp/WorkflowEngine.DemoApp.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj b/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj index 8e663cd..13be400 100644 --- a/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj +++ b/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj @@ -25,7 +25,7 @@ - - + + diff --git a/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj b/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj index a44661c..9ffd069 100644 --- a/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj +++ b/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj @@ -10,8 +10,8 @@ WorkflowEngine - - + + From f3ca4265067ee4cc6aed917655b7bf4458e12935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Poul=20Kjeldager=20S=C3=B8rensen?= Date: Thu, 25 Apr 2024 19:06:11 +0200 Subject: [PATCH 4/5] fix: removed net3.1 --- src/WorkflowEngine.Core/WorkflowEngine.Core.csproj | 2 +- src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj b/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj index 13be400..6bfcbf7 100644 --- a/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj +++ b/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1;net6.0;net8.0 + net6.0;net8.0 Delegate.WorkflowEngine.Core Delegate A/S diff --git a/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj b/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj index 9ffd069..a0c47e2 100644 --- a/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj +++ b/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1;net6.0;net8.0 + net6.0;net8.0 Delegate.WorkflowEngine.Hangfire Delegate A/S From 5be6a321b02a77a1ec0514248b45841a06237ff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Poul=20Kjeldager=20S=C3=B8rensen?= Date: Wed, 29 May 2024 22:39:47 +0200 Subject: [PATCH 5/5] updated deps --- .../WorkflowEngine.Core.csproj | 18 +++--------------- .../WorkflowEngine.Hangfire.csproj | 2 +- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj b/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj index 6bfcbf7..ecd5ffe 100644 --- a/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj +++ b/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj @@ -10,22 +10,10 @@ - - - - - - - - - - - - - - - + + + diff --git a/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj b/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj index a0c47e2..c27bf9e 100644 --- a/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj +++ b/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj @@ -19,7 +19,7 @@ - +