Merge pull request #1259 from yileicn/master

fix openapi compatibility

Author: yileicn

Directory.Packages.props

@@ -139,7 +139,7 @@
     <PackageVersion Include="EntityFrameworkCore.BootKit" Version="10.0.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="10.1.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="8.1.4" />
     <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" />

src/Infrastructure/BotSharp.OpenAPI/BotSharpOpenApiExtensions.cs

@@ -13,6 +13,9 @@
 using System.Text.Json.Serialization;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.OpenApi;
+#if NET8_0
+using Microsoft.OpenApi.Models;
+#endif
 
 namespace BotSharp.OpenAPI;
 
@@ -168,16 +171,33 @@ public static IServiceCollection AddBotSharpOpenAPI(this IServiceCollection serv
                     Name = "Authorization",
                     Type = SecuritySchemeType.ApiKey
                 });
+#if NET8_0
+                c.AddSecurityRequirement(new OpenApiSecurityRequirement {
+                   {
+                     new OpenApiSecurityScheme
+                     {
+                       Reference = new OpenApiReference
+                       {
+                         Type = ReferenceType.SecurityScheme,
+                         Id = "Bearer"
+                       }
+                      },
+                      Array.Empty<string>()
+                   }
+                });
+#elif NET10_0
                 c.AddSecurityRequirement(x => new OpenApiSecurityRequirement
                 {
                    {
                      new OpenApiSecuritySchemeReference("Bearer"),
                      []
                    }
                 });
+#endif
             }
         );
 
+
         services.AddHttpContextAccessor();
 
         services.AddCors(options =>