Skip to content

Update Shared and related NuGet packages to 2026.5.6 #266

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 4 commits into from
May 12, 2026
Merged

Update Shared and related NuGet packages to 2026.5.6 #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83104bc
Update Shared and related NuGet packages to 2026.5.6
StuartFerguson May 12, 2026
e0818e6
Merge branch 'main' into task/#247_new_serialiser
StuartFerguson May 12, 2026
06a41a3
fix failing tests
StuartFerguson May 12, 2026
db0ef66
Merge branch 'task/#247_new_serialiser' of ssh://github.com/Transacti…
StuartFerguson May 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
2 changes: 1 addition & 1 deletion CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="Shared.EventStore" Version="2026.5.5" />
<PackageReference Include="Shared.EventStore" Version="2026.5.6" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
Expand Down
10 changes: 5 additions & 5 deletions CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MediatR" Version="14.1.0" />
<PackageReference Include="SecurityService.Client" Version="2026.4.3-build156" />
<PackageReference Include="Shared" Version="2026.5.5" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2026.5.5" />
<PackageReference Include="Shared.EventStore" Version="2026.5.5" />
<PackageReference Include="TransactionProcessor.Client" Version="2026.4.3-build352" />
<PackageReference Include="SecurityService.Client" Version="2026.4.3-build157" />
<PackageReference Include="Shared" Version="2026.5.6" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2026.5.6" />
<PackageReference Include="Shared.EventStore" Version="2026.5.6" />
<PackageReference Include="TransactionProcessor.Client" Version="2026.4.3-build355" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CallbackHandler.CallbackMessageAggregate\CallbackHandler.CallbackMessageAggregate.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion CallbackHandler.BusinessLogic/Services/CallbackDomainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ public async Task<Result> RecordCallback(CallbackCommands.RecordCallbackCommand
Result<(Guid estateId, Guid merchantId)> validateResult = await ValidateReference(command.Reference, cancellationToken);
if (validateResult.IsFailed)
return ResultHelpers.CreateFailure(validateResult);

Result<CallbackMessageAggregate> getResult = await this.AggregateRepository.GetLatestVersion(command.CallbackId, cancellationToken);
Result<CallbackMessageAggregate> callbackMessageAggregateResult =
DomainServiceHelper.HandleGetAggregateResult(getResult, command.CallbackId, false);
Expand All @@ -56,6 +55,7 @@ public async Task<Result> RecordCallback(CallbackCommands.RecordCallbackCommand
(command.Reference,validateResult.Data.estateId, validateResult.Data.merchantId));
if (stateResult.IsFailed)
return stateResult;

return await this.AggregateRepository.SaveChanges(aggregate, cancellationToken);
}

Expand Down
4 changes: 2 additions & 2 deletions ...kHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<DebugType>None</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Shared" Version="2026.5.5" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2026.5.5" />
<PackageReference Include="Shared" Version="2026.5.6" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2026.5.6" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...dler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.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.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="Shared.EventStore" Version="2026.5.5" />
<PackageReference Include="Shared.EventStore" Version="2026.5.6" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.extensibility.core" Version="2.9.3" />
Expand Down
6 changes: 3 additions & 3 deletions CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Grpc.Net.Client" Version="2.76.0" />
<PackageReference Include="Shared" Version="2026.5.5" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2026.5.5" />
<PackageReference Include="Shared.EventStore" Version="2026.5.5" />
<PackageReference Include="Shared" Version="2026.5.6" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2026.5.6" />
<PackageReference Include="Shared.EventStore" Version="2026.5.6" />
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions CallbackHandler.IntegrationTests/CallbackHandler.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
<PackageReference Include="NUnit" Version="4.5.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="SecurityService.Client" Version="2026.4.3-build156" />
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2026.4.3-build156" />
<PackageReference Include="Shared" Version="2026.5.5" />
<PackageReference Include="Shared.IntegrationTesting" Version="2026.5.5" />
<PackageReference Include="TransactionProcessor.Client" Version="2026.4.3-build352" />
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2026.4.3-build352" />
<PackageReference Include="SecurityService.Client" Version="2026.4.3-build157" />
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2026.4.3-build157" />
<PackageReference Include="Shared" Version="2026.5.6" />
<PackageReference Include="Shared.IntegrationTesting" Version="2026.5.6" />
<PackageReference Include="TransactionProcessor.Client" Version="2026.4.3-build355" />
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2026.4.3-build355" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 3 additions & 1 deletion CallbackHandler.IntegrationTests/Shared/SharedSteps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@ public async Task WhenISendTheRequestsToTheCallbackHandlerForDeposits()
msg.Content = new StringContent(payload, Encoding.UTF8,
MediaTypeHeaderValue.Parse("application/json"));
var response = await client.SendAsync(msg);
response.StatusCode.ShouldBe(HttpStatusCode.OK);

var content = await response.Content.ReadAsStringAsync();
response.StatusCode.ShouldBe(HttpStatusCode.OK, content);

CallbackResponse responseData =
StringSerialiser.Deserialise<CallbackResponse>(content);

Expand Down
4 changes: 2 additions & 2 deletions CallbackHandler/CallbackHandler.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<PackageReference Include="MediatR" Version="14.1.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
<PackageReference Include="Sentry.AspNetCore" Version="6.2.0" />
<PackageReference Include="Shared" Version="2026.5.5" />
<PackageReference Include="Shared.Results.Web" Version="2026.5.5" />
<PackageReference Include="Shared" Version="2026.5.6" />
<PackageReference Include="Shared.Results.Web" Version="2026.5.6" />
<PackageReference Include="SimpleResults.AspNetCore" Version="4.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.4" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="10.1.4" />
Expand Down
42 changes: 1 addition & 41 deletions CallbackHandler/Common/JsonSerializerConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,46 +13,6 @@ public static void ConfigureMinimalApi(JsonSerializerOptions serializerOptions)
serializerOptions.DictionaryKeyPolicy = defaultOptions.DictionaryKeyPolicy;
serializerOptions.ReferenceHandler = defaultOptions.ReferenceHandler;
serializerOptions.WriteIndented = defaultOptions.WriteIndented;
serializerOptions.Converters.Add(new UtcDateTimeJsonConverter());
serializerOptions.Converters.Add(new NullableUtcDateTimeJsonConverter());
}

private sealed class UtcDateTimeJsonConverter : System.Text.Json.Serialization.JsonConverter<DateTime>
{
public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
var value = reader.GetDateTime();
return value.Kind == DateTimeKind.Utc ? value : value.ToUniversalTime();
}

public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
{
writer.WriteStringValue(value.Kind == DateTimeKind.Utc ? value : value.ToUniversalTime());
}
}

private sealed class NullableUtcDateTimeJsonConverter : System.Text.Json.Serialization.JsonConverter<DateTime?>
{
public override DateTime? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
if (reader.TokenType == JsonTokenType.Null)
{
return null;
}

var value = reader.GetDateTime();
return value.Kind == DateTimeKind.Utc ? value : value.ToUniversalTime();
}

public override void Write(Utf8JsonWriter writer, DateTime? value, JsonSerializerOptions options)
{
if (value.HasValue == false)
{
writer.WriteNullValue();
return;
}

writer.WriteStringValue(value.Value.Kind == DateTimeKind.Utc ? value.Value : value.Value.ToUniversalTime());
}
serializerOptions.Converters.Add(new DateTimeSpaceConverter());
}
}
1 change: 1 addition & 0 deletions CallbackHandler/Handlers/CallbackHandlers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Shared.Logger;
using Shared.Serialisation;

namespace CallbackHandler.Handlers;
Expand Down
Loading