Merge branch 'v7' into master

justdmitry · Apr 23, 2024 · 44a41ba · 44a41ba
2 parents 31359d8 + f5859e9
commit 44a41ba
Show file tree

Hide file tree

Showing 8 changed files with 122 additions and 153 deletions.
diff --git a/sample/RecurrentTasks.Sample/RecurrentTasks.Sample.csproj b/sample/RecurrentTasks.Sample/RecurrentTasks.Sample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>RecurrentTasks.Sample</AssemblyName>
     <OutputType>Exe</OutputType>
@@ -15,13 +15,10 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.34" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\RecurrentTasks\RecurrentTasks.csproj" />
   </ItemGroup>

diff --git a/src/RecurrentTasks/RecurrentTasks.csproj b/src/RecurrentTasks/RecurrentTasks.csproj
@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Copyright>Dmitry Popov, 2016-2022</Copyright>
+    <Copyright>Dmitry Popov, 2016-2024</Copyright>
     <AssemblyTitle>RecurrentTasks</AssemblyTitle>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>RecurrentTasks</AssemblyName>
+    <Nullable>enable</Nullable>
     <PackageId>RecurrentTasks</PackageId>
     <PackageTags>task;job;recurrent;recurring;aspnetcore</PackageTags>
-    <PackageReleaseNotes>https://github.com/justdmitry/RecurrentTasks/releases/tag/v6.6</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/justdmitry/RecurrentTasks/releases/tag/v7.0</PackageReleaseNotes>
     <PackageProjectUrl>https://github.com/justdmitry/RecurrentTasks</PackageProjectUrl>
     <PackageLicenseUrl></PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/justdmitry/RecurrentTasks.git</RepositoryUrl>
-    <Version>6.6.0</Version>
+    <Version>7.0.0-beta</Version>
     <Description>RecurrentTasks for .NET allows you to run simple recurrent background tasks with specific intervals, without complex frameworks, persistance, etc...</Description>
     <Authors>just_dmitry</Authors>
     <Company />
@@ -29,24 +30,6 @@
     <Compile Include="..\..\GlobalSuppressions.cs" Link="GlobalSuppressions.cs" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
@@ -61,7 +44,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/src/RecurrentTasks/RecurrentTasksServiceCollectionExtensions.cs b/src/RecurrentTasks/RecurrentTasksServiceCollectionExtensions.cs
@@ -9,14 +9,11 @@ public static class RecurrentTasksServiceCollectionExtensions
     {
         public static IServiceCollection AddTask<TRunnable>(
             this IServiceCollection services,
-            Action<TaskOptions<TRunnable>> optionsAction = null,
+            Action<TaskOptions<TRunnable>>? optionsAction = null,
             ServiceLifetime runnableLifetime = ServiceLifetime.Transient)
             where TRunnable : IRunnable
         {
-            if (services == null)
-            {
-                throw new ArgumentNullException(nameof(services));
-            }
+            ArgumentNullException.ThrowIfNull(services);
 
             var runnableType = typeof(TRunnable);
 

diff --git a/src/RecurrentTasks/TaskOptions.cs b/src/RecurrentTasks/TaskOptions.cs
@@ -18,15 +18,15 @@ public class TaskOptions
         /// <summary>
         /// Custom logger (to use instead of calling loggerFactory.CreateLogger()).
         /// </summary>
-        public ILogger Logger { get; set; }
+        public ILogger? Logger { get; set; }
 
         /// <summary>
-        /// If non-null, current thread culture will be set to this value before <see cref="IRunnable.RunAsync"/> is called
+        /// If non-null, current thread culture will be set to this value before <see cref="IRunnable.RunAsync"/> is called.
         /// </summary>
-        public CultureInfo RunCulture { get; set; }
+        public CultureInfo? RunCulture { get; set; }
 
         /// <summary>
-        /// Auto-start task when <see cref="IHostedService.StartAsync"/> is called (default <b>true</b>)
+        /// Auto-start task when <see cref="IHostedService.StartAsync"/> is called (default <b>true</b>).
         /// </summary>
         public bool AutoStart { get; set; } = true;
 
@@ -73,14 +73,13 @@ public TimeSpan FirstRunDelay
             }
         }
 
-
         /// <summary>
-        /// Return <b>false</b> to cancel/skip task run
+        /// Return <b>false</b> to cancel/skip task run.
         /// </summary>
-        public Func<IServiceProvider, ITask, Task<bool>> BeforeRun { get; set; }
+        public Func<IServiceProvider, ITask, Task<bool>>? BeforeRun { get; set; }
 
-        public Func<IServiceProvider, ITask, Task> AfterRunSuccess { get; set; }
+        public Func<IServiceProvider, ITask, Task>? AfterRunSuccess { get; set; }
 
-        public Func<IServiceProvider, ITask, Exception, Task> AfterRunFail { get; set; }
+        public Func<IServiceProvider, ITask, Exception, Task>? AfterRunFail { get; set; }
     }
 }
diff --git a/src/RecurrentTasks/TaskRunStatus.cs b/src/RecurrentTasks/TaskRunStatus.cs
@@ -14,7 +14,7 @@ public class TaskRunStatus
 
         public int FailsCount { get; set; }
 
-        public Exception LastException { get; set; }
+        public Exception? LastException { get; set; }
 
         public DateTimeOffset NextRunTime { get; set; }
     }