Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions src/Api/Api.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
Expand All @@ -17,8 +17,10 @@
<ItemGroup>
<PackageReference Include="Amazon.CloudWatch.EMF" Version="2.2.0" />
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="9.0.0" />
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.400.1" />
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.502.55" />
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.3.26" />
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="4.0.2.20" />
<!-- Ensure SecurityToken aligns with AWSSDK.Core 4.x to avoid NU1608 -->
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.5.13" />
<PackageReference Include="Elastic.CommonSchema.Serilog" Version="9.0.0" />
<PackageReference Include="Elastic.Serilog.Enrichers.Web" Version="9.0.0" />
<PackageReference Include="FluentValidation" Version="12.1.1" />
Expand All @@ -33,7 +35,7 @@
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6" />
<PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="9.0.6" />
<PackageReference Include="JsonPath.Net" Version="3.0.2" />
<PackageReference Include="JsonPatch.Net" Version="3.3.0" />
<PackageReference Include="JsonPatch.Net" Version="5.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Data\Data.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions src/Data/Data.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="10.0.5" />
<PackageReference Include="MongoDB.Driver.Authentication.AWS" Version="3.7.0" />
<PackageReference Include="MongoDB.Driver" Version="3.7.0" />
<PackageReference Include="MongoDB.Driver.Authentication.AWS" Version="3.7.1" />
<PackageReference Include="MongoDB.Driver" Version="3.7.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Domain\Domain.csproj" />
Expand Down
4 changes: 4 additions & 0 deletions tests/Api.Client.Tests/Api.Client.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
<RootNamespace>Defra.TradeImportsDataApi.Api.Client.Tests</RootNamespace>
</PropertyGroup>
<ItemGroup>
<!-- Force the package resolution to the version required by Humanizer.Core.af -->
<PackageReference Include="Humanizer" Version="3.0.10" />
<!-- Ensure SecurityToken aligns with AWSSDK.Core 4.x to avoid NU1608 -->
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.5.13" />
<PackageReference Include="FluentValidation" Version="12.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
Expand Down
8 changes: 6 additions & 2 deletions tests/Api.IntegrationTests/Api.IntegrationTests.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
Expand All @@ -12,7 +12,11 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.SQS" Version="3.7.502.51" />
<!-- Force the package resolution to the version required by Humanizer.Core.af -->
<PackageReference Include="Humanizer" Version="3.0.10" />
<!-- Ensure SecurityToken aligns with AWSSDK.Core 4.x to avoid NU1608 -->
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.5.13" />
<PackageReference Include="AWSSDK.SQS" Version="4.0.2.18" />
<PackageReference Include="FluentValidation" Version="12.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
Expand Down
4 changes: 2 additions & 2 deletions tests/Api.IntegrationTests/Endpoints/SqsTestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ protected async Task DrainAllMessages()
await AsyncWaiter.WaitForAsync(async () =>
{
var response = await ReceiveMessage();

foreach (var message in response.Messages)
var messages = response.Messages ?? [];
foreach (var message in messages)
{
testOutputHelper?.WriteLine("Drain message: {0} {1}", message.MessageId, message.Body);

Expand Down
4 changes: 4 additions & 0 deletions tests/Api.Tests/Api.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
<RootNamespace>Defra.TradeImportsDataApi.Api.Tests</RootNamespace>
</PropertyGroup>
<ItemGroup>
<!-- Force the package resolution to the version required by Humanizer.Core.af -->
<PackageReference Include="Humanizer" Version="3.0.10" />
<!-- Ensure SecurityToken aligns with AWSSDK.Core 4.x to avoid NU1608 -->
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.5.13" />
<PackageReference Include="FluentValidation" Version="12.1.1" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.4.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5" />
Expand Down
4 changes: 2 additions & 2 deletions tests/Testing/Testing.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoFixture.Xunit2" Version="4.18.1" />
<PackageReference Include="FluentAssertions" Version="8.8.0" />
<PackageReference Include="FluentAssertions" Version="8.9.0" />
<PackageReference Include="MartinCostello.Logging.XUnit" Version="0.7.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
Expand All @@ -20,7 +20,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="WireMock.Net.FluentAssertions" Version="1.25.0" />
<PackageReference Include="WireMock.Net.FluentAssertions" Version="2.0.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="NSubstitute" Version="5.3.0" />
<PackageReference Include="Verify.Xunit" Version="31.12.5" />
Expand Down