Update Quartz to version 3.0.7 to finally fix #93

FOGProject · Apr 22, 2020 · 3a6ae73 · 3a6ae73
1 parent 3e2fbdb
commit 3a6ae73
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/Modules/Modules.csproj b/Modules/Modules.csproj
@@ -107,16 +107,17 @@
     <Reference Include="ProcessPrivileges">
       <HintPath>..\libs\ProcessPrivileges.dll</HintPath>
     </Reference>
-    <Reference Include="Quartz, Version=2.4.1.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
-      <HintPath>..\libs\Quartz.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Quartz, Version=3.0.7.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Quartz.3.0.7\lib\net452\Quartz.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.Management" />
+    <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Xml" />

diff --git a/Modules/PowerManagement/PowerManagement.cs b/Modules/PowerManagement/PowerManagement.cs
@@ -33,18 +33,22 @@ namespace FOG.Modules.PowerManagement
     /// </summary>
     public class PowerManagement : AbstractModule<DataContracts.PowerManagement>
     {
-        private readonly ISchedulerFactory _schedulerFactory;
-        private readonly IScheduler _scheduler;
+        private ISchedulerFactory _schedulerFactory;
+        private IScheduler _scheduler;
 
-        private readonly Dictionary<string, TriggerKey> _triggers; 
+        private Dictionary<string, TriggerKey> _triggers;
 
         public PowerManagement()
         {
             Name = "PowerManagement";
+            InitPowerManagement();
+        }
 
+        private async void InitPowerManagement()
+        {
             _schedulerFactory = new StdSchedulerFactory();
-            _scheduler = _schedulerFactory.GetScheduler();
-            _scheduler.Start();
+            _scheduler = await _schedulerFactory.GetScheduler();
+            await _scheduler.Start();
 
             _triggers = new Dictionary<string, TriggerKey>(StringComparer.OrdinalIgnoreCase);
         }
@@ -181,17 +185,17 @@ private void CreateTasks(List<Task> tasks)
 
     internal class ShutdownJob : IJob
     {
-        void IJob.Execute(IJobExecutionContext context)
+        async System.Threading.Tasks.Task IJob.Execute(IJobExecutionContext context)
         {
-            Power.Shutdown("FOG PowerManagement");
+            await Power.Shutdown("FOG PowerManagement");
         }
     }
 
     internal class RestartJob : IJob
     {
-        void IJob.Execute(IJobExecutionContext context)
+        async System.Threading.Tasks.Task IJob.Execute(IJobExecutionContext context)
         {
-            Power.Restart("FOG PowerManagement");
+            await Power.Restart("FOG PowerManagement");
         }
     }
 

diff --git a/Modules/packages.config b/Modules/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="Common.Logging" version="3.4.1" targetFramework="net452" />
   <package id="Common.Logging.Core" version="3.4.1" targetFramework="net452" />
-  <package id="Quartz" version="2.4.1" targetFramework="net452" />
+  <package id="Quartz" version="3.0.7" targetFramework="net452" />
   <package id="SharpZipLib" version="1.2.0" targetFramework="net452" />
 </packages>
diff --git a/libs/Zazzles.dll b/libs/Zazzles.dll