Skip to content

nuget updates #1400

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

Closed
StuartFerguson wants to merge 23 commits into from
Closed

nuget updates #1400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7addde2
nuget updates
StuartFerguson Nov 17, 2025
dea1cc8
:|
StuartFerguson Nov 17, 2025
becc8e5
another try
StuartFerguson Nov 17, 2025
5cb658b
:|
StuartFerguson Nov 18, 2025
c52f0d3
:|
StuartFerguson Nov 18, 2025
c940195
:|
StuartFerguson Nov 18, 2025
9ad4b4f
debugging
StuartFerguson Nov 18, 2025
0e7d6ef
...
StuartFerguson Nov 18, 2025
c27e6d0
:|
StuartFerguson Nov 18, 2025
27507eb
:Z\
StuartFerguson Nov 18, 2025
1165de3
:|
StuartFerguson Nov 18, 2025
7ccfd17
:|
StuartFerguson Nov 18, 2025
f3e90ad
:|
StuartFerguson Nov 18, 2025
4b6f89d
:|
StuartFerguson Nov 18, 2025
42d3bd4
:|
StuartFerguson Nov 18, 2025
8bd9931
more debug
StuartFerguson Nov 18, 2025
7dd772a
:|
StuartFerguson Nov 18, 2025
30009cd
another random test
StuartFerguson Nov 18, 2025
99b23d7
trying out test containers
StuartFerguson Nov 21, 2025
0cd35a1
:|
StuartFerguson Nov 21, 2025
f9836da
:|
StuartFerguson Nov 21, 2025
20de267
lets see how this goes
StuartFerguson Nov 21, 2025
48ac517
bring the tests back in
StuartFerguson Nov 21, 2025
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
2 changes: 1 addition & 1 deletion TransactionProcessor.Aggregates/TransactionProcessor.Aggregates.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
<PackageReference Include="Shared.EventStore" Version="2025.10.2" />
<PackageReference Include="Shared.EventStore" Version="2025.11.11" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

<ItemGroup>
<PackageReference Include="CallbackHandler.DataTransferObjects" Version="2025.8.1" />
<PackageReference Include="ClientProxyBase" Version="2025.10.2" />
<PackageReference Include="ClientProxyBase" Version="2025.11.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
<PackageReference Include="MessagingService.Client" Version="2025.8.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
<PackageReference Include="Polly" Version="8.6.4" />
<PackageReference Include="prometheus-net" Version="8.2.1" />
<PackageReference Include="SecurityService.Client" Version="2025.8.1" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.10.2" />
<PackageReference Include="Shared.EventStore" Version="2025.10.2" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.11" />
<PackageReference Include="Shared.EventStore" Version="2025.11.11" />
<PackageReference Include="MediatR" Version="13.1.0" />
<PackageReference Include="Syncfusion.HtmlToPdfConverter.Net.Windows" Version="31.2.3" />
<PackageReference Include="System.IO.Abstractions" Version="22.0.16" />
Expand Down
4 changes: 2 additions & 2 deletions TransactionProcessor.Client/TransactionProcessor.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions TransactionProcessor.Database/TransactionProcessor.Database.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
<PackageReference Include="Shared" Version="2025.10.2" />
<PackageReference Include="Shared" Version="2025.11.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.10" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.10.2" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.11" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions TransactionProcessor.DatabaseTests/BaseTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
using System.Net.Http.Headers;
using System.Text;
using System.Threading.Tasks;
using Shared.IntegrationTesting.Ductus;
using TransactionProcessor.Database.Contexts;
using TransactionProcessor.Repository;
using Xunit.Abstractions;
Expand Down
5 changes: 2 additions & 3 deletions TransactionProcessor.DatabaseTests/TransactionProcessor.DatabaseTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,15 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Ductus.FluentDocker" Version="2.85.0" />
<PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Ductus.FluentDocker" Version="2.85.0" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.10.2" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.11.11" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion TransactionProcessor.DomainEvents/TransactionProcessor.DomainEvents.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.10.2" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.11" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions ...ocessor.IntegrationTesting.Helpers/TransactionProcessor.IntegrationTesting.Helpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.10.2" />
<PackageReference Include="Ductus.FluentDocker" Version="2.85.0" />
<PackageReference Include="ClientProxyBase" Version="2025.11.11" />
<PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
<PackageReference Include="Reqnroll" Version="3.2.0" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.10.2" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.11.11" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
</ItemGroup>
Expand Down
191 changes: 166 additions & 25 deletions TransactionProcessor.IntegrationTests/Common/DockerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,128 @@
using TransactionProcessor.Database.Contexts;
using Ductus.FluentDocker.Model.Containers;
using Ductus.FluentDocker.Services;
using Shared.IntegrationTesting.TestContainers;
using SimpleResults;
using TransactionProcessor.Database.Contexts;

namespace TransactionProcessor.IntegrationTests.Common
{
using System;
using System.Collections.Generic;
using System.Net.Http;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Client;
using Ductus.FluentDocker.Builders;
using Ductus.FluentDocker.Executors;
using Ductus.FluentDocker.Services.Extensions;
using EventStore.Client;
using global::Shared.IntegrationTesting;
using Newtonsoft.Json;
using SecurityService.Client;
using Shouldly;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Retry = IntegrationTests.Retry;

/// <summary>
///
/// </summary>
/// <seealso cref="Shared.IntegrationTesting.DockerHelper" />
public class DockerHelper : global::Shared.IntegrationTesting.DockerHelper
public class DockerHelper : global::Shared.IntegrationTesting.TestContainers.DockerHelper
{

/*public override INetworkService SetupTestNetwork(String networkName = null,
Boolean reuseIfExists = false)
{
networkName = String.IsNullOrEmpty(networkName) ? $"testnw{this.TestId:N}" : networkName;
//SimpleResults.Result<DockerEnginePlatform> engineType = BaseDockerHelper.GetDockerEnginePlatform();
//Console.WriteLine($"Engine Type is {engineType.Data}");

// Build a network
NetworkBuilder networkService = new Builder().UseNetwork(networkName).ReuseIfExist();

return networkService.Build();
}

public override async Task<IContainerService> SetupSqlServerContainer(INetworkService networkService)
{
if (this.SqlCredentials == default)
throw new ArgumentNullException("Sql Credentials have not been set");

IContainerService databaseServerContainer = await this.StartContainerX(this.ConfigureSqlContainer,
new List<INetworkService>{
networkService
},
DockerServices.SqlServer);

return databaseServerContainer;
}*/
/*
protected async Task<IContainerService> StartContainerX(Func<ContainerBuilder> buildContainerFunc, List<INetworkService> networkServices, DockerServices dockerService)
{
if ((this.RequiredDockerServices & dockerService) != dockerService)
{
return default;
}

//ConsoleStream<String> consoleLogs = null;
try {
Result<DockerEnginePlatform> dockerEnginePlatform = await BaseDockerHelper.GetDockerEnginePlatform();
Console.WriteLine($"Engine Type is {dockerEnginePlatform.Data}");

this.Trace($"{dockerService} about to call builder func");
ContainerBuilder containerBuilder = buildContainerFunc();

this.Trace($"{dockerService} about to call build");
IContainerService builtContainer = containerBuilder.Build();

this.Trace($"{dockerService} about to attach logs");
//consoleLogs = builtContainer.Logs(true);

this.Trace($"{dockerService} about to call Start");
IContainerService startedContainer = builtContainer.Start();
if (startedContainer == null)
throw new Exception($"{dockerService} startedContainer is null");
this.Trace($"{dockerService} after call to Start");
if (networkServices == null || networkServices.Count == 0) {
this.Trace($"{dockerService} No network services to attach");
}
else{
foreach (INetworkService networkService in networkServices) {
this.Trace($"{dockerService} about to attach network service");
if (networkService == null)
throw new ArgumentNullException("networkService is null");

networkService.Attach(startedContainer, false);
}
}

this.Trace($"{dockerService} Container Started");
this.Containers.Add((dockerService, startedContainer));

await DoSqlServerHealthCheck(startedContainer);

this.Trace($"Container [{buildContainerFunc.Method.Name}] started");

return startedContainer;
}
catch (Exception ex)
{
//if (consoleLogs != null)
//{
// while (!consoleLogs.IsFinished)
// {
// String s = consoleLogs.TryRead(10000);
// this.Trace(s);
// }
//}

this.Error($"Error starting container [{buildContainerFunc.Method.Name}]", ex);
throw;
}
}
*/

#region Fields
public static String TestBankAccountNumber = "12345678";

Expand Down Expand Up @@ -85,7 +185,7 @@ await Retry.For(async () =>
responseMessage.IsSuccessStatusCode.ShouldBeTrue();
});
}

/*
public override ContainerBuilder SetupTransactionProcessorContainer(){

List<String> variables = new List<String>();
Expand All @@ -95,7 +195,7 @@ public override ContainerBuilder SetupTransactionProcessorContainer(){
//this.SetAdditionalVariables(ContainerType.FileProcessor, variables);

return base.SetupTransactionProcessorContainer();
}
}*/

public override async Task CreateSubscriptions(){
List<(String streamName, String groupName, Int32 maxRetries)> subscriptions = new();
Expand All @@ -109,7 +209,7 @@ public override async Task CreateSubscriptions(){
}
}

public override ContainerBuilder SetupSecurityServiceContainer()
/*public override ContainerBuilder SetupSecurityServiceContainer()
{
this.Trace("About to Start Security Container");

Expand Down Expand Up @@ -157,7 +257,7 @@ public override ContainerBuilder SetupSecurityServiceContainer()

// Now build and return the container
return securityServiceContainer;
}
}*/

/// <summary>
/// Starts the containers for scenario run.
Expand Down Expand Up @@ -204,23 +304,64 @@ public override async Task StopContainersForScenarioRun(DockerServices dockerSer

await base.StopContainersForScenarioRun(dockerServices);
}
private async Task RemoveEstateReadModel()

/*public async Task StopContainersForScenarioRunX(DockerServices sharedDockerServices)
{
List<Guid> estateIdList = this.TestingContext.GetAllEstateIds();
if (this.Containers.Any())
{
this.Containers.Reverse();

foreach ((DockerServices, IContainerService) containerService in this.Containers)
{

if ((sharedDockerServices & containerService.Item1) == containerService.Item1)
{
continue;
}

this.Trace($"Stopping container [{containerService.Item2.Name}]");
if (containerService.Item2.Name.Contains("eventstore"))
{
CopyEventStoreLogs(containerService.Item2);
}

containerService.Item2.Stop();
containerService.Item2.Remove(true);
this.Trace($"Container [{containerService.Item2.Name}] stopped");
}
}

foreach (Guid estateId in estateIdList)
if (this.TestNetworks.Any())
{
String databaseName = $"EstateReportingReadModel{estateId}";

await Retry.For(async () =>
{
// Build the connection string (to master)
String connectionString = Setup.GetLocalConnectionString(databaseName);
EstateManagementContext context = new EstateManagementContext(connectionString);
await context.Database.EnsureDeletedAsync(CancellationToken.None);
});
foreach (INetworkService networkService in this.TestNetworks)
{
this.Trace($"Teardown network {networkService.Name}");
var cfg = networkService.GetConfiguration(true);
if (!cfg.Containers.Any())
{
networkService.Stop();
networkService.Remove(true);
}
}
}
*/

private async Task RemoveEstateReadModel()
{
//List<Guid> estateIdList = this.TestingContext.GetAllEstateIds();

//foreach (Guid estateId in estateIdList)
//{
// String databaseName = $"EstateReportingReadModel{estateId}";

// await Retry.For(async () =>
// {
// // Build the connection string (to master)
// String connectionString = Setup.GetLocalConnectionString(databaseName);
// EstateManagementContext context = new EstateManagementContext(connectionString);
// await context.Database.EnsureDeletedAsync(CancellationToken.None);
// });
//}
}

protected override List<String> GetRequiredProjections()
Expand Down
Loading
Loading