Skip to content

shared nuget updates #351

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 3 commits into from
Jan 1, 2026
Merged

shared nuget updates #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd79185
shared nuget updates
StuartFerguson Jan 1, 2026
895ce29
:|
StuartFerguson Jan 1, 2026
10c6d8d
fix test failures
StuartFerguson Jan 1, 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
4 changes: 2 additions & 2 deletions EstateReportingAPI.BusinessLogic/EstateReportingAPI.BusinessLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<ItemGroup>
<PackageReference Include="MediatR" Version="14.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.DynamicLinq" Version="10.7.1" />
<PackageReference Include="Shared" Version="2025.12.1" />
<PackageReference Include="TransactionProcessor.Database" Version="2025.10.1" />
<PackageReference Include="Shared" Version="2025.12.2" />
<PackageReference Include="TransactionProcessor.Database" Version="2025.12.1" />
</ItemGroup>

<ItemGroup>
Expand Down
15 changes: 13 additions & 2 deletions EstateReportingAPI.BusinessLogic/ReportingManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,20 @@
using ResolvedDbContext<EstateManagementContext>? resolvedContext = this.Resolver.Resolve(EstateManagementDatabaseName, estateId.ToString());
await using EstateManagementContext context = resolvedContext.Context;

DateTime startOfYear = new(DateTime.Now.Year, 1, 1);
//DateTime startOfYear = new(DateTime.Now.Year, 1, 1);

Check notice on line 40 in EstateReportingAPI.BusinessLogic/ReportingManager.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

EstateReportingAPI.BusinessLogic/ReportingManager.cs#L40 

Remove this commented out code.

List<TransactionProcessor.Database.Entities.Calendar> entities = context.Calendar.Where(c => c.Date >= startOfYear && c.Date < DateTime.Now.Date.AddDays(-1)).OrderByDescending(d => d.Date).ToList();
//List<TransactionProcessor.Database.Entities.Calendar> entities = context.Calendar.Where(c => c.Date >= startOfYear && c.Date < DateTime.Now.Date.AddDays(-1)).OrderByDescending(d => d.Date).ToList();

DateTime today = DateTime.Today;
DateTime startDate = today.AddYears(-1);
DateTime endDate = today.AddDays(-1); // yesterday

List<TransactionProcessor.Database.Entities.Calendar> entities =
context.Calendar
.Where(c => c.Date >= startDate &&
c.Date < endDate)
.OrderByDescending(c => c.Date)
.ToList();

List<Calendar> result = new();
foreach (TransactionProcessor.Database.Entities.Calendar calendar in entities)
Expand Down
4 changes: 2 additions & 2 deletions EstateReportingAPI.Client/EstateReportingAPI.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.12.1" />
<PackageReference Include="ClientProxyBase" Version="2025.12.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Shared.Results" Version="2025.12.1" />
<PackageReference Include="Shared.Results" Version="2025.12.2" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions EstateReportingAPI.IntegrationTests/ControllerTestsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using DotNet.Testcontainers.Containers;
using DotNet.Testcontainers.Networks;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Shared.IntegrationTesting.TestContainers;
using SimpleResults;
using TransactionProcessor.Database.Contexts;
Expand Down
1 change: 0 additions & 1 deletion EstateReportingAPI.IntegrationTests/CustomWebApplicationFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace EstateReportingAPI.IntegrationTests;

using BusinessLogic;
using EstateReportingAPI.Common;
using k8s.KubeConfigModels;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.Testing;
Expand Down
4 changes: 2 additions & 2 deletions EstateReportingAPI.IntegrationTests/DimensionControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@ public async Task DimensionsController_GetCalendarYears_YearsReturned()
[Fact]
public async Task DimensionsController_GetCalendarComparisonDates_DatesReturned()
{
List<DateTime> datesInPreviousYear = helper.GetDatesForYear(DateTime.Now.Year - 1);
await helper.AddCalendarDates(datesInPreviousYear);
List<DateTime> datesInYear = helper.GetDatesForYear(DateTime.Now.Year);
await helper.AddCalendarDates(datesInYear);

Result<List<ComparisonDate>> result = await ApiClient.GetComparisonDates(string.Empty, this.TestId, CancellationToken.None);
result.IsSuccess.ShouldBeTrue();
List<ComparisonDate> dates = result.Data;
List <DateTime> expectedDates = datesInYear.Where(d => d <= DateTime.Now.Date.AddDays(-1)).ToList();
int expectedCount = expectedDates.Count + 2;
dates.ShouldNotBeNull();
dates.Count.ShouldBe(expectedCount);
foreach (DateTime date in expectedDates)
{
dates.Select(d => d.Date).Contains(date.Date).ShouldBeTrue();
Expand Down
18 changes: 9 additions & 9 deletions EstateReportingAPI.IntegrationTests/EstateReportingAPI.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
<PackageReference Include="TransactionProcessor.Database" Version="2025.10.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.0" />
<PackageReference Include="TransactionProcessor.Database" Version="2025.12.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
Expand All @@ -22,13 +22,13 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="Shared" Version="2025.12.1" />
<PackageReference Include="Shared.Logger" Version="2025.12.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.12.1" />
<PackageReference Include="Shared" Version="2025.12.2" />
<PackageReference Include="Shared.Logger" Version="2025.12.2" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.12.2" />
<PackageReference Include="Ductus.FluentDocker" Version="2.85.0" />
<PackageReference Include="NLog" Version="6.0.6" />
<PackageReference Include="NLog" Version="6.0.7" />
<PackageReference Include="NLog.Extensions.Logging" Version="6.1.0" />
<PackageReference Include="SecurityService.Client" Version="2025.12.1" />
<PackageReference Include="SecurityService.Client" Version="2025.12.2" />
<PackageReference Include="Lamar" Version="15.0.1" />
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="15.0.1" />

Expand Down
16 changes: 8 additions & 8 deletions EstateReportingAPI.Tests/EstateReportingAPI.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0">
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
<PackageReference Include="TransactionProcessor.Database" Version="2025.10.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.0" />
<PackageReference Include="TransactionProcessor.Database" Version="2025.12.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
Expand Down
27 changes: 13 additions & 14 deletions EstateReportingAPI/EstateReportingAPI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,32 @@

<ItemGroup>

<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
<PackageReference Include="Shared.Results" Version="2025.12.1" />
<PackageReference Include="Shared.Results.Web" Version="2025.12.1" />
<PackageReference Include="Shared.Results" Version="2025.12.2" />
<PackageReference Include="Shared.Results.Web" Version="2025.12.2" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Lamar" Version="15.0.1" />
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="15.0.1" />
<PackageReference Include="NLog.Extensions.Logging" Version="6.1.0" />
<PackageReference Include="Shared" Version="2025.12.1" />
<PackageReference Include="Shared" Version="2025.12.2" />
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI" 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.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="10.1.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="10.0.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="10.0.1" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="10.0.1" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0" />
<PackageReference Include="TransactionProcessor.Database" Version="2025.10.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="10.1.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="10.1.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.1" />
<PackageReference Include="TransactionProcessor.Database" Version="2025.12.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading