diff --git a/ClientProxyBase/ClientProxyBase.csproj b/ClientProxyBase/ClientProxyBase.csproj index 498fea06..7677d47c 100644 --- a/ClientProxyBase/ClientProxyBase.csproj +++ b/ClientProxyBase/ClientProxyBase.csproj @@ -5,11 +5,11 @@ - - + + - + diff --git a/Driver/Driver.csproj b/Driver/Driver.csproj index 2b9e8309..118fdd22 100644 --- a/Driver/Driver.csproj +++ b/Driver/Driver.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/Shared.EventStore.Tests/Shared.EventStore.Tests.csproj b/Shared.EventStore.Tests/Shared.EventStore.Tests.csproj index e62b76c9..2aa8317b 100644 --- a/Shared.EventStore.Tests/Shared.EventStore.Tests.csproj +++ b/Shared.EventStore.Tests/Shared.EventStore.Tests.csproj @@ -13,13 +13,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/Shared.EventStore/Shared.EventStore.csproj b/Shared.EventStore/Shared.EventStore.csproj index 64410b46..08b7d15f 100644 --- a/Shared.EventStore/Shared.EventStore.csproj +++ b/Shared.EventStore/Shared.EventStore.csproj @@ -7,11 +7,11 @@ - - - - - + + + + + diff --git a/Shared.EventStoreContext.Tests/Shared.EventStoreContext.Tests.csproj b/Shared.EventStoreContext.Tests/Shared.EventStoreContext.Tests.csproj index b3e12c06..b720dd9a 100644 --- a/Shared.EventStoreContext.Tests/Shared.EventStoreContext.Tests.csproj +++ b/Shared.EventStoreContext.Tests/Shared.EventStoreContext.Tests.csproj @@ -11,16 +11,16 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Shared.IntegrationTesting.Tests/Shared.IntegrationTesting.Tests.csproj b/Shared.IntegrationTesting.Tests/Shared.IntegrationTesting.Tests.csproj index a8640838..d47b75c5 100644 --- a/Shared.IntegrationTesting.Tests/Shared.IntegrationTesting.Tests.csproj +++ b/Shared.IntegrationTesting.Tests/Shared.IntegrationTesting.Tests.csproj @@ -11,16 +11,16 @@ - - - - - - - - + + + + + + + + - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Shared.IntegrationTesting.UnitTests/Shared.IntegrationTesting.UnitTests.csproj b/Shared.IntegrationTesting.UnitTests/Shared.IntegrationTesting.UnitTests.csproj index bb2d27cf..80ac9439 100644 --- a/Shared.IntegrationTesting.UnitTests/Shared.IntegrationTesting.UnitTests.csproj +++ b/Shared.IntegrationTesting.UnitTests/Shared.IntegrationTesting.UnitTests.csproj @@ -11,17 +11,17 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Shared.IntegrationTesting/Ductus/BaseDockerHelper.cs b/Shared.IntegrationTesting/Ductus/BaseDockerHelper.cs index 06fa1a9c..9de1d89b 100644 --- a/Shared.IntegrationTesting/Ductus/BaseDockerHelper.cs +++ b/Shared.IntegrationTesting/Ductus/BaseDockerHelper.cs @@ -144,7 +144,7 @@ protected BaseDockerHelper(Boolean skipHealthChecks=false) { else { this.ImageDetails.Add(ContainerType.SqlServer, ("mcr.microsoft.com/mssql/server:2022-latest", true)); - this.ImageDetails.Add(ContainerType.EventStore, ("kurrentplatform/kurrentdb:25.1", true)); + this.ImageDetails.Add(ContainerType.EventStore, ("kurrentplatform/kurrentdb:26.1", true)); this.ImageDetails.Add(ContainerType.MessagingService, ("stuartferguson/messagingservice:master", true)); this.ImageDetails.Add(ContainerType.SecurityService, ("stuartferguson/securityservice:master", true)); this.ImageDetails.Add(ContainerType.CallbackHandler, ("stuartferguson/callbackhandler:master", true)); diff --git a/Shared.IntegrationTesting/Shared.IntegrationTesting.csproj b/Shared.IntegrationTesting/Shared.IntegrationTesting.csproj index b9f9c0f1..e746ed52 100644 --- a/Shared.IntegrationTesting/Shared.IntegrationTesting.csproj +++ b/Shared.IntegrationTesting/Shared.IntegrationTesting.csproj @@ -8,15 +8,16 @@ - - - - + + + + - + + diff --git a/Shared.IntegrationTesting/TestContainers/BaseDockerHelper.cs b/Shared.IntegrationTesting/TestContainers/BaseDockerHelper.cs index a637d487..bea3be54 100644 --- a/Shared.IntegrationTesting/TestContainers/BaseDockerHelper.cs +++ b/Shared.IntegrationTesting/TestContainers/BaseDockerHelper.cs @@ -140,7 +140,7 @@ protected BaseDockerHelper(Boolean skipHealthChecks=false) { else { this.ImageDetails.Add(ContainerType.SqlServer, ("mcr.microsoft.com/mssql/server:2022-latest", true)); - this.ImageDetails.Add(ContainerType.EventStore, ("kurrentplatform/kurrentdb:25.1", true)); + this.ImageDetails.Add(ContainerType.EventStore, ("kurrentplatform/kurrentdb:26.1", true)); this.ImageDetails.Add(ContainerType.MessagingService, ("stuartferguson/messagingservice:master", true)); this.ImageDetails.Add(ContainerType.SecurityService, ("stuartferguson/securityservice:master", true)); this.ImageDetails.Add(ContainerType.CallbackHandler, ("stuartferguson/callbackhandler:master", true)); @@ -206,7 +206,9 @@ public virtual Dictionary GetCommonEnvironmentVariables(){ public static async Task> GetDockerEnginePlatform(){ try{ - DockerClient? docker = new DockerClientConfiguration().CreateClient(); + Docker.DotNet.DockerClientBuilder b = new DockerClientBuilder(); + DockerClient docker = b.Build(); + SystemInfoResponse? info = await docker.System.GetSystemInfoAsync(); return info.OSType switch { @@ -220,7 +222,11 @@ public virtual Dictionary GetCommonEnvironmentVariables(){ } } - public static DockerClient GetDockerHost() => new DockerClientConfiguration().CreateClient(); + public static DockerClient GetDockerHost() { + Docker.DotNet.DockerClientBuilder b = new DockerClientBuilder(); + DockerClient docker = b.Build(); + return docker; + } public Int32? GetHostPort(ContainerType key) => diff --git a/Shared.Logger/Shared.Logger.csproj b/Shared.Logger/Shared.Logger.csproj index 1e87ffee..32bd7289 100644 --- a/Shared.Logger/Shared.Logger.csproj +++ b/Shared.Logger/Shared.Logger.csproj @@ -6,7 +6,7 @@ enable - - + + diff --git a/Shared.Results/Shared.Results.csproj b/Shared.Results/Shared.Results.csproj index 7cc5145b..3d611d81 100644 --- a/Shared.Results/Shared.Results.csproj +++ b/Shared.Results/Shared.Results.csproj @@ -8,7 +8,7 @@ - + diff --git a/Shared.Tests/Shared.Tests.csproj b/Shared.Tests/Shared.Tests.csproj index cf522e48..70d446d0 100644 --- a/Shared.Tests/Shared.Tests.csproj +++ b/Shared.Tests/Shared.Tests.csproj @@ -8,14 +8,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj index 95ed1d8d..487b589b 100644 --- a/Shared/Shared.csproj +++ b/Shared/Shared.csproj @@ -11,15 +11,15 @@ - + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - +