From 2faa612d6c8ae41d5b303f7ad39bfe09093c0fdc Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@btinternet.com>
Date: Sat, 19 Nov 2022 07:49:29 +0000
Subject: [PATCH 1/2] Upgrade to Net 7

---
 ...ionProcessing.SchedulerService.Jobs.csproj | 12 ++++-----
 ...rocessing - Backup.SchedulerService.csproj | 26 +++++++++++++++++++
 ...nsactionProcessing.SchedulerService.csproj | 16 ++++++------
 .../Program.cs                                |  4 +--
 .../Properties/launchSettings.json            |  2 +-
 ...ctionProcessing.SettlementProcessor.csproj | 12 ++++-----
 .../TransactionDataGenerator.csproj           |  8 +++---
 ...TransactionProcessor.HealthChecksUI.csproj |  6 ++---
 ...ransactionProcessor.SystemSetupTool.csproj | 18 ++++++-------
 compose-dev.yaml                              | 12 +++++++++
 10 files changed, 77 insertions(+), 39 deletions(-)
 create mode 100644 TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService/TransactionProcessing - Backup.SchedulerService.csproj
 create mode 100644 compose-dev.yaml

diff --git a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/TransactionProcessing.SchedulerService.Jobs.csproj b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/TransactionProcessing.SchedulerService.Jobs.csproj
index a317cfa..df828f8 100644
--- a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/TransactionProcessing.SchedulerService.Jobs.csproj
+++ b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/TransactionProcessing.SchedulerService.Jobs.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EstateManagement.Client" Version="1.1.3" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
+    <PackageReference Include="EstateManagement.Client" Version="1.1.6-build21" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Quartz" Version="3.3.3" />
-    <PackageReference Include="SecurityService.Client" Version="1.1.1" />
-    <PackageReference Include="TransactionProcessor.Client" Version="1.1.9" />
+    <PackageReference Include="Quartz" Version="3.5.0" />
+    <PackageReference Include="SecurityService.Client" Version="1.1.2-build23" />
+    <PackageReference Include="TransactionProcessor.Client" Version="1.1.13-build29" />
   </ItemGroup>
 </Project>
diff --git a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService/TransactionProcessing - Backup.SchedulerService.csproj b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService/TransactionProcessing - Backup.SchedulerService.csproj
new file mode 100644
index 0000000..29b0345
--- /dev/null
+++ b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService/TransactionProcessing - Backup.SchedulerService.csproj	
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
+    <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
+    <PackageReference Include="Quartz.Extensions.Hosting" Version="3.5.0" />
+    <PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.5.0" />
+    <PackageReference Include="Quartz.Serialization.Json" Version="3.5.0" />
+    <PackageReference Include="Shared" Version="1.5.1" />
+    <PackageReference Include="SilkierQuartz" Version="5.0.309" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\TransactionProcessing.SchedulerService.Jobs\TransactionProcessing.SchedulerService.Jobs.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Update="quartz.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+</Project>
diff --git a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.csproj b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.csproj
index 07574b8..e4b4041 100644
--- a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.csproj
+++ b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
-    <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.3.3" />
-    <PackageReference Include="Quartz.Extensions.Hosting" Version="3.3.3" />
-    <PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.3.3" />
-    <PackageReference Include="Quartz.Serialization.Json" Version="3.3.3" />
-    <PackageReference Include="Shared" Version="1.3.8" />
-    <PackageReference Include="SilkierQuartz" Version="5.0.309" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
+    <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
+    <PackageReference Include="Quartz.Extensions.Hosting" Version="3.5.0" />
+    <PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.5.0" />
+    <PackageReference Include="Quartz.Serialization.Json" Version="3.5.0" />
+    <PackageReference Include="Shared" Version="1.5.1" />
+    <PackageReference Include="SilkierQuartz" Version="5.0.356" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/Program.cs b/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/Program.cs
index a55ccb3..03b5dff 100644
--- a/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/Program.cs
+++ b/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/Program.cs
@@ -19,8 +19,8 @@ static async Task Main(string[] args)
                 endDate = DateTime.ParseExact(args[2], "yyyy-MM-dd", null);
             }
 
-            startDate = new DateTime(2022,7,1);
-            endDate = new DateTime(2022,7,31);
+            startDate = new DateTime(2022,11,3);
+            endDate = new DateTime(2022,11,7);
 
             SettlementProcessor processor = new SettlementProcessor();
             processor.LoadConfiguration();
diff --git a/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/Properties/launchSettings.json b/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/Properties/launchSettings.json
index 6d2ce60..1b8a47e 100644
--- a/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/Properties/launchSettings.json
+++ b/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "TransactionProcessing.SettlementProcessor": {
       "commandName": "Project",
-      "commandLineArgs": "435613ac-a468-47a3-ac4f-649d89764c22"
+      "commandLineArgs": "7c757c2c-4ec9-4d78-ac9b-3a7bfc6d5877"
     }
   }
 }
\ No newline at end of file
diff --git a/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor.csproj b/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor.csproj
index a72b752..53df596 100644
--- a/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor.csproj
+++ b/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor.csproj
@@ -2,16 +2,16 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="SecurityService.Client" Version="1.0.8" />
-    <PackageReference Include="Shared" Version="1.3.3" />
-    <PackageReference Include="TransactionProcessor.Client" Version="1.1.5" />
+    <PackageReference Include="SecurityService.Client" Version="1.1.2-build23" />
+    <PackageReference Include="Shared" Version="1.5.1" />
+    <PackageReference Include="TransactionProcessor.Client" Version="1.1.13-build29" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TransactionProcessor.DataGenerator/DataGenerator/TransactionDataGenerator.csproj b/TransactionProcessor.DataGenerator/DataGenerator/TransactionDataGenerator.csproj
index 3d7ce54..d7e4820 100644
--- a/TransactionProcessor.DataGenerator/DataGenerator/TransactionDataGenerator.csproj
+++ b/TransactionProcessor.DataGenerator/DataGenerator/TransactionDataGenerator.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EstateManagement.Client" Version="1.1.5" />
+    <PackageReference Include="EstateManagement.Client" Version="1.1.6-build21" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="SecurityService.Client" Version="1.0.6" />
-    <PackageReference Include="TransactionProcessor.Client" Version="1.1.11" />
+    <PackageReference Include="SecurityService.Client" Version="1.1.2-build23" />
+    <PackageReference Include="TransactionProcessor.Client" Version="1.1.13-build29" />
   </ItemGroup>
 
 </Project>
diff --git a/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.csproj b/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.csproj
index b807ed5..645638b 100644
--- a/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.csproj
+++ b/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AspNetCore.HealthChecks.UI" Version="5.0.1" />
-    <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="5.0.1" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI" Version="6.0.5" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="6.0.5" />
   </ItemGroup>
 
 </Project>
diff --git a/TransactionProcessor.SystemSetupTool/TransactionProcessor.SystemSetupTool.csproj b/TransactionProcessor.SystemSetupTool/TransactionProcessor.SystemSetupTool.csproj
index 669824b..1cda87b 100644
--- a/TransactionProcessor.SystemSetupTool/TransactionProcessor.SystemSetupTool.csproj
+++ b/TransactionProcessor.SystemSetupTool/TransactionProcessor.SystemSetupTool.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,15 +16,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EstateManagement.Client" Version="1.1.5" />
-    <PackageReference Include="EventStore.Client.Grpc.PersistentSubscriptions" Version="21.2.0" />
-    <PackageReference Include="EventStore.Client.Grpc.ProjectionManagement" Version="21.2.0" />
-    <PackageReference Include="EventStoreProjections" Version="1.0.11" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+    <PackageReference Include="EstateManagement.Client" Version="1.1.6-build21" />
+    <PackageReference Include="EventStore.Client.Grpc.PersistentSubscriptions" Version="22.0.0" />
+    <PackageReference Include="EventStore.Client.Grpc.ProjectionManagement" Version="22.0.0" />
+    <PackageReference Include="EventStoreProjections" Version="1.0.13" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="SecurityService.Client" Version="1.0.8" />
-    <PackageReference Include="Shared" Version="1.3.3" />
+    <PackageReference Include="SecurityService.Client" Version="1.1.2-build23" />
+    <PackageReference Include="Shared" Version="1.5.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/compose-dev.yaml b/compose-dev.yaml
new file mode 100644
index 0000000..a92f701
--- /dev/null
+++ b/compose-dev.yaml
@@ -0,0 +1,12 @@
+services:
+  app:
+    entrypoint:
+    - sleep
+    - infinity
+    image: docker/dev-environments-default:stable-1
+    init: true
+    volumes:
+    - type: bind
+      source: /var/run/docker.sock
+      target: /var/run/docker.sock
+

From 1fa53cc6614bfbd76f21a87505636799915939f5 Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@btinternet.com>
Date: Sat, 19 Nov 2022 07:51:47 +0000
Subject: [PATCH 2/2] Workflow :|

---
 .github/workflows/createrelease.yml | 5 +++++
 .github/workflows/pullrequest.yml   | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/.github/workflows/createrelease.yml b/.github/workflows/createrelease.yml
index 7ed0b27..da19685 100644
--- a/.github/workflows/createrelease.yml
+++ b/.github/workflows/createrelease.yml
@@ -14,6 +14,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
+        
+    - name: Install NET 7
+      uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: '7.0.x'
 
     - name: Get the version
       id: get_version
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index 60e81e4..a8350ae 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -15,6 +15,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
+        
+    - name: Install NET 7
+      uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: '7.0.x'
 
     - name: Restore Nuget Packages
       run: |