diff --git a/Source/Examples/AspNetCoreDocker/Program.cs b/Source/Examples/AspNetCoreDocker/Program.cs index ef03fe2..d07f2ae 100644 --- a/Source/Examples/AspNetCoreDocker/Program.cs +++ b/Source/Examples/AspNetCoreDocker/Program.cs @@ -9,7 +9,7 @@ namespace AspNetCoreDocker { public static void Main(string[] args) { - var scheduler = DemoScheduler.Create(); + var scheduler = DemoScheduler.Create().Result; var host = WebHost.CreateDefaultBuilder(args).Configure(app => { diff --git a/Source/Examples/AspNetCoreDocker/app.config b/Source/Examples/AspNetCoreDocker/app.config index 8bba0a4..6e3f579 100644 --- a/Source/Examples/AspNetCoreDocker/app.config +++ b/Source/Examples/AspNetCoreDocker/app.config @@ -4,7 +4,7 @@
- - + + diff --git a/Source/Examples/AspNetCoreHost/Startup.cs b/Source/Examples/AspNetCoreHost/Startup.cs index 4284816..5426768 100644 --- a/Source/Examples/AspNetCoreHost/Startup.cs +++ b/Source/Examples/AspNetCoreHost/Startup.cs @@ -14,7 +14,7 @@ namespace Quartzmin.AspNetCore { app.UseQuartzmin(new QuartzminOptions() { - Scheduler = DemoScheduler.Create(), + Scheduler = DemoScheduler.Create().Result, }); } } diff --git a/Source/Examples/AspNetCoreHost/app.config b/Source/Examples/AspNetCoreHost/app.config index c035740..31e49cd 100644 --- a/Source/Examples/AspNetCoreHost/app.config +++ b/Source/Examples/AspNetCoreHost/app.config @@ -5,7 +5,7 @@ - - + + diff --git a/Source/Examples/AspNetWebHost/Startup.cs b/Source/Examples/AspNetWebHost/Startup.cs index 0993fa9..8e3ca1c 100644 --- a/Source/Examples/AspNetWebHost/Startup.cs +++ b/Source/Examples/AspNetWebHost/Startup.cs @@ -12,7 +12,7 @@ namespace Quartzmin.AspNet { app.UseQuartzmin(new QuartzminOptions() { - Scheduler = DemoScheduler.Create(), + Scheduler = DemoScheduler.Create().Result, DefaultDateFormat = "dd.MM.yyyy", VirtualPathRoot = "/test", diff --git a/Source/Examples/AspNetWebHost/Web.config b/Source/Examples/AspNetWebHost/Web.config index 8c3616e..0845986 100644 --- a/Source/Examples/AspNetWebHost/Web.config +++ b/Source/Examples/AspNetWebHost/Web.config @@ -10,8 +10,8 @@ - - + + diff --git a/Source/Examples/NetCoreSelfHost/Program.cs b/Source/Examples/NetCoreSelfHost/Program.cs index c94c84a..e704f16 100644 --- a/Source/Examples/NetCoreSelfHost/Program.cs +++ b/Source/Examples/NetCoreSelfHost/Program.cs @@ -7,7 +7,7 @@ namespace NetCoreSelfHost { static void Main(string[] args) { - var scheduler = DemoScheduler.Create(); + var scheduler = DemoScheduler.Create().Result; scheduler.Start(); while (!scheduler.IsShutdown) diff --git a/Source/Examples/NetCoreSelfHost/app.config b/Source/Examples/NetCoreSelfHost/app.config index cd50513..1a13585 100644 --- a/Source/Examples/NetCoreSelfHost/app.config +++ b/Source/Examples/NetCoreSelfHost/app.config @@ -5,8 +5,8 @@ - - + + diff --git a/Source/Examples/Shared/DemoScheduler.cs b/Source/Examples/Shared/DemoScheduler.cs index 22bbc32..8152cdc 100644 --- a/Source/Examples/Shared/DemoScheduler.cs +++ b/Source/Examples/Shared/DemoScheduler.cs @@ -10,10 +10,9 @@ namespace Quartzmin { public static class DemoScheduler { - public static IScheduler Create(bool start = true) + public static async Task Create(bool start = true) { - var schedulerFactory = new StdSchedulerFactory(); - var scheduler = schedulerFactory.GetScheduler().Result; + var scheduler = await StdSchedulerFactory.GetDefaultScheduler(); { var jobData = new JobDataMap(); @@ -31,7 +30,7 @@ namespace Quartzmin .StartNow() .WithCronSchedule("0 0 8 1/1 * ? *") .Build(); - scheduler.ScheduleJob(job, trigger).Wait(); + await scheduler.ScheduleJob(job, trigger); trigger = TriggerBuilder.Create() .WithIdentity("MonthlySales") @@ -39,8 +38,8 @@ namespace Quartzmin .StartNow() .WithCronSchedule("0 0 12 1 1/1 ? *") .Build(); - scheduler.ScheduleJob(trigger).Wait(); - scheduler.PauseTrigger(trigger.Key).Wait(); + await scheduler.ScheduleJob(trigger); + await scheduler.PauseTrigger(trigger.Key); trigger = TriggerBuilder.Create() .WithIdentity("HourlySales") @@ -48,22 +47,22 @@ namespace Quartzmin .StartNow() .WithSimpleSchedule(x => x.WithIntervalInHours(1).RepeatForever()) .Build(); - scheduler.ScheduleJob(trigger).Wait(); + await scheduler.ScheduleJob(trigger); } { var job = JobBuilder.Create().WithIdentity("Job1").StoreDurably().Build(); - scheduler.AddJob(job, false).Wait(); + await scheduler.AddJob(job, false); job = JobBuilder.Create().WithIdentity("Job2").StoreDurably().Build(); - scheduler.AddJob(job, false).Wait(); + await scheduler.AddJob(job, false); job = JobBuilder.Create().WithIdentity("Job3").StoreDurably().Build(); - scheduler.AddJob(job, false).Wait(); + await scheduler.AddJob(job, false); job = JobBuilder.Create().WithIdentity("Job4").StoreDurably().Build(); - scheduler.AddJob(job, false).Wait(); + await scheduler.AddJob(job, false); job = JobBuilder.Create().WithIdentity("Job5").StoreDurably().Build(); - scheduler.AddJob(job, false).Wait(); + await scheduler.AddJob(job, false); job = JobBuilder.Create().WithIdentity("Send SMS", "CRITICAL").StoreDurably().RequestRecovery().Build(); - scheduler.AddJob(job, false).Wait(); + await scheduler.AddJob(job, false); var trigger = TriggerBuilder.Create() .WithIdentity("PushAds (US)") @@ -72,7 +71,7 @@ namespace Quartzmin .StartNow() .WithCronSchedule("0 0/5 * 1/1 * ? *") .Build(); - scheduler.ScheduleJob(trigger).Wait(); + await scheduler.ScheduleJob(trigger); trigger = TriggerBuilder.Create() .WithIdentity("PushAds (EU)") @@ -81,11 +80,11 @@ namespace Quartzmin .StartNow() .WithCronSchedule("0 0/7 * 1/1 * ? *") .Build(); - scheduler.ScheduleJob(trigger).Wait(); - scheduler.PauseTriggers(GroupMatcher.GroupEquals("LONGRUNNING")); + await scheduler.ScheduleJob(trigger); + await scheduler.PauseTriggers(GroupMatcher.GroupEquals("LONGRUNNING")); job = JobBuilder.Create().WithIdentity("Send Push", "CRITICAL").StoreDurably().RequestRecovery().Build(); - scheduler.AddJob(job, false).Wait(); + await scheduler.AddJob(job, false); } { @@ -99,17 +98,17 @@ namespace Quartzmin .StartNow() .WithSimpleSchedule(x => x.WithIntervalInSeconds(5).RepeatForever()) .Build(); - scheduler.ScheduleJob(job, trigger).Wait(); + await scheduler.ScheduleJob(job, trigger); trigger = TriggerBuilder.Create() .WithIdentity("CSV_big", "LONGRUNNING") .ForJob(job) .StartNow() .WithDailyTimeIntervalSchedule(x=>x.OnMondayThroughFriday()) .Build(); - scheduler.ScheduleJob(trigger).Wait(); + await scheduler.ScheduleJob(trigger); } if (start) - scheduler.Start().GetAwaiter().GetResult(); + await scheduler.Start(); return scheduler; } diff --git a/Source/Examples/WinFormSelfHost/App.config b/Source/Examples/WinFormSelfHost/App.config index 2c6226e..b1bef7f 100644 --- a/Source/Examples/WinFormSelfHost/App.config +++ b/Source/Examples/WinFormSelfHost/App.config @@ -9,8 +9,8 @@ - - + + diff --git a/Source/Examples/WinFormSelfHost/MainForm.cs b/Source/Examples/WinFormSelfHost/MainForm.cs index d6e6d42..3616f05 100644 --- a/Source/Examples/WinFormSelfHost/MainForm.cs +++ b/Source/Examples/WinFormSelfHost/MainForm.cs @@ -18,7 +18,7 @@ namespace WinFormSelfHost void CreateScheduler() { - scheduler = DemoScheduler.Create(start: false); + scheduler = DemoScheduler.Create(start: false).Result; } private void btnStart_Click(object sender, EventArgs e) diff --git a/Source/Examples/WinFormSelfHost/WinFormSelfHost.csproj b/Source/Examples/WinFormSelfHost/WinFormSelfHost.csproj index b349629..7b673ff 100644 --- a/Source/Examples/WinFormSelfHost/WinFormSelfHost.csproj +++ b/Source/Examples/WinFormSelfHost/WinFormSelfHost.csproj @@ -36,8 +36,8 @@ ..\..\..\packages\Microsoft.Owin.2.1.0\lib\net45\Microsoft.Owin.dll - - ..\..\..\packages\Microsoft.Owin.Host.HttpListener.2.0.2\lib\net45\Microsoft.Owin.Host.HttpListener.dll + + ..\..\..\packages\Microsoft.Owin.Host.HttpListener.2.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll ..\..\..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net45\Microsoft.Owin.Hosting.dll diff --git a/Source/Examples/WinFormSelfHost/packages.config b/Source/Examples/WinFormSelfHost/packages.config index e1386e6..480fd6f 100644 --- a/Source/Examples/WinFormSelfHost/packages.config +++ b/Source/Examples/WinFormSelfHost/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/Quartz.Plugins.RecentHistory/ExecutionHistoryPlugin.cs b/Source/Quartz.Plugins.RecentHistory/ExecutionHistoryPlugin.cs index 8aad7f3..6729b29 100644 --- a/Source/Quartz.Plugins.RecentHistory/ExecutionHistoryPlugin.cs +++ b/Source/Quartz.Plugins.RecentHistory/ExecutionHistoryPlugin.cs @@ -1,5 +1,4 @@ -using Quartz; -using Quartz.Impl.Matchers; +using Quartz.Impl.Matchers; using Quartz.Spi; using System; using System.Threading; @@ -13,7 +12,7 @@ namespace Quartz.Plugins.RecentHistory IExecutionHistoryStore _store; public string Name { get; set; } - public Type ExecutionHistoryStoreType { get; set; } + public Type StoreType { get; set; } public Task Initialize(string pluginName, IScheduler scheduler, CancellationToken cancellationToken = default(CancellationToken)) { @@ -30,11 +29,11 @@ namespace Quartz.Plugins.RecentHistory if (_store == null) { - if (ExecutionHistoryStoreType != null) - _store = (IExecutionHistoryStore)Activator.CreateInstance(ExecutionHistoryStoreType); + if (StoreType != null) + _store = (IExecutionHistoryStore)Activator.CreateInstance(StoreType); if (_store == null) - throw new Exception(nameof(ExecutionHistoryStoreType) + " is not set."); + throw new Exception(nameof(StoreType) + " is not set."); _scheduler.Context.SetExecutionHistoryStore(_store); } diff --git a/Source/Quartz.Plugins.RecentHistory/Quartz.Plugins.RecentHistory.csproj b/Source/Quartz.Plugins.RecentHistory/Quartz.Plugins.RecentHistory.csproj index a0cea53..df74463 100644 --- a/Source/Quartz.Plugins.RecentHistory/Quartz.Plugins.RecentHistory.csproj +++ b/Source/Quartz.Plugins.RecentHistory/Quartz.Plugins.RecentHistory.csproj @@ -7,17 +7,19 @@ true 1591 - 1.0.0 + 1.0.1 Quartz.Plugins.RecentHistory Quartz.NET plugin to persist recent job execution history Jan Lucansky https://github.com/jlucansky/Quartzmin This is supporting package for Quartzmin - quartz recent history + quartz;recent;history 1.0.0.0 1.0.0.0 LICENSE - + Copyright © 2018 Jan Lucansky + git + https://github.com/jlucansky/Quartzmin diff --git a/Source/Quartzmin.SelfHost/Quartzmin.SelfHost.csproj b/Source/Quartzmin.SelfHost/Quartzmin.SelfHost.csproj index 97d7efd..1826eba 100644 --- a/Source/Quartzmin.SelfHost/Quartzmin.SelfHost.csproj +++ b/Source/Quartzmin.SelfHost/Quartzmin.SelfHost.csproj @@ -7,18 +7,20 @@ true 1591 - 1.0.0 + 1.0.1 Quartzmin.SelfHost Quartzmin Self Host Jan Lucansky https://github.com/jlucansky/Quartzmin https://raw.githubusercontent.com/jlucansky/public-assets/master/Quartzmin/avatar.png This package allows you to host Quartzmin within your own process. - quartzmin web host + quartzmin;web;host 1.0.0.0 1.0.0.0 LICENSE - + Copyright © 2018 Jan Lucansky + git + https://github.com/jlucansky/Quartzmin @@ -34,6 +36,7 @@ + diff --git a/Source/Quartzmin/Quartzmin.csproj b/Source/Quartzmin/Quartzmin.csproj index 569aa26..75b726a 100644 --- a/Source/Quartzmin/Quartzmin.csproj +++ b/Source/Quartzmin/Quartzmin.csproj @@ -8,17 +8,20 @@ 1591 true - 1.0.0 + 1.0.1 Quartzmin Web management tool for Quartz.NET Jan Lucansky https://github.com/jlucansky/Quartzmin https://raw.githubusercontent.com/jlucansky/public-assets/master/Quartzmin/avatar.png Powerful, easy to use web management tool for Quartz.NET - quartz web ui + quartz;web;ui 1.0.0.0 1.0.0.0 LICENSE + Copyright © 2018 Jan Lucansky + git + https://github.com/jlucansky/Quartzmin