Skip to content

Commit e95e3cb

Browse files
TomekMelissaTomekMelissa
committed
Fixing #143
Added server component based on quartznet server It is important to completely uninstall any previous version of RIS. You need to delete Schedule.xml file as well if you are upgrading from <3.0
1 parent e974299 commit e95e3cb

31 files changed

+703
-467
lines changed

‎Common/Common.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<Version>2.0.12</Version>
9292
</PackageReference>
9393
<PackageReference Include="Microsoft.Identity.Client">
94-
<Version>4.34.0</Version>
94+
<Version>4.35.1</Version>
9595
</PackageReference>
9696
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
9797
<Version>5.2.9</Version>
@@ -103,10 +103,10 @@
103103
<Version>7.2.2</Version>
104104
</PackageReference>
105105
<PackageReference Include="Quartz">
106-
<Version>3.3.2</Version>
106+
<Version>3.3.3</Version>
107107
</PackageReference>
108108
<PackageReference Include="System.Linq.Dynamic.Core">
109-
<Version>1.2.10</Version>
109+
<Version>1.2.12</Version>
110110
</PackageReference>
111111
<PackageReference Include="UrlCombine">
112112
<Version>2.0.0</Version>

‎Job.Download/Job.Download.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
<Reference Include="Polly, Version=7.0.0.0, Culture=neutral, PublicKeyToken=c8a3ffc3f8f825cc, processorArchitecture=MSIL">
5151
<HintPath>..\packages\Polly.7.2.2\lib\net472\Polly.dll</HintPath>
5252
</Reference>
53-
<Reference Include="Quartz, Version=3.3.2.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Quartz.3.3.2\lib\net472\Quartz.dll</HintPath>
53+
<Reference Include="Quartz, Version=3.3.3.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Quartz.3.3.3\lib\net472\Quartz.dll</HintPath>
5555
</Reference>
5656
<Reference Include="System" />
5757
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

‎Job.Download/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.Extensions.Logging.Abstractions" version="5.0.0" targetFramework="net472" />
55
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
66
<package id="Polly" version="7.2.2" targetFramework="net472" />
7-
<package id="Quartz" version="3.3.2" targetFramework="net472" />
7+
<package id="Quartz" version="3.3.3" targetFramework="net472" />
88
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
99
<package id="System.Diagnostics.DiagnosticSource" version="5.0.1" targetFramework="net472" />
1010
<package id="System.Memory" version="4.5.4" targetFramework="net472" />

‎Job.ExecutionMonitor/Job.ExecutionMonitor.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
<Reference Include="Polly, Version=7.0.0.0, Culture=neutral, PublicKeyToken=c8a3ffc3f8f825cc, processorArchitecture=MSIL">
5151
<HintPath>..\packages\Polly.7.2.2\lib\net472\Polly.dll</HintPath>
5252
</Reference>
53-
<Reference Include="Quartz, Version=3.3.2.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Quartz.3.3.2\lib\net472\Quartz.dll</HintPath>
53+
<Reference Include="Quartz, Version=3.3.3.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Quartz.3.3.3\lib\net472\Quartz.dll</HintPath>
5555
</Reference>
5656
<Reference Include="System" />
5757
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

‎Job.ExecutionMonitor/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.Extensions.Logging.Abstractions" version="5.0.0" targetFramework="net472" />
55
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
66
<package id="Polly" version="7.2.2" targetFramework="net472" />
7-
<package id="Quartz" version="3.3.2" targetFramework="net472" />
7+
<package id="Quartz" version="3.3.3" targetFramework="net472" />
88
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
99
<package id="System.Diagnostics.DiagnosticSource" version="5.0.1" targetFramework="net472" />
1010
<package id="System.Memory" version="4.5.4" targetFramework="net472" />

‎Job.Export/Job.Export.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
<Reference Include="Polly, Version=7.0.0.0, Culture=neutral, PublicKeyToken=c8a3ffc3f8f825cc, processorArchitecture=MSIL">
4848
<HintPath>..\packages\Polly.7.2.2\lib\net472\Polly.dll</HintPath>
4949
</Reference>
50-
<Reference Include="Quartz, Version=3.3.2.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Quartz.3.3.2\lib\net472\Quartz.dll</HintPath>
50+
<Reference Include="Quartz, Version=3.3.3.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Quartz.3.3.3\lib\net472\Quartz.dll</HintPath>
5252
</Reference>
5353
<Reference Include="System" />
5454
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

‎Job.Export/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="log4net" version="2.0.12" targetFramework="net472" />
44
<package id="Microsoft.Extensions.Logging.Abstractions" version="5.0.0" targetFramework="net472" />
55
<package id="Polly" version="7.2.2" targetFramework="net472" />
6-
<package id="Quartz" version="3.3.2" targetFramework="net472" />
6+
<package id="Quartz" version="3.3.3" targetFramework="net472" />
77
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
88
<package id="System.Diagnostics.DiagnosticSource" version="5.0.1" targetFramework="net472" />
99
<package id="System.Memory" version="4.5.4" targetFramework="net472" />

‎Job.Import/Job.Import.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
<Reference Include="Polly, Version=7.0.0.0, Culture=neutral, PublicKeyToken=c8a3ffc3f8f825cc, processorArchitecture=MSIL">
5151
<HintPath>..\packages\Polly.7.2.2\lib\net472\Polly.dll</HintPath>
5252
</Reference>
53-
<Reference Include="Quartz, Version=3.3.2.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Quartz.3.3.2\lib\net472\Quartz.dll</HintPath>
53+
<Reference Include="Quartz, Version=3.3.3.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Quartz.3.3.3\lib\net472\Quartz.dll</HintPath>
5555
</Reference>
5656
<Reference Include="System" />
5757
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

‎Job.Import/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.Extensions.Logging.Abstractions" version="5.0.0" targetFramework="net472" />
55
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
66
<package id="Polly" version="7.2.2" targetFramework="net472" />
7-
<package id="Quartz" version="3.3.2" targetFramework="net472" />
7+
<package id="Quartz" version="3.3.3" targetFramework="net472" />
88
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
99
<package id="System.Diagnostics.DiagnosticSource" version="5.0.1" targetFramework="net472" />
1010
<package id="System.Memory" version="4.5.4" targetFramework="net472" />

‎Job.ProcessingMonitor/Job.ProcessingMonitor.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
<Reference Include="Polly, Version=7.0.0.0, Culture=neutral, PublicKeyToken=c8a3ffc3f8f825cc, processorArchitecture=MSIL">
5151
<HintPath>..\packages\Polly.7.2.2\lib\net472\Polly.dll</HintPath>
5252
</Reference>
53-
<Reference Include="Quartz, Version=3.3.2.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Quartz.3.3.2\lib\net472\Quartz.dll</HintPath>
53+
<Reference Include="Quartz, Version=3.3.3.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Quartz.3.3.3\lib\net472\Quartz.dll</HintPath>
5555
</Reference>
5656
<Reference Include="System" />
5757
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

‎Job.ProcessingMonitor/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.Extensions.Logging.Abstractions" version="5.0.0" targetFramework="net472" />
55
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
66
<package id="Polly" version="7.2.2" targetFramework="net472" />
7-
<package id="Quartz" version="3.3.2" targetFramework="net472" />
7+
<package id="Quartz" version="3.3.3" targetFramework="net472" />
88
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
99
<package id="System.Diagnostics.DiagnosticSource" version="5.0.1" targetFramework="net472" />
1010
<package id="System.Memory" version="4.5.4" targetFramework="net472" />

‎Job.Upload/Job.Upload.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
<Reference Include="Polly, Version=7.0.0.0, Culture=neutral, PublicKeyToken=c8a3ffc3f8f825cc, processorArchitecture=MSIL">
4848
<HintPath>..\packages\Polly.7.2.2\lib\net472\Polly.dll</HintPath>
4949
</Reference>
50-
<Reference Include="Quartz, Version=3.3.2.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Quartz.3.3.2\lib\net472\Quartz.dll</HintPath>
50+
<Reference Include="Quartz, Version=3.3.3.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Quartz.3.3.3\lib\net472\Quartz.dll</HintPath>
5252
</Reference>
5353
<Reference Include="System" />
5454
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

‎Job.Upload/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="log4net" version="2.0.12" targetFramework="net472" />
44
<package id="Microsoft.Extensions.Logging.Abstractions" version="5.0.0" targetFramework="net472" />
55
<package id="Polly" version="7.2.2" targetFramework="net472" />
6-
<package id="Quartz" version="3.3.2" targetFramework="net472" />
6+
<package id="Quartz" version="3.3.3" targetFramework="net472" />
77
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
88
<package id="System.Diagnostics.DiagnosticSource" version="5.0.1" targetFramework="net472" />
99
<package id="System.Memory" version="4.5.4" targetFramework="net472" />

‎Recurring Integrations Scheduler.sln

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26730.16
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.31424.327
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csproj", "{96BB041A-3FDE-400F-ADDA-9DB19F3274BE}"
77
EndProject
@@ -24,6 +24,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2424
Version.cs = Version.cs
2525
EndProjectSection
2626
EndProject
27+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{A83C017E-6A29-4039-8970-46AB95BEE619}"
28+
EndProject
2729
Global
2830
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2931
Debug|Any CPU = Debug|Any CPU
@@ -96,6 +98,14 @@ Global
9698
{8E9BC494-6962-48DC-BC55-4E159E5517D3}.Release|Any CPU.Build.0 = Release|Any CPU
9799
{8E9BC494-6962-48DC-BC55-4E159E5517D3}.Release|x86.ActiveCfg = Release|Any CPU
98100
{8E9BC494-6962-48DC-BC55-4E159E5517D3}.Release|x86.Build.0 = Release|Any CPU
101+
{A83C017E-6A29-4039-8970-46AB95BEE619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
102+
{A83C017E-6A29-4039-8970-46AB95BEE619}.Debug|Any CPU.Build.0 = Debug|Any CPU
103+
{A83C017E-6A29-4039-8970-46AB95BEE619}.Debug|x86.ActiveCfg = Debug|Any CPU
104+
{A83C017E-6A29-4039-8970-46AB95BEE619}.Debug|x86.Build.0 = Debug|Any CPU
105+
{A83C017E-6A29-4039-8970-46AB95BEE619}.Release|Any CPU.ActiveCfg = Release|Any CPU
106+
{A83C017E-6A29-4039-8970-46AB95BEE619}.Release|Any CPU.Build.0 = Release|Any CPU
107+
{A83C017E-6A29-4039-8970-46AB95BEE619}.Release|x86.ActiveCfg = Release|Any CPU
108+
{A83C017E-6A29-4039-8970-46AB95BEE619}.Release|x86.Build.0 = Release|Any CPU
99109
EndGlobalSection
100110
GlobalSection(SolutionProperties) = preSolution
101111
HideSolutionNode = FALSE

‎Scheduler/App.config

+5-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
175175
<dependentAssembly>
176176
<assemblyIdentity name="Quartz" publicKeyToken="f6b8c98a402cc8a4" culture="neutral" />
177-
<bindingRedirect oldVersion="0.0.0.0-3.0.7.0" newVersion="3.0.7.0" />
177+
<bindingRedirect oldVersion="0.0.0.0-3.3.3.0" newVersion="3.3.3.0" />
178178
</dependentAssembly>
179179
<dependentAssembly>
180180
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
@@ -196,6 +196,10 @@
196196
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
197197
<bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1" />
198198
</dependentAssembly>
199+
<dependentAssembly>
200+
<assemblyIdentity name="Quartz.Jobs" publicKeyToken="f6b8c98a402cc8a4" culture="neutral" />
201+
<bindingRedirect oldVersion="0.0.0.0-3.3.3.0" newVersion="3.3.3.0" />
202+
</dependentAssembly>
199203
</assemblyBinding>
200204
</runtime>
201205
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>

‎Scheduler/Scheduler.csproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,17 @@
7777
<Reference Include="PortableSettingsProvider, Version=0.2.4.0, Culture=neutral, processorArchitecture=MSIL">
7878
<HintPath>..\packages\PortableSettingsProvider.0.2.4\lib\net45\PortableSettingsProvider.dll</HintPath>
7979
</Reference>
80-
<Reference Include="Quartz, Version=3.3.2.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
81-
<HintPath>..\packages\Quartz.3.3.2\lib\net472\Quartz.dll</HintPath>
80+
<Reference Include="Quartz, Version=3.3.3.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
81+
<HintPath>..\packages\Quartz.3.3.3\lib\net472\Quartz.dll</HintPath>
8282
</Reference>
83-
<Reference Include="Quartz.Jobs, Version=3.3.2.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
84-
<HintPath>..\packages\Quartz.Jobs.3.3.2\lib\net472\Quartz.Jobs.dll</HintPath>
83+
<Reference Include="Quartz.Jobs, Version=3.3.3.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
84+
<HintPath>..\packages\Quartz.Jobs.3.3.3\lib\net472\Quartz.Jobs.dll</HintPath>
8585
</Reference>
86-
<Reference Include="Quartz.Plugins, Version=3.3.2.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
87-
<HintPath>..\packages\Quartz.Plugins.3.3.2\lib\net472\Quartz.Plugins.dll</HintPath>
86+
<Reference Include="Quartz.Plugins, Version=3.3.3.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
87+
<HintPath>..\packages\Quartz.Plugins.3.3.3\lib\net472\Quartz.Plugins.dll</HintPath>
8888
</Reference>
89-
<Reference Include="Quartz.Serialization.Json, Version=3.3.2.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
90-
<HintPath>..\packages\Quartz.Serialization.Json.3.3.2\lib\net472\Quartz.Serialization.Json.dll</HintPath>
89+
<Reference Include="Quartz.Serialization.Json, Version=3.3.3.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
90+
<HintPath>..\packages\Quartz.Serialization.Json.3.3.3\lib\net472\Quartz.Serialization.Json.dll</HintPath>
9191
</Reference>
9292
<Reference Include="System" />
9393
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -123,8 +123,8 @@
123123
<Reference Include="System.Drawing" />
124124
<Reference Include="System.Windows.Forms" />
125125
<Reference Include="System.Xml" />
126-
<Reference Include="Topshelf, Version=4.2.1.215, Culture=neutral, PublicKeyToken=b800c4cfcdeea87b, processorArchitecture=MSIL">
127-
<HintPath>..\packages\Topshelf.4.2.1\lib\net452\Topshelf.dll</HintPath>
126+
<Reference Include="Topshelf, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b800c4cfcdeea87b, processorArchitecture=MSIL">
127+
<HintPath>..\packages\Topshelf.4.3.0\lib\net452\Topshelf.dll</HintPath>
128128
</Reference>
129129
</ItemGroup>
130130
<ItemGroup>

‎Scheduler/packages.config

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
66
<package id="Polly" version="7.2.2" targetFramework="net472" />
77
<package id="PortableSettingsProvider" version="0.2.4" targetFramework="net472" />
8-
<package id="Quartz" version="3.3.2" targetFramework="net472" />
9-
<package id="Quartz.Jobs" version="3.3.2" targetFramework="net472" />
10-
<package id="Quartz.Plugins" version="3.3.2" targetFramework="net472" />
11-
<package id="Quartz.Serialization.Json" version="3.3.2" targetFramework="net472" />
8+
<package id="Quartz" version="3.3.3" targetFramework="net472" />
9+
<package id="Quartz.Jobs" version="3.3.3" targetFramework="net472" />
10+
<package id="Quartz.Plugins" version="3.3.3" targetFramework="net472" />
11+
<package id="Quartz.Serialization.Json" version="3.3.3" targetFramework="net472" />
1212
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
1313
<package id="System.Diagnostics.DiagnosticSource" version="5.0.1" targetFramework="net472" />
1414
<package id="System.Memory" version="4.5.4" targetFramework="net472" />
1515
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
1616
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net472" />
1717
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net472" />
18-
<package id="Topshelf" version="4.2.1" targetFramework="net472" />
18+
<package id="Topshelf" version="4.3.0" targetFramework="net472" />
1919
</packages>

0 commit comments

Comments
 (0)