Skip to content

Commit c9907ae

Browse files
committed
[deps] Target framework bump to .NET 9
[deps] Microsoft.Extensions.Configuration.Json bump to 9.0.* [deps] Simplify.Repository.FluentNHibernate bump to 1.7.1 [deps] System.Data.SqlClient bump to 4.9.* [deps] NUnit bump to v4 [deps] Test deps bump to latest [edit] Switch to async Simplify.Scheduler usage
1 parent 45331c6 commit c9907ae

File tree

14 files changed

+61
-36
lines changed

14 files changed

+61
-36
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ jobs:
2020

2121
- name: Install DotNet
2222
uses: actions/setup-dotnet@v4
23+
with:
24+
dotnet-version: "9.0.x"
2325

2426
- name: Restore Dependencies
2527
run: dotnet restore Simplify.ProjectsTemplates.csproj

src/CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Changelog
22

3+
## [0.9] - 2024-03-17
4+
5+
### Dependencies
6+
7+
- Target framework bump to .NET 9
8+
- Microsoft.Extensions.Configuration.Json bump to 9.0.*
9+
- Simplify.Repository.FluentNHibernate bump to 1.7.1
10+
- System.Data.SqlClient bump to 4.9.*
11+
- NUnit bump to v4
12+
- Test deps bump to latest
13+
14+
### Changed
15+
16+
- Switch to async Simplify.Scheduler usage
17+
318
## [0.8] - 2024-06-01
419

520
### Dependencies

src/Simplify.ProjectsTemplates.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44

5-
<PackageVersion>0.8</PackageVersion>
5+
<PackageVersion>0.9</PackageVersion>
66

77
<PackageType>Template</PackageType>
88
<PackageId>Simplify.ProjectsTemplates</PackageId>

src/templates/MyProject.Scheduler/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# build
22

3-
FROM mcr.microsoft.com/dotnet/sdk:7.0 as build
3+
FROM mcr.microsoft.com/dotnet/sdk:9.0 as build
44
WORKDIR /src
55

66
COPY . .
7-
RUN dotnet publish -f net7.0 -c release -o out
7+
RUN dotnet publish -f net9.0 -c release -o out
88

99
# launch
1010

11-
FROM mcr.microsoft.com/dotnet/runtime:7.0
11+
FROM mcr.microsoft.com/dotnet/runtime:9.0
1212
WORKDIR /app
1313

1414
COPY --from=build /src/out /app

src/templates/MyProject.Scheduler/MyProject.Scheduler.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">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0</TargetFrameworks>
3+
<TargetFrameworks>net9.0</TargetFrameworks>
44
<LangVersion>latest</LangVersion>
55
<OutputType>Exe</OutputType>
66

77
<Description>MyProject.Scheduler service</Description>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.*" />
10+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.*" />
1111
<PackageReference Include="Simplify.Scheduler" Version="1.5.*" />
1212
</ItemGroup>
1313
<ItemGroup>

src/templates/MyProject.Scheduler/Program.cs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@
99
.RegisterAll()
1010
.Verify();
1111

12-
using var scheduler = new SingleTaskScheduler<Worker>(IocRegistrations.Configuration)
12+
using var scheduler = new SingleTaskScheduler<WorkerAsync>(IocRegistrations.Configuration)
1313
.SubscribeLog();
1414

15-
if (!scheduler.Start(args))
16-
{
17-
// One-time launch of user code without the scheduler
15+
if (await scheduler.StartAsync(args))
16+
return;
17+
18+
19+
// One-time launch of user code without the scheduler
20+
21+
using var scope = DIContainer.Current.BeginLifetimeScope();
22+
await scope.Resolver.Resolve<WorkerAsync>().Run();
1823

19-
using var scope = DIContainer.Current.BeginLifetimeScope();
20-
scope.Resolver.Resolve<Worker>().Run();
21-
}

src/templates/MyProject.Scheduler/Setup/IocRegistrations.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public static class IocRegistrations
1010
public static IDIContainerProvider RegisterAll(this IDIContainerProvider provider)
1111
{
1212
provider.RegisterConfiguration()
13-
.Register<Worker>();
13+
.Register<WorkerAsync>();
1414

1515
return provider;
1616
}

src/templates/MyProject.Scheduler/Worker.cs

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using System;
2+
using System.Threading.Tasks;
3+
4+
namespace MyProject.Scheduler;
5+
6+
// Example of a class that will be executed by Simplify.Scheduler
7+
internal class WorkerAsync
8+
{
9+
public Task Run()
10+
{
11+
Console.WriteLine("Hello world!");
12+
13+
return Task.CompletedTask;
14+
}
15+
}

src/templates/MyProject.WindowsService/MyProject.WindowsService.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Description>MyProject.WindowsService service</Description>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.*" />
10+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.*" />
1111
<PackageReference Include="Simplify.WindowsServices" Version="2.14.*" />
1212
</ItemGroup>
1313
<ItemGroup>

0 commit comments

Comments
 (0)