Merge pull request #175 from FromDoppler/net7

Update to .NET 7

Author: andresmoschini

.vscode/launch.json

@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/Doppler.HelloMicroservice/bin/Debug/net6.0/Doppler.HelloMicroservice.dll",
+            "program": "${workspaceFolder}/Doppler.HelloMicroservice/bin/Debug/net7.0/Doppler.HelloMicroservice.dll",
             "args": [],
             "cwd": "${workspaceFolder}/Doppler.HelloMicroservice",
             "stopAtEntry": false,

Dockerfile

@@ -10,7 +10,7 @@ WORKDIR /src
 COPY ./*.sh ./
 RUN shellcheck -e SC1091,SC1090 ./*.sh
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0.406-bullseye-slim AS restore
+FROM mcr.microsoft.com/dotnet/sdk:7.0.103-bullseye-slim AS restore
 WORKDIR /src
 COPY ./*.sln ./
 COPY */*.csproj ./
@@ -29,7 +29,7 @@ RUN dotnet test
 FROM build AS publish
 RUN dotnet publish "./Doppler.HelloMicroservice/Doppler.HelloMicroservice.csproj" -c Release -o /app/publish
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.14-bullseye-slim AS final
+FROM mcr.microsoft.com/dotnet/aspnet:7.0.3-bullseye-slim AS final
 # We need these changes in openssl.cnf to access to our SQL Server instances in QA and INT environments
 # See more information in https://stackoverflow.com/questions/56473656/cant-connect-to-sql-server-named-instance-from-asp-net-core-running-in-docker/59391426#59391426
 RUN sed -i 's/DEFAULT@SECLEVEL=2/DEFAULT@SECLEVEL=1/g' /etc/ssl/openssl.cnf \

Doppler.HelloMicroservice.Test/Doppler.HelloMicroservice.Test.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <RootNamespace>Doppler.HelloMicroservice</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.14" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.3" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

Doppler.HelloMicroservice/Dockerfile

@@ -1,10 +1,10 @@
 #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:6.0.14-bullseye-slim AS base
+FROM mcr.microsoft.com/dotnet/aspnet:7.0.3-bullseye-slim AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0.406-bullseye-slim AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0.103-bullseye-slim AS build
 WORKDIR /src
 COPY ["Doppler.HelloMicroservice/Doppler.HelloMicroservice.csproj", "Doppler.HelloMicroservice/"]
 RUN dotnet restore "Doppler.HelloMicroservice/Doppler.HelloMicroservice.csproj"

Doppler.HelloMicroservice/Doppler.HelloMicroservice.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Hellang.Middleware.ProblemDetails" Version="6.5.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.14" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.3" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.1" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />

Doppler.HelloMicroservice/Startup.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Hellang.Middleware.ProblemDetails;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -23,7 +22,11 @@ public Startup(IConfiguration configuration)
     // This method gets called by the runtime. Use this method to add services to the container.
     public void ConfigureServices(IServiceCollection services)
     {
-        services.AddProblemDetails();
+        // Explicitly using Hellang because services.AddProblemDetails() generates an ambiguity
+        // between Microsoft.AspNetCore.Http.Extensions.ProblemDetailsServiceCollectionExtensions
+        // and Hellang.Middleware.ProblemDetails.ProblemDetailsExtensions
+        // TODO: consider replace Hellang by out of the box alternative (but it is not working fine right now)
+        Hellang.Middleware.ProblemDetails.ProblemDetailsExtensions.AddProblemDetails(services);
         services.AddDopplerSecurity();
         services.AddControllers();
         services.AddCors();
@@ -64,7 +67,7 @@ public void ConfigureServices(IServiceCollection services)
     // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
     public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
     {
-        app.UseProblemDetails();
+        Hellang.Middleware.ProblemDetails.ProblemDetailsExtensions.UseProblemDetails(app);
 
         app.UseSwagger();
         app.UseSwaggerUI(c => c.SwaggerEndpoint("v1/swagger.json", "Doppler.HelloMicroservice v1"));