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

---
 .../TransactionProcessorACL.BusinessLogic.csproj          | 2 +-
 .../Common/DockerHelper.cs                                | 8 ++++++--
 .../TransactionProcessorACL.IntegrationTests.csproj       | 4 ++--
 TransactionProcessorACL/TransactionProcessorACL.csproj    | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj b/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj
index 788dd1c..707c508 100644
--- a/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj
+++ b/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj
@@ -7,7 +7,7 @@
   <ItemGroup>
     <PackageReference Include="MediatR" Version="9.0.0" />
     <PackageReference Include="SecurityService.Client" Version="1.0.5.1" />
-    <PackageReference Include="Shared" Version="1.0.13" />
+    <PackageReference Include="Shared" Version="1.0.14" />
     <PackageReference Include="TransactionProcessor.Client" Version="1.0.11.2" />
   </ItemGroup>
 
diff --git a/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs b/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs
index b674c33..9c60322 100644
--- a/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs
+++ b/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs
@@ -274,10 +274,14 @@ await Retry.For(async () =>
                                                                          "stuartferguson/testhosts",
                                                                          new List<INetworkService>
                                                                          {
-                                                                             testNetwork
+                                                                             testNetwork,
+                                                                             Setup.DatabaseServerNetwork
                                                                          },
                                                                          traceFolder,
-                                                                         dockerCredentials,
+                                                                         dockerCredentials, 
+                                                                         (Setup.SqlServerContainerName,
+                                                                             "sa",
+                                                                             "thisisalongpassword123!"),
                                                                          true);
 
             this.Containers.AddRange(new List<IContainerService>
diff --git a/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj b/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj
index 37e9171..8119079 100644
--- a/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj
+++ b/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="1.0.13" />
+    <PackageReference Include="ClientProxyBase" Version="1.0.14" />
     <PackageReference Include="Ductus.FluentDocker" Version="2.10.7" />
     <PackageReference Include="EstateManagement.Client" Version="1.0.9.2" />
     <PackageReference Include="EstateReporting.Database" Version="1.0.12" />
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="SecurityService.Client" Version="1.0.5.1" />
-    <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" Version="3.5.14" />
     <PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.5.14" />
diff --git a/TransactionProcessorACL/TransactionProcessorACL.csproj b/TransactionProcessorACL/TransactionProcessorACL.csproj
index 5b0b198..1980e10 100644
--- a/TransactionProcessorACL/TransactionProcessorACL.csproj
+++ b/TransactionProcessorACL/TransactionProcessorACL.csproj
@@ -20,7 +20,7 @@
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.1" />
     <PackageReference Include="NLog.Extensions.Logging" Version="1.7.0" />
-    <PackageReference Include="Shared" Version="1.0.13" />
+    <PackageReference Include="Shared" Version="1.0.14" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.1.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.2" />

From 617d9e1322b8647f27835ff03e6f6003deea0fdc Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@btinternet.com>
Date: Wed, 20 Oct 2021 20:31:47 +0100
Subject: [PATCH 2/2] :|

---
 TransactionProcessorACL.IntegrationTests/Common/Setup.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TransactionProcessorACL.IntegrationTests/Common/Setup.cs b/TransactionProcessorACL.IntegrationTests/Common/Setup.cs
index 1d1f390..a2912ea 100644
--- a/TransactionProcessorACL.IntegrationTests/Common/Setup.cs
+++ b/TransactionProcessorACL.IntegrationTests/Common/Setup.cs
@@ -46,7 +46,7 @@ protected static void GlobalSetup()
             // Start the Database Server here
             DatabaseServerContainer = global::Shared.IntegrationTesting.DockerHelper.StartSqlContainerWithOpenConnection(Setup.SqlServerContainerName,
                                                                                        logger,
-                                                                                       "stuartferguson/subscriptionservicedatabasesqlserver",
+                                                                                       "mcr.microsoft.com/mssql/server:2019-latest",
                                                                                        Setup.DatabaseServerNetwork,
                                                                                        "",
                                                                                        dockerCredentials,