Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions Shared.IntegrationTesting/BaseDockerHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
// 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));
Expand All @@ -148,13 +148,7 @@
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));
Expand Down Expand Up @@ -201,7 +195,7 @@
return result;
}

public List<String> GetCommonEnvironmentVariables(){
public virtual List<String> GetCommonEnvironmentVariables(){
Int32 securityServicePort = this.GetSecurityServicePort();

String healthCheckConnString = this.SetConnectionString("ConnectionStrings:HealthCheck", "master", this.UseSecureSqlServerDatabase);
Expand Down Expand Up @@ -855,7 +849,7 @@
try{
await projectionClient.CreateContinuousAsync(projectionName, projection, trackEmittedStreams:true).ConfigureAwait(false);
}
catch (Exception ex) {

Check warning on line 852 in Shared.IntegrationTesting/BaseDockerHelper.cs

View workflow job for this annotation

GitHub Actions / Build and Test Pull Requests - Linux

The variable 'ex' is declared but never used
// ignored
}

Expand Down
6 changes: 3 additions & 3 deletions Shared/Shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading