docs;

target framework; some packages; removed mapster in favor of mapperly; removed newid in favor of the new guidv7 factory; dockerfile;
yanpitangui · Nov 12, 2024 · a8cca62 · a8cca62
1 parent 70e83f3
commit a8cca62
Show file tree

Hide file tree

Showing 19 changed files with 50 additions and 46 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/[email protected]
         with:
-          dotnet-version: '8.x'
+          dotnet-version: '9.x'
       - name: Install dotnet-sonarscanner
         run: |
           dotnet tool install --global dotnet-sonarscanner

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,25 +6,24 @@
   <ItemGroup>
     <!--    add your PackageVersion nodes here -->
     <PackageVersion Include="Ardalis.Result" Version="10.1.0" />
-    <PackageVersion Include="Ardalis.Result.AspNetCore" Version="10.0.0" />
+    <PackageVersion Include="Ardalis.Result.AspNetCore" Version="10.1.0" />
     <PackageVersion Include="Ardalis.Result.FluentValidation" Version="10.1.0" />
     <PackageVersion Include="EntityFrameworkCore.Exceptions.PostgreSQL" Version="8.1.3" />
-    <PackageVersion Include="Mapster.EFCore" Version="5.1.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
-    <PackageVersion Include="NewId" Version="4.0.1" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
     <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.10" />
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
+    <PackageVersion Include="Riok.Mapperly" Version="4.1.0" />
     <PackageVersion Include="StronglyTypedId" Version="1.0.0-beta08" />
     <PackageVersion Include="FluentValidation" Version="11.10.0" />
     <PackageVersion Include="MediatR" Version="12.4.1" />
     <PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
     <PackageVersion Include="Bogus" Version="35.6.1" />
     <PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
-    <PackageVersion Include="FluentAssertions" Version="6.12.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.2" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="coverlet.collector" Version="6.0.0" />
     <PackageVersion Include="Respawn" Version="6.2.1" />
@@ -37,20 +36,20 @@
     </PackageVersion>
     <PackageVersion Include="Ben.Demystifier" Version="0.4.1" />
     <PackageVersion Include="FluentValidation.AspNetCore" Version="11.3.0" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
     <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
-    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
     <PackageVersion Include="Serilog" Version="4.1.0" />
     <PackageVersion Include="Serilog.AspNetCore" Version="8.0.3" />
     <PackageVersion Include="Serilog.Exceptions" Version="8.4.0" />
     <PackageVersion Include="Serilog.Sinks.Async" Version="2.1.0" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="7.0.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
-    <PackageVersion Include="Swashbuckle.AspNetCore.Swagger" Version="6.9.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.Swagger" Version="7.0.0" />
   </ItemGroup>
 </Project>
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
   <a href="https://github.com/yanpitangui/dotnet-api-boilerplate/tree/main/translations/pt-br/README.md">Português</a>
 </p>
 
-A ``.Net 8.0`` WebApi boilerplate / template project. MediatR, Swagger, ~~AutoMapper~~ Mapster, Serilog and more implemented. 
+A ``.Net 9.0`` WebApi boilerplate / template project. MediatR, Swagger, ~~AutoMapper~~ Mapster, Serilog and more implemented. 
 
 [![Build](https://github.com/yanpitangui/dotnet-api-boilerplate/actions/workflows/build.yml/badge.svg)](https://github.com/yanpitangui/dotnet-api-boilerplate/actions/workflows/build.yml)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=yanpitangui_dotnet-api-boilerplate&metric=coverage)](https://sonarcloud.io/dashboard?id=yanpitangui_dotnet-api-boilerplate)

diff --git a/src/Boilerplate.Api/Boilerplate.Api.csproj b/src/Boilerplate.Api/Boilerplate.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <UserSecretsId>83093e71-d34c-405d-b8eb-442525b137fc</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>..\..</DockerfileContext>
@@ -10,7 +10,6 @@
     <TieredPGO>true</TieredPGO>
     <GarbageCollectionAdaptationMode>1</GarbageCollectionAdaptationMode>
     <Features>InterceptorsPreview</Features>
-    <EnableRequestDelegateGenerator>true</EnableRequestDelegateGenerator>
 
   </PropertyGroup>
 

diff --git a/src/Boilerplate.Api/Configurations/ApplicationSetup.cs b/src/Boilerplate.Api/Configurations/ApplicationSetup.cs
@@ -1,7 +1,5 @@
 using Boilerplate.Application.Common;
 using Boilerplate.Infrastructure;
-using MassTransit;
-using MassTransit.NewIdProviders;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Boilerplate.Api.Configurations;
@@ -11,8 +9,6 @@ public static class ApplicationSetup
     public static IServiceCollection AddApplicationSetup(this IServiceCollection services)
     {
         services.AddScoped<IContext, ApplicationDbContext>();
-        NewId.SetProcessIdProvider(new CurrentProcessIdProvider());
-
         return services;
     }
 

diff --git a/src/Boilerplate.Api/Dockerfile b/src/Boilerplate.Api/Dockerfile
@@ -1,6 +1,6 @@
 ##See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 #
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS base
 WORKDIR /app
 EXPOSE 8080
 
@@ -10,7 +10,7 @@ RUN apk add --no-cache icu-libs
 # Disable the invariant mode (set in base image)
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build
 WORKDIR /src
 COPY ["./Directory.Packages.props", "./"]
 COPY ["src/Boilerplate.Api/Boilerplate.Api.csproj", "src/Boilerplate.Api/"]

diff --git a/src/Boilerplate.Application/Boilerplate.Application.csproj b/src/Boilerplate.Application/Boilerplate.Application.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>11</LangVersion>
   </PropertyGroup>
@@ -10,10 +10,10 @@
     <PackageReference Include="Ardalis.Result" />
     <PackageReference Include="Ardalis.Result.FluentValidation" />
     <PackageReference Include="FluentValidation" />
-    <PackageReference Include="Mapster.EFCore" />
     <PackageReference Include="MediatR" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" />
+    <PackageReference Include="Riok.Mapperly" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Boilerplate.Application/Features/Heroes/CreateHero/CreateHeroHandler.cs b/src/Boilerplate.Application/Features/Heroes/CreateHero/CreateHeroHandler.cs
@@ -1,6 +1,5 @@
 using Ardalis.Result;
 using Boilerplate.Application.Common;
-using Mapster;
 using MediatR;
 using System.Threading;
 using System.Threading.Tasks;
@@ -19,9 +18,9 @@ public CreateHeroHandler(IContext context)
 
     public async Task<Result<GetHeroResponse>> Handle(CreateHeroRequest request, CancellationToken cancellationToken)
     {
-        var created = request.Adapt<Domain.Entities.Hero>();
+        var created = Mapper.ToHeroEntity(request);
         _context.Heroes.Add(created);
         await _context.SaveChangesAsync(cancellationToken);
-        return created.Adapt<GetHeroResponse>();
+        return Mapper.ToHeroDto(created);
     }
 }
diff --git a/src/Boilerplate.Application/Features/Heroes/GetAllHeroes/GetAllHeroesHandler.cs b/src/Boilerplate.Application/Features/Heroes/GetAllHeroes/GetAllHeroesHandler.cs
@@ -1,7 +1,6 @@
 using Boilerplate.Application.Common;
 using Boilerplate.Application.Common.Responses;
 using Boilerplate.Application.Extensions;
-using Mapster;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 using System.Linq;
@@ -27,7 +26,7 @@ public async Task<PaginatedList<GetHeroResponse>> Handle(GetAllHeroesRequest req
             .WhereIf(request.HeroType != null, x => x.HeroType == request.HeroType)
             .WhereIf(!string.IsNullOrEmpty(request.Team), x => x.Team == request.Team)
             .WhereIf(!string.IsNullOrEmpty(request.Individuality), x => EF.Functions.Like(x.Individuality!, $"%{request.Individuality}%"));
-        return await heroes.ProjectToType<GetHeroResponse>()
+        return await heroes.ProjectToResponse()
             .OrderBy(x => x.Name)
             .ToPaginatedListAsync(request.CurrentPage, request.PageSize);
     }

diff --git a/src/Boilerplate.Application/Features/Heroes/GetHeroById/GetHeroByIdHandler.cs b/src/Boilerplate.Application/Features/Heroes/GetHeroById/GetHeroByIdHandler.cs
@@ -1,6 +1,5 @@
 using Ardalis.Result;
 using Boilerplate.Application.Common;
-using Mapster;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 using System.Threading;
@@ -22,6 +21,6 @@ public async Task<Result<GetHeroResponse>> Handle(GetHeroByIdRequest request, Ca
         var hero = await _context.Heroes.FirstOrDefaultAsync(x => x.Id == request.Id,
             cancellationToken: cancellationToken);
         if (hero is null) return Result.NotFound();
-        return hero.Adapt<GetHeroResponse>();
+        return Mapper.ToHeroDto(hero);
     }
 }
diff --git a/src/Boilerplate.Application/Features/Heroes/Mapper.cs b/src/Boilerplate.Application/Features/Heroes/Mapper.cs
@@ -0,0 +1,16 @@
+using Boilerplate.Application.Features.Heroes.CreateHero;
+using Boilerplate.Domain.Entities;
+using Riok.Mapperly.Abstractions;
+using System.Linq;
+
+namespace Boilerplate.Application.Features.Heroes;
+
+[Mapper]
+public static partial class Mapper
+{
+    public static partial Hero ToHeroEntity(CreateHeroRequest dto);
+    public static partial GetHeroResponse ToHeroDto(Hero entity);
+
+    public static partial IQueryable<GetHeroResponse> ProjectToResponse(this IQueryable<Hero> source);
+
+}
diff --git a/src/Boilerplate.Application/Features/Heroes/UpdateHero/UpdateHeroHandler.cs b/src/Boilerplate.Application/Features/Heroes/UpdateHero/UpdateHeroHandler.cs
@@ -1,6 +1,5 @@
 using Ardalis.Result;
 using Boilerplate.Application.Common;
-using Mapster;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 using System.Threading;
@@ -32,6 +31,6 @@ public async Task<Result<GetHeroResponse>> Handle(UpdateHeroRequest request,
         originalHero.HeroType = request.HeroType;
         _context.Heroes.Update(originalHero);
         await _context.SaveChangesAsync(cancellationToken);
-        return originalHero.Adapt<GetHeroResponse>();
+        return Mapper.ToHeroDto(originalHero);
     }
 }
diff --git a/src/Boilerplate.Domain/Boilerplate.Domain.csproj b/src/Boilerplate.Domain/Boilerplate.Domain.csproj
@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <LangVersion>11</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" />
-    <PackageReference Include="NewId" />
     <PackageReference Include="StronglyTypedId" PrivateAssets="all" ExcludeAssets="runtime" />
     <PackageReference Include="StronglyTypedId.Templates" PrivateAssets="all" ExcludeAssets="runtime" />
   </ItemGroup>

diff --git a/src/Boilerplate.Domain/Entities/Hero.cs b/src/Boilerplate.Domain/Entities/Hero.cs
@@ -1,12 +1,12 @@
 using Boilerplate.Domain.Entities.Common;
 using Boilerplate.Domain.Entities.Enums;
-using MassTransit;
+using System;
 
 namespace Boilerplate.Domain.Entities;
 
 public class Hero : Entity<HeroId>
 {
-    public override HeroId Id { get; set; } = NewId.NextGuid();
+    public override HeroId Id { get; set; } = Guid.CreateVersion7();
     public string Name { get; set; } = null!;
 
     public string? Nickname { get; set; }

diff --git a/src/Boilerplate.Infrastructure/ApplicationUser.cs b/src/Boilerplate.Infrastructure/ApplicationUser.cs
@@ -1,15 +1,14 @@
-using MassTransit;
-using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity;
 using System;
 
 namespace Boilerplate.Infrastructure;
 
 public class ApplicationUser : IdentityUser<Guid>
 {
-    public override Guid Id { get; set; } = NewId.NextSequentialGuid();
+    public override Guid Id { get; set; } = Guid.CreateVersion7();
 }
 
 public class ApplicationRole : IdentityRole<Guid>
 {
-    public override Guid Id { get; set; } = NewId.NextSequentialGuid();
+    public override Guid Id { get; set; } = Guid.CreateVersion7();
 }
diff --git a/src/Boilerplate.Infrastructure/Boilerplate.Infrastructure.csproj b/src/Boilerplate.Infrastructure/Boilerplate.Infrastructure.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <LangVersion>11</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/tests/Boilerplate.Api.IntegrationTests/Boilerplate.Api.IntegrationTests.csproj b/tests/Boilerplate.Api.IntegrationTests/Boilerplate.Api.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <LangVersion>11</LangVersion>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>

diff --git a/tests/Boilerplate.Api.UnitTests/Boilerplate.Api.UnitTests.csproj b/tests/Boilerplate.Api.UnitTests/Boilerplate.Api.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <LangVersion>11</LangVersion>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>

diff --git a/translations/pt-br/README.md b/translations/pt-br/README.md
@@ -4,7 +4,7 @@
   <span>Português</span>
 </p>
 
-Um boilerplate de API ``.Net 8.0`` / projeto de template. MediatR, Swagger, ~~AutoMapper~~ Mapster, Serilog, entre outros, implementados.
+Um boilerplate de API ``.Net 9.0`` / projeto de template. MediatR, Swagger, ~~AutoMapper~~ Mapster, Serilog, entre outros, implementados.
 
 [![Build](https://github.com/yanpitangui/dotnet-api-boilerplate/actions/workflows/build.yml/badge.svg)](https://github.com/yanpitangui/dotnet-api-boilerplate/actions/workflows/build.yml)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=yanpitangui_dotnet-api-boilerplate&metric=coverage)](https://sonarcloud.io/dashboard?id=yanpitangui_dotnet-api-boilerplate)