Fix some .NET 7 preprocessor symbols

Author: schnerring

src/Swashbuckle.AspNetCore.ReDoc/ReDocMiddleware.cs

@@ -41,7 +41,7 @@ public ReDocMiddleware(
 
             _jsonSerializerOptions = new JsonSerializerOptions();
 
-#if NET6_0
+#if NET6_0_OR_GREATER
             _jsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
 #else
             _jsonSerializerOptions.IgnoreNullValues = true;

src/Swashbuckle.AspNetCore.SwaggerUI/SwaggerUIMiddleware.cs

@@ -42,7 +42,7 @@ public SwaggerUIMiddleware(
             _staticFileMiddleware = CreateStaticFileMiddleware(next, hostingEnv, loggerFactory, options);
 
             _jsonSerializerOptions = new JsonSerializerOptions();
-#if NET6_0
+#if NET6_0_OR_GREATER
             _jsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
 #else
             _jsonSerializerOptions.IgnoreNullValues = true;

test/Swashbuckle.AspNetCore.Cli.Test/ToolTests.cs

@@ -35,7 +35,7 @@ public void Can_Generate_Swagger_Json()
             }
         }
 
-#if NET6_0
+#if NET6_0_OR_GREATER
         [Fact]
         public void Can_Generate_Swagger_Json_ForTopLevelApp()
         {
@@ -58,5 +58,33 @@ public void Can_Generate_Swagger_Json_ForTopLevelApp()
             }
         }
 #endif
+
+#if NET7_0_OR_GREATER
+        [Fact]
+        public void Can_Generate_Swagger_Json_ForMinimalApiEndpoints()
+        {
+            var dir = Directory.CreateDirectory(Path.Join(Path.GetTempPath(), Path.GetRandomFileName()));
+            try
+            {
+                var args = new string[] { "tofile", "--output", $"{dir}/swagger.json", "--serializeasv2", Path.Combine(Directory.GetCurrentDirectory(), "MinimalApiEndpoints.dll"), "v1" };
+                Assert.Equal(0, Program.Main(args));
+
+                // using var document = JsonDocument.Parse(File.ReadAllText(Path.Combine(dir.FullName, "swagger.json")));
+                using var document = JsonDocument.Parse(File.ReadAllText(Path.Combine(dir.FullName, "swagger.json")));
+
+                // verify one of the endpoints
+                var paths = document.RootElement.GetProperty("paths");
+                var controllerPath = paths.GetProperty("/helloController");
+                Assert.True(controllerPath.TryGetProperty("get", out _));
+
+                var endpointPath = paths.GetProperty("/helloEndpoint");
+                Assert.True(endpointPath.TryGetProperty("get", out _));
+            }
+            finally
+            {
+                dir.Delete(true);
+            }
+        }
+#endif
     }
 }