From 6e3a8c99c2851b2acb90805fec993a032c28bfeb Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@btinternet.com>
Date: Mon, 27 Oct 2025 16:13:07 +0000
Subject: [PATCH] change to standard sql image

---
 Shared.IntegrationTesting/BaseDockerHelper.cs | 12 +++---------
 Shared/Shared.csproj                          |  6 +++---
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Shared.IntegrationTesting/BaseDockerHelper.cs b/Shared.IntegrationTesting/BaseDockerHelper.cs
index 3611253d..298d6116 100644
--- a/Shared.IntegrationTesting/BaseDockerHelper.cs
+++ b/Shared.IntegrationTesting/BaseDockerHelper.cs
@@ -137,7 +137,7 @@ protected BaseDockerHelper(Boolean skipHealthChecks=false) {
         // Setup the default image details
         SimpleResults.Result<DockerEnginePlatform> engineType = BaseDockerHelper.GetDockerEnginePlatform();
         if (engineType.Data == DockerEnginePlatform.Windows){
-            this.ImageDetails.Add(ContainerType.SqlServer, ("iamrjindal/sqlserverexpress:2019", true));
+            this.ImageDetails.Add(ContainerType.SqlServer, ("iamrjindal/sqlserverexpress:2022", true));
             this.ImageDetails.Add(ContainerType.EventStore, ("stuartferguson/eventstore_windows", true));
             this.ImageDetails.Add(ContainerType.MessagingService, ("stuartferguson/messagingservicewindows:master", true));
             this.ImageDetails.Add(ContainerType.SecurityService, ("stuartferguson/securityservicewindows:master", true));
@@ -148,13 +148,7 @@ protected BaseDockerHelper(Boolean skipHealthChecks=false) {
             this.ImageDetails.Add(ContainerType.TransactionProcessorAcl, ("stuartferguson/transactionprocessoraclwindows:master", true));
         }
         else{
-            if (FdOs.IsLinux()){
-                this.ImageDetails.Add(ContainerType.SqlServer, ("mcr.microsoft.com/mssql/server:2019-latest", true));
-            }
-            else{
-                this.ImageDetails.Add(ContainerType.SqlServer, ("mcr.microsoft.com/azure-sql-edge", true));
-            }
-
+            this.ImageDetails.Add(ContainerType.SqlServer, ("mcr.microsoft.com/mssql/server:2022-latest", true));
             this.ImageDetails.Add(ContainerType.EventStore, ("eventstore/eventstore:24.10.0-jammy", true));
             this.ImageDetails.Add(ContainerType.MessagingService, ("stuartferguson/messagingservice:master", true));
             this.ImageDetails.Add(ContainerType.SecurityService, ("stuartferguson/securityservice:master", true));
@@ -201,7 +195,7 @@ public virtual List<String> GetAdditionalVariables(ContainerType containerType){
         return result;
     }
 
-    public List<String> GetCommonEnvironmentVariables(){
+    public virtual List<String> GetCommonEnvironmentVariables(){
         Int32 securityServicePort = this.GetSecurityServicePort();
 
         String healthCheckConnString = this.SetConnectionString("ConnectionStrings:HealthCheck", "master", this.UseSecureSqlServerDatabase);
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
index 74ef44e1..7078b3b8 100644
--- a/Shared/Shared.csproj
+++ b/Shared/Shared.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="Logger\" />
-    <Folder Include="Results\" />
-    <Folder Include="TennantContext\" />
+    <Compile Remove="Logger\**" />
+    <EmbeddedResource Remove="Logger\**" />
+    <None Remove="Logger\**" />
   </ItemGroup>
 
   <ItemGroup>