Skip to content

Move to .NET 10, EF Core 10 and CqApi 10 #32

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
samerzughul merged 1 commit into from
Oct 11, 2026
Merged

Move to .NET 10, EF Core 10 and CqApi 10 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .github/workflows/ci-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
github.event_name == 'workflow_dispatch' }}
uses: simplify9/.github/.github/workflows/reusable-service-cicd.yml@main
with:
major-version: '8'
major-version: '10'
minor-version: '0'
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'

# Build + push the SDK NuGet package (tests off, as before)
nuget-projects: 'SW.Surl.Sdk/SW.Surl.Sdk.csproj'
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base
WORKDIR /app
# .NET 8+ listens on 8080 by default; the surl Helm chart sends traffic to containerPort 80.
ENV ASPNETCORE_HTTP_PORTS=80
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
WORKDIR /src
COPY ["SW.Surl.Web/SW.Surl.Web.csproj", "SW.Surl.Web/"]
COPY ["SW.Surl.Sdk/SW.Surl.Sdk.csproj", "SW.Surl.Sdk/"]
Expand Down
4 changes: 2 additions & 2 deletions SW.Surl.Sdk/SW.Surl.Sdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<PackageId>SimplyWorks.Surl.Sdk</PackageId>
<Authors>SimplyWorks</Authors>
<Product>SimplyWorks.Surl.Sdk</Product>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.3.0" />
<PackageReference Include="SimplyWorks.HttpExtensions" Version="8.0.0" />
<PackageReference Include="SimplyWorks.HttpExtensions" Version="8.1.1" />
</ItemGroup>

</Project>
16 changes: 8 additions & 8 deletions SW.Surl.Web/SW.Surl.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\SW.Surl.Sdk\SW.Surl.Sdk.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.20">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.12">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.20" />
<PackageReference Include="EFCore.NamingConventions" Version="8.0.3" />
<PackageReference Include="FluentValidation" Version="12.0.0" />
<PackageReference Include="SimplyWorks.CqApi" Version="8.2.3" />
<PackageReference Include="SimplyWorks.EfCoreExtensions" Version="8.1.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.12" />
<PackageReference Include="EFCore.NamingConventions" Version="10.0.1" />
<PackageReference Include="FluentValidation" Version="12.1.1" />
<PackageReference Include="SimplyWorks.CqApi" Version="10.0.0" />
<PackageReference Include="SimplyWorks.EfCoreExtensions" Version="10.0.1" />
<PackageReference Include="SimplyWorks.Logger" Version="8.0.1" />

</ItemGroup>
Expand Down
7 changes: 7 additions & 0 deletions SW.Surl.Web/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Diagnostics;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
Expand Down Expand Up @@ -52,6 +53,11 @@ public void ConfigureServices(IServiceCollection services)
services.AddDbContext<SurlDbContext>(c =>
{
c.EnableSensitiveDataLogging(true);
// created_on is timestamp without time zone in the database but the model maps DateTime
// to timestamptz (Npgsql 6+), which EF 8 ignored and EF 9+ reports as a pending change and
// throws on in Migrate(). Pinning the column type would make Npgsql refuse the UTC
// CreatedOn values the audit writes, so keep EF 8's behaviour.
c.ConfigureWarnings(w => w.Ignore(RelationalEventId.PendingModelChangesWarning));
c.UseSnakeCaseNamingConvention();
c.UseNpgsql(Configuration.GetConnectionString(SurlDbContext.ConnectionString), b =>
{
Expand Down Expand Up @@ -79,6 +85,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
app.UseEndpoints(endpoints =>
{
endpoints.MapControllers();
endpoints.MapCqApi();
});
}
}
Expand Down