From 55af22f0c9a9f3f925f145264f7a61e46015e3ab Mon Sep 17 00:00:00 2001 From: WarriorsSami Date: Wed, 19 Jun 2024 19:23:45 +0300 Subject: [PATCH] misc(quetzalcoatl): update .net sdk to 8 (and packages too) --- quetzalcoatl-auth/Api/Api.csproj | 10 ++++---- .../Application/Application.csproj | 8 +++---- .../Bootstrapper/Bootstrapper.csproj | 24 +++++++++---------- quetzalcoatl-auth/Bootstrapper/Program.cs | 9 ++++--- quetzalcoatl-auth/Dockerfile | 6 ++--- quetzalcoatl-auth/Domain/Domain.csproj | 6 ++--- .../Infrastructure/Infrastructure.csproj | 12 +++++----- .../Tests.Integration.csproj | 22 ++++++++--------- quetzalcoatl-auth/global.json | 2 +- 9 files changed, 51 insertions(+), 48 deletions(-) diff --git a/quetzalcoatl-auth/Api/Api.csproj b/quetzalcoatl-auth/Api/Api.csproj index e2d6208..fa6fc0f 100644 --- a/quetzalcoatl-auth/Api/Api.csproj +++ b/quetzalcoatl-auth/Api/Api.csproj @@ -1,14 +1,14 @@ - net7.0 + net8.0 enable enable - - - - + + + + diff --git a/quetzalcoatl-auth/Application/Application.csproj b/quetzalcoatl-auth/Application/Application.csproj index 53343ac..6d534db 100644 --- a/quetzalcoatl-auth/Application/Application.csproj +++ b/quetzalcoatl-auth/Application/Application.csproj @@ -1,13 +1,13 @@ - net7.0 + net8.0 enable enable - - - + + + diff --git a/quetzalcoatl-auth/Bootstrapper/Bootstrapper.csproj b/quetzalcoatl-auth/Bootstrapper/Bootstrapper.csproj index eb3650d..4a77b90 100644 --- a/quetzalcoatl-auth/Bootstrapper/Bootstrapper.csproj +++ b/quetzalcoatl-auth/Bootstrapper/Bootstrapper.csproj @@ -1,30 +1,30 @@ - net7.0 + net8.0 enable enable 08993c74-41b7-4d94-8059-37ba2c85a1c6 - - - + + + - - - + + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/quetzalcoatl-auth/Bootstrapper/Program.cs b/quetzalcoatl-auth/Bootstrapper/Program.cs index 04db81e..9052b06 100644 --- a/quetzalcoatl-auth/Bootstrapper/Program.cs +++ b/quetzalcoatl-auth/Bootstrapper/Program.cs @@ -90,14 +90,17 @@ }; }) .AddSingleton(tokenValidationParameters) - .AddJWTBearerAuth(jwtConfig.SecretKey) + .AddAuthenticationJwtBearer(opt => + { + opt.SigningKey = jwtConfig!.SecretKey; + }) .AddAutoMapper(typeof(IApiMarker), typeof(IApplicationMarker)) - .AddSwaggerDoc(settings => + .AddSwaggerDocument(settings => { settings.Title = "Quetzalcoatl Auth API"; settings.Version = "v1"; }); - + var app = builder.Build(); if (app.Environment.IsDevelopment()) diff --git a/quetzalcoatl-auth/Dockerfile b/quetzalcoatl-auth/Dockerfile index edfaa22..98fe9ad 100644 --- a/quetzalcoatl-auth/Dockerfile +++ b/quetzalcoatl-auth/Dockerfile @@ -1,5 +1,5 @@ # Restore files Stage -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS prepare-restore-files +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS prepare-restore-files LABEL stage=builder ENV PATH="${PATH}:/root/.dotnet/tools" RUN dotnet tool install --global --no-cache dotnet-subset --version 0.3.2 @@ -8,7 +8,7 @@ COPY . . RUN dotnet subset restore Bootstrapper/Bootstrapper.csproj --root-directory /src --output restore_subset/ # Build Stage -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build LABEL stage=builder WORKDIR /src COPY --from=prepare-restore-files /src/restore_subset . @@ -29,7 +29,7 @@ LABEL stage=builder RUN dotnet publish -c release --no-build -o /publish # Final Stage/Image -FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS final +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final WORKDIR /publish COPY --from=publish /publish . diff --git a/quetzalcoatl-auth/Domain/Domain.csproj b/quetzalcoatl-auth/Domain/Domain.csproj index 5f6bf70..129a771 100644 --- a/quetzalcoatl-auth/Domain/Domain.csproj +++ b/quetzalcoatl-auth/Domain/Domain.csproj @@ -1,11 +1,11 @@ - net7.0 + net8.0 enable enable - - + + \ No newline at end of file diff --git a/quetzalcoatl-auth/Infrastructure/Infrastructure.csproj b/quetzalcoatl-auth/Infrastructure/Infrastructure.csproj index d89d3e1..3875994 100644 --- a/quetzalcoatl-auth/Infrastructure/Infrastructure.csproj +++ b/quetzalcoatl-auth/Infrastructure/Infrastructure.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable @@ -9,14 +9,14 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/quetzalcoatl-auth/Tests.Integration/Tests.Integration.csproj b/quetzalcoatl-auth/Tests.Integration/Tests.Integration.csproj index 36221f9..96fa47a 100644 --- a/quetzalcoatl-auth/Tests.Integration/Tests.Integration.csproj +++ b/quetzalcoatl-auth/Tests.Integration/Tests.Integration.csproj @@ -1,24 +1,24 @@ - net7.0 + net8.0 enable enable false - - - - - - - - - + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/quetzalcoatl-auth/global.json b/quetzalcoatl-auth/global.json index 7cd6a1f..dad2db5 100644 --- a/quetzalcoatl-auth/global.json +++ b/quetzalcoatl-auth/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.0", + "version": "8.0.0", "rollForward": "latestMajor", "allowPrerelease": true }