Skip to content

Commit 8988da9

Browse files
pksorensenpksorensen
committed
feat!: updated for .net 9
1 parent 0a6d6c0 commit 8988da9

File tree

10 files changed

+46
-45
lines changed

10 files changed

+46
-45
lines changed

‎.github/workflows/build.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ jobs:
1414
strategy:
1515
matrix:
1616
include:
17-
- framework: "net6.0"
18-
version: 6.0.x
19-
- framework: net8.0
17+
- framework: "net8.0"
2018
version: 8.0.x
19+
- framework: net9.0
20+
version: 9.0.x
2121

2222
steps:
2323
- name: Checkout code base
2424
uses: actions/checkout@v4
2525

2626
- uses: actions/setup-dotnet@v4
2727
with:
28-
dotnet-version: 8.0.x
28+
dotnet-version: 9.0.x
2929

3030
- name: Run tests
3131
run: dotnet test --verbosity normal -f ${{ matrix.framework }}
@@ -36,17 +36,17 @@ jobs:
3636
strategy:
3737
matrix:
3838
include:
39-
- framework: "net6.0"
40-
version: 6.0.x
41-
- framework: net8.0
39+
- framework: "net8.0"
4240
version: 8.0.x
41+
- framework: net9.0
42+
version: 9.0.x
4343
steps:
4444
- name: Checkout code base
4545
uses: actions/checkout@v4
4646

4747
- uses: actions/setup-dotnet@v4
4848
with:
49-
dotnet-version: 8.0.x
49+
dotnet-version: 9.0.x
5050

5151
- name: Cleaning
5252
run: dotnet clean

‎.github/workflows/prerelease.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515

1616
- uses: actions/setup-dotnet@v1
1717
with:
18-
dotnet-version: '6.0.x'
18+
dotnet-version: '9.0.x'
1919

2020
- name: Setup Node.js
2121
uses: actions/setup-node@v1
2222
with:
23-
node-version: 16
23+
node-version: 22
2424

2525
- name: Add plugin for conventional commits
2626
run: npm install conventional-changelog-conventionalcommits

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ jobs:
1313
strategy:
1414
matrix:
1515
include:
16-
- framework: "net6.0"
17-
version: 6.0.x
18-
- framework: net8.0
16+
- framework: "net8.0"
1917
version: 8.0.x
18+
- framework: net9.0
19+
version: 9.0.x
2020
steps:
2121
- name: Checkout code base
2222
uses: actions/checkout@v4
2323

2424
- uses: actions/setup-dotnet@v4
2525
with:
26-
dotnet-version: 8.0.x
26+
dotnet-version: 9.0.x
2727

2828
- name: Run tests
2929
run: dotnet test --verbosity normal -f ${{ matrix.framework }}
@@ -46,12 +46,12 @@ jobs:
4646

4747
- uses: actions/setup-dotnet@v4
4848
with:
49-
dotnet-version: '8.0.x'
49+
dotnet-version: '9.0.x'
5050

5151
- name: Setup Node.js
5252
uses: actions/setup-node@v1
5353
with:
54-
node-version: 20
54+
node-version: 22
5555

5656
- name: Add plugin for conventional commits
5757
run: npm install conventional-changelog-conventionalcommits

‎.github/workflows/todo.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
name: "Create issues from todo"
1+
name: "Create issues from todo"
22

33
on:
44
push:
55
branches:
66
- 'dev'
7+
- 'master'
78
- 'feature/**'
89

910
jobs:
1011
build:
1112
runs-on: "ubuntu-latest"
1213
steps:
13-
- uses: "actions/checkout@master"
14+
- name: Checkout repo
15+
uses: actions/checkout@v2
1416
- name: "TODO to Issue"
15-
uses: "alstr/todo-to-issue-action@v2.4"
17+
uses: "alstr/todo-to-issue-action@v5"
1618
id: "todo"
1719
with:
1820
TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎WorkflowEngine.sln‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,25 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1111
ProjectSection(SolutionItems) = preProject
1212
.gitignore = .gitignore
1313
.github\workflows\.releaserc = .github\workflows\.releaserc
14-
.github\workflows\build.yml = .github\workflows\build.yml
15-
.github\workflows\prerelease.yml = .github\workflows\prerelease.yml
1614
README.md = README.md
17-
.github\workflows\release.yml = .github\workflows\release.yml
18-
.github\workflows\todo.yml = .github\workflows\todo.yml
1915
EndProjectSection
2016
EndProject
2117
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowEngine.Hangfire", "src\WorkflowEngine.Hangfire\WorkflowEngine.Hangfire.csproj", "{7A50D90B-98AE-4B7F-9B39-8828D9ACED5B}"
2218
EndProject
23-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NewFolder1", "NewFolder1", "{144FC2ED-C165-401D-BDD8-9431B447C96C}"
24-
EndProject
2519
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{76AE8C20-E425-4B07-BFAA-536CCF9ED4EB}"
2620
ProjectSection(SolutionItems) = preProject
2721
.github\dependabot.yml = .github\dependabot.yml
2822
EndProjectSection
2923
EndProject
24+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{93A05ACF-3938-4543-9DA0-CE5D8F389790}"
25+
ProjectSection(SolutionItems) = preProject
26+
.github\workflows\.releaserc = .github\workflows\.releaserc
27+
.github\workflows\build.yml = .github\workflows\build.yml
28+
.github\workflows\prerelease.yml = .github\workflows\prerelease.yml
29+
.github\workflows\release.yml = .github\workflows\release.yml
30+
.github\workflows\todo.yml = .github\workflows\todo.yml
31+
EndProjectSection
32+
EndProject
3033
Global
3134
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3235
Debug|Any CPU = Debug|Any CPU
@@ -50,7 +53,7 @@ Global
5053
HideSolutionNode = FALSE
5154
EndGlobalSection
5255
GlobalSection(NestedProjects) = preSolution
53-
{144FC2ED-C165-401D-BDD8-9431B447C96C} = {0749C5E8-52D4-4B3A-89EA-891DD156A056}
56+
{93A05ACF-3938-4543-9DA0-CE5D8F389790} = {76AE8C20-E425-4B07-BFAA-536CCF9ED4EB}
5457
EndGlobalSection
5558
GlobalSection(ExtensibilityGlobals) = postSolution
5659
SolutionGuid = {56ADE641-E5CE-4AED-AB11-4D507F8C0816}

‎apps/WorkflowEngine.DemoApp/WorkflowEngine.DemoApp.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Hangfire" Version="1.8.14" />
10+
<PackageReference Include="Hangfire" Version="1.8.15" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎src/WorkflowEngine.Core/WorkflowEngine.Core.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55

66
<PackageId>Delegate.WorkflowEngine.Core</PackageId>
77
<Authors>Delegate A/S</Authors>
@@ -13,12 +13,12 @@
1313
<ProjectReference Include="$(LocalExternalpath)/ExpressionEngine/ExpressionEngine/ExpressionEngine.csproj" />
1414
</ItemGroup>
1515
<ItemGroup Condition="$(UseEAVFromNuget) != 'false'">
16-
<PackageReference Include="Delegate.ExpressionEngine" Version="4.2.0" />
16+
<PackageReference Include="Delegate.ExpressionEngine" Version="5.0.0" />
1717
</ItemGroup>
1818
<ItemGroup>
1919

20-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
21-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
20+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
2222
</ItemGroup>
2323

2424

‎src/WorkflowEngine.Hangfire/HangfireWorkflowExecutor.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,8 @@ public async ValueTask<object> TriggerAsync(ITriggerContext triggerContext, Perf
192192
var action = await executor.Trigger(triggerContext);
193193

194194
if (action != null)
195-
{
195+
{
196+
196197
var a = backgroundJobClient.Enqueue<IHangfireActionExecutor>(queue,
197198
(executor) => executor.ExecuteAsync(triggerContext, triggerContext.Workflow, action, null));
198199
}

‎src/WorkflowEngine.Hangfire/WorkflowEngine.Hangfire.csproj‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55

66
<PackageId>Delegate.WorkflowEngine.Hangfire</PackageId>
77
<Authors>Delegate A/S</Authors>
@@ -11,18 +11,12 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Hangfire.Core" Version="1.8.14" />
14+
<PackageReference Include="Hangfire.Core" Version="1.8.15" />
1515

1616
</ItemGroup>
17-
18-
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
19-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.0" />
20-
</ItemGroup>
21-
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
22-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
23-
</ItemGroup>
24-
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
25-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
17+
18+
<ItemGroup>
19+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
2620
</ItemGroup>
2721
<ItemGroup>
2822
<ProjectReference Include="..\WorkflowEngine.Core\WorkflowEngine.Core.csproj" />

‎src/WorkflowEngine.Hangfire/WorkflowStarterBackgroundJob.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
5858
}
5959

6060
workflow.Manifest = null;
61+
6162

6263
jobs.AddOrUpdate(workflow.Id.ToString() + trigger.Key, options.Value.QueueName,
6364
(System.Linq.Expressions.Expression<System.Action<IHangfireWorkflowExecutor>>) ((executor) => executor.TriggerAsync(new TriggerContext
@@ -75,7 +76,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
7576
},
7677
}, null)), trigger.Value.Inputs["cronExpression"] as string,new RecurringJobOptions
7778
{
78-
TimeZone = GetTimeZone(trigger),
79+
TimeZone = GetTimeZone(trigger),
7980
});
8081

8182

0 commit comments

Comments
 (0)