feat!: updated for .net 9

delegateas · Nov 12, 2024 · 8988da9 · 8988da9
1 parent 0a6d6c0
commit 8988da9
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 45 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,18 +14,18 @@ jobs:
     strategy:
       matrix:
         include: 
-          - framework: "net6.0"
-            version: 6.0.x
-          - framework: net8.0
+          - framework: "net8.0"
             version: 8.0.x
+          - framework: net9.0
+            version: 9.0.x
 
     steps:
       - name: Checkout code base
         uses: actions/checkout@v4
 
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
 
       - name: Run tests
         run: dotnet test --verbosity normal -f ${{ matrix.framework }}
@@ -36,17 +36,17 @@ jobs:
     strategy:
       matrix: 
         include: 
-          - framework: "net6.0"
-            version: 6.0.x
-          - framework: net8.0
+          - framework: "net8.0"
             version: 8.0.x
+          - framework: net9.0
+            version: 9.0.x
     steps:
       - name: Checkout code base
         uses: actions/checkout@v4
 
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
 
       - name: Cleaning
         run: dotnet clean

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -15,12 +15,12 @@ jobs:
 
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '6.0.x'       
+          dotnet-version: '9.0.x'       
 
       - name: Setup Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 22
 
       - name: Add plugin for conventional commits
         run: npm install conventional-changelog-conventionalcommits

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,17 +13,17 @@ jobs:
     strategy:
       matrix: 
         include: 
-          - framework: "net6.0"
-            version: 6.0.x
-          - framework: net8.0
+          - framework: "net8.0"
             version: 8.0.x
+          - framework: net9.0
+            version: 9.0.x
     steps:
       - name: Checkout code base
         uses: actions/checkout@v4
 
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
 
       - name: Run tests
         run: dotnet test --verbosity normal -f ${{ matrix.framework }}
@@ -46,12 +46,12 @@ jobs:
 
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '8.0.x'   
+          dotnet-version: '9.0.x'   
 
       - name: Setup Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 20
+          node-version: 22
 
       - name: Add plugin for conventional commits
         run: npm install conventional-changelog-conventionalcommits

diff --git a/.github/workflows/todo.yml b/.github/workflows/todo.yml
@@ -1,18 +1,20 @@
-name: "Create issues from todo"
+name: "Create issues from todo"
 
 on:
   push:
     branches:
       - 'dev'
+      - 'master'
       - 'feature/**'
 
 jobs:
   build:
     runs-on: "ubuntu-latest"
     steps:
-      - uses: "actions/checkout@master"
+      - name: Checkout repo
+        uses: actions/checkout@v2
       - name: "TODO to Issue"
-        uses: "alstr/todo-to-issue-action@v2.4"
+        uses: "alstr/todo-to-issue-action@v5"
         id: "todo"
         with:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/WorkflowEngine.sln b/WorkflowEngine.sln
@@ -11,22 +11,25 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
 		.github\workflows\.releaserc = .github\workflows\.releaserc
-		.github\workflows\build.yml = .github\workflows\build.yml
-		.github\workflows\prerelease.yml = .github\workflows\prerelease.yml
 		README.md = README.md
-		.github\workflows\release.yml = .github\workflows\release.yml
-		.github\workflows\todo.yml = .github\workflows\todo.yml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowEngine.Hangfire", "src\WorkflowEngine.Hangfire\WorkflowEngine.Hangfire.csproj", "{7A50D90B-98AE-4B7F-9B39-8828D9ACED5B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NewFolder1", "NewFolder1", "{144FC2ED-C165-401D-BDD8-9431B447C96C}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{76AE8C20-E425-4B07-BFAA-536CCF9ED4EB}"
 	ProjectSection(SolutionItems) = preProject
 		.github\dependabot.yml = .github\dependabot.yml
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{93A05ACF-3938-4543-9DA0-CE5D8F389790}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\.releaserc = .github\workflows\.releaserc
+		.github\workflows\build.yml = .github\workflows\build.yml
+		.github\workflows\prerelease.yml = .github\workflows\prerelease.yml
+		.github\workflows\release.yml = .github\workflows\release.yml
+		.github\workflows\todo.yml = .github\workflows\todo.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -50,7 +53,7 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{144FC2ED-C165-401D-BDD8-9431B447C96C} = {0749C5E8-52D4-4B3A-89EA-891DD156A056}
+		{93A05ACF-3938-4543-9DA0-CE5D8F389790} = {76AE8C20-E425-4B07-BFAA-536CCF9ED4EB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {56ADE641-E5CE-4AED-AB11-4D507F8C0816}

diff --git a/apps/WorkflowEngine.DemoApp/WorkflowEngine.DemoApp.csproj b/apps/WorkflowEngine.DemoApp/WorkflowEngine.DemoApp.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Hangfire" Version="1.8.14" />
+        <PackageReference Include="Hangfire" Version="1.8.15" />
     </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">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 
         <PackageId>Delegate.WorkflowEngine.Core</PackageId>
         <Authors>Delegate A/S</Authors>
@@ -13,12 +13,12 @@
         <ProjectReference Include="$(LocalExternalpath)/ExpressionEngine/ExpressionEngine/ExpressionEngine.csproj" />
     </ItemGroup>
     <ItemGroup Condition="$(UseEAVFromNuget) != 'false'">
-        <PackageReference Include="Delegate.ExpressionEngine" Version="4.2.0" />
+        <PackageReference Include="Delegate.ExpressionEngine" Version="5.0.0" />
     </ItemGroup>
     <ItemGroup>
 
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
     </ItemGroup>
 
 

diff --git a/src/WorkflowEngine.Hangfire/HangfireWorkflowExecutor.cs b/src/WorkflowEngine.Hangfire/HangfireWorkflowExecutor.cs
@@ -192,7 +192,8 @@ public async ValueTask<object> TriggerAsync(ITriggerContext triggerContext, Perf
             var action = await executor.Trigger(triggerContext);
 
             if (action != null)
-            {   
+            {
+
                 var a = backgroundJobClient.Enqueue<IHangfireActionExecutor>(queue,
                             (executor) => executor.ExecuteAsync(triggerContext, triggerContext.Workflow, action, null));
             }

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">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 
         <PackageId>Delegate.WorkflowEngine.Hangfire</PackageId>
         <Authors>Delegate A/S</Authors>
@@ -11,18 +11,12 @@
     </PropertyGroup>
 
     <ItemGroup> 
-        <PackageReference Include="Hangfire.Core" Version="1.8.14" />
+        <PackageReference Include="Hangfire.Core" Version="1.8.15" />
 
     </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="8.0.0" />
-	</ItemGroup>
-    <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
     </ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\WorkflowEngine.Core\WorkflowEngine.Core.csproj" />

diff --git a/src/WorkflowEngine.Hangfire/WorkflowStarterBackgroundJob.cs b/src/WorkflowEngine.Hangfire/WorkflowStarterBackgroundJob.cs
@@ -58,6 +58,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                             }
 
                             workflow.Manifest = null;
+
 
                             jobs.AddOrUpdate(workflow.Id.ToString() + trigger.Key, options.Value.QueueName,
                                  (System.Linq.Expressions.Expression<System.Action<IHangfireWorkflowExecutor>>) ((executor) => executor.TriggerAsync(new TriggerContext
@@ -75,7 +76,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                                      },
                                  }, null)), trigger.Value.Inputs["cronExpression"] as string,new RecurringJobOptions
                                  {
-                                      TimeZone = GetTimeZone(trigger),  
+                                      TimeZone = GetTimeZone(trigger), 
                                  });