Skip to content

update shared nugets #1968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StuartFerguson merged 2 commits into from
Oct 12, 2026
Merged

update shared nugets #1968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
495f862
update shared nugets
StuartFerguson Oct 12, 2026
449c00f
Merge branch 'main' into task/#1966_integration_test_hardening
StuartFerguson Oct 12, 2026
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
22 changes: 11 additions & 11 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<PackageVersion Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" />
<PackageVersion Include="CallbackHandler.DataTransferObjects" Version="2026.9.3.165" />
<PackageVersion Include="ClientProxyBase" Version="2026.10.1" />
<PackageVersion Include="ClientProxyBase" Version="2026.10.2" />
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
<PackageVersion Include="coverlet.msbuild" Version="10.0.1" />
<PackageVersion Include="Ductus.FluentDocker" Version="2.85.0" />
<PackageVersion Include="EntityFrameworkCore.Exceptions.Common" Version="10.0.1" />
<PackageVersion Include="EntityFrameworkCore.Exceptions.SqlServer" Version="10.0.1" />
<PackageVersion Include="EventStoreProjections" Version="2023.12.3" />
<PackageVersion Include="FileProcessor.File.DomainEvents" Version="2026.9.4.162" />
<PackageVersion Include="FileProcessor.FileImportLog.DomainEvents" Version="2026.9.4.162" />
<PackageVersion Include="FileProcessor.File.DomainEvents" Version="2026.9.4.163" />
<PackageVersion Include="FileProcessor.FileImportLog.DomainEvents" Version="2026.9.4.163" />
<PackageVersion Include="HealthMonitoring.Client" Version="2026.9.4.48" />
<PackageVersion Include="Lamar" Version="16.0.0" />
<PackageVersion Include="Lamar.Microsoft.DependencyInjection" Version="16.0.0" />
Expand Down Expand Up @@ -62,15 +62,15 @@
<PackageVersion Include="Reqnroll.NUnit" Version="3.3.4" />
<PackageVersion Include="Reqnroll.Tools.MsBuild.Generation" Version="3.3.4" />
<PackageVersion Include="RichardSzalay.MockHttp" Version="7.1.0" />
<PackageVersion Include="SecurityService.Client" Version="2026.9.3.196" />
<PackageVersion Include="SecurityService.IntegrationTesting.Helpers" Version="2026.9.3.196" />
<PackageVersion Include="SecurityService.Client" Version="2026.9.3.198" />
<PackageVersion Include="SecurityService.IntegrationTesting.Helpers" Version="2026.9.3.198" />
<PackageVersion Include="Sentry.AspNetCore" Version="6.11.0" />
<PackageVersion Include="Shared" Version="2026.10.1" />
<PackageVersion Include="Shared.DomainDrivenDesign" Version="2026.10.1" />
<PackageVersion Include="Shared.EventStore" Version="2026.10.1" />
<PackageVersion Include="Shared.IntegrationTesting" Version="2026.10.1" />
<PackageVersion Include="Shared.Results" Version="2026.10.1" />
<PackageVersion Include="Shared.Results.Web" Version="2026.10.1" />
<PackageVersion Include="Shared" Version="2026.10.2" />
<PackageVersion Include="Shared.DomainDrivenDesign" Version="2026.10.2" />
<PackageVersion Include="Shared.EventStore" Version="2026.10.2" />
<PackageVersion Include="Shared.IntegrationTesting" Version="2026.10.2" />
<PackageVersion Include="Shared.Results" Version="2026.10.2" />
<PackageVersion Include="Shared.Results.Web" Version="2026.10.2" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.2.3" />
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="10.2.3" />
Expand Down
4 changes: 2 additions & 2 deletions TransactionProcessor.DatabaseTests/DatabaseTestFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public DatabaseTestFixture()

public async ValueTask InitializeAsync()
{
await this.dockerHelper.StartContainersForScenarioRun("database-tests", DockerServices.SqlServer);
await this.dockerHelper.StartContainersForScenarioRun("database-tests", DockerServices.SqlServer, CancellationToken.None);
}

public async ValueTask DisposeAsync()
Expand All @@ -52,7 +52,7 @@ private NlogLogger CreateLogger()

public class TestDockerHelper : DockerHelper
{
public override Task CreateSubscriptions()
public override Task CreateSubscriptions(CancellationToken cancellationToken)
{
return Task.CompletedTask;
}
Expand Down
8 changes: 4 additions & 4 deletions TransactionProcessor.IntegrationTests/Common/DockerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,13 @@ public override ContainerBuilder SetupTestHostContainer()
.WithName(this.TestHostContainerName) // similar to WithName()
.WithImage(imageDetails.imageName)
.WithEnvironment(environmentVariables)
.MountHostFolder(this.DockerPlatform, this.HostTraceFolder)
.MountHostFolder(this.HostTraceFolder)
.WithPortBinding(DockerPorts.TestHostPort, true);

return testHostContainer;
}

public override async Task CreateSubscriptions(){
public override async Task CreateSubscriptions(CancellationToken cancellationToken){
List<(String streamName, String groupName, Int32 maxRetries)> subscriptions = new();
subscriptions.AddRange(MessagingService.IntegrationTesting.Helpers.SubscriptionsHelper.GetSubscriptions());
subscriptions.AddRange(TransactionProcessor.IntegrationTesting.Helpers.SubscriptionsHelper.GetSubscriptions());
Expand Down Expand Up @@ -178,9 +178,9 @@ Object Deserialise_CamelCase(String arg, Type type)
/// Starts the containers for scenario run.
/// </summary>
/// <param name="scenarioName">Name of the scenario.</param>
public override async Task StartContainersForScenarioRun(String scenarioName, DockerServices dockerServices){
public override async Task StartContainersForScenarioRun(String scenarioName, DockerServices dockerServices, CancellationToken cancellationToken){
this.HostTraceFolder = Path.Combine(Directory.GetCurrentDirectory(), "trace");
await base.StartContainersForScenarioRun(scenarioName, dockerServices);
await base.StartContainersForScenarioRun(scenarioName, dockerServices, cancellationToken);

// Setup the base address resolvers
String SecurityServiceBaseAddressResolver(String api) => $"https://127.0.0.1:{this.SecurityServicePort}";
Expand Down
3 changes: 2 additions & 1 deletion TransactionProcessor.IntegrationTests/Common/GenericSteps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace TransactionProcessor.IntegrationTests.Common
{
using System.Threading;
using System.Threading.Tasks;
using global::Shared.IntegrationTesting;
using global::Shared.Logger;
Expand Down Expand Up @@ -53,7 +54,7 @@ public async Task StartSystem()

this.TestingContext.Logger = logger;
this.TestingContext.Logger.LogInformation("About to Start Containers for Scenario Run");
await this.TestingContext.DockerHelper.StartContainersForScenarioRun(scenarioName, dockerServices).ConfigureAwait(false);
await this.TestingContext.DockerHelper.StartContainersForScenarioRun(scenarioName, dockerServices, cancellationToken: CancellationToken.None).ConfigureAwait(false);
this.TestingContext.Logger.LogInformation("Containers for Scenario Run Started");
}

Expand Down
Loading
Loading