fix openapi compatibility

Author: Oceania2018

Directory.Packages.props

@@ -5,7 +5,6 @@
   <ItemGroup>
     <PackageVersion Include="CsvHelper" Version="33.1.0" />
     <PackageVersion Include="FuzzySharp" Version="2.0.2" />
-    <PackageVersion Include="EntityFramework" Version="6.4.4" />
     <PackageVersion Include="Google_GenerativeAI" Version="3.4.1" />
     <PackageVersion Include="Google_GenerativeAI.Live" Version="3.4.1" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
@@ -26,7 +25,6 @@
     <PackageVersion Include="Fluid.Core" Version="2.11.1" />
     <PackageVersion Include="Nanoid" Version="3.1.0" />
     <PackageVersion Include="Anthropic.SDK" Version="5.8.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
     <PackageVersion Include="NAudio" Version="2.2.1" />
     <PackageVersion Include="NAudio.Core" Version="2.2.1" />
     <PackageVersion Include="Whisper.net" Version="1.8.1" />
@@ -38,7 +36,6 @@
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.0" />
     <PackageVersion Include="MySql.Data" Version="9.5.0" />
     <PackageVersion Include="NPOI" Version="2.7.5" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Core" Version="2.3.0" />
     <PackageVersion Include="Refit" Version="8.0.0" />
     <PackageVersion Include="Refit.HttpClientFactory" Version="8.0.0" />
     <PackageVersion Include="Jint" Version="4.1.0" />
@@ -117,7 +114,7 @@
     <PackageVersion Include="BotSharp.Plugin.ChatHub" Version="$(BotSharpVersion)" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="10.0.1" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="10.1.0" />
     <PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="10.0.0" />
     <PackageVersion Include="AspNet.Security.OAuth.Keycloak" Version="10.0.0" />
     <PackageVersion Include="AspNet.Security.OAuth.Weixin" Version="10.0.0" />
@@ -135,15 +132,14 @@
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="10.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="10.0.0" />
-    <PackageVersion Include="Microsoft.OpenApi" Version="3.0.1" />
     <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="10.0.0" />
     <PackageVersion Include="System.Text.Json" Version="10.0.0" />
     <PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="10.0.0" />
     <PackageVersion Include="EntityFrameworkCore.BootKit" Version="10.0.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="8.1.4" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="10.1.0" />
     <PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="8.3.0" />
     <PackageVersion Include="AspNet.Security.OAuth.Keycloak" Version="8.3.0" />
     <PackageVersion Include="AspNet.Security.OAuth.Weixin" Version="8.3.0" />
@@ -161,7 +157,6 @@
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.16" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.16" />
     <PackageVersion Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.16" />
-    <PackageVersion Include="Microsoft.OpenApi" Version="2.3.10" />
     <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="Serilog.Extensions.Hosting" Version="8.0.0" />

src/Infrastructure/BotSharp.OpenAPI/BotSharpOpenApiExtensions.cs

@@ -12,9 +12,7 @@
 using BotSharp.OpenAPI.BackgroundServices;
 using System.Text.Json.Serialization;
 using Microsoft.AspNetCore.Authentication;
-#if NET8_0
-using Microsoft.OpenApi.Models;
-#endif
+using Microsoft.OpenApi;
 
 namespace BotSharp.OpenAPI;
 
@@ -163,28 +161,20 @@ public static IServiceCollection AddBotSharpOpenAPI(this IServiceCollection serv
         services.AddSwaggerGen(
             c =>
             {
-#if NET8_0
                 c.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
                 {
                     In = ParameterLocation.Header,
                     Description = "Please insert JWT with Bearer into field",
                     Name = "Authorization",
                     Type = SecuritySchemeType.ApiKey
                 });
-                c.AddSecurityRequirement(new OpenApiSecurityRequirement {
+                c.AddSecurityRequirement(x => new OpenApiSecurityRequirement
+                {
                    {
-                     new OpenApiSecurityScheme
-                     {
-                       Reference = new OpenApiReference
-                       {
-                         Type = ReferenceType.SecurityScheme,
-                         Id = "Bearer"
-                       }
-                      },
-                      Array.Empty<string>()
+                     new OpenApiSecuritySchemeReference("Bearer"),
+                     []
                    }
                 });
-#endif
             }
         );