Merge pull request #238 from DentallApp/patch-13

Add support for .NET 8.0
DentallApp · Mar 4, 2024 · 0de0a0b · 0de0a0b
2 parents e94e6bb + 6977a84
commit 0de0a0b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -8,21 +8,21 @@
     <PackageVersion Include="Dapper" Version="2.0.123" />
     <PackageVersion Include="DelegateDecompiler" Version="0.30.0" />
     <PackageVersion Include="EFCore.CustomQueryPreprocessor" Version="2.0.0" />
-    <PackageVersion Include="EFCore.NamingConventions" Version="7.0.0" />
-    <PackageVersion Include="EntityFrameworkCore.Exceptions.MySQL.Pomelo" Version="6.0.3" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" />
+    <PackageVersion Include="EFCore.NamingConventions" Version="8.0.3" />
+    <PackageVersion Include="EntityFrameworkCore.Exceptions.MySQL.Pomelo" Version="8.0.0" />
+    <PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.1" />
+    <PackageVersion Include="linq2db.EntityFrameworkCore" Version="8.0.0" />
     <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.3.1" />
     <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
-    <PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
-    <PackageVersion Include="linq2db.EntityFrameworkCore" Version="7.0.0" />
     <PackageVersion Include="File.TypeChecker" Version="3.0.0" />
     <PackageVersion Include="itext7.pdfhtml" Version="4.0.5" />
     <PackageVersion Include="libphonenumber-csharp" Version="8.13.4" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Bot.Builder.Dialogs" Version="4.19.1" />
-    <PackageVersion Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.19.1" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Bot.Builder.Dialogs" Version="4.22.2" />
+    <PackageVersion Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.2" />
     <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30" />
     <PackageVersion Include="Quartz" Version="3.5.0" />
     <PackageVersion Include="Quartz.Extensions.Hosting" Version="3.5.0" />
@@ -46,7 +46,7 @@
     <PackageVersion Include="coverlet.msbuild" Version="3.1.2" />
     <PackageVersion Include="FluentAssertions" Version="6.10.0" />
     <PackageVersion Include="JustMock" Version="2023.1.117.1" />
-    <PackageVersion Include="Microsoft.Bot.Builder.Testing" Version="4.18.1" />
+    <PackageVersion Include="Microsoft.Bot.Builder.Testing" Version="4.22.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageVersion Include="NUnit" Version="3.13.3" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.3.0" />

diff --git a/Dockerfile b/Dockerfile
@@ -50,7 +50,7 @@ RUN dotnet publish -c Release -o /app/out --no-restore
 #
 # Final stage/image
 #
-FROM mcr.microsoft.com/dotnet/aspnet:7.0
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /app
 
 # The tzdata package (contains time zone data) is installed so that the "TZ" variable can be set at runtime

diff --git a/src/HostApplication/Extensions/AuthenticationJwtBearer.cs b/src/HostApplication/Extensions/AuthenticationJwtBearer.cs
@@ -43,8 +43,8 @@ private class CustomJwtBearerHandler : JwtBearerHandler
         /// </summary>
         private const string BotPath = "/messages";
 
-        public CustomJwtBearerHandler(IOptionsMonitor<JwtBearerOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock)
-            : base(options, logger, encoder, clock) { }
+        public CustomJwtBearerHandler(IOptionsMonitor<JwtBearerOptions> options, ILoggerFactory logger, UrlEncoder encoder)
+            : base(options, logger, encoder) { }
 
         protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
             => Context.Request.Path.StartsWithSegments(BotPath) ?