Merge pull request #780 from LuccaSA/net8

UPdate : net6 -> net8
LuccaSA · Oct 25, 2024 · bfb679c · bfb679c
2 parents bbdef35 + 3b0dcf8
commit bfb679c
Show file tree

Hide file tree

Showing 28 changed files with 75 additions and 190 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '8.0.x'
 
     - name: Install GitVersion
       uses: gittools/actions/gitversion/setup@v0.9.15

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
   </ItemGroup>
 
 </Project>
diff --git a/Rdd.sln b/Rdd.sln
@@ -13,10 +13,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rdd.Application", "src\Rdd.
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{505AAC10-0297-43ED-8097-22B0CB65030B}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		.gitignore = .gitignore
 		build.ps1 = build.ps1
+		CODEOWNERS = CODEOWNERS
+		coverlet.runsettings = coverlet.runsettings
 		Directory.Build.props = Directory.Build.props
 		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
+		GitVersion.yml = GitVersion.yml
 		global.json = global.json
+		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rdd.Domain.Tests", "test\Rdd.Domain.Tests\Rdd.Domain.Tests.csproj", "{CB42A78B-6DC8-4A20-B7EB-228FA1324C70}"

diff --git a/build.ps1 b/build.ps1
@@ -17,4 +17,5 @@ param(
     dotnet pack .\Application\Rdd.Application\Rdd.Application.csproj --configuration Debug $propack -o $nuget_path
     dotnet pack .\Web\Rdd.Web\Rdd.Web.csproj --configuration Debug $propack -o $nuget_path
     dotnet pack .\Web\Rdd.Web.AutoMapper\RDD.Web.AutoMapper.csproj --configuration Debug $propack -o $nuget_path
+    dotnet pack .\Web\Rdd.Z.EntityFramework\Rdd.Z.EntityFramework.csproj --configuration Debug $propack -o $nuget_path
 
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.0",
+    "version": "8.0.0",
     "rollForward": "latestFeature"
   }
 }
diff --git a/src/RDD.Web.AutoMapper/RDD.Web.AutoMapper.csproj b/src/RDD.Web.AutoMapper/RDD.Web.AutoMapper.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,11 +13,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="12.0.0" />
-    <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="6.0.2" />
+    <PackageReference Include="AutoMapper" Version="13.0.1" />
+    <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="7.0.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
   </ItemGroup>
 </Project>
diff --git a/src/Rdd.Application/Rdd.Application.csproj b/src/Rdd.Application/Rdd.Application.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ProjectGuid>{C07BD97E-A1DC-47FB-9C00-23B6B3CB70B8}</ProjectGuid>
   </PropertyGroup>
 
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Rdd.Domain/Exceptions/BadRequestException.cs b/src/Rdd.Domain/Exceptions/BadRequestException.cs
@@ -17,11 +17,6 @@ public BadRequestException(string message, Exception innerException)
         {
         }
 
-        protected BadRequestException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-
         public override HttpStatusCode StatusCode => HttpStatusCode.BadRequest;
     }
 }
diff --git a/src/Rdd.Domain/Exceptions/BusinessException.cs b/src/Rdd.Domain/Exceptions/BusinessException.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Net;
-using System.Runtime.Serialization;
 
 namespace Rdd.Domain.Exceptions
 {
@@ -20,17 +19,6 @@ protected BusinessException(string message, Exception innerException)
         {
         }
 
-        protected BusinessException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-
         public abstract HttpStatusCode StatusCode { get; }
-
-        public override void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-            base.GetObjectData(info, context);
-            info.AddValue(nameof(StatusCode), StatusCode);
-        }
     }
 }
diff --git a/src/Rdd.Domain/Exceptions/ForbiddenException.cs b/src/Rdd.Domain/Exceptions/ForbiddenException.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Net;
-using System.Runtime.Serialization;
 
 namespace Rdd.Domain.Exceptions
 {
@@ -12,11 +11,6 @@ public ForbiddenException(string message)
         {
         }
 
-        private ForbiddenException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-
         public override HttpStatusCode StatusCode => HttpStatusCode.Forbidden;
     }
 }
diff --git a/src/Rdd.Domain/Exceptions/TechnicalException.cs b/src/Rdd.Domain/Exceptions/TechnicalException.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Net;
-using System.Runtime.Serialization;
 
 namespace Rdd.Domain.Exceptions
 {
@@ -21,17 +20,6 @@ public TechnicalException(string message, Exception innerException)
         {
         }
 
-        private TechnicalException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-
         public HttpStatusCode StatusCode => HttpStatusCode.InternalServerError;
-
-        public override void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-            base.GetObjectData(info, context);
-            info.AddValue(nameof(StatusCode), StatusCode);
-        }
     }
 }
diff --git a/src/Rdd.Domain/Exceptions/UnauthorizedException.cs b/src/Rdd.Domain/Exceptions/UnauthorizedException.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Net;
-using System.Runtime.Serialization;
 
 namespace Rdd.Domain.Exceptions
 {
@@ -12,11 +11,6 @@ public UnauthorizedException(string message)
         {
         }
 
-        private UnauthorizedException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-
         public override HttpStatusCode StatusCode => HttpStatusCode.Unauthorized;
     }
 }
diff --git a/src/Rdd.Domain/Exceptions/UnsupportedContentTypeException.cs b/src/Rdd.Domain/Exceptions/UnsupportedContentTypeException.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Net;
-using System.Runtime.Serialization;
 
 namespace Rdd.Domain.Exceptions
 {
@@ -12,11 +11,6 @@ public UnsupportedContentTypeException(string message)
         {
         }
 
-        private UnsupportedContentTypeException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-
         public override HttpStatusCode StatusCode => HttpStatusCode.UnsupportedMediaType;
     }
 }
diff --git a/src/Rdd.Domain/Rdd.Domain.csproj b/src/Rdd.Domain/Rdd.Domain.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ProjectGuid>{64D838DB-55D3-4F2E-8EDB-CF1866B3939B}</ProjectGuid>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Primitives" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Primitives" Version="8.0.0" />
     <PackageReference Include="NExtends" Version="2.3.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Rdd.Infra/Exceptions/QueryBuilderException.cs b/src/Rdd.Infra/Exceptions/QueryBuilderException.cs
@@ -1,7 +1,6 @@
 using Rdd.Domain.Exceptions;
 using System;
 using System.Net;
-using System.Runtime.Serialization;
 
 namespace Rdd.Infra.Exceptions
 {
@@ -12,7 +11,5 @@ public sealed class QueryBuilderException : BusinessException
 
         public QueryBuilderException(string message) : base(message) { }
         public QueryBuilderException(string message, Exception innerException) : base(message, innerException) { }
-
-        private QueryBuilderException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
diff --git a/src/Rdd.Infra/Rdd.Infra.csproj b/src/Rdd.Infra/Rdd.Infra.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ProjectGuid>{ED772E81-78BC-4126-8A4F-CB6EAFA72A4D}</ProjectGuid>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.12" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Rdd.Domain\Rdd.Domain.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Rdd.Web/Rdd.Web.csproj b/src/Rdd.Web/Rdd.Web.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ProjectGuid>{35EB26DD-BF14-4B20-A644-9E566F51EA76}</ProjectGuid>
   </PropertyGroup>
 
   <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" Version="3.1.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.0.12" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.12" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
   </ItemGroup>
 
   <ItemGroup>
@@ -19,6 +19,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
   </ItemGroup> 
 </Project>
diff --git a/src/Rdd.Z.EntityFramework/Rdd.Z.EntityFramework.csproj b/src/Rdd.Z.EntityFramework/Rdd.Z.EntityFramework.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="6.18.1" />
+    <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="8.103.6" />
   </ItemGroup>
 
   <ItemGroup>
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Rdd.Domain.Tests/AbstractEntityTests.cs b/test/Rdd.Domain.Tests/AbstractEntityTests.cs
@@ -4,6 +4,7 @@
 using Rdd.Domain.Tests.Models;
 using Rdd.Infra.Storage;
 using System.Linq;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Rdd.Domain.Tests
@@ -23,7 +24,7 @@ public ConcreteClassThreeCollection(IRepository<ConcreteClassThree> repository)
     public class AbstractEntityTests
     {
         [Fact]
-        public async void NonAbstractCollection_SHOULD_return_all_entities_WHEN_GetAll_is_called()
+        public async Task NonAbstractCollection_SHOULD_return_all_entities_WHEN_GetAll_is_called()
         {
             var rightsService = new OpenRightExpressionsHelper<ConcreteClassThree>();
             var storage = new InMemoryStorageService();
@@ -40,7 +41,7 @@ public async void NonAbstractCollection_SHOULD_return_all_entities_WHEN_GetAll_i
         }
 
         [Fact]
-        public async void AbstractCollection_SHOULD_return_all_entities_WHEN_GetAll_is_called()
+        public async Task AbstractCollection_SHOULD_return_all_entities_WHEN_GetAll_is_called()
         {
             var rightsService = new OpenRightExpressionsHelper<AbstractClass>();
             var storage = new InMemoryStorageService();

diff --git a/test/Rdd.Domain.Tests/ExceptionTests.cs b/test/Rdd.Domain.Tests/ExceptionTests.cs