Fix loading of correct JSON serializer options, fixes #4834, regressi…

…on of #4733, v14.0.7
RicoSuter · Mar 26, 2024 · b3615b4 · b3615b4
1 parent 3e19ef2
commit b3615b4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>14.0.6</VersionPrefix>
+    <VersionPrefix>14.0.7</VersionPrefix>
 
     <Authors>Rico Suter</Authors>
     <Copyright>Copyright © Rico Suter, 2023</Copyright>

diff --git a/src/NSwag.AspNetCore/Extensions/NSwagServiceCollectionExtensions.cs b/src/NSwag.AspNetCore/Extensions/NSwagServiceCollectionExtensions.cs
@@ -69,23 +69,25 @@ public static IServiceCollection AddSwaggerDocument(this IServiceCollection serv
                 var settings = new AspNetCoreOpenApiDocumentGeneratorSettings();
 
                 var mvcOptions = services.GetRequiredService<IOptions<MvcOptions>>();
+                var hasSystemTextJsonOutputFormatter = mvcOptions.Value.OutputFormatters
+                    .Any(f => f.GetType().Name == "SystemTextJsonOutputFormatter");
+
                 var newtonsoftSettings = AspNetCoreOpenApiDocumentGenerator.GetJsonSerializerSettings(services);
-                var systemTextJsonOptions = mvcOptions.Value.OutputFormatters
-                    .Any(f => f.GetType().Name == "SystemTextJsonOutputFormatter")
+                var systemTextJsonOptions = hasSystemTextJsonOutputFormatter
                     ? AspNetCoreOpenApiDocumentGenerator.GetSystemTextJsonSettings(services)
 #if NET6_0_OR_GREATER
-                    : services.GetService<IOptions<Microsoft.AspNetCore.Http.Json.JsonOptions>>()?.Value.SerializerOptions;
+                    : services.GetService<IOptions<AspNetCore.Http.Json.JsonOptions>>()?.Value.SerializerOptions;
 #else 
                     : null;
 #endif
 
-                if (systemTextJsonOptions != null)
-                {
-                    settings.ApplySettings(new SystemTextJsonSchemaGeneratorSettings { SerializerOptions = systemTextJsonOptions }, mvcOptions.Value);
-                }
-                else if (newtonsoftSettings != null)
+                if (newtonsoftSettings != null && !hasSystemTextJsonOutputFormatter)
                 {
                     settings.ApplySettings(new NewtonsoftJsonSchemaGeneratorSettings { SerializerSettings = newtonsoftSettings }, mvcOptions.Value);
+                } 
+                else if (systemTextJsonOptions != null)
+                {
+                    settings.ApplySettings(new SystemTextJsonSchemaGeneratorSettings { SerializerOptions = systemTextJsonOptions }, mvcOptions.Value);
                 }
                 else
                 {