Merge branch 'master' of https://github.com/delegateas/WorkflowEngine

delegateas · Jun 20, 2024 · 7c7012d · 7c7012d
2 parents c9a6411 + 5be6a32
commit 7c7012d
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 40 deletions.
diff --git 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/checkout@v4
 
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: 8.0.x
 
       - 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/checkout@v4
 
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: 8.0.x
 
       - 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
@@ -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/checkout@v4
 
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.x'   
+          dotnet-version: 8.0.x
 
       - name: Run tests
-        run: dotnet test --verbosity normal -f ${{ matrix.dotnet }}
+        run: dotnet test --verbosity normal -f ${{ matrix.framework }}
 
 
   release:
@@ -32,17 +36,17 @@ 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
 
       - name: Print GIT verison
         run:  git --version  
 
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.x'   
+          dotnet-version: '8.0.x'   
 
       - name: Setup Node.js
         uses: actions/setup-node@v1

diff --git a/apps/WorkflowEngine.DemoApp/WorkflowEngine.DemoApp.csproj b/apps/WorkflowEngine.DemoApp/WorkflowEngine.DemoApp.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Hangfire" Version="1.8.6" />
+        <PackageReference Include="Hangfire" Version="1.8.12" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj b/src/WorkflowEngine.Core/WorkflowEngine.Core.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
 
         <PackageId>Delegate.WorkflowEngine.Core</PackageId>
         <Authors>Delegate A/S</Authors>
@@ -10,18 +10,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-
+        <PackageReference Include="Delegate.ExpressionEngine" Version="4.1.2" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     </ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
-		<PackageReference Include="Delegate.ExpressionEngine" Version="4.1.2" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
-	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-		<PackageReference Include="Delegate.ExpressionEngine" Version="4.1.2" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-	</ItemGroup>
-
+
 </Project>
diff --git a/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj b/src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
 
         <PackageId>Delegate.WorkflowEngine.Hangfire</PackageId>
         <Authors>Delegate A/S</Authors>
@@ -10,17 +10,20 @@
         <RootNamespace>WorkflowEngine</RootNamespace>
     </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Hangfire.Core" Version="1.8.6" />
+    <ItemGroup> 
+        <PackageReference Include="Hangfire.Core" Version="1.8.12" />
 
     </ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.0" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
 	</ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
+        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
+    </ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\WorkflowEngine.Core\WorkflowEngine.Core.csproj" />
 	</ItemGroup>