Skip to content

Commit 56dfdc7

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #342 from TransactionProcessing/bug/#340_correlation_id_not_being_passedon
Update package references and streamline ClientRegistry
2 parents 9a6d302 + bef29b1 commit 56dfdc7

7 files changed

Lines changed: 39 additions & 38 deletions

File tree

‎TransactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACL.BusinessLogic.Tests.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10+
<PackageReference Include="ClientProxyBase" Version="2025.7.13" />
1011
<PackageReference Include="Lamar" Version="15.0.0" />
1112
<PackageReference Include="MediatR" Version="12.5.0" />
1213
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
1314
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1415
<PackageReference Include="Moq" Version="4.20.72" />
1516
<PackageReference Include="Shouldly" Version="4.3.0" />
16-
<PackageReference Include="TransactionProcessor.Client" Version="2025.7.1" />
17-
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.7.1" />
17+
<PackageReference Include="TransactionProcessor.Client" Version="2025.7.2" />
18+
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.7.2" />
1819
<PackageReference Include="xunit" Version="2.9.3" />
1920
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
2021
<PrivateAssets>all</PrivateAssets>

‎TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8+
<PackageReference Include="ClientProxyBase" Version="2025.7.13" />
89
<PackageReference Include="MediatR" Version="12.5.0" />
9-
<PackageReference Include="SecurityService.Client" Version="2025.7.1" />
10-
<PackageReference Include="Shared" Version="2025.7.10" />
11-
<PackageReference Include="TransactionProcessor.Client" Version="2025.7.1" />
10+
<PackageReference Include="SecurityService.Client" Version="2025.7.2" />
11+
<PackageReference Include="Shared" Version="2025.7.13" />
12+
<PackageReference Include="TransactionProcessor.Client" Version="2025.7.2" />
1213
</ItemGroup>
1314

1415
<ItemGroup>

‎TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="ClientProxyBase" Version="2025.7.10" />
10+
<PackageReference Include="ClientProxyBase" Version="2025.7.13" />
1111
<PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
1212
<PackageReference Include="EventStoreProjections" Version="2023.12.3" />
13-
<PackageReference Include="MessagingService.IntegrationTesting.Helpers" Version="2025.7.1" />
13+
<PackageReference Include="MessagingService.IntegrationTesting.Helpers" Version="2025.7.2" />
1414
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.5" />
1515
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
@@ -19,12 +19,12 @@
1919
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
2020
<PackageReference Include="Reqnroll" Version="2.4.1" />
2121
<PackageReference Include="Reqnroll.NUnit" Version="2.4.1" />
22-
<PackageReference Include="SecurityService.Client" Version="2025.7.1" />
23-
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2025.7.1" />
24-
<PackageReference Include="Shared.IntegrationTesting" Version="2025.7.10" />
22+
<PackageReference Include="SecurityService.Client" Version="2025.7.2" />
23+
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2025.7.2" />
24+
<PackageReference Include="Shared.IntegrationTesting" Version="2025.7.13" />
2525
<PackageReference Include="Shouldly" Version="4.3.0" />
26-
<PackageReference Include="TransactionProcessor.Client" Version="2025.7.1" />
27-
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.7.1" />
26+
<PackageReference Include="TransactionProcessor.Client" Version="2025.7.2" />
27+
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.7.2" />
2828

2929
<PackageReference Include="coverlet.collector" Version="6.0.4">
3030
<PrivateAssets>all</PrivateAssets>

‎TransactionProcessorACL.Testing/TransactionProcessorACL.Testing.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="TransactionProcessor.Client" Version="2025.7.1" />
10-
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.7.1" />
9+
<PackageReference Include="ClientProxyBase" Version="2025.7.13" />
10+
<PackageReference Include="TransactionProcessor.Client" Version="2025.7.2" />
11+
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.7.2" />
1112
</ItemGroup>
1213

1314
<ItemGroup>

‎TransactionProcessorACL.Tests/TransactionProcessorACL.Tests.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10+
<PackageReference Include="ClientProxyBase" Version="2025.7.13" />
1011
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.5" />
1112
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
1213
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1314
<PackageReference Include="Moq" Version="4.20.72" />
1415
<PackageReference Include="Shouldly" Version="4.3.0" />
15-
<PackageReference Include="TransactionProcessor.Client" Version="2025.7.1" />
16-
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.7.1" />
16+
<PackageReference Include="TransactionProcessor.Client" Version="2025.7.2" />
17+
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.7.2" />
1718
<PackageReference Include="xunit" Version="2.9.3" />
1819
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
1920
<PrivateAssets>all</PrivateAssets>

‎TransactionProcessorACL/Bootstrapper/ClientRegistry.cs‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
namespace TransactionProcessorACL.Bootstrapper
22
{
3-
using System;
4-
using System.Diagnostics.CodeAnalysis;
5-
using System.Net.Http;
3+
using ClientProxyBase;
64
using Lamar;
75
using Microsoft.Extensions.DependencyInjection;
86
using SecurityService.Client;
97
using Shared.General;
8+
using System;
9+
using System.Diagnostics.CodeAnalysis;
10+
using System.Net.Http;
1011
using TransactionProcessor.Client;
1112

1213
/// <summary>
@@ -21,23 +22,12 @@ public class ClientRegistry : ServiceRegistry
2122
/// <summary>
2223
/// Initializes a new instance of the <see cref="ClientRegistry"/> class.
2324
/// </summary>
24-
public ClientRegistry()
25-
{
26-
this.AddSingleton<ITransactionProcessorClient, TransactionProcessorClient>();
27-
this.AddSingleton<ISecurityServiceClient, SecurityServiceClient>();
28-
this.AddSingleton<Func<String, String>>(container => serviceName => { return ConfigurationReader.GetBaseServerUri(serviceName).OriginalString; });
29-
HttpClientHandler httpClientHandler = new HttpClientHandler
30-
{
31-
ServerCertificateCustomValidationCallback = (message,
32-
certificate2,
33-
arg3,
34-
arg4) =>
35-
{
36-
return true;
37-
}
38-
};
39-
HttpClient httpClient = new HttpClient(httpClientHandler);
40-
this.AddSingleton(httpClient);
25+
public ClientRegistry() {
26+
this.AddHttpContextAccessor();
27+
this.RegisterHttpClient<ISecurityServiceClient, SecurityServiceClient>();
28+
this.RegisterHttpClient<ITransactionProcessorClient, TransactionProcessorClient>();
29+
Func<String, String> resolver(IServiceProvider container) => serviceName => ConfigurationReader.GetBaseServerUri(serviceName).OriginalString;
30+
this.AddSingleton<Func<String, String>>(resolver);
4131
}
4232

4333
#endregion

‎TransactionProcessorACL/TransactionProcessorACL.csproj‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14+
<PackageReference Include="ClientProxyBase" Version="2025.7.13" />
1415
<PackageReference Include="Lamar" Version="15.0.0" />
1516
<PackageReference Include="MediatR" Version="12.5.0" />
1617
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="15.0.0" />
@@ -26,8 +27,8 @@
2627
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
2728
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2829
<PackageReference Include="NLog.Extensions.Logging" Version="5.5.0" />
29-
<PackageReference Include="Shared" Version="2025.7.10" />
30-
<PackageReference Include="Shared.Results.Web" Version="2025.7.10" />
30+
<PackageReference Include="Shared" Version="2025.7.13" />
31+
<PackageReference Include="Shared.Results.Web" Version="2025.7.13" />
3132
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.4" />
3233
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="8.1.4" />
3334
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.3" />
@@ -42,6 +43,12 @@
4243
<ProjectReference Include="..\TransactionProcessorACL.DataTransferObjects\TransactionProcessorACL.DataTransferObjects.csproj" />
4344
</ItemGroup>
4445

46+
<ItemGroup>
47+
<Content Update="appsettings.development.json">
48+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
49+
</Content>
50+
</ItemGroup>
51+
4552
<ItemGroup>
4653
<None Update="..\.dockerignore">
4754
<DependentUpon>dockerfile</DependentUpon>

0 commit comments

Comments
 (0)