Merge pull request #175 from AndriiLab/feature/dotnet10-upgrade

AndriiLab · web-flow · commit 73588aea994f · 2025-11-26T20:41:59.000+01:00
Upgrade to .NET 10 and update dependencies
diff --git a/Modules/Promasy.Modules.Auth/Promasy.Modules.Auth.csproj b/Modules/Promasy.Modules.Auth/Promasy.Modules.Auth.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
@@ -12,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.14" />
+      <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/Modules/Promasy.Modules.Core/Modules/ModuleExtensions.cs b/Modules/Promasy.Modules.Core/Modules/ModuleExtensions.cs
@@ -9,7 +9,7 @@ namespace Promasy.Modules.Core.Modules;
 
 public static class ModuleExtensions
 {
-    private static readonly ICollection<IModule> RegisteredModules = new List<IModule>();
+    private static readonly List<IModule> RegisteredModules = [];
 
     public static IServiceCollection RegisterModule<TModule>(this IServiceCollection services, IConfiguration configuration) where TModule : class, IModule
     {
@@ -20,16 +20,16 @@ public static IServiceCollection RegisterModule<TModule>(this IServiceCollection
         // and rules decorated with IRules
         services.Scan(scan => scan
             .FromAssemblyOf<TModule>()
-            .AddClasses(classes => classes.AssignableTo<IService>())
+            .AddClasses(classes => classes.AssignableTo<IService>(), publicOnly: false)
             .AsImplementedInterfaces()
             .WithScopedLifetime()
-            .AddClasses(classes => classes.AssignableTo<IRepository>())
+            .AddClasses(classes => classes.AssignableTo<IRepository>(), publicOnly: false)
             .AsImplementedInterfaces()
             .WithScopedLifetime()
-            .AddClasses(classes => classes.AssignableTo(typeof(IRules<>)))
+            .AddClasses(classes => classes.AssignableTo(typeof(IRules<>)), publicOnly: false)
             .AsImplementedInterfaces()
             .WithScopedLifetime()
-            .AddClasses(classes => classes.AssignableTo(typeof(IMapper<,>)))
+            .AddClasses(classes => classes.AssignableTo(typeof(IMapper<,>)), publicOnly: false)
             .AsImplementedInterfaces()
             .WithSingletonLifetime());
         
diff --git a/Modules/Promasy.Modules.Core/OpenApi/OpenApiExtensions.cs b/Modules/Promasy.Modules.Core/OpenApi/OpenApiExtensions.cs
@@ -1,5 +1,5 @@
 ﻿using Microsoft.AspNetCore.Builder;
-using Microsoft.OpenApi.Models;
+using Microsoft.AspNetCore.Http;
 
 namespace Promasy.Modules.Core.OpenApi;
 
@@ -8,13 +8,14 @@ public static class OpenApiExtensions
     public static RouteHandlerBuilder WithApiDescription(this RouteHandlerBuilder builder, string tag, string id,
         string? summary = null, string? description = null)
     {
-        builder.WithOpenApi(o => new OpenApiOperation(o)
+        builder.WithName(id)
+            .WithSummary(summary ?? id)
+            .WithTags(tag);
+
+        if (description is not null)
         {
-            OperationId = id,
-            Summary = summary ?? id,
-            Description = description,
-            Tags = new List<OpenApiTag> { new() { Name = tag } }
-        });
+            builder.WithDescription(description);
+        }
 
         return builder;
     }
diff --git a/Modules/Promasy.Modules.Core/Promasy.Modules.Core.csproj b/Modules/Promasy.Modules.Core/Promasy.Modules.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
@@ -17,11 +17,10 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0" />
-      <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.14" />
-      <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
-      <PackageReference Include="Riok.Mapperly" Version="4.1.1" />
-      <PackageReference Include="Scrutor" Version="6.0.1" />
-      <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="9.103.7.2" />
+      <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.0" />
+      <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
+      <PackageReference Include="Riok.Mapperly" Version="4.3.0" />
+      <PackageReference Include="Scrutor" Version="7.0.0" />
+      <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="10.105.0" />
     </ItemGroup>
 </Project>
diff --git a/Modules/Promasy.Modules.Cpv/Promasy.Modules.Cpv.csproj b/Modules/Promasy.Modules.Cpv/Promasy.Modules.Cpv.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
diff --git a/Modules/Promasy.Modules.Dashboard/Promasy.Modules.Dashboard.csproj b/Modules/Promasy.Modules.Dashboard/Promasy.Modules.Dashboard.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
diff --git a/Modules/Promasy.Modules.Employees/Promasy.Modules.Employees.csproj b/Modules/Promasy.Modules.Employees/Promasy.Modules.Employees.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
diff --git a/Modules/Promasy.Modules.Files/Promasy.Modules.Files.csproj b/Modules/Promasy.Modules.Files/Promasy.Modules.Files.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
diff --git a/Modules/Promasy.Modules.Finances/Promasy.Modules.Finances.csproj b/Modules/Promasy.Modules.Finances/Promasy.Modules.Finances.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
diff --git a/Modules/Promasy.Modules.Manufacturers/Promasy.Modules.Manufacturers.csproj b/Modules/Promasy.Modules.Manufacturers/Promasy.Modules.Manufacturers.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
diff --git a/Modules/Promasy.Modules.Orders/Promasy.Modules.Orders.csproj b/Modules/Promasy.Modules.Orders/Promasy.Modules.Orders.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
@@ -12,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="QuestPDF" Version="2025.1.6" />
+      <PackageReference Include="QuestPDF" Version="2025.7.4" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Modules/Promasy.Modules.Organizations/Promasy.Modules.Organizations.csproj b/Modules/Promasy.Modules.Organizations/Promasy.Modules.Organizations.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
diff --git a/Modules/Promasy.Modules.Suppliers/Promasy.Modules.Suppliers.csproj b/Modules/Promasy.Modules.Suppliers/Promasy.Modules.Suppliers.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
diff --git a/Modules/Promasy.Modules.Units/Promasy.Modules.Units.csproj b/Modules/Promasy.Modules.Units/Promasy.Modules.Units.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
diff --git a/Promasy.Application/Promasy.Application.csproj b/Promasy.Application/Promasy.Application.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.3" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Promasy.Core/Promasy.Core.csproj b/Promasy.Core/Promasy.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
diff --git a/Promasy.Domain/Promasy.Domain.csproj b/Promasy.Domain/Promasy.Domain.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
diff --git a/Promasy.Persistence/Promasy.Persistence.csproj b/Promasy.Persistence/Promasy.Persistence.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
@@ -10,11 +10,11 @@
     <ItemGroup>
         <PackageReference Include="EntityFrameworkCore.Triggered.Extensions" Version="3.2.2" />
         <PackageReference Include="Microsoft.AspNetCore.App" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.3" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.3" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.3" />
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
-        <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="9.103.7.2" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
+        <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="10.105.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Promasy.Web.Api/Program.cs b/Promasy.Web.Api/Program.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Localization;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Promasy.Core.Constants;
 using Promasy.Modules.Auth;
 using Promasy.Modules.Core;
@@ -77,18 +77,18 @@
             Description =
                 "JWT Authorization header using the Bearer scheme. \r\n\r\n Enter 'Bearer' [space] and then your token in the text input below.",
         });
-        o.AddSecurityRequirement(new OpenApiSecurityRequirement
+        o.AddSecurityRequirement(d => new OpenApiSecurityRequirement
         {
             {
-                new OpenApiSecurityScheme
+                new OpenApiSecuritySchemeReference("Bearer", d)
                 {
-                    Reference = new OpenApiReference
+                    Reference = new JsonSchemaReference
                     {
                         Type = ReferenceType.SecurityScheme,
                         Id = "Bearer"
                     }
                 },
-                Array.Empty<string>()
+                []
             }
         });
     });
@@ -133,7 +133,7 @@
         .AddSupportedUICultures(LocalizationCulture.SupportedCultures)
         .AddInitialRequestCultureProvider(new CustomRequestCultureProvider(context =>
         {
-            var requestLanguages = context.Request.Headers["Accept-Language"].ToString();
+            var requestLanguages = context.Request.Headers.AcceptLanguage.ToString();
             var requestLanguage = requestLanguages.Split(',').FirstOrDefault() ?? string.Empty;
             string selectedLanguage;
             if (LocalizationCulture.SupportedCultures.Contains(requestLanguage))
diff --git a/Promasy.Web.Api/Promasy.Web.Api.csproj b/Promasy.Web.Api/Promasy.Web.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Promasy.Web.App</RootNamespace>
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.3.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/README.md b/README.md
@@ -14,8 +14,8 @@ Vue.js as frontend.
 
 ## Requirements
 
-- .NET Core 8
-- PostgreSQL 14
+- .NET Core 10
+- PostgreSQL 17
 
 ## How to run
 
