Skip to content

Commit 42465d6

Browse files
committed
[r] to new C# style
[deps] upgrade to latest
1 parent 326dac3 commit 42465d6

File tree

6 files changed

+32
-53
lines changed

6 files changed

+32
-53
lines changed

src/Examples/Simplify.Examples.Repository.FluentNHibernate.App/Program.cs

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,15 @@
33
using Simplify.Examples.Repository.FluentNHibernate.App.Infrastructure;
44
using Simplify.Examples.Repository.FluentNHibernate.App.Setup;
55

6-
namespace Simplify.Examples.Repository.FluentNHibernate.App;
76

8-
internal class Program
9-
{
10-
private static void Main(string[] args)
11-
{
12-
// IOC container setup
13-
DIContainer.Current.RegisterSimplifyFluentNHibernateExamplesApp()
14-
.Verify();
7+
DIContainer.Current
8+
.RegisterAll()
9+
.Verify();
1510

16-
// App launch
11+
// App launch
1712

18-
var scope = DIContainer.Current.BeginLifetimeScope();
19-
scope.Resolver.Resolve<ArgsHandler>().ProcessArgs(args);
13+
var scope = DIContainer.Current.BeginLifetimeScope();
2014

21-
Console.ReadLine();
22-
}
23-
}
15+
scope.Resolver.Resolve<ArgsHandler>().ProcessArgs(args);
16+
17+
Console.ReadLine();

src/Examples/Simplify.Examples.Repository.FluentNHibernate.App/Setup/IocRegistrations.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace Simplify.Examples.Repository.FluentNHibernate.App.Setup;
44

55
public static class IocRegistrations
66
{
7-
public static IDIContainerProvider RegisterSimplifyFluentNHibernateExamplesApp(this IDIContainerProvider provider)
7+
public static IDIContainerProvider RegisterAll(this IDIContainerProvider provider)
88
{
99
provider.RegisterConfiguration()
1010
.RegisterDatabase()

src/Examples/Simplify.Examples.Repository.FluentNHibernate.SchemaUpdater/Simplify.Examples.Repository.FluentNHibernate.SchemaUpdater.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Copyright>Licensed under LGPL</Copyright>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.*" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.6" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.*" />
1414
<PackageReference Include="NUnit" Version="4.3.*" />
1515
<PackageReference Include="NUnit3TestAdapter" Version="5.0.*" />
Lines changed: 17 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,28 @@
11
using System;
22
using Simplify.DI;
3+
using Simplify.Scheduler;
4+
using Simplify.Scheduler.Jobs;
5+
using Simplify.Scheduler.SimpleApp;
36
using Simplify.Scheduler.SimpleApp.Setup;
47

5-
namespace Simplify.Scheduler.SimpleApp;
8+
// IOC container setup
69

7-
internal class Program
8-
{
9-
private static void Main(string[] args)
10-
{
11-
// IOC container setup
10+
DIContainer.Current
11+
.RegisterAll()
12+
.Verify();
1213

13-
IocRegistrations.Register()
14-
.Verify();
14+
// Using scheduler
1515

16-
// Using scheduler
16+
using var scheduler = new MultitaskScheduler();
1717

18-
using (var scheduler = new MultitaskScheduler())
19-
{
20-
scheduler.OnJobStart += HandlerOnJobStart;
21-
scheduler.OnJobFinish += HandlerOnJobFinish;
18+
scheduler.OnJobStart += (ISchedulerJobRepresentation representation) => Console.WriteLine("Job started: " + representation.JobClassType.Name);
19+
scheduler.OnJobFinish += (ISchedulerJobRepresentation representation) => Console.WriteLine("Job finished: " + representation.JobClassType.Name);
2220

23-
scheduler.AddJob<PeriodicalProcessor>(IocRegistrations.Configuration);
21+
scheduler.AddJob<PeriodicalProcessor>(IocRegistrations.Configuration);
2422

25-
if (scheduler.Start(args))
26-
return;
27-
}
23+
if (await scheduler.StartAsync(args))
24+
return;
2825

29-
// Testing without scheduler
30-
using (var scope = DIContainer.Current.BeginLifetimeScope())
31-
scope.Resolver.Resolve<PeriodicalProcessor>().Run();
32-
}
33-
34-
private static void HandlerOnJobStart(Jobs.ISchedulerJobRepresentation representation)
35-
{
36-
Console.WriteLine("Job started: " + representation.JobClassType.Name);
37-
}
38-
39-
private static void HandlerOnJobFinish(Jobs.ISchedulerJobRepresentation representation)
40-
{
41-
Console.WriteLine("Job finished: " + representation.JobClassType.Name);
42-
}
43-
}
26+
// Testing without scheduler
27+
using (var scope = DIContainer.Current.BeginLifetimeScope())
28+
scope.Resolver.Resolve<PeriodicalProcessor>().Run();

src/Examples/Simplify.Scheduler.SimpleApp/Setup/IocRegistrations.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ public static class IocRegistrations
77
{
88
public static IConfiguration Configuration { get; private set; }
99

10-
public static IDIContainerProvider Register()
10+
public static IDIContainerProvider RegisterAll(this IDIContainerProvider provider)
1111
{
12-
DIContainer.Current.RegisterConfiguration()
12+
provider.RegisterConfiguration()
1313
.Register<PeriodicalProcessor>();
1414

15-
return DIContainer.Current;
15+
return provider;
1616
}
1717

1818
private static IDIRegistrator RegisterConfiguration(this IDIRegistrator registrator)

src/Examples/Simplify.Scheduler.SimpleApp/Simplify.Scheduler.SimpleApp.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<Copyright>Licensed under LGPL</Copyright>
1313
</PropertyGroup>
1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
16-
<PackageReference Include="Simplify.Scheduler" Version="1.3.0" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.6" />
16+
<PackageReference Include="Simplify.Scheduler" Version="1.5.0" />
1717
</ItemGroup>
1818
<ItemGroup>
1919
<None Update="appsettings.json">

0 commit comments

Comments
 (0)