.NET 10 preparation

Cherry-pick refactoring from #3283 to make multi-targeting easier for ASP.NET Core 10 and Microsoft.OpenApi v2.

Author: martincostello

Directory.Build.props

@@ -58,7 +58,7 @@
   <ItemGroup Condition=" '$(PackageReadmeFile)' != '' ">
     <None Include="$(MSBuildThisFileDirectory)$(PackageReadmeFile)" Pack="True" PackagePath="" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(SignAssembly)' == 'true' AND '$(OS)' != 'Windows_NT' ">
+  <PropertyGroup Condition=" '$(SignAssembly)' == 'true' AND '$(OS)' != !$([MSBuild]::IsOSPlatform('Windows')) ">
     <PublicSign>true</PublicSign>
   </PropertyGroup>
   <PropertyGroup>

perf/Swashbuckle.AspNetCore.Benchmarks/Swashbuckle.AspNetCore.Benchmarks.csproj

@@ -4,6 +4,9 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\src\Shared\JsonSchemaTypes.cs" Link="JsonSchemaTypes.cs" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Swashbuckle.AspNetCore.Annotations\Swashbuckle.AspNetCore.Annotations.csproj" />
     <ProjectReference Include="..\..\src\Swashbuckle.AspNetCore.SwaggerGen\Swashbuckle.AspNetCore.SwaggerGen.csproj" />

perf/Swashbuckle.AspNetCore.Benchmarks/XmlCommentsBenchmark.cs

@@ -101,7 +101,7 @@ public void Setup()
         {
             Schema = new()
             {
-                Type = "string",
+                Type = JsonSchemaTypes.String,
                 Description = "schema-level description",
             },
         };
@@ -120,7 +120,7 @@ public void Setup()
                 {
                     Schema = new()
                     {
-                        Type = "string",
+                        Type = JsonSchemaTypes.String,
                     },
                 },
             },

src/Shared/JsonSchemaTypes.cs

@@ -0,0 +1,12 @@
+namespace Swashbuckle.AspNetCore;
+
+internal static class JsonSchemaTypes
+{
+    public const string Array = "array";
+    public const string Boolean = "boolean";
+    public const string Integer = "integer";
+    public const string Number = "number";
+    public const string Null = "null";
+    public const string Object = "object";
+    public const string String = "string";
+}

src/Swashbuckle.AspNetCore.Annotations/AnnotationsOperationFilter.cs

@@ -10,9 +10,9 @@ public class AnnotationsOperationFilter : IOperationFilter
     {
         public void Apply(OpenApiOperation operation, OperationFilterContext context)
         {
-            IEnumerable<object> controllerAttributes = Array.Empty<object>();
-            IEnumerable<object> actionAttributes = Array.Empty<object>();
-            IEnumerable<object> metadataAttributes = Array.Empty<object>();
+            IEnumerable<object> controllerAttributes = [];
+            IEnumerable<object> actionAttributes = [];
+            IEnumerable<object> metadataAttributes = [];
 
             if (context.MethodInfo != null)
             {
@@ -65,9 +65,7 @@ private static void ApplySwaggerOperationAttribute(
 
             if (swaggerOperationAttribute.Tags != null)
             {
-                operation.Tags = swaggerOperationAttribute.Tags
-                    .Select(tagName => new OpenApiTag { Name = tagName })
-                    .ToList();
+                operation.Tags = [.. swaggerOperationAttribute.Tags.Select(tagName => new OpenApiTag { Name = tagName })];
             }
         }
 
@@ -86,7 +84,7 @@ public static void ApplySwaggerOperationFilterAttributes(
             }
         }
 
-        private void ApplySwaggerResponseAttributes(
+        private static void ApplySwaggerResponseAttributes(
             OpenApiOperation operation,
             OperationFilterContext context,
             IEnumerable<object> controllerAndActionAttributes)
@@ -97,10 +95,7 @@ private void ApplySwaggerResponseAttributes(
             {
                 var statusCode = swaggerResponseAttribute.StatusCode.ToString();
 
-                if (operation.Responses == null)
-                {
-                    operation.Responses = new OpenApiResponses();
-                }
+                operation.Responses ??= [];
 
                 if (!operation.Responses.TryGetValue(statusCode, out OpenApiResponse response))
                 {

src/Swashbuckle.AspNetCore.Annotations/PublicAPI/PublicAPI.Shipped.txt

@@ -49,8 +49,6 @@ Swashbuckle.AspNetCore.Annotations.SwaggerRequestBodyAttribute.SwaggerRequestBod
 Swashbuckle.AspNetCore.Annotations.SwaggerResponseAttribute
 Swashbuckle.AspNetCore.Annotations.SwaggerResponseAttribute.ContentTypes.get -> string[]
 Swashbuckle.AspNetCore.Annotations.SwaggerResponseAttribute.ContentTypes.set -> void
-Swashbuckle.AspNetCore.Annotations.SwaggerResponseAttribute.Description.get -> string
-Swashbuckle.AspNetCore.Annotations.SwaggerResponseAttribute.Description.set -> void
 Swashbuckle.AspNetCore.Annotations.SwaggerResponseAttribute.SwaggerResponseAttribute(int statusCode, string description = null, System.Type type = null) -> void
 Swashbuckle.AspNetCore.Annotations.SwaggerResponseAttribute.SwaggerResponseAttribute(int statusCode, string description = null, System.Type type = null, params string[] contentTypes) -> void
 Swashbuckle.AspNetCore.Annotations.SwaggerSchemaAttribute

src/Swashbuckle.AspNetCore.Annotations/PublicAPI/net6.0/PublicAPI.Shipped.txt

@@ -0,0 +1,2 @@
+Swashbuckle.AspNetCore.Annotations.SwaggerResponseAttribute.Description.get -> string
+Swashbuckle.AspNetCore.Annotations.SwaggerResponseAttribute.Description.set -> void

src/Swashbuckle.AspNetCore.Annotations/PublicAPI/net6.0/PublicAPI.Unshipped.txt

@@ -0,0 +1,2 @@
+Swashbuckle.AspNetCore.Annotations.SwaggerResponseAttribute.Description.get -> string
+Swashbuckle.AspNetCore.Annotations.SwaggerResponseAttribute.Description.set -> void