Update to Swagger 5.0.0

Author: Chris Martinez

samples/aspnetcore/SwaggerODataSample/ConfigureSwaggerOptions.cs

@@ -3,8 +3,9 @@
     using Microsoft.AspNetCore.Mvc.ApiExplorer;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.Options;
-    using Swashbuckle.AspNetCore.Swagger;
+    using Microsoft.OpenApi.Models;
     using Swashbuckle.AspNetCore.SwaggerGen;
+    using System;
 
     /// <summary>
     /// Configures the Swagger generation options.
@@ -32,16 +33,15 @@ public void Configure( SwaggerGenOptions options )
             }
         }
 
-        static Info CreateInfoForApiVersion( ApiVersionDescription description )
+        static OpenApiInfo CreateInfoForApiVersion( ApiVersionDescription description )
         {
-            var info = new Info()
+            var info = new OpenApiInfo()
             {
                 Title = "Sample API",
                 Version = description.ApiVersion.ToString(),
                 Description = "A sample application with Swagger, Swashbuckle, and API versioning.",
-                Contact = new Contact() { Name = "Bill Mei", Email = "bill.mei@somewhere.com" },
-                TermsOfService = "Shareware",
-                License = new License() { Name = "MIT", Url = "https://opensource.org/licenses/MIT" }
+                Contact = new OpenApiContact() { Name = "Bill Mei", Email = "bill.mei@somewhere.com" },
+                License = new OpenApiLicense() { Name = "MIT", Url = new Uri( "https://opensource.org/licenses/MIT" ) }
             };
 
             if ( description.IsDeprecated )

samples/aspnetcore/SwaggerODataSample/SwaggerDefaultValues.cs

@@ -1,7 +1,8 @@
 namespace Microsoft.Examples
 {
     using Microsoft.AspNetCore.Mvc.ApiExplorer;
-    using Swashbuckle.AspNetCore.Swagger;
+    using Microsoft.OpenApi.Any;
+    using Microsoft.OpenApi.Models;
     using Swashbuckle.AspNetCore.SwaggerGen;
     using System.Linq;
 
@@ -17,7 +18,7 @@ public class SwaggerDefaultValues : IOperationFilter
         /// </summary>
         /// <param name="operation">The operation to apply the filter to.</param>
         /// <param name="context">The current operation filter context.</param>
-        public void Apply( Operation operation, OperationFilterContext context )
+        public void Apply( OpenApiOperation operation, OperationFilterContext context )
         {
             var apiDescription = context.ApiDescription;
 
@@ -30,7 +31,7 @@ public void Apply( Operation operation, OperationFilterContext context )
 
             // REF: https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/412
             // REF: https://github.com/domaindrivendev/Swashbuckle.AspNetCore/pull/413
-            foreach ( var parameter in operation.Parameters.OfType<NonBodyParameter>() )
+            foreach ( var parameter in operation.Parameters )
             {
                 var description = apiDescription.ParameterDescriptions.First( p => p.Name == parameter.Name );
 
@@ -39,9 +40,9 @@ public void Apply( Operation operation, OperationFilterContext context )
                     parameter.Description = description.ModelMetadata?.Description;
                 }
 
-                if ( parameter.Default == null )
+                if ( parameter.Schema.Default == null && description.DefaultValue != null )
                 {
-                    parameter.Default = description.DefaultValue;
+                    parameter.Schema.Default = new OpenApiString( description.DefaultValue.ToString() );
                 }
 
                 parameter.Required |= description.IsRequired;

samples/aspnetcore/SwaggerODataSample/SwaggerODataSample.csproj

@@ -11,7 +11,7 @@
   <PackageReference Include="Microsoft.AspNetCore.App" />
   <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
   <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
-  <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
+  <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-*" />
  </ItemGroup>
 
  <ItemGroup>

samples/aspnetcore/SwaggerSample/SwaggerSample.csproj

@@ -8,7 +8,7 @@
 
  <ItemGroup>
   <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
-  <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc2" />
+  <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-*" />
  </ItemGroup>
 
  <ItemGroup>