From 51d03e994db1925d27997d956f16bfe3b18f2905 Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1development@outlook.com>
Date: Sat, 29 Nov 2025 15:17:18 +0000
Subject: [PATCH 1/2] shared nuget updates

---
 .../SecurityService.BusinessLogic.csproj      |   6 +-
 .../SecurityService.Client.csproj             |   4 +-
 .../SecurityService.Database.csproj           |   2 +-
 ...yService.IntegrationTesting.Helpers.csproj |   2 +-
 .../Common/DockerHelper.cs                    |   6 +-
 .../Common/GenericSteps.cs                    |   2 -
 .../Common/Setup.cs                           |  25 ----
 .../SecurityService.IntegrationTests.csproj   |   2 +-
 .../Common/DockerHelper.cs                    | 122 +++++++-----------
 .../Common/GenericSteps.cs                    |   2 -
 .../Common/Hooks.cs                           |   2 +-
 .../Common/Setup.cs                           |  26 +---
 ...vice.OpenIdConnect.IntegrationTests.csproj |   2 +-
 .../UserLogin/UserLoginSteps.cs               |   3 +-
 .../SecurityService.UserInterface.csproj      |   2 +-
 SecurityService/SecurityService.csproj        |   6 +-
 .../SecurityServiceTestUI.csproj              |   2 +-
 SecurityServiceTestUI/Startup.cs              |  18 +--
 18 files changed, 76 insertions(+), 158 deletions(-)

diff --git a/SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj b/SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj
index 534f31e..e605643 100644
--- a/SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj
+++ b/SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj
@@ -9,15 +9,15 @@
     <PackageReference Include="Duende.IdentityServer.EntityFramework.Storage" Version="7.3.2" />
     <PackageReference Include="Duende.IdentityServer.Storage" Version="7.3.2" />
     <PackageReference Include="MediatR" Version="13.1.0" />
-    <PackageReference Include="MessagingService.Client" Version="2025.8.1" />
+    <PackageReference Include="MessagingService.Client" Version="2025.10.2-build106" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.10" />
     <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.3.1" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.10" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10" />
     <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.10" />
-    <PackageReference Include="Shared" Version="2025.10.2" />
-    <PackageReference Include="Shared.Results" Version="2025.10.2" />
+    <PackageReference Include="Shared" Version="2025.11.11" />
+    <PackageReference Include="Shared.Results" Version="2025.11.11" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SecurityService.Client/SecurityService.Client.csproj b/SecurityService.Client/SecurityService.Client.csproj
index f2ac99a..616d329 100644
--- a/SecurityService.Client/SecurityService.Client.csproj
+++ b/SecurityService.Client/SecurityService.Client.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="2025.10.2" />
-    <PackageReference Include="Shared.Results" Version="2025.10.2" />
+    <PackageReference Include="ClientProxyBase" Version="2025.11.11" />
+    <PackageReference Include="Shared.Results" Version="2025.11.11" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SecurityService.Database/SecurityService.Database.csproj b/SecurityService.Database/SecurityService.Database.csproj
index 8fa1b0d..e81711d 100644
--- a/SecurityService.Database/SecurityService.Database.csproj
+++ b/SecurityService.Database/SecurityService.Database.csproj
@@ -22,7 +22,7 @@
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10" />
-		<PackageReference Include="Shared" Version="2025.10.2" />
+		<PackageReference Include="Shared" Version="2025.11.11" />
 	</ItemGroup>
 	<ItemGroup>
     <Folder Include="DbContexts\" />
diff --git a/SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj b/SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj
index d360859..c8afba4 100644
--- a/SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj
+++ b/SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj
@@ -19,7 +19,7 @@
     <!--<PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="1.0.1" />
     <PackageReference Include="Reqnroll.xUnit" Version="1.0.1" />-->
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10" />
-    <PackageReference Include="Shared.IntegrationTesting" Version="2025.10.2" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="2025.11.11" />
     <!--<PackageReference Include="Shouldly" Version="4.2.1" />-->
     <!--<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
 	    <PrivateAssets>all</PrivateAssets>
diff --git a/SecurityService.IntegrationTests/Common/DockerHelper.cs b/SecurityService.IntegrationTests/Common/DockerHelper.cs
index 11478c9..e830d4d 100644
--- a/SecurityService.IntegrationTests/Common/DockerHelper.cs
+++ b/SecurityService.IntegrationTests/Common/DockerHelper.cs
@@ -23,7 +23,7 @@ namespace SecurityService.IntergrationTests.Common
     using Microsoft.EntityFrameworkCore;
     using Shared.IntegrationTesting;
     
-    public class DockerHelper : Shared.IntegrationTesting.DockerHelper
+    public class DockerHelper : Shared.IntegrationTesting.TestContainers.DockerHelper
     {
         public ISecurityServiceClient SecurityServiceClient;
                 
@@ -38,7 +38,7 @@ public async Task StartContainersForScenarioRun(String scenarioName, DockerServi
             ServicePointManager.SecurityProtocol = SecurityProtocolType.SystemDefault;
         }
 
-        public override ContainerBuilder SetupSecurityServiceContainer()
+        /*public override DotNet.Testcontainers.Builders.ContainerBuilder SetupSecurityServiceContainer()
         {
             
             this.Trace("About to Start Security Container");
@@ -88,7 +88,7 @@ public override ContainerBuilder SetupSecurityServiceContainer()
 
             // Now build and return the container                
             return securityServiceContainer;
-        }
+        }*/
         
         public override async Task CreateSubscriptions(){
             // No subscriptions needed
diff --git a/SecurityService.IntegrationTests/Common/GenericSteps.cs b/SecurityService.IntegrationTests/Common/GenericSteps.cs
index f44f01a..cabf07d 100644
--- a/SecurityService.IntegrationTests/Common/GenericSteps.cs
+++ b/SecurityService.IntegrationTests/Common/GenericSteps.cs
@@ -50,8 +50,6 @@ public async Task StartSystem()
 
             await Setup.GlobalSetup(this.TestingContext.DockerHelper);
 
-            this.TestingContext.DockerHelper.SqlServerContainer = Setup.DatabaseServerContainer;
-            this.TestingContext.DockerHelper.SqlServerNetwork = Setup.DatabaseServerNetwork;
             this.TestingContext.DockerHelper.DockerCredentials = Setup.DockerCredentials;
             this.TestingContext.DockerHelper.SqlCredentials = Setup.SqlCredentials;
             this.TestingContext.DockerHelper.SqlServerContainerName = "sharedsqlserver";
diff --git a/SecurityService.IntegrationTests/Common/Setup.cs b/SecurityService.IntegrationTests/Common/Setup.cs
index 9744869..2055d22 100644
--- a/SecurityService.IntegrationTests/Common/Setup.cs
+++ b/SecurityService.IntegrationTests/Common/Setup.cs
@@ -25,31 +25,6 @@ public class Setup
         public static async Task GlobalSetup(DockerHelper dockerHelper)
         {
             ShouldlyConfiguration.DefaultTaskTimeout = TimeSpan.FromMinutes(1);
-            dockerHelper.SqlCredentials = Setup.SqlCredentials;
-            dockerHelper.DockerCredentials = Setup.DockerCredentials;
-            dockerHelper.SqlServerContainerName = "sharedsqlserver";
-
-            // Only one thread can execute this block at a time
-            lock (Setup.padLock)
-            {
-                Setup.DatabaseServerNetwork = dockerHelper.SetupTestNetwork("sharednetwork");
-
-                dockerHelper.Logger.LogInformation("in start SetupSqlServerContainer");
-                Setup.DatabaseServerContainer = dockerHelper.SetupSqlServerContainer(Setup.DatabaseServerNetwork).Result;
-            }
-        }
-
-        public static String GetConnectionString(String databaseName)
-        {
-            return $"server={Setup.DatabaseServerContainer.Name};database={databaseName};user id={Setup.SqlCredentials.usename};password={Setup.SqlCredentials.password}";
         }
-
-        public static String GetLocalConnectionString(String databaseName)
-        {
-            Int32 databaseHostPort = Setup.DatabaseServerContainer.ToHostExposedEndpoint("1433/tcp").Port;
-
-            return $"server=localhost,{databaseHostPort};database={databaseName};user id={Setup.SqlCredentials.usename};password={Setup.SqlCredentials.password}";
-        }
-
     }
 }
diff --git a/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj b/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj
index 8c85663..0b63003 100644
--- a/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj
+++ b/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
     <PackageReference Include="Reqnroll.NUnit" Version="3.2.0" />
 
-    <PackageReference Include="Shared.IntegrationTesting" Version="2025.10.2" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="2025.11.11" />
     <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
     
diff --git a/SecurityService.OpenIdConnect.IntegrationTests/Common/DockerHelper.cs b/SecurityService.OpenIdConnect.IntegrationTests/Common/DockerHelper.cs
index 9d8059d..f4c8aa2 100644
--- a/SecurityService.OpenIdConnect.IntegrationTests/Common/DockerHelper.cs
+++ b/SecurityService.OpenIdConnect.IntegrationTests/Common/DockerHelper.cs
@@ -1,4 +1,10 @@
-namespace SecurityService.IntergrationTests.Common
+using System.Runtime.InteropServices;
+using DotNet.Testcontainers.Builders;
+using DotNet.Testcontainers.Containers;
+using DotNet.Testcontainers.Networks;
+using Shared.IntegrationTesting.TestContainers;
+
+namespace SecurityService.IntergrationTests.Common
 {
     using System;
     using System.Collections.Generic;
@@ -10,14 +16,6 @@
     using System.Threading;
     using System.Threading.Tasks;
     using Client;
-    using Ductus.FluentDocker;
-    using Ductus.FluentDocker.Builders;
-    using Ductus.FluentDocker.Commands;
-    using Ductus.FluentDocker.Common;
-    using Ductus.FluentDocker.Executors;
-    using Ductus.FluentDocker.Model.Builders;
-    using Ductus.FluentDocker.Services;
-    using Ductus.FluentDocker.Services.Extensions;
     using Newtonsoft.Json;
     using Shared.HealthChecks;
     using Shared.IntegrationTesting;
@@ -28,7 +26,7 @@
     /// 
     /// </summary>
     /// <seealso cref="Shared.IntegrationTesting.DockerHelper" />
-    public class DockerHelper : Shared.IntegrationTesting.DockerHelper
+    public class DockerHelper : Shared.IntegrationTesting.TestContainers.DockerHelper
     {
         #region Fields
 
@@ -94,16 +92,6 @@ public override async Task StartContainersForScenarioRun(String scenarioName, Do
 
             securityServiceBaseAddressResolver = api => $"https://localhost:{this.SecurityServicePort}";
 
-
-
-            //IContainerService securityServiceTestUIContainer = SetupSecurityServiceTestUIContainer(this.SecurityServiceTestUIContainerName,
-            //                                                                                                    this.SecurityServiceContainerName,
-            //                                                                                                    this.SecurityServicePort,
-            //                                                                                                    this.TestNetworks,
-            //                                                                                                    ("estateUIClient", "Secret1"));
-
-            //
-
             this.SecurityServiceClient = new SecurityServiceClient(securityServiceBaseAddressResolver, httpClient);
 
             //this.Containers.AddRange(new List<IContainerService>
@@ -135,39 +123,25 @@ await Retry.For(async () => {
                             TimeSpan.FromSeconds(20));
         }
 
-        protected async Task<IContainerService> StartContainer(Func<ContainerBuilder> buildContainerFunc, List<INetworkService> networkServices)
+        protected async Task StartContainer(Func<ContainerBuilder> buildContainerFunc, List<INetwork> networkServices)
         {
-            ConsoleStream<String> consoleLogs = null;
-            try
+           try
             {
                 var containerBuilder = buildContainerFunc();
 
-                IContainerService builtContainer = containerBuilder.Build();
-                consoleLogs = builtContainer.Logs(true);
-                var startedContainer = builtContainer.Start();
-                foreach (INetworkService networkService in networkServices)
-                {
-                    networkService.Attach(startedContainer, false);
+                foreach (INetwork networkService in networkServices) {
+                    containerBuilder = containerBuilder.WithNetwork(networkService);
                 }
-
+                IContainer builtContainer = containerBuilder.Build();
+                await builtContainer.StartAsync();
                 this.Trace($"Test UI Container Started");
-                this.Containers.Add((DockerServices.SecurityService, startedContainer));
 
-                this.SecurityServiceTestUIPort = startedContainer.ToHostExposedEndpoint("5004/tcp").Port;
+                this.SecurityServiceTestUIPort = builtContainer.GetMappedPublicPort(5004);
 
                 await this.DoTestUIHealthCheck();
-                
-                return startedContainer;
             }
             catch (Exception ex)
             {
-                if (consoleLogs != null){
-                    while (consoleLogs.IsFinished == false){
-                        var s = consoleLogs.TryRead(10000);
-                        this.Trace(s);
-                    }
-                }
-
                 this.Error($"Error starting container [{buildContainerFunc.Method.Name}]", ex);
                 throw;
             }
@@ -181,14 +155,14 @@ protected async Task<IContainerService> StartContainer(Func<ContainerBuilder> bu
         private static void AddEntryToHostsFile(String ipaddress,
                                                 String hostname)
         {
-            if (FdOs.IsWindows())
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
                 using(StreamWriter w = File.AppendText(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), @"drivers\etc\hosts")))
                 {
                     w.WriteLine($"{ipaddress} {hostname}");
                 }
             }
-            else if (BaseDockerHelper.GetDockerEnginePlatform().Data == DockerEnginePlatform.Linux)
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
             {
                 DockerHelper.ExecuteBashCommand($"echo {ipaddress} {hostname} | sudo tee -a /etc/hosts");
             }
@@ -222,21 +196,22 @@ private static void ExecuteBashCommand(String command)
             proc.WaitForExit();
         }
         
-        private const String SetupSecurityServiceTestUIContainerName = "";
-
         private ContainerBuilder SetupSecurityServiceTestUIContainer(){
 
             var clientDetails = ("estateUIClient", "Secret1");
+            Dictionary<String, String> environmentVariables = new Dictionary<String, String>();
+            environmentVariables.Add($"AppSettings:Authority",$"https://identity-server:{this.SecurityServicePort}");
+            environmentVariables.Add($"AppSettings:ClientId",clientDetails.Item1);
+            environmentVariables.Add($"AppSettings:ClientSecret",clientDetails.Item2);
+            environmentVariables.Add("urls","https://*:5004");
+            environmentVariables.Add("Logging:LogLevel:Microsoft","Information");
+            environmentVariables.Add("Logging:LogLevel:Default","Information");
+            environmentVariables.Add("Logging:EventLog:LogLevel:Default","None");
 
-            ContainerBuilder securityServiceTestUIContainer = new Builder().UseContainer().WithName(this.SecurityServiceTestUIContainerName)
-                                                                           .WithEnvironment($"AppSettings:Authority=https://identity-server:{this.SecurityServicePort}",
-                                                                                            $"AppSettings:ClientId={clientDetails.Item1}",
-                                                                                            $"AppSettings:ClientSecret={clientDetails.Item2}",
-                                                                                            "urls=https://*:5004",
-                                                                                            "Logging:LogLevel:Microsoft=Information",
-                                                                                            "Logging:LogLevel:Default=Information",
-                                                                                            "Logging:EventLog:LogLevel:Default=None")
-                                                                           .UseImage("securityservicetestui").ExposePort(5004);
+
+
+            ContainerBuilder securityServiceTestUIContainer = new ContainerBuilder().WithName(this.SecurityServiceTestUIContainerName)
+                .WithEnvironment(environmentVariables).WithImage("securityservicetestui").WithPortBinding(5004);
 
             return securityServiceTestUIContainer;
         }
@@ -245,39 +220,36 @@ public override ContainerBuilder SetupSecurityServiceContainer()
         {
             this.Trace("About to Start Security Container");
 
-            List<String> environmentVariables = this.GetCommonEnvironmentVariables();
-            environmentVariables.Add($"ServiceOptions:PublicOrigin=https://{this.SecurityServiceContainerName}:{DockerPorts.SecurityServiceDockerPort}");
-            environmentVariables.Add($"ServiceOptions:IssuerUrl=https://{this.SecurityServiceContainerName}:{DockerPorts.SecurityServiceDockerPort}");
-            environmentVariables.Add("ASPNETCORE_ENVIRONMENT=IntegrationTest");
-            environmentVariables.Add($"urls=https://*:{DockerPorts.SecurityServiceDockerPort}");
+            var environmentVariables = this.GetCommonEnvironmentVariables();
+            environmentVariables.Add($"ServiceOptions:PublicOrigin",$"https://{this.SecurityServiceContainerName}:{DockerPorts.SecurityServiceDockerPort}");
+            environmentVariables.Add($"ServiceOptions:IssuerUrl",$"https://{this.SecurityServiceContainerName}:{DockerPorts.SecurityServiceDockerPort}");
+            environmentVariables.Add("ASPNETCORE_ENVIRONMENT","IntegrationTest");
+            environmentVariables.Add($"urls",$"https://*:{DockerPorts.SecurityServiceDockerPort}");
 
-            environmentVariables.Add($"ServiceOptions:PasswordOptions:RequiredLength=6");
-            environmentVariables.Add($"ServiceOptions:PasswordOptions:RequireDigit=false");
-            environmentVariables.Add($"ServiceOptions:PasswordOptions:RequireUpperCase=false");
-            environmentVariables.Add($"ServiceOptions:UserOptions:RequireUniqueEmail=false");
-            environmentVariables.Add($"ServiceOptions:SignInOptions:RequireConfirmedEmail=false");
+            environmentVariables.Add($"ServiceOptions:PasswordOptions:RequiredLength","6");
+            environmentVariables.Add($"ServiceOptions:PasswordOptions:RequireDigit","false");
+            environmentVariables.Add($"ServiceOptions:PasswordOptions:RequireUpperCase","false");
+            environmentVariables.Add($"ServiceOptions:UserOptions:RequireUniqueEmail","false");
+            environmentVariables.Add($"ServiceOptions:SignInOptions:RequireConfirmedEmail","false");
 
-            environmentVariables.Add(this.SetConnectionString("ConnectionStrings:PersistedGrantDbContext", $"PersistedGrantStore-{this.TestId}", this.UseSecureSqlServerDatabase));
-            environmentVariables.Add(this.SetConnectionString("ConnectionStrings:ConfigurationDbContext", $"Configuration-{this.TestId}", this.UseSecureSqlServerDatabase));
-            environmentVariables.Add(this.SetConnectionString("ConnectionStrings:AuthenticationDbContext", $"Authentication-{this.TestId}", this.UseSecureSqlServerDatabase));
+            environmentVariables.Add("ConnectionStrings:PersistedGrantDbContext",this.SetConnectionString($"PersistedGrantStore-{this.TestId}", this.UseSecureSqlServerDatabase));
+            environmentVariables.Add("ConnectionStrings:ConfigurationDbContext", this.SetConnectionString( $"Configuration-{this.TestId}", this.UseSecureSqlServerDatabase));
+            environmentVariables.Add("ConnectionStrings:AuthenticationDbContext", this.SetConnectionString($"Authentication-{this.TestId}", this.UseSecureSqlServerDatabase));
 
-            List<String> additionalEnvironmentVariables = this.GetAdditionalVariables(ContainerType.SecurityService);
+            Dictionary<String, String> additionalEnvironmentVariables = this.GetAdditionalVariables(ContainerType.SecurityService);
 
             if (additionalEnvironmentVariables != null)
             {
-                environmentVariables.AddRange(additionalEnvironmentVariables);
+                foreach (KeyValuePair<String, String> additionalEnvironmentVariable in additionalEnvironmentVariables) {
+                    environmentVariables.Add(additionalEnvironmentVariable.Key, additionalEnvironmentVariable.Value);
+                }
             }
 
             var imageDetailsResult = this.GetImageDetails(ContainerType.SecurityService);
             if (imageDetailsResult.IsFailed)
                 throw new Exception($"Image details not found for {ContainerType.SecurityService}");
 
-            ContainerBuilder securityServiceContainer = new Builder().UseContainer().WithName(this.SecurityServiceContainerName)
-                                                                     .WithEnvironment(environmentVariables.ToArray())
-                                                                     .UseImageDetails(imageDetailsResult.Data)
-                                                                     .ExposePort(DockerPorts.SecurityServiceDockerPort, DockerPorts.SecurityServiceDockerPort)
-                                                                     .MountHostFolder(this.DockerPlatform, this.HostTraceFolder)
-                                                                     .SetDockerCredentials(this.DockerCredentials);
+            ContainerBuilder securityServiceContainer = new ContainerBuilder().WithName(this.SecurityServiceContainerName).WithEnvironment(environmentVariables).WithImage(imageDetailsResult.Data.imageName).WithPortBinding(DockerPorts.SecurityServiceDockerPort, DockerPorts.SecurityServiceDockerPort).MountHostFolder(this.DockerPlatform, this.HostTraceFolder);
 
             return securityServiceContainer;
         }
diff --git a/SecurityService.OpenIdConnect.IntegrationTests/Common/GenericSteps.cs b/SecurityService.OpenIdConnect.IntegrationTests/Common/GenericSteps.cs
index 001f12f..6af97f9 100644
--- a/SecurityService.OpenIdConnect.IntegrationTests/Common/GenericSteps.cs
+++ b/SecurityService.OpenIdConnect.IntegrationTests/Common/GenericSteps.cs
@@ -44,8 +44,6 @@ public async Task StartSystem()
 
             await Setup.GlobalSetup(this.TestingContext.DockerHelper);
 
-            this.TestingContext.DockerHelper.SqlServerContainer = Setup.DatabaseServerContainer;
-            this.TestingContext.DockerHelper.SqlServerNetwork = Setup.DatabaseServerNetwork;
             this.TestingContext.DockerHelper.DockerCredentials = Setup.DockerCredentials;
             this.TestingContext.DockerHelper.SqlCredentials = Setup.SqlCredentials;
             this.TestingContext.DockerHelper.SqlServerContainerName = "sharedsqlserver";
diff --git a/SecurityService.OpenIdConnect.IntegrationTests/Common/Hooks.cs b/SecurityService.OpenIdConnect.IntegrationTests/Common/Hooks.cs
index 7cc97e0..17c652e 100644
--- a/SecurityService.OpenIdConnect.IntegrationTests/Common/Hooks.cs
+++ b/SecurityService.OpenIdConnect.IntegrationTests/Common/Hooks.cs
@@ -71,7 +71,7 @@ public async Task BeforeScenario()
             {
                 ChromeOptions options = new ChromeOptions();
                 options.AddArguments("--disable-gpu");
-                options.AddArguments("--headless");
+                //options.AddArguments("--headless");
                 options.AddArguments("--no-sandbox");
                 options.AddArguments("--disable-dev-shm-usage");
                 options.AddArguments("disable-infobars");
diff --git a/SecurityService.OpenIdConnect.IntegrationTests/Common/Setup.cs b/SecurityService.OpenIdConnect.IntegrationTests/Common/Setup.cs
index fb667c5..6e522bd 100644
--- a/SecurityService.OpenIdConnect.IntegrationTests/Common/Setup.cs
+++ b/SecurityService.OpenIdConnect.IntegrationTests/Common/Setup.cs
@@ -23,31 +23,7 @@ public class Setup
         public static async Task GlobalSetup(DockerHelper dockerHelper)
         {
             ShouldlyConfiguration.DefaultTaskTimeout = TimeSpan.FromMinutes(1);
-            dockerHelper.SqlCredentials = Setup.SqlCredentials;
-            dockerHelper.DockerCredentials = Setup.DockerCredentials;
-            dockerHelper.SqlServerContainerName = "sharedsqlserver";
-
-            // Only one thread can execute this block at a time
-            lock (Setup.padLock)
-            {
-                Setup.DatabaseServerNetwork = dockerHelper.SetupTestNetwork("sharednetwork");
-
-                dockerHelper.Logger.LogInformation("in start SetupSqlServerContainer");
-                Setup.DatabaseServerContainer = dockerHelper.SetupSqlServerContainer(Setup.DatabaseServerNetwork).Result;
-            }
-        }
-
-        public static String GetConnectionString(String databaseName)
-        {
-            return $"server={Setup.DatabaseServerContainer.Name};database={databaseName};user id={Setup.SqlCredentials.usename};password={Setup.SqlCredentials.password}";
         }
-
-        public static String GetLocalConnectionString(String databaseName)
-        {
-            Int32 databaseHostPort = Setup.DatabaseServerContainer.ToHostExposedEndpoint("1433/tcp").Port;
-
-            return $"server=localhost,{databaseHostPort};database={databaseName};user id={Setup.SqlCredentials.usename};password={Setup.SqlCredentials.password}";
-        }
-
+        
     }
 }
diff --git a/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj b/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj
index a8bb843..06b60b7 100644
--- a/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj
+++ b/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj
@@ -24,7 +24,7 @@
     
     <PackageReference Include="Selenium.Support" Version="4.38.0" />
     <PackageReference Include="Selenium.WebDriver" Version="4.38.0" />
-    <PackageReference Include="Shared.IntegrationTesting" Version="2025.10.2" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="2025.11.11" />
     <PackageReference Include="coverlet.collector" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/SecurityService.OpenIdConnect.IntegrationTests/UserLogin/UserLoginSteps.cs b/SecurityService.OpenIdConnect.IntegrationTests/UserLogin/UserLoginSteps.cs
index b2718a9..3f42726 100644
--- a/SecurityService.OpenIdConnect.IntegrationTests/UserLogin/UserLoginSteps.cs
+++ b/SecurityService.OpenIdConnect.IntegrationTests/UserLogin/UserLoginSteps.cs
@@ -160,8 +160,7 @@ public async Task ThenIGetAWelcomeEmailWithMyLoginDetails()
 
 
         [When(@"I navigate to the confirm email address")]
-        public void WhenINavigateToTheConfirmEmailAddress()
-        {
+        public void WhenINavigateToTheConfirmEmailAddress() {
             this.WebDriver.Navigate().GoToUrl(this.TestingContext.ConfirmEmailAddressLink);
         }
 
diff --git a/SecurityService.UserInterface/SecurityService.UserInterface.csproj b/SecurityService.UserInterface/SecurityService.UserInterface.csproj
index eaad79e..8aceac9 100644
--- a/SecurityService.UserInterface/SecurityService.UserInterface.csproj
+++ b/SecurityService.UserInterface/SecurityService.UserInterface.csproj
@@ -16,7 +16,7 @@
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.10" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10" />
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10" />
-		<PackageReference Include="Shared" Version="2025.10.2" />
+		<PackageReference Include="Shared" Version="2025.11.11" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/SecurityService/SecurityService.csproj b/SecurityService/SecurityService.csproj
index 89dca23..62aa01f 100644
--- a/SecurityService/SecurityService.csproj
+++ b/SecurityService/SecurityService.csproj
@@ -32,10 +32,10 @@
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10" />
 	  <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
-	  <PackageReference Include="ClientProxyBase" Version="2025.10.2" />
+	  <PackageReference Include="ClientProxyBase" Version="2025.11.11" />
     <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
-	  <PackageReference Include="Shared" Version="2025.10.2" />
-    <PackageReference Include="Shared.Results.Web" Version="2025.10.2" />
+	  <PackageReference Include="Shared" Version="2025.11.11" />
+    <PackageReference Include="Shared.Results.Web" Version="2025.11.11" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="9.0.6" />
     <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="9.0.1" />
diff --git a/SecurityServiceTestUI/SecurityServiceTestUI.csproj b/SecurityServiceTestUI/SecurityServiceTestUI.csproj
index 81b07a1..93f5b27 100644
--- a/SecurityServiceTestUI/SecurityServiceTestUI.csproj
+++ b/SecurityServiceTestUI/SecurityServiceTestUI.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.10" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
-    <PackageReference Include="Shared" Version="2025.10.2" />
+    <PackageReference Include="Shared" Version="2025.11.11" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SecurityServiceTestUI/Startup.cs b/SecurityServiceTestUI/Startup.cs
index 269b898..0a9c6a5 100644
--- a/SecurityServiceTestUI/Startup.cs
+++ b/SecurityServiceTestUI/Startup.cs
@@ -97,16 +97,16 @@ public void ConfigureServices(IServiceCollection services)
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
-            if (env.IsDevelopment())
-            {
+            //if (env.IsDevelopment())
+            //{
                 app.UseDeveloperExceptionPage();
-            }
-            else
-            {
-                app.UseExceptionHandler("/Home/Error");
-                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-                app.UseHsts();
-            }
+            //}
+            //else
+            //{
+            //    app.UseExceptionHandler("/Home/Error");
+            //    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+            //    app.UseHsts();
+            //}
             app.UseHttpsRedirection();
             app.UseStaticFiles();
 

From df7236f19543e73f742c56976b41eba893f33811 Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1development@outlook.com>
Date: Sun, 30 Nov 2025 14:47:09 +0000
Subject: [PATCH 2/2] try fix failing tests

---
 .../Common/DockerHelper.cs                       | 16 ++++++++--------
 .../Common/GenericSteps.cs                       |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/SecurityService.OpenIdConnect.IntegrationTests/Common/DockerHelper.cs b/SecurityService.OpenIdConnect.IntegrationTests/Common/DockerHelper.cs
index f4c8aa2..60a4229 100644
--- a/SecurityService.OpenIdConnect.IntegrationTests/Common/DockerHelper.cs
+++ b/SecurityService.OpenIdConnect.IntegrationTests/Common/DockerHelper.cs
@@ -1,5 +1,6 @@
 using System.Runtime.InteropServices;
 using DotNet.Testcontainers.Builders;
+using DotNet.Testcontainers.Configurations;
 using DotNet.Testcontainers.Containers;
 using DotNet.Testcontainers.Networks;
 using Shared.IntegrationTesting.TestContainers;
@@ -84,7 +85,7 @@ public override async Task CreateSubscriptions(){
         /// <param name="scenarioName">Name of the scenario.</param>
         public override async Task StartContainersForScenarioRun(String scenarioName, DockerServices dockerServices)
         {
-            this.Trace($"Test Id is {this.TestId} and Scenrio {scenarioName}");
+            this.Trace($"Test Id is {this.TestId} and Scenario {scenarioName}");
 
             await base.StartContainersForScenarioRun(scenarioName,dockerServices);
 
@@ -94,11 +95,6 @@ public override async Task StartContainersForScenarioRun(String scenarioName, Do
 
             this.SecurityServiceClient = new SecurityServiceClient(securityServiceBaseAddressResolver, httpClient);
 
-            //this.Containers.AddRange(new List<IContainerService>
-            //                         {
-            //                             securityServiceTestUIContainer
-            //                         });
-
             DockerHelper.AddEntryToHostsFile("127.0.0.1", SecurityServiceContainerName);
             DockerHelper.AddEntryToHostsFile("localhost", SecurityServiceContainerName);
         }
@@ -138,6 +134,10 @@ protected async Task StartContainer(Func<ContainerBuilder> buildContainerFunc, L
 
                 this.SecurityServiceTestUIPort = builtContainer.GetMappedPublicPort(5004);
 
+                this.Containers.AddRange(new List<(DockerServices, IContainer)> {
+                    (DockerServices.None,builtContainer)
+                });
+
                 await this.DoTestUIHealthCheck();
             }
             catch (Exception ex)
@@ -203,7 +203,7 @@ private ContainerBuilder SetupSecurityServiceTestUIContainer(){
             environmentVariables.Add($"AppSettings:Authority",$"https://identity-server:{this.SecurityServicePort}");
             environmentVariables.Add($"AppSettings:ClientId",clientDetails.Item1);
             environmentVariables.Add($"AppSettings:ClientSecret",clientDetails.Item2);
-            environmentVariables.Add("urls","https://*:5004");
+            //environmentVariables.Add("urls","https://*:5004");
             environmentVariables.Add("Logging:LogLevel:Microsoft","Information");
             environmentVariables.Add("Logging:LogLevel:Default","Information");
             environmentVariables.Add("Logging:EventLog:LogLevel:Default","None");
@@ -211,7 +211,7 @@ private ContainerBuilder SetupSecurityServiceTestUIContainer(){
 
 
             ContainerBuilder securityServiceTestUIContainer = new ContainerBuilder().WithName(this.SecurityServiceTestUIContainerName)
-                .WithEnvironment(environmentVariables).WithImage("securityservicetestui").WithPortBinding(5004);
+                .WithEnvironment(environmentVariables).WithImage("securityservicetestui").WithPortBinding(5004, true);
 
             return securityServiceTestUIContainer;
         }
diff --git a/SecurityService.OpenIdConnect.IntegrationTests/Common/GenericSteps.cs b/SecurityService.OpenIdConnect.IntegrationTests/Common/GenericSteps.cs
index 6af97f9..472bb5c 100644
--- a/SecurityService.OpenIdConnect.IntegrationTests/Common/GenericSteps.cs
+++ b/SecurityService.OpenIdConnect.IntegrationTests/Common/GenericSteps.cs
@@ -58,7 +58,7 @@ public async Task StartSystem()
 
         [AfterScenario]
         public async Task StopSystem(){
-            DockerServices sharedDockerServices = DockerServices.SqlServer;
+            DockerServices sharedDockerServices = DockerServices.None;
             this.TestingContext.DockerHelper.Logger.LogInformation("About to Stop Containers for Scenario Run");
             await this.TestingContext.DockerHelper.StopContainersForScenarioRun(sharedDockerServices).ConfigureAwait(false);
             this.TestingContext.DockerHelper.Logger.LogInformation("Containers for Scenario Run Stopped");