Skip to content

Commit

Permalink
misc(quetzalcoatl): update .net sdk to 8 (and packages too)
Browse files Browse the repository at this point in the history
  • Loading branch information
WarriorsSami committed Jun 19, 2024
1 parent ce0187a commit 55af22f
Show file tree
Hide file tree
Showing 9 changed files with 51 additions and 48 deletions.
10 changes: 5 additions & 5 deletions quetzalcoatl-auth/Api/Api.csproj
Original file line number Diff line number Diff line change
@@ -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="AutoMapper" Version="12.0.1" />
<PackageReference Include="FastEndpoints" Version="5.8.0" />
<PackageReference Include="FastEndpoints.Security" Version="5.8.0" />
<PackageReference Include="FastEndpoints.Swagger" Version="5.8.0" />
<PackageReference Include="AutoMapper" Version="13.0.1" />
<PackageReference Include="FastEndpoints" Version="5.26.0" />
<PackageReference Include="FastEndpoints.Security" Version="5.26.0" />
<PackageReference Include="FastEndpoints.Swagger" Version="5.26.0" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
</ItemGroup>
<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions quetzalcoatl-auth/Application/Application.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="12.0.1" />
<PackageReference Include="FastEndpoints" Version="5.8.0" />
<PackageReference Include="FastEndpoints.Security" Version="5.8.0" />
<PackageReference Include="AutoMapper" Version="13.0.1" />
<PackageReference Include="FastEndpoints" Version="5.26.0" />
<PackageReference Include="FastEndpoints.Security" Version="5.26.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Domain\Domain.csproj" />
Expand Down
24 changes: 12 additions & 12 deletions quetzalcoatl-auth/Bootstrapper/Bootstrapper.csproj
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>08993c74-41b7-4d94-8059-37ba2c85a1c6</UserSecretsId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="6.0.5" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
<PackageReference Include="AutoMapper" Version="13.0.1" />
<PackageReference Include="EntityFrameworkCore.Triggered" Version="3.2.2" />
<PackageReference Include="FastEndpoints" Version="5.8.0" />
<PackageReference Include="FastEndpoints.Security" Version="5.8.0" />
<PackageReference Include="FastEndpoints.Swagger" Version="5.8.0" />
<PackageReference Include="FastEndpoints" Version="5.26.0" />
<PackageReference Include="FastEndpoints.Security" Version="5.26.0" />
<PackageReference Include="FastEndpoints.Swagger" Version="5.26.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
Expand Down
9 changes: 6 additions & 3 deletions quetzalcoatl-auth/Bootstrapper/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
6 changes: 3 additions & 3 deletions quetzalcoatl-auth/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 .
Expand All @@ -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 .

Expand Down
6 changes: 3 additions & 3 deletions quetzalcoatl-auth/Domain/Domain.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<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" Version="7.0.3" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="7.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.6" />
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions quetzalcoatl-auth/Infrastructure/Infrastructure.csproj
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="EntityFrameworkCore.Triggered" Version="3.2.2" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3">
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
22 changes: 11 additions & 11 deletions quetzalcoatl-auth/Tests.Integration/Tests.Integration.csproj
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<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="Bogus" Version="34.0.2" />
<PackageReference Include="FluentAssertions" Version="6.10.0" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Testcontainers" Version="3.0.0" />
<PackageReference Include="Testcontainers.MsSql" Version="3.0.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Bogus" Version="35.5.1" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.6" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Testcontainers" Version="3.9.0" />
<PackageReference Include="Testcontainers.MsSql" Version="3.9.0" />
<PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion quetzalcoatl-auth/global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "7.0.0",
"version": "8.0.0",
"rollForward": "latestMajor",
"allowPrerelease": true
}
Expand Down

0 comments on commit 55af22f

Please sign in to comment.