Tweak timeoutExceptionTask (#435)

* Tweak timeoutExceptionTask

* ReleaseNotes.md

* non async cancel

* #if NET8_0_OR_GREATER

* Formatting Markdown

---------

Co-authored-by: Tom Longhurst <thomhurst@users.noreply.github.com>

Author: thomhurst

README.md

@@ -63,7 +63,6 @@ Define your pipeline in .NET! Strong types, intellisense, parallelisation, and t
 | ModularPipelines.WinGet | Helpers for interacting with the Windows Package Manager. | [![nuget](https://img.shields.io/nuget/v/ModularPipelines.WinGet.svg)](https://www.nuget.org/packages/ModularPipelines.WinGet/) |
 | ModularPipelines.Yarn | Helpers for interacting with Yarn CLI. | [![nuget](https://img.shields.io/nuget/v/ModularPipelines.Yarn.svg)](https://www.nuget.org/packages/ModularPipelines.Yarn/) |
 
-
 ## Getting Started
 
 If you want to see how to get started, or want to know more about ModularPipelines, [read the Documentation here](https://thomhurst.github.io/ModularPipelines)

src/ModularPipelines.Build/ReleaseNotes.md

@@ -0,0 +1 @@
+*   Tweak logic for throwing Timeout Exceptions

src/ModularPipelines/Modules/Module.cs

@@ -320,16 +320,15 @@ private void SetResult(ModuleResult<T> result)
         ModuleCancellationTokenSource.CancelAfter(Timeout);
 
         var timeoutCancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(ModuleCancellationTokenSource.Token);
-        _ = executeAsyncTask.ContinueWith(async t =>
-        {
-            await Task.Delay(TimeSpan.FromSeconds(5), CancellationToken.None);
-            timeoutCancellationTokenSource.Cancel();
-            timeoutCancellationTokenSource.Dispose();
-        }, CancellationToken.None);
 
         var timeoutExceptionTask = Task.Delay(Timeout, timeoutCancellationTokenSource.Token)
             .ContinueWith(t =>
             {
+                if (executeAsyncTask.IsCompleted)
+                {
+                    return;
+                }
+                
                 if (ModuleRunType == ModuleRunType.OnSuccessfulDependencies)
                 {
                     Context.EngineCancellationToken.Token.ThrowIfCancellationRequested();
@@ -338,8 +337,17 @@ private void SetResult(ModuleResult<T> result)
                 throw new ModuleTimeoutException(this);
             }, CancellationToken.None);
 
+        var finishedTask = await Task.WhenAny(timeoutExceptionTask, executeAsyncTask);
+
+#if NET8_0_OR_GREATER
+        await timeoutCancellationTokenSource.CancelAsync();
+#else
+        timeoutCancellationTokenSource.Cancel();
+#endif
+        timeoutCancellationTokenSource.Dispose();
+        
         // Will throw a timeout exception if configured and timeout is reached
-        await await Task.WhenAny(timeoutExceptionTask, executeAsyncTask);
+        await finishedTask;
 
         return await executeAsyncTask;
     }