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
3 changes: 3 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<Project>
<Import Project="Directory.Packages.props" Condition="Exists('Directory.Packages.props')" />
</Project>
55 changes: 55 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.9" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.9" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.9" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.9" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.9" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.9" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.2.1" />
<PackageVersion Include="TransactionProcessor.Database" Version="2026.5.2" />
<PackageVersion Include="xunit.v3" Version="3.2.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageVersion Include="coverlet.msbuild" Version="10.0.1" />
<PackageVersion Include="ClientProxyBase" Version="2026.5.7" />
<PackageVersion Include="Shared.Results" Version="2026.5.7" />
<PackageVersion Include="MediatR" Version="14.1.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.DynamicLinq" Version="10.7.2" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.9" />
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
<PackageVersion Include="Shared.Results.Web" Version="2026.5.7" />
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="7.5.0" />
<PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="7.5.0" />
<PackageVersion Include="Lamar" Version="16.0.0" />
<PackageVersion Include="Lamar.Microsoft.DependencyInjection" Version="16.0.0" />
<PackageVersion Include="NLog.Extensions.Logging" Version="6.1.3" />
<PackageVersion Include="Shared" Version="2026.5.7" />
<PackageVersion Include="AspNetCore.HealthChecks.SqlServer" Version="9.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.9" />
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="10.2.1" />
<PackageVersion Include="Swashbuckle.AspNetCore.Filters" Version="10.0.1" />
<PackageVersion Include="Swashbuckle.AspNetCore.Swagger" Version="10.2.1" />
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="10.2.1" />
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.2.1" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.9" />
<PackageVersion Include="Sentry.AspNetCore" Version="6.6.0" />
<PackageVersion Include="Shared.Logger" Version="2026.5.7" />
<PackageVersion Include="Shared.IntegrationTesting" Version="2026.5.7" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.8" />
<PackageVersion Include="coverlet.collector" Version="3.2.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.9" />
<PackageVersion Include="Ductus.FluentDocker" Version="2.85.0" />
<PackageVersion Include="NLog" Version="6.1.3" />
<PackageVersion Include="SecurityService.Client" Version="2026.5.1" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.11">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.11" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
<PackageReference Include="Moq" Version="4.20.69" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Moq" />
<PackageReference Include="Shouldly" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="coverlet.collector">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MediatR" Version="14.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.DynamicLinq" Version="10.7.2" />
<PackageReference Include="Shared" Version="2026.5.6" />
<PackageReference Include="Shared.Results" Version="2026.5.6" />
<PackageReference Include="TransactionProcessor.Database" Version="2026.5.2-build358" />
<PackageReference Include="MediatR" />
<PackageReference Include="Microsoft.EntityFrameworkCore.DynamicLinq" />
<PackageReference Include="Shared" />
<PackageReference Include="Shared.Results" />
<PackageReference Include="TransactionProcessor.Database" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions EstateReportingAPI.Client/EstateReportingAPI.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2026.5.6" />
<PackageReference Include="Shared.Results" Version="2026.5.6" />
<PackageReference Include="ClientProxyBase" />
<PackageReference Include="Shared.Results" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions EstateReportingAPI.IntegrationTests/ControllerTestsBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ namespace EstateReportingAPI.IntegrationTests;
using Shared.Logger;
using Shouldly;
using Xunit;
using Xunit.Abstractions;

public abstract class ControllerTestsBase : IAsyncLifetime
{
Expand All @@ -30,7 +29,7 @@ public abstract class ControllerTestsBase : IAsyncLifetime
protected DatabaseHelper helper;
protected ITestOutputHelper TestOutputHelper;
protected DockerHelper DockerHelper;
public virtual async Task InitializeAsync()
public virtual async ValueTask InitializeAsync()
{
this.TestId = Guid.NewGuid();
String scenarioName = this.TestId.ToString();
Expand All @@ -55,7 +54,7 @@ public virtual async Task InitializeAsync()
await this.SetupStandingData();
}

public virtual async Task DisposeAsync()
public virtual async ValueTask DisposeAsync()
{
await this.DockerHelper.StopContainersForScenarioRun(DockerServices.None);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,30 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.5" />
<PackageReference Include="TransactionProcessor.Database" Version="2026.5.2-build358" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.4" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PackageReference Include="Swashbuckle.AspNetCore" />
<PackageReference Include="TransactionProcessor.Database" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit.v3" />
<PackageReference Include="xunit.runner.visualstudio">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.msbuild" Version="8.0.0">
<PackageReference Include="coverlet.msbuild">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="Shared" Version="2026.5.6" />
<PackageReference Include="Shared.Logger" Version="2026.5.6" />
<PackageReference Include="Shared.IntegrationTesting" Version="2026.5.6" />
<PackageReference Include="Ductus.FluentDocker" Version="2.85.0" />
<PackageReference Include="NLog" Version="6.1.1" />
<PackageReference Include="NLog.Extensions.Logging" Version="6.1.2" />
<PackageReference Include="SecurityService.Client" Version="2026.4.3-build157" />
<PackageReference Include="Lamar" Version="15.0.1" />
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="15.0.1" />
<PackageReference Include="Shouldly" />
<PackageReference Include="Shared" />
<PackageReference Include="Shared.Logger" />
<PackageReference Include="Shared.IntegrationTesting" />
<PackageReference Include="Ductus.FluentDocker" />
<PackageReference Include="NLog" />
<PackageReference Include="NLog.Extensions.Logging" />
<PackageReference Include="SecurityService.Client" />
<PackageReference Include="Lamar" />
<PackageReference Include="Lamar.Microsoft.DependencyInjection" />

</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
using Shouldly;
using SimpleResults;
using Xunit;
using Xunit.Abstractions;

namespace EstateReportingAPI.IntegrationTests
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using System.Threading.Tasks;
using Shouldly;
using Xunit;
using Xunit.Abstractions;

namespace EstateReportingAPI.IntegrationTests;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
using SimpleResults;
using TransactionProcessor.Database.Entities;
using Xunit;
using Xunit.Abstractions;

namespace EstateReportingAPI.IntegrationTests;

Expand Down
2 changes: 1 addition & 1 deletion EstateReportingAPI.Testing/EstateReportingAPI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
</ItemGroup>


Expand Down
28 changes: 14 additions & 14 deletions EstateReportingAPI.Tests/EstateReportingAPI.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8">
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
<PackageReference Include="Microsoft.EntityFrameworkCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.5" />
<PackageReference Include="TransactionProcessor.Database" Version="2026.5.2-build358" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Moq" />
<PackageReference Include="Shouldly" />
<PackageReference Include="Swashbuckle.AspNetCore" />
<PackageReference Include="TransactionProcessor.Database" />
<PackageReference Include="xunit.v3" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.msbuild" Version="8.0.0">
<PackageReference Include="coverlet.msbuild">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 4 additions & 2 deletions EstateReportingAPI.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.8.34004.107
# Visual Studio Version 18
VisualStudioVersion = 18.7.11903.348
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EstateReportingAPI", "EstateReportingAPI\EstateReportingAPI.csproj", "{8E6ED1E8-9776-49F3-ADEB-17A03318E136}"
EndProject
Expand All @@ -21,6 +21,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EstateReportingAPI.Models",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EstateReportingAPI.IntegrationTests", "EstateReportingAPI.IntegrationTests\EstateReportingAPI.IntegrationTests.csproj", "{85555B3A-FC04-4291-B0CB-F0835AC23D3E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A296632F-ABDB-4D3E-9351-51346C70C08A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
2 changes: 2 additions & 0 deletions EstateReportingAPI/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
WORKDIR /src
COPY ["EstateReportingAPI/NuGet.Config", "."]
COPY ["EstateReportingAPI/EstateReportingAPI.csproj", "EstateReportingAPI/"]
COPY ["Directory.Packages.props", "."]
COPY . .
RUN dotnet restore "EstateReportingAPI/EstateReportingAPI.csproj"
COPY . .
WORKDIR "/src/EstateReportingAPI"
Expand Down
2 changes: 2 additions & 0 deletions EstateReportingAPI/Dockerfilewindows
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0-windowsservercore-ltsc2022 AS build
WORKDIR /src
COPY ["EstateReportingAPI/NuGet.Config", "."]
COPY ["EstateReportingAPI/EstateReportingAPI.csproj", "EstateReportingAPI/"]
COPY ["Directory.Packages.props", "."]
COPY . .
RUN dotnet restore "EstateReportingAPI/EstateReportingAPI.csproj"
COPY . .
WORKDIR "/src/EstateReportingAPI"
Expand Down
52 changes: 26 additions & 26 deletions EstateReportingAPI/EstateReportingAPI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,35 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.4" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
<PackageReference Include="Shared.Results" Version="2026.5.6" />
<PackageReference Include="Shared.Results.Web" Version="2026.5.6" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />

<PackageReference Include="Microsoft.AspNetCore.OpenApi" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Condition="'$(OS)' == 'Windows_NT'" />
<PackageReference Include="Shared.Results" />
<PackageReference Include="Shared.Results.Web" />
<PackageReference Include="Swashbuckle.AspNetCore" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenIddict.Validation.AspNetCore" Version="7.4.0" />
<PackageReference Include="OpenIddict.Validation.SystemNetHttp" Version="7.4.0" />
<PackageReference Include="Lamar" Version="15.0.1" />
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="15.0.1" />
<PackageReference Include="NLog.Extensions.Logging" Version="6.1.2" />
<PackageReference Include="Shared" Version="2026.5.6" />
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.4" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.5" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="10.1.5" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="10.0.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="10.1.5" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="10.1.5" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.5" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.4" />
<PackageReference Include="TransactionProcessor.Database" Version="2026.5.2-build358" />
<PackageReference Include="Sentry.AspNetCore" Version="6.2.0" />
<PackageReference Include="OpenIddict.Validation.AspNetCore" />
<PackageReference Include="OpenIddict.Validation.SystemNetHttp" />
<PackageReference Include="Lamar" />
<PackageReference Include="Lamar.Microsoft.DependencyInjection" />
<PackageReference Include="NLog.Extensions.Logging" />
<PackageReference Include="Shared" />
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" />
<PackageReference Include="AspNetCore.HealthChecks.Uris" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" />
<PackageReference Include="Swashbuckle.AspNetCore" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" />
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<PackageReference Include="TransactionProcessor.Database" />
<PackageReference Include="Sentry.AspNetCore" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading