From ba1480d3cbb7e690f232df2899ab6b3035bf887e Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@btinternet.com>
Date: Wed, 20 Oct 2021 21:00:29 +0100
Subject: [PATCH 1/2] Update to latest shared nugets

---
 .../FileProcessor.BusinessLogic.csproj                      | 6 +++---
 FileProcessor.Client/FileProcessor.Client.csproj            | 2 +-
 .../FileProcessor.File.DomainEvents.csproj                  | 2 +-
 .../FileProcessor.FileAggregate.csproj                      | 4 ++--
 .../FileProcessor.FileImportLog.DomainEvents.csproj         | 2 +-
 .../FileProcessor.FileImportLogAggregate.csproj             | 2 +-
 FileProcessor.IntegrationTests/Common/DockerHelper.cs       | 6 +++++-
 FileProcessor.IntegrationTests/Common/Setup.cs              | 2 +-
 .../FileProcessor.IntegrationTests.csproj                   | 2 +-
 FileProcessor/FileProcessor.csproj                          | 2 +-
 10 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj b/FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj
index 4e6d234..59444bc 100644
--- a/FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj
+++ b/FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj
@@ -9,10 +9,10 @@
 		<PackageReference Include="EstateReporting.Database" Version="1.0.17-build76" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
 		<PackageReference Include="SecurityService.Client" Version="1.0.6.2" />
-		<PackageReference Include="Shared" Version="1.0.13" />
-		<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.13" />
+		<PackageReference Include="Shared" Version="1.0.14" />
+		<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.14" />
 		<PackageReference Include="MediatR" Version="9.0.0" />
-		<PackageReference Include="Shared.EventStore" Version="1.0.13" />
+		<PackageReference Include="Shared.EventStore" Version="1.0.14" />
 		<PackageReference Include="System.IO.Abstractions" Version="13.2.29" />
 		<PackageReference Include="TransactionProcessor.Client" Version="1.0.12.3" />
 	</ItemGroup>
diff --git a/FileProcessor.Client/FileProcessor.Client.csproj b/FileProcessor.Client/FileProcessor.Client.csproj
index 9164d6f..f6c32b9 100644
--- a/FileProcessor.Client/FileProcessor.Client.csproj
+++ b/FileProcessor.Client/FileProcessor.Client.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="1.0.13" />
+    <PackageReference Include="ClientProxyBase" Version="1.0.14" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/FileProcessor.File.DomainEvents/FileProcessor.File.DomainEvents.csproj b/FileProcessor.File.DomainEvents/FileProcessor.File.DomainEvents.csproj
index c7eeea0..14869b4 100644
--- a/FileProcessor.File.DomainEvents/FileProcessor.File.DomainEvents.csproj
+++ b/FileProcessor.File.DomainEvents/FileProcessor.File.DomainEvents.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.13" />
+		<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.14" />
 	</ItemGroup>
 
 </Project>
diff --git a/FileProcessor.FileAggregate/FileProcessor.FileAggregate.csproj b/FileProcessor.FileAggregate/FileProcessor.FileAggregate.csproj
index 7982552..4194477 100644
--- a/FileProcessor.FileAggregate/FileProcessor.FileAggregate.csproj
+++ b/FileProcessor.FileAggregate/FileProcessor.FileAggregate.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.13" />
-		<PackageReference Include="Shared.EventStore" Version="1.0.13" />
+		<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.14" />
+		<PackageReference Include="Shared.EventStore" Version="1.0.14" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/FileProcessor.FileImportLog.DomainEvents/FileProcessor.FileImportLog.DomainEvents.csproj b/FileProcessor.FileImportLog.DomainEvents/FileProcessor.FileImportLog.DomainEvents.csproj
index 74e64f5..6da5d43 100644
--- a/FileProcessor.FileImportLog.DomainEvents/FileProcessor.FileImportLog.DomainEvents.csproj
+++ b/FileProcessor.FileImportLog.DomainEvents/FileProcessor.FileImportLog.DomainEvents.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.13" />
+    <PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.14" />
   </ItemGroup>
 
 </Project>
diff --git a/FileProcessor.FileImportLogAggregate/FileProcessor.FileImportLogAggregate.csproj b/FileProcessor.FileImportLogAggregate/FileProcessor.FileImportLogAggregate.csproj
index 2949fd5..0db6a05 100644
--- a/FileProcessor.FileImportLogAggregate/FileProcessor.FileImportLogAggregate.csproj
+++ b/FileProcessor.FileImportLogAggregate/FileProcessor.FileImportLogAggregate.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.EventStore" Version="1.0.13" />
+    <PackageReference Include="Shared.EventStore" Version="1.0.14" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/FileProcessor.IntegrationTests/Common/DockerHelper.cs b/FileProcessor.IntegrationTests/Common/DockerHelper.cs
index c56d375..2102ffc 100644
--- a/FileProcessor.IntegrationTests/Common/DockerHelper.cs
+++ b/FileProcessor.IntegrationTests/Common/DockerHelper.cs
@@ -300,10 +300,14 @@ await Retry.For(async () =>
                                                                          "stuartferguson/testhosts",
                                                                          new List<INetworkService>
                                                                          {
-                                                                             testNetwork
+                                                                             testNetwork,
+                                                                             Setup.DatabaseServerNetwork
                                                                          },
                                                                          traceFolder,
                                                                          dockerCredentials,
+                                                                         (Setup.SqlServerContainerName,
+                                                                             "sa",
+                                                                             "thisisalongpassword123!"),
                                                                          true);
 
             IContainerService fileProcessorContainer = SetupFileProcessorContainer(this.FileProcessorContainerName,
diff --git a/FileProcessor.IntegrationTests/Common/Setup.cs b/FileProcessor.IntegrationTests/Common/Setup.cs
index d9b4cdc..0f4b94c 100644
--- a/FileProcessor.IntegrationTests/Common/Setup.cs
+++ b/FileProcessor.IntegrationTests/Common/Setup.cs
@@ -37,7 +37,7 @@ protected static void GlobalSetup()
             // Start the Database Server here
             Setup.DatabaseServerContainer = global::Shared.IntegrationTesting.DockerHelper.StartSqlContainerWithOpenConnection(Setup.SqlServerContainerName,
                 logger,
-                "stuartferguson/subscriptionservicedatabasesqlserver",
+                "mcr.microsoft.com/mssql/server:2019-latest",
                 Setup.DatabaseServerNetwork,
                 "",
                 dockerCredentials,
diff --git a/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj b/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj
index 59e8638..e21e532 100644
--- a/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj
+++ b/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj
@@ -17,7 +17,7 @@
 	  <PackageReference Include="EventStore.Client.Grpc.Streams" Version="20.10.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="SecurityService.Client" Version="1.0.6.2" />
-    <PackageReference Include="Shared.IntegrationTesting" Version="1.0.13" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="1.0.14" />
     <PackageReference Include="Shouldly" Version="4.0.3" />
     <PackageReference Include="SpecFlow.xUnit" Version="3.7.38" />
     <PackageReference Include="xunit" Version="2.4.1" />
diff --git a/FileProcessor/FileProcessor.csproj b/FileProcessor/FileProcessor.csproj
index 5c1b254..f7ec2d0 100644
--- a/FileProcessor/FileProcessor.csproj
+++ b/FileProcessor/FileProcessor.csproj
@@ -16,7 +16,7 @@
 	  <PackageReference Include="AspNetCore.HealthChecks.Uris" Version="5.0.1" />
 	  <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.13" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.2" />
-    <PackageReference Include="Shared" Version="1.0.13" />
+    <PackageReference Include="Shared" Version="1.0.14" />
 	  <PackageReference Include="NLog.Extensions.Logging" Version="1.7.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />

From 2eb89949b9e02c8e5fa4550b030f60586f6608e9 Mon Sep 17 00:00:00 2001
From: StuartFerguson <stuart_ferguson1@btinternet.com>
Date: Wed, 20 Oct 2021 21:23:30 +0100
Subject: [PATCH 2/2] Update appsettings.json

---
 FileProcessor/appsettings.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FileProcessor/appsettings.json b/FileProcessor/appsettings.json
index ea2261d..473b773 100644
--- a/FileProcessor/appsettings.json
+++ b/FileProcessor/appsettings.json
@@ -5,6 +5,7 @@
   "AppSettings": {
     "FileProfilePollingWindowInSeconds": 20,
     "SubscriptionFilter": "FileProcessor",
+    "UseInternalSubscriptionService": "true", 
     "ClientId": "serviceClient",
     "ClientSecret": "d192cbc46d834d0da90e8a9d50ded543",
     "EventHandlerConfiguration": {