migrate to .NET 8 and upgrade all nuget packages

iongritco · Nov 18, 2023 · e6c6038 · e6c6038
1 parent 681a619
commit e6c6038
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 37 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore ./MicroserviceTemplate/MicroserviceTemplate.sln
     - name: Build

diff --git a/...plate/src/Domain/MicroserviceTemplate.Application/MicroserviceTemplate.Application.csproj b/...plate/src/Domain/MicroserviceTemplate.Application/MicroserviceTemplate.Application.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	 <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="11.3.0" />
-    <PackageReference Include="MediatR" Version="11.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="FluentValidation" Version="11.8.0" />
+    <PackageReference Include="MediatR" Version="12.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ain/MicroserviceTemplate.Application/ToDo/Commands/CreateToDo/CreateToDoCommandHandler.cs b/...ain/MicroserviceTemplate.Application/ToDo/Commands/CreateToDo/CreateToDoCommandHandler.cs
@@ -16,13 +16,11 @@ public CreateToDoCommandHandler(IToDoCommandRepository commandRepository, IMedia
             _mediator = mediator;
         }
 
-        public async Task<Unit> Handle(CreateToDoCommand request, CancellationToken cancellationToken)
+        public async Task Handle(CreateToDoCommand request, CancellationToken cancellationToken)
         {
             var toDo = new ToDoItem(request.Id, request.Description, request.Username);
             await _commandRepository.CreateToDo(toDo);
             await _mediator.Publish(new TaskCreatedEvent(toDo.Username, toDo.Description, toDo.Status), cancellationToken);
-
-            return Unit.Value;
         }
     }
 }
diff --git a/...serviceTemplate/src/Domain/MicroserviceTemplate.Domain/MicroserviceTemplate.Domain.csproj b/...serviceTemplate/src/Domain/MicroserviceTemplate.Domain/MicroserviceTemplate.Domain.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>

diff --git a/...c/Infrastructure/MicroserviceTemplate.Persistence/MicroserviceTemplate.Persistence.csproj b/...c/Infrastructure/MicroserviceTemplate.Persistence/MicroserviceTemplate.Persistence.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/...src/Presentation/MicroserviceTemplate.Server.REST/MicroserviceTemplate.Server.REST.csproj b/...src/Presentation/MicroserviceTemplate.Server.REST/MicroserviceTemplate.Server.REST.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
   </PropertyGroup>
@@ -11,20 +11,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentValidation.AspNetCore" Version="11.2.2" />
-    <PackageReference Include="MediatR" Version="11.0.0" />
-    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
+    <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
+    <PackageReference Include="MediatR" Version="12.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/MicroserviceTemplate/src/Presentation/MicroserviceTemplate.Server.REST/Startup.cs b/MicroserviceTemplate/src/Presentation/MicroserviceTemplate.Server.REST/Startup.cs
@@ -24,7 +24,7 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddControllers();
             services.AddDbContext<ToDoDataContext>(options => options.UseSqlServer(_configuration.GetConnectionString("ToDoDataConnection")));
-            services.AddMediatR(typeof(GetToDoListQuery).GetTypeInfo().Assembly);
+            services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblies(typeof(GetToDoListQuery).GetTypeInfo().Assembly));
             services.AddValidatorsFromAssembly(typeof(GetToDoListQuery).GetTypeInfo().Assembly);
             services.AddTransient(typeof(IPipelineBehavior<,>), typeof(RequestValidationHandler<,>));
             services.AddTransient(typeof(IPipelineBehavior<,>), typeof(RequestPerformanceHandler<,>));

diff --git a/...te/tests/MicroserviceTemplate.UnitTest/Application/ToDo/CreateToDoCommandHandlerShould.cs b/...te/tests/MicroserviceTemplate.UnitTest/Application/ToDo/CreateToDoCommandHandlerShould.cs
@@ -1,11 +1,14 @@
 using AutoFixture.Xunit2;
-using FluentAssertions;
+
 using MediatR;
+
 using MicroserviceTemplate.Application.Interfaces;
 using MicroserviceTemplate.Application.ToDo.Commands.CreateToDo;
 using MicroserviceTemplate.Application.ToDo.Events.TaskCreatedEvent;
 using MicroserviceTemplate.Domain.Entities;
+
 using Moq;
+
 using Xunit;
 
 namespace MicroserviceTemplate.UnitTests.Application.ToDo
@@ -20,13 +23,12 @@ public async Task ReturnUnitValueWhenSuccessful(
             [Frozen] Mock<IMediator> mediator,
             CreateToDoCommandHandler sut)
         {
-            var result = await sut.Handle(command, CancellationToken.None);
+            await sut.Handle(command, CancellationToken.None);
 
             todoCommandRepositoryMock.Verify(call => call.CreateToDo(
                 It.Is<ToDoItem>(x => x.Id.Equals(command.Id) && x.Description.Equals(command.Description) && x.Username.Equals(command.Username))),
                 Times.Once);
             mediator.Verify(call => call.Publish(It.IsAny<TaskCreatedEvent>(), CancellationToken.None), Times.Once);
-            result.Should().Be(Unit.Value);
         }
     }
 }
diff --git a/...serviceTemplate/tests/MicroserviceTemplate.UnitTest/MicroserviceTemplate.UnitTests.csproj b/...serviceTemplate/tests/MicroserviceTemplate.UnitTest/MicroserviceTemplate.UnitTests.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="AutoFixture.AutoMoq" Version="4.17.0" />
-		<PackageReference Include="AutoFixture.Xunit2" Version="4.17.0" />
-		<PackageReference Include="FluentAssertions" Version="6.8.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
-		<PackageReference Include="Moq" Version="4.18.2" />
-		<PackageReference Include="xunit" Version="2.4.2" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+		<PackageReference Include="AutoFixture.AutoMoq" Version="4.18.0" />
+		<PackageReference Include="AutoFixture.Xunit2" Version="4.18.0" />
+		<PackageReference Include="FluentAssertions" Version="6.12.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+		<PackageReference Include="Moq" Version="4.20.69" />
+		<PackageReference Include="xunit" Version="2.6.1" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [![.NET](https://github.com/iongritco/CleanArchitecture-MicroserviceTemplate/actions/workflows/dotnet.yml/badge.svg)](https://github.com/iongritco/CleanArchitecture-MicroserviceTemplate/actions/workflows/dotnet.yml)
 
 # CleanArchitecture microservice template
-A template for creating a new microservice with Clean Architecture - DDD, CQRS, MediatR, .NET 7, Entity Framework Core
+A template for creating a new microservice with Clean Architecture - DDD, CQRS, MediatR, .NET 8, Entity Framework Core
 
 
 **Installation and usage**