From 1e2ba1aa679590de688075519872a981d26a2556 Mon Sep 17 00:00:00 2001
From: DeonHeyns <heynsd@gmail.com>
Date: Mon, 5 Sep 2022 19:32:35 -0300
Subject: [PATCH 1/2] Upgrade to latest ServiceStack and .NET

---
 .../ServiceStack.Quartz.Tests.csproj          | 34 ++++----
 .../ServiceStack.Quartz.csproj                | 84 +++++++++----------
 .../ServiceStack.Quartz.NetCore.csproj        | 37 ++++----
 3 files changed, 77 insertions(+), 78 deletions(-)

diff --git a/src/ServiceStack.Quartz.Tests/ServiceStack.Quartz.Tests.csproj b/src/ServiceStack.Quartz.Tests/ServiceStack.Quartz.Tests.csproj
index caba2f8..c3b6972 100644
--- a/src/ServiceStack.Quartz.Tests/ServiceStack.Quartz.Tests.csproj
+++ b/src/ServiceStack.Quartz.Tests/ServiceStack.Quartz.Tests.csproj
@@ -1,18 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
-    <LangVersion>8</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="ServiceStack" Version="5.8.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\demo\ServiceStackQuartz.ServiceInterface\ServiceStack.Quartz.ServiceInterface.csproj" />
-    <ProjectReference Include="..\demo\ServiceStackQuartz.ServiceModel\ServiceStack.Quartz.ServiceModel.csproj" />
-    <ProjectReference Include="..\ServiceStack.Quartz\ServiceStack.Quartz.csproj" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <LangVersion>8</LangVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="ServiceStack" Version="6.3.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\demo\ServiceStackQuartz.ServiceInterface\ServiceStack.Quartz.ServiceInterface.csproj" />
+    <ProjectReference Include="..\demo\ServiceStackQuartz.ServiceModel\ServiceStack.Quartz.ServiceModel.csproj" />
+    <ProjectReference Include="..\ServiceStack.Quartz\ServiceStack.Quartz.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/ServiceStack.Quartz/ServiceStack.Quartz.csproj b/src/ServiceStack.Quartz/ServiceStack.Quartz.csproj
index d40586b..32eeeed 100644
--- a/src/ServiceStack.Quartz/ServiceStack.Quartz.csproj
+++ b/src/ServiceStack.Quartz/ServiceStack.Quartz.csproj
@@ -1,43 +1,43 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
-    <Configurations>Debug;Release</Configurations>
-    <Description>Easy job scheduling for ServiceStack - https://wwwlicious.github.io/ServiceStack.Quartz/</Description>
-    <Authors>Scott Mackay (@wwwlicious)</Authors>
-    <Owners>Scott Mackay (@wwwlicious)</Owners>
-    <Copyright>Copyright (c) wwwlicious 2016 - Present</Copyright>
-    <RequireLicenseAcceptance>false</RequireLicenseAcceptance>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-    <PackageId>ServiceStack.Quartz</PackageId>
-    <Version>$(VersionNumber)</Version>
-    <PackageLicenseUrl>https://opensource.org/licenses/MPL-2.0</PackageLicenseUrl>
-    <PackageProjectUrl>https://github.com/wwwlicious/ServiceStack.Quartz</PackageProjectUrl>
-    <PackageIconUrl>https://wwwlicious.github.io/ServiceStack.Quartz/content/images/logo.png</PackageIconUrl>
-    <ReleaseNotes>https://github.com/wwwlicious/ServiceStack.Quartz/releases</ReleaseNotes>
-    <PackageTags>servicestack quartz quartznet job schedule plugin</PackageTags>
-    <RepositoryUrl>https://github.com/wwwlicious/ServiceStack.Quartz</RepositoryUrl>
-    <LangVersion>default</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net452|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG;NET452;</DefineConstants>
-    <DocumentationFile>bin\Debug\net452\ServiceStack.Quartz.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net452|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG;NET452</DefineConstants>
-    <DocumentationFile>bin\Release\net452\ServiceStack.Quartz.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG;NETSTANDARD2_0;</DefineConstants>
-    <DocumentationFile>bin\Debug\netstandard2.0\ServiceStack.Quartz.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG;NETSTANDARD2_0</DefineConstants>
-    <DocumentationFile>bin\Release\netstandard2.0\ServiceStack.Quartz.xml</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
-    <PackageReference Include="Quartz" Version="3.0.7" />
-    <PackageReference Include="ServiceStack.Server" Version="5.8.0" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
+    <Configurations>Debug;Release</Configurations>
+    <Description>Easy job scheduling for ServiceStack - https://wwwlicious.github.io/ServiceStack.Quartz/</Description>
+    <Authors>Scott Mackay (@wwwlicious)</Authors>
+    <Owners>Scott Mackay (@wwwlicious)</Owners>
+    <Copyright>Copyright (c) wwwlicious 2016 - Present</Copyright>
+    <RequireLicenseAcceptance>false</RequireLicenseAcceptance>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <PackageId>ServiceStack.Quartz</PackageId>
+    <Version>$(VersionNumber)</Version>
+    <PackageLicenseUrl>https://opensource.org/licenses/MPL-2.0</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/wwwlicious/ServiceStack.Quartz</PackageProjectUrl>
+    <PackageIconUrl>https://wwwlicious.github.io/ServiceStack.Quartz/content/images/logo.png</PackageIconUrl>
+    <ReleaseNotes>https://github.com/wwwlicious/ServiceStack.Quartz/releases</ReleaseNotes>
+    <PackageTags>servicestack quartz quartznet job schedule plugin</PackageTags>
+    <RepositoryUrl>https://github.com/wwwlicious/ServiceStack.Quartz</RepositoryUrl>
+    <LangVersion>default</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net452|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NET472;</DefineConstants>
+    <DocumentationFile>bin\Debug\net472\ServiceStack.Quartz.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net452|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NET472</DefineConstants>
+    <DocumentationFile>bin\Release\net472\ServiceStack.Quartz.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NETSTANDARD2_0;</DefineConstants>
+    <DocumentationFile>bin\Debug\netstandard2.0\ServiceStack.Quartz.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NETSTANDARD2_0</DefineConstants>
+    <DocumentationFile>bin\Release\netstandard2.0\ServiceStack.Quartz.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageReference Include="Quartz" Version="3.4.0" />
+    <PackageReference Include="ServiceStack" Version="6.3.0" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/demo/ServiceStackQuartz.NetCore/ServiceStack.Quartz.NetCore.csproj b/src/demo/ServiceStackQuartz.NetCore/ServiceStack.Quartz.NetCore.csproj
index 24d1424..c64db81 100644
--- a/src/demo/ServiceStackQuartz.NetCore/ServiceStack.Quartz.NetCore.csproj
+++ b/src/demo/ServiceStackQuartz.NetCore/ServiceStack.Quartz.NetCore.csproj
@@ -1,20 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Configurations>Debug;Release</Configurations>
-    <LangVersion>default</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.3" />
-    <PackageReference Include="Quartz" Version="3.0.7" />
-    <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
-    <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
-    <PackageReference Include="ServiceStack" Version="5.8.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\ServiceStack.Quartz\ServiceStack.Quartz.csproj" />
-    <ProjectReference Include="..\ServiceStackQuartz.ServiceInterface\ServiceStack.Quartz.ServiceInterface.csproj" />
-    <ProjectReference Include="..\ServiceStackQuartz.ServiceModel\ServiceStack.Quartz.ServiceModel.csproj" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <Configurations>Debug;Release</Configurations>
+    <LangVersion>default</LangVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.3" />
+    <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
+    <PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
+    <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
+    <PackageReference Include="ServiceStack" Version="6.3.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ServiceStack.Quartz\ServiceStack.Quartz.csproj" />
+    <ProjectReference Include="..\ServiceStackQuartz.ServiceInterface\ServiceStack.Quartz.ServiceInterface.csproj" />
+    <ProjectReference Include="..\ServiceStackQuartz.ServiceModel\ServiceStack.Quartz.ServiceModel.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

From e38718c7d8dfdfb5a08365580bf22db1e8e7eb01 Mon Sep 17 00:00:00 2001
From: DeonHeyns <heynsd@gmail.com>
Date: Mon, 5 Sep 2022 19:36:08 -0300
Subject: [PATCH 2/2] Upgrade to latest ServiceStack and .NET

---
 src/ServiceStack.Quartz/ServiceStack.Quartz.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ServiceStack.Quartz/ServiceStack.Quartz.csproj b/src/ServiceStack.Quartz/ServiceStack.Quartz.csproj
index 32eeeed..6fe1a44 100644
--- a/src/ServiceStack.Quartz/ServiceStack.Quartz.csproj
+++ b/src/ServiceStack.Quartz/ServiceStack.Quartz.csproj
@@ -19,11 +19,11 @@
     <RepositoryUrl>https://github.com/wwwlicious/ServiceStack.Quartz</RepositoryUrl>
     <LangVersion>default</LangVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net452|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472|AnyCPU'">
     <DefineConstants>TRACE;DEBUG;NET472;</DefineConstants>
     <DocumentationFile>bin\Debug\net472\ServiceStack.Quartz.xml</DocumentationFile>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net452|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net472|AnyCPU'">
     <DefineConstants>TRACE;DEBUG;NET472</DefineConstants>
     <DocumentationFile>bin\Release\net472\ServiceStack.Quartz.xml</DocumentationFile>
   </PropertyGroup>