fix: Refactor LongDelaySafe method to use Task directly and update tests

Author: linkdotnet

Directory.Build.props

@@ -5,6 +5,7 @@
         <EnableNETAnalyzers>true</EnableNETAnalyzers>
         <AnalysisLevel>latest</AnalysisLevel>
         <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+        <LangVersion>14.0</LangVersion>
 
         <NoWarn>$(NoWarn);NCRONJOB_OBSERVER</NoWarn>
     </PropertyGroup>

src/NCronJob/NCronJob.csproj

@@ -5,7 +5,6 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<RootNamespace>NCronJob</RootNamespace>
-    <LangVersion>preview</LangVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Label="NuGet">

src/NCronJob/Scheduler/JobWorker.cs

@@ -167,7 +167,7 @@ private async Task WaitForNextExecution(DateTimeOffset nextRunTime, Cancellation
         var delay = nextRunTime - utcNow;
         if (delay > TimeSpan.Zero)
         {
-            await TaskExtensions.LongDelaySafe(delay, timeProvider, stopToken).ConfigureAwait(false);
+            await Task.LongDelaySafe(delay, timeProvider, stopToken).ConfigureAwait(false);
         }
     }
 

src/NCronJob/Scheduler/TaskExtensions.cs

@@ -5,22 +5,28 @@ namespace NCronJob;
 /// </summary>
 internal static class TaskExtensions
 {
-    /// <summary>
-    /// Has the same semantics as <see cref="Task.Delay(TimeSpan, TimeProvider, CancellationToken)"/> but is safe to use for long delays.
-    /// </summary>
-    /// <param name="targetTimeSpan">The <see cref="TimeSpan" /> to wait before completing the returned task, or <see cref="Timeout.InfiniteTimeSpan" /> to wait indefinitely.</param>
-    /// <param name="timeProvider">The <see cref="TimeProvider" /> with which to interpret <paramref name="targetTimeSpan" />.</param>
-    /// <param name="token">A cancellation token to observe while waiting for the task to complete.</param>
-    public static async Task LongDelaySafe(TimeSpan targetTimeSpan, TimeProvider timeProvider, CancellationToken token)
+    extension(Task)
     {
-        ArgumentOutOfRangeException.ThrowIfLessThanOrEqual(targetTimeSpan, TimeSpan.Zero);
-
-        var remainingTime = targetTimeSpan;
-        while (remainingTime > TimeSpan.Zero)
+        /// <summary>
+        /// Has the same semantics as <see cref="Task.Delay(TimeSpan, TimeProvider, CancellationToken)"/> but is safe to use for long delays.
+        /// </summary>
+        /// <param name="targetTimeSpan">The <see cref="TimeSpan" /> to wait before completing the returned task, or <see cref="Timeout.InfiniteTimeSpan" /> to wait indefinitely.</param>
+        /// <param name="timeProvider">The <see cref="TimeProvider" /> with which to interpret <paramref name="targetTimeSpan" />.</param>
+        /// <param name="token">A cancellation token to observe while waiting for the task to complete.</param>
+        public static async Task LongDelaySafe(
+            TimeSpan targetTimeSpan,
+            TimeProvider timeProvider,
+            CancellationToken token)
         {
-            var delay = TimeSpan.FromMilliseconds(Math.Min(remainingTime.TotalMilliseconds, uint.MaxValue - 1));
-            await Task.Delay(delay, timeProvider, token).ConfigureAwait(ConfigureAwaitOptions.ForceYielding);
-            remainingTime -= delay;
+            ArgumentOutOfRangeException.ThrowIfLessThanOrEqual(targetTimeSpan, TimeSpan.Zero);
+
+            var remainingTime = targetTimeSpan;
+            while (remainingTime > TimeSpan.Zero)
+            {
+                var delay = TimeSpan.FromMilliseconds(Math.Min(remainingTime.TotalMilliseconds, uint.MaxValue - 1));
+                await Task.Delay(delay, timeProvider, token).ConfigureAwait(ConfigureAwaitOptions.ForceYielding);
+                remainingTime -= delay;
+            }
         }
     }
 }

tests/NCronJob.Tests/TaskExtensionsTests.cs

@@ -13,12 +13,12 @@ public async Task LongDelaySafe_WhenCalledWith100Days_ShouldDelay()
         var maxDelayTimeSpan = TimeSpan.FromMilliseconds(uint.MaxValue - 1);
         var timeProvider = new FakeTimeProvider();
         var targetTimeSpan = TimeSpan.FromDays(100);
-        var token = new CancellationToken();
+        var token = CancellationToken.None;
 
         // Act
         var act = () =>
         {
-            var delayTask = TaskExtensions.LongDelaySafe(targetTimeSpan, timeProvider, token);
+            var delayTask = Task.LongDelaySafe(targetTimeSpan, timeProvider, token);
             timeProvider.Advance(maxDelayTimeSpan);
             timeProvider.Advance(maxDelayTimeSpan);
             timeProvider.Advance(targetTimeSpan - (maxDelayTimeSpan + maxDelayTimeSpan));
@@ -36,10 +36,10 @@ public void LongDelaySafeThrowsWhenTimeSpanZeroIsPassedIn()
         // Arrange
         var timeProvider = new FakeTimeProvider();
         var targetTimeSpan = TimeSpan.Zero;
-        var token = new CancellationToken();
+        var token = CancellationToken.None;
 
         // Act
-        var act = () => TaskExtensions.LongDelaySafe(targetTimeSpan, timeProvider, token);
+        var act = () => Task.LongDelaySafe(targetTimeSpan, timeProvider, token);
 
         // Assert
         act.ShouldThrow<ArgumentOutOfRangeException>();