Skip to content

Commit 44a41ba

Browse files
justdmitryjustdmitry
committed
Merge branch 'v7' into master
2 parents 31359d8 + f5859e9 commit 44a41ba

File tree

8 files changed

+122
-153
lines changed

8 files changed

+122
-153
lines changed

‎sample/RecurrentTasks.Sample/RecurrentTasks.Sample.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net6.0</TargetFrameworks>
3+
<TargetFramework>net8.0</TargetFramework>
44
<PreserveCompilationContext>true</PreserveCompilationContext>
55
<AssemblyName>RecurrentTasks.Sample</AssemblyName>
66
<OutputType>Exe</OutputType>
@@ -15,13 +15,10 @@
1515
</Content>
1616
</ItemGroup>
1717
<ItemGroup>
18-
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
18+
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
1919
<PrivateAssets>All</PrivateAssets>
2020
</PackageReference>
2121
</ItemGroup>
22-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
23-
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.34" />
24-
</ItemGroup>
2522
<ItemGroup>
2623
<ProjectReference Include="..\..\src\RecurrentTasks\RecurrentTasks.csproj" />
2724
</ItemGroup>

‎src/RecurrentTasks/RecurrentTasks.csproj‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<Copyright>Dmitry Popov, 2016-2022</Copyright>
3+
<Copyright>Dmitry Popov, 2016-2024</Copyright>
44
<AssemblyTitle>RecurrentTasks</AssemblyTitle>
5-
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
5+
<TargetFramework>net8.0</TargetFramework>
66
<AssemblyName>RecurrentTasks</AssemblyName>
7+
<Nullable>enable</Nullable>
78
<PackageId>RecurrentTasks</PackageId>
89
<PackageTags>task;job;recurrent;recurring;aspnetcore</PackageTags>
9-
<PackageReleaseNotes>https://github.com/justdmitry/RecurrentTasks/releases/tag/v6.6</PackageReleaseNotes>
10+
<PackageReleaseNotes>https://github.com/justdmitry/RecurrentTasks/releases/tag/v7.0</PackageReleaseNotes>
1011
<PackageProjectUrl>https://github.com/justdmitry/RecurrentTasks</PackageProjectUrl>
1112
<PackageLicenseUrl></PackageLicenseUrl>
1213
<RepositoryType>git</RepositoryType>
1314
<RepositoryUrl>https://github.com/justdmitry/RecurrentTasks.git</RepositoryUrl>
14-
<Version>6.6.0</Version>
15+
<Version>7.0.0-beta</Version>
1516
<Description>RecurrentTasks for .NET allows you to run simple recurrent background tasks with specific intervals, without complex frameworks, persistance, etc...</Description>
1617
<Authors>just_dmitry</Authors>
1718
<Company />
@@ -29,24 +30,6 @@
2930
<Compile Include="..\..\GlobalSuppressions.cs" Link="GlobalSuppressions.cs" />
3031
</ItemGroup>
3132

32-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
33-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
34-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.0.0" />
35-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
36-
</ItemGroup>
37-
38-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
39-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
40-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.0" />
41-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
42-
</ItemGroup>
43-
44-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
45-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
46-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
47-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
48-
</ItemGroup>
49-
5033
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
5134
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
5235
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
@@ -61,7 +44,7 @@
6144
</ItemGroup>
6245

6346
<ItemGroup>
64-
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
47+
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
6548
<PrivateAssets>All</PrivateAssets>
6649
</PackageReference>
6750
</ItemGroup>

‎src/RecurrentTasks/RecurrentTasksServiceCollectionExtensions.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,11 @@ public static class RecurrentTasksServiceCollectionExtensions
99
{
1010
public static IServiceCollection AddTask<TRunnable>(
1111
this IServiceCollection services,
12-
Action<TaskOptions<TRunnable>> optionsAction = null,
12+
Action<TaskOptions<TRunnable>>? optionsAction = null,
1313
ServiceLifetime runnableLifetime = ServiceLifetime.Transient)
1414
where TRunnable : IRunnable
1515
{
16-
if (services == null)
17-
{
18-
throw new ArgumentNullException(nameof(services));
19-
}
16+
ArgumentNullException.ThrowIfNull(services);
2017

2118
var runnableType = typeof(TRunnable);
2219

‎src/RecurrentTasks/TaskOptions.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ public class TaskOptions
1818
/// <summary>
1919
/// Custom logger (to use instead of calling loggerFactory.CreateLogger()).
2020
/// </summary>
21-
public ILogger Logger { get; set; }
21+
public ILogger? Logger { get; set; }
2222

2323
/// <summary>
24-
/// If non-null, current thread culture will be set to this value before <see cref="IRunnable.RunAsync"/> is called
24+
/// If non-null, current thread culture will be set to this value before <see cref="IRunnable.RunAsync"/> is called.
2525
/// </summary>
26-
public CultureInfo RunCulture { get; set; }
26+
public CultureInfo? RunCulture { get; set; }
2727

2828
/// <summary>
29-
/// Auto-start task when <see cref="IHostedService.StartAsync"/> is called (default <b>true</b>)
29+
/// Auto-start task when <see cref="IHostedService.StartAsync"/> is called (default <b>true</b>).
3030
/// </summary>
3131
public bool AutoStart { get; set; } = true;
3232

@@ -73,14 +73,13 @@ public TimeSpan FirstRunDelay
7373
}
7474
}
7575

76-
7776
/// <summary>
78-
/// Return <b>false</b> to cancel/skip task run
77+
/// Return <b>false</b> to cancel/skip task run.
7978
/// </summary>
80-
public Func<IServiceProvider, ITask, Task<bool>> BeforeRun { get; set; }
79+
public Func<IServiceProvider, ITask, Task<bool>>? BeforeRun { get; set; }
8180

82-
public Func<IServiceProvider, ITask, Task> AfterRunSuccess { get; set; }
81+
public Func<IServiceProvider, ITask, Task>? AfterRunSuccess { get; set; }
8382

84-
public Func<IServiceProvider, ITask, Exception, Task> AfterRunFail { get; set; }
83+
public Func<IServiceProvider, ITask, Exception, Task>? AfterRunFail { get; set; }
8584
}
8685
}

‎src/RecurrentTasks/TaskRunStatus.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class TaskRunStatus
1414

1515
public int FailsCount { get; set; }
1616

17-
public Exception LastException { get; set; }
17+
public Exception? LastException { get; set; }
1818

1919
public DateTimeOffset NextRunTime { get; set; }
2020
}

0 commit comments

Comments
 (0)