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
46 changes: 23 additions & 23 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,53 @@
</PropertyGroup>
<ItemGroup>
<!-- ASP.NET Core -->
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.12" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.12" />
<PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />

<!-- Entity Framework Core -->
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.1" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.12" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.12" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.12" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.3" />

<!-- Dapper / Npgsql (Style-2 modules + messaging Dapper inbox executor) -->
<PackageVersion Include="Dapper" Version="2.1.66" />
<PackageVersion Include="Npgsql" Version="10.0.0" />
<PackageVersion Include="Dapper" Version="2.1.86" />
<PackageVersion Include="Npgsql" Version="10.0.3" />

<!-- DbUp (Style-2 module migrations) -->
<PackageVersion Include="dbup-postgresql" Version="6.0.3" />
<PackageVersion Include="dbup-postgresql" Version="6.1.5" />

<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.12" />

<!-- Hosting (BackgroundService for OutboxWorker) -->
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.12" />

<!-- Infrastructure -->
<PackageVersion Include="Scrutor" Version="4.2.2" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
<PackageVersion Include="Scalar.AspNetCore" Version="2.13.1" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.12" />
<PackageVersion Include="Scalar.AspNetCore" Version="2.17.3" />

<!-- Validation (legacy — used by existing DietPlanner.Api) -->

<!-- Transitive override: pin to patched version per NU1903 advisories
GHSA-37gx-xxp4-5rgx and GHSA-w3x6-4m5h-cxqf -->
<PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.7" />
<PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.12" />

<!-- Testing -->
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.12" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.10.0" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="NSubstitute" Version="6.2.0" />
<PackageVersion Include="Shouldly" Version="4.2.1" />
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.4.0" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.15.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ namespace DietPlanner.IntegrationTests.Infrastructure;

public sealed class DatabaseFixture : IAsyncLifetime
{
private readonly PostgreSqlContainer _container = new PostgreSqlBuilder()
.WithImage("postgres:17-alpine")
private readonly PostgreSqlContainer _container = new PostgreSqlBuilder("postgres:17-alpine")
.WithDatabase("dietplanner_test")
.WithUsername("test")
.WithPassword("test")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ namespace DietPlanner.IntegrationTests.Infrastructure;
/// </summary>
public sealed class HouseholdShoppingListFixture : IAsyncLifetime
{
private readonly PostgreSqlContainer _dietPlanner = new PostgreSqlBuilder()
.WithImage("postgres:17-alpine").WithDatabase("dp_hh_test").WithUsername("test").WithPassword("test").Build();
private readonly PostgreSqlContainer _dietPlanner = new PostgreSqlBuilder("postgres:17-alpine").WithDatabase("dp_hh_test").WithUsername("test").WithPassword("test").Build();

private readonly PostgreSqlContainer _household = new PostgreSqlBuilder()
.WithImage("postgres:17-alpine").WithDatabase("hh_test").WithUsername("test").WithPassword("test").Build();
private readonly PostgreSqlContainer _household = new PostgreSqlBuilder("postgres:17-alpine").WithDatabase("hh_test").WithUsername("test").WithPassword("test").Build();

public string DietPlannerConnectionString => _dietPlanner.GetConnectionString();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ public async Task PickablePersons_ListsPeopleNotYetInAHousehold()

var pickable = await owner.GetFromJsonAsync<List<PickableBody>>("/api/households/pickable-persons");

pickable!.ShouldContain(p => p.PersonId == freeId);
pickable.ShouldNotBeNull();
pickable.ShouldContain(p => p.PersonId == freeId);
pickable.ShouldNotContain(p => p.DisplayName == "Owner");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ namespace Household.IntegrationTests.Infrastructure;

public sealed class HouseholdDatabaseFixture : IAsyncLifetime
{
private readonly PostgreSqlContainer _container = new PostgreSqlBuilder()
.WithImage("postgres:17-alpine")
private readonly PostgreSqlContainer _container = new PostgreSqlBuilder("postgres:17-alpine")
.WithDatabase("household_test")
.WithUsername("test")
.WithPassword("test")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace Notifications.IntegrationTests.Infrastructure;

public sealed class NotificationsPostgresFixture : IAsyncLifetime
{
private readonly PostgreSqlContainer _container = new PostgreSqlBuilder()
private readonly PostgreSqlContainer _container = new PostgreSqlBuilder("postgres:17-alpine")
.WithDatabase("notifications_test")
.WithUsername("notifications")
.WithPassword("notifications")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ namespace Shared.Messaging.IntegrationTests.Fixtures;

public sealed class PostgresContainerFixture : IAsyncLifetime
{
public PostgreSqlContainer Container { get; } = new PostgreSqlBuilder()
.WithImage("postgres:17-alpine")
public PostgreSqlContainer Container { get; } = new PostgreSqlBuilder("postgres:17-alpine")
.WithDatabase("messaging_tests")
.Build();

Expand Down
Loading