From 30e6dd2c54ce455c343695e2299b39717f900602 Mon Sep 17 00:00:00 2001
From: Tudor Stanciu <tudor.stanciu94@gmail.com>
Date: Sat, 22 Mar 2025 02:42:47 +0200
Subject: [PATCH] .NET 8 upgrade - part 1

---
 .../Netmash.Application.DataContracts.csproj  |  8 ++++----
 .../Netmash.Extensions.Swagger.csproj         |  6 +++---
 .../SwaggerExtensions.cs                      | 12 +++---------
 ...sh.Infrastructure.DatabaseMigration.csproj | 19 ++++++++++---------
 4 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/application/Netmash.Application.DataContracts/Netmash.Application.DataContracts.csproj b/src/application/Netmash.Application.DataContracts/Netmash.Application.DataContracts.csproj
index e59d5aa..f1615ad 100644
--- a/src/application/Netmash.Application.DataContracts/Netmash.Application.DataContracts.csproj
+++ b/src/application/Netmash.Application.DataContracts/Netmash.Application.DataContracts.csproj
@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Description>Data contracts</Description>
     <PackageReleaseNotes>Data contracts</PackageReleaseNotes>
     <PackageProjectUrl>https://lab.code-rove.com/gitea/bricks/netmash</PackageProjectUrl>
     <RepositoryUrl>https://lab.code-rove.com/gitea/bricks/netmash</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
-    <Version>1.0.1</Version>
+    <Version>1.1.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MediatR" Version="9.0.0" />
+    <PackageReference Include="MediatR.Contracts" Version="2.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/extensions/swagger/Netmash.Extensions.Swagger/Netmash.Extensions.Swagger.csproj b/src/extensions/swagger/Netmash.Extensions.Swagger/Netmash.Extensions.Swagger.csproj
index f358f89..932d141 100644
--- a/src/extensions/swagger/Netmash.Extensions.Swagger/Netmash.Extensions.Swagger.csproj
+++ b/src/extensions/swagger/Netmash.Extensions.Swagger/Netmash.Extensions.Swagger.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Description>Swagger extensions</Description>
     <PackageReleaseNotes>Swagger extensions</PackageReleaseNotes>
     <PackageProjectUrl>https://lab.code-rove.com/gitea/bricks/netmash</PackageProjectUrl>
     <RepositoryUrl>https://lab.code-rove.com/gitea/bricks/netmash</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <PackageTags>Netmash swagger</PackageTags>
-    <Version>1.0.7</Version>
+    <Version>1.1.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/extensions/swagger/Netmash.Extensions.Swagger/SwaggerExtensions.cs b/src/extensions/swagger/Netmash.Extensions.Swagger/SwaggerExtensions.cs
index 68f22c8..ed7a70f 100644
--- a/src/extensions/swagger/Netmash.Extensions.Swagger/SwaggerExtensions.cs
+++ b/src/extensions/swagger/Netmash.Extensions.Swagger/SwaggerExtensions.cs
@@ -18,7 +18,7 @@ namespace Netmash.Extensions.Swagger
             {
                 c.SwaggerDoc("v1", new OpenApiInfo { Title = title, Version = "v1" });
                 c.SetAuthorization(authorizationType);
-                c.CustomSchemaIds(type => type.ToString());
+                c.CustomSchemaIds(type => type.FullName.Replace("+", "."));
             });
 
             return services;
@@ -28,17 +28,11 @@ namespace Netmash.Extensions.Swagger
         {
             services.AddSwaggerGen(c =>
             {
-                c.SwaggerDoc("v1",
-                    new OpenApiInfo
-                    {
-                        Title = title,
-                        Version = "v1"
-                    });
-
+                c.SwaggerDoc("v1", new OpenApiInfo { Title = title, Version = "v1" });
                 c.SetAuthorization(authorizationType);
                 c.OperationFilter<PathParamsOperationFilter>();
                 c.SchemaFilter<DtoSchemaFilter>();
-                c.CustomSchemaIds(type => type.ToString());
+                c.CustomSchemaIds(type => type.FullName.Replace("+", "."));
             });
 
             return services;
diff --git a/src/infrastructure/Netmash.Infrastructure.DatabaseMigration/Netmash.Infrastructure.DatabaseMigration.csproj b/src/infrastructure/Netmash.Infrastructure.DatabaseMigration/Netmash.Infrastructure.DatabaseMigration.csproj
index 183e230..767a115 100644
--- a/src/infrastructure/Netmash.Infrastructure.DatabaseMigration/Netmash.Infrastructure.DatabaseMigration.csproj
+++ b/src/infrastructure/Netmash.Infrastructure.DatabaseMigration/Netmash.Infrastructure.DatabaseMigration.csproj
@@ -1,15 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Description>Database migration service</Description>
 	<PackageProjectUrl>https://lab.code-rove.com/gitea/bricks/netmash</PackageProjectUrl>
 	<RepositoryUrl>https://lab.code-rove.com/gitea/bricks/netmash</RepositoryUrl>
 	<RepositoryType>Git</RepositoryType>
 	<PackageTags>Netmash database migration</PackageTags>
-	<Version>1.2.0</Version>
+	<Version>1.3.0</Version>
 	<PackageReleaseNotes>1.1.0: From this version the migration service can keep its metadata in the database (SqlServer or Sqlite)
-1.2.0: .NET 6 upgrade</PackageReleaseNotes>
+1.2.0: .NET 6 upgrade
+1.3.0: .NET 8 upgrade</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
@@ -29,12 +30,12 @@
   </ItemGroup>
 
   <ItemGroup>
-	<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-	<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.13" />
-	<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.13" />
-	<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-	<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-	<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
+	<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
+	<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.14" />
+	<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.14" />
+	<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+	<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+	<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
   </ItemGroup>
 
 </Project>