WIP - Upgrade swashbuckle

Author: niemyjski

src/Exceptionless.Web/Exceptionless.Web.csproj

@@ -19,7 +19,7 @@
     <PackageReference Include="MiniValidation" Version="0.9.2" />
     <PackageReference Include="NEST.JsonNetSerializer" Version="7.17.5" />
     <PackageReference Include="OAuth2" Version="0.10.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
     <PackageReference Include="Serilog.Enrichers.Span" Version="3.1.0" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />

src/Exceptionless.Web/Startup.cs

@@ -22,7 +22,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.NewtonsoftJson;
 using Microsoft.Net.Http.Headers;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Newtonsoft.Json;
 using Serilog;
 using Serilog.Events;
@@ -135,26 +135,12 @@ public void ConfigureServices(IServiceCollection services)
                 Type = SecuritySchemeType.ApiKey
             });
 
-            c.AddSecurityRequirement(new OpenApiSecurityRequirement {
-                    {
-                        new OpenApiSecurityScheme {
-                            Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = "Basic" }
-                        },
-                        Array.Empty<string>()
-                    },
-                    {
-                        new OpenApiSecurityScheme {
-                            Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = "Bearer" }
-                        },
-                        Array.Empty<string>()
-                    },
-                    {
-                        new OpenApiSecurityScheme {
-                            Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = "Token" }
-                        },
-                        Array.Empty<string>()
-                    }
-                });
+            c.AddSecurityRequirement(document => new OpenApiSecurityRequirement
+            {
+                { new OpenApiSecuritySchemeReference("Basic", document), [] },
+                { new OpenApiSecuritySchemeReference("Bearer", document), [] },
+                { new OpenApiSecuritySchemeReference("Token", document), [] }
+            });
 
             string xmlDocPath = Path.Combine(AppContext.BaseDirectory, "Exceptionless.Web.xml");
             if (File.Exists(xmlDocPath))
@@ -236,7 +222,7 @@ ApplicationException applicationException when applicationException.Message.Cont
             Predicate = hcr => hcr.Tags.Contains("Critical") || (options.RunJobsInProcess && hcr.Tags.Contains("AllJobs"))
         });
 
-        var readyTags = new List<string> { "Critical" };
+        List<string> readyTags = ["Critical"];
         if (!options.EventSubmissionDisabled)
             readyTags.Add("Storage");
         app.UseReadyHealthChecks(readyTags.ToArray());

src/Exceptionless.Web/Utility/RequestBodyOperationFilter.cs

@@ -1,9 +1,11 @@
+using System.Text.Json.Nodes;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-public class RequestBodyContentAttribute : Attribute { }
+public class RequestBodyContentAttribute : Attribute
+{
+}
 
 public class RequestBodyOperationFilter : IOperationFilter
 {
@@ -17,12 +19,17 @@ public void Apply(OpenApiOperation operation, OperationFilterContext context)
         if (consumesAttribute is null)
             return;
 
-        operation.RequestBody = new OpenApiRequestBody { Required = true };
+        operation.RequestBody = new OpenApiRequestBody
+        {
+            Required = true,
+            Content = new Dictionary<string, OpenApiMediaType>()
+        };
+
         foreach (string contentType in consumesAttribute.ContentTypes)
         {
-            operation.RequestBody.Content.Add(contentType, new OpenApiMediaType
+            operation.RequestBody.Content!.Add(contentType, new OpenApiMediaType
             {
-                Schema = new OpenApiSchema { Type = "string", Example = new OpenApiString(String.Empty) }
+                Schema = new OpenApiSchema { Type = JsonSchemaType.String, Example = JsonValue.Create(String.Empty) }
             });
         }
     }