WIP Upgrade quartz and convert tasks to async

Author: ethanhann

src/InEngine.Commands/AlwaysFail.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using InEngine.Core;
 using InEngine.Core.Exceptions;
 
@@ -9,7 +10,10 @@ namespace InEngine.Commands;
 /// </summary>
 public class AlwaysFail : AbstractCommand
 {
-    public override void Run() => throw new CommandFailedException("This command always fails.");
+    public override async Task Run()
+    {
+        await Task.Run(() => throw new CommandFailedException("This command always fails."));
+    }
 
     public override void Failed(Exception exception)
     {

src/InEngine.Commands/AlwaysSucceed.cs

@@ -1,4 +1,5 @@
-using InEngine.Core;
+using System.Threading.Tasks;
+using InEngine.Core;
 
 namespace InEngine.Commands;
 
@@ -7,5 +8,8 @@ namespace InEngine.Commands;
 /// </summary>
 public class AlwaysSucceed : AbstractCommand
 {
-    public override void Run() => Info("This command always succeeds.");
+    public override async Task Run()
+    {
+        await Task.Run(() => Info("This command always succeeds."));
+    }
 }

src/InEngine.Commands/Sample/Minimal.cs

@@ -1,7 +1,10 @@
-using InEngine.Core;
+using System.Threading.Tasks;
+using InEngine.Core;
 
 namespace InEngine.Commands.Sample;
 
+using System;
+
 /*
  * At a minimum, a command must implement the AbstractCommand interface.
  *
@@ -11,7 +14,8 @@ namespace InEngine.Commands.Sample;
  */
 public class Minimal : AbstractCommand
 {
-    public override void Run()
+    public override async Task Run()
     {
+        await Task.Run(() => Console.WriteLine("This is an example of a minimal command."));
     }
-}
+}

src/InEngine.Commands/Sample/Pause.cs

@@ -1,12 +1,13 @@
 using System.Threading;
 using InEngine.Core;
+using System.Threading.Tasks;
 
 namespace InEngine.Commands.Sample;
 
 public class Pause : AbstractCommand
 {
-    public override void Run()
+    public override async Task Run()
     {
-        Thread.Sleep(3000);
+        await Task.Run(() => Thread.Sleep(3000));
     }
 }

src/InEngine.Commands/Sample/SayHello.cs

@@ -1,12 +1,13 @@
 using InEngine.Core;
 using System;
+using System.Threading.Tasks;
 
 namespace InEngine.Commands.Sample;
 
 public class SayHello : AbstractCommand
 {
-    public override void Run()
+    public override async Task Run()
     {
-        Console.WriteLine("hello");
+        await Task.Run(() => Console.WriteLine("hello"));
     }
 }

src/InEngine.Commands/Sample/ShowProgress.cs

@@ -1,4 +1,5 @@
 using InEngine.Core;
+using System.Threading.Tasks;
 
 namespace InEngine.Commands.Sample;
 
@@ -12,7 +13,7 @@ public class ShowProgress : AbstractCommand
      * Note that the override keyword is necessary in the Run method 
      * signature as the base class method is virtual.
      */
-    public override void Run()
+    public override async Task Run()
     {
         // Define the ticks (aka steps) for the command...
         var maxTicks = 100000;
@@ -22,7 +23,7 @@ public override void Run()
         for (var i = 0; i <= maxTicks;i++)
         {
             // Update the command's progress
-            UpdateProgress(i);
+            await Task.Run(() => UpdateProgress(i));
         }
     }
 }

src/InEngine.Core.Test/InEngine.Core.Test.csproj

@@ -18,7 +18,7 @@
     <PackageReference Include="NUnit" Version="3.9.0" />
     <PackageReference Include="NUnit.Console" Version="3.7.0" />
     <PackageReference Include="NUnit.ConsoleRunner" Version="3.7.0" />
-    <PackageReference Include="Quartz" Version="2.6.1" />
+    <PackageReference Include="Quartz" Version="3.4.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\InEngine.Core\InEngine.Core.csproj" />

src/InEngine.Core/AbstractCommand.cs

@@ -38,15 +38,15 @@ protected AbstractCommand()
         SchedulerGroup = GetType().AssemblyQualifiedName;
     }
 
-    public virtual void Run() => throw new NotImplementedException();
+    public abstract Task Run();
 
-    public virtual void RunWithLifeCycle()
+    public virtual async Task RunWithLifeCycle()
     {
         try
         {
             CommandLifeCycle.FirePreActions(this);
             if (SecondsBeforeTimeout <= 0)
-                Run();
+                await Run();
             else
             {
                 var task = Task.Run(Run);
@@ -75,7 +75,7 @@ public virtual void Failed(Exception exception)
     #endregion
 
     #region Scheduling
-    public virtual void Execute(IJobExecutionContext context)
+    public virtual async Task Execute(IJobExecutionContext context)
     {
         if (context != null)
         {
@@ -86,7 +86,7 @@ public virtual void Execute(IJobExecutionContext context)
                     property.SetValue(this, x.Value);
             });
         }
-        RunWithLifeCycle();
+        await RunWithLifeCycle();
     }
     #endregion
 

src/InEngine.Core/Commands/Chain.cs

@@ -3,28 +3,29 @@
 using System.Linq;
 using InEngine.Core.Exceptions;
 using Microsoft.Extensions.Logging;
+using System.Threading.Tasks;
 
 namespace InEngine.Core.Commands;
 
 public class Chain : AbstractCommand
 {
     public IList<AbstractCommand> Commands { get; set; } = new List<AbstractCommand>();
 
-    public override void Run()
+    public override async Task Run()
     {
-        Commands.ToList().ForEach(x =>
+        foreach (var x in Commands.ToList())
         {
             try
             {
                 x.WriteSummaryToConsole();
-                x.Run();
+                await x.Run();
             }
             catch (Exception exception)
             {
                 Log.LogError(exception, "Chain command failed");
                 x.Failed(exception);
                 throw new CommandChainFailedException(x.Name, exception);
             }
-        });
+        }
     }
 }

src/InEngine.Core/Commands/Echo.cs

@@ -1,4 +1,5 @@
-using CommandLine;
+using System.Threading.Tasks;
+using CommandLine;
 
 namespace InEngine.Core.Commands;
 
@@ -16,5 +17,5 @@ public Echo()
     [Option("text", HelpText = "The text to echo.")]
     public string VerbatimText { get; init; }
 
-    public override void Run() => Line(VerbatimText);
+    public override async Task Run() => await Task.Run(() => Line(VerbatimText));
 }