From b59719a6ea0f29312f910faf34b9d617c002cdc8 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Sun, 3 Sep 2023 04:20:12 -0400 Subject: [PATCH] [csharp][generichost] Minor formatting changes (#16482) * started source generator * copy the options * fixed visibility * added new sample * discarded changes to existing samples * discarded changes to existing samples * build new sample * changed package name due to file path length limit * reverted changes to manual tests * fixed all new manual tests * inject contexts into api * only one JsonConstructor * fixed spacing * revert samples for easier merge master * revert unnecessary change * fixed formatting * build samples * reverting unintended commit * fixing default value * reverting unintended commit * move minor formatting changes to different pr --- .../csharp/libraries/generichost/HostConfiguration.mustache | 3 ++- .../main/resources/csharp/libraries/generichost/model.mustache | 2 ++ .../src/Org.OpenAPITools/Client/HostConfiguration.cs | 3 ++- .../src/Org.OpenAPITools/Model/EnumClass.cs | 1 - .../src/Org.OpenAPITools/Model/OuterEnum.cs | 1 - .../src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 1 - .../src/Org.OpenAPITools/Model/OuterEnumInteger.cs | 1 - .../src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs | 1 - .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 1 - .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 1 - .../src/Org.OpenAPITools/Client/HostConfiguration.cs | 3 ++- .../src/Org.OpenAPITools/Model/EnumClass.cs | 1 - .../src/Org.OpenAPITools/Model/OuterEnum.cs | 1 - .../src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 1 - .../src/Org.OpenAPITools/Model/OuterEnumInteger.cs | 1 - .../src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs | 1 - .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 1 - .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 1 - .../src/Org.OpenAPITools/Client/HostConfiguration.cs | 3 ++- .../src/Org.OpenAPITools/Client/HostConfiguration.cs | 3 ++- .../src/Org.OpenAPITools/Client/HostConfiguration.cs | 3 ++- .../src/Org.OpenAPITools/Client/HostConfiguration.cs | 3 ++- .../src/Org.OpenAPITools/Model/EnumClass.cs | 1 - .../src/Org.OpenAPITools/Model/OuterEnum.cs | 1 - .../src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 1 - .../src/Org.OpenAPITools/Model/OuterEnumInteger.cs | 1 - .../src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs | 1 - .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 1 - .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 1 - 29 files changed, 16 insertions(+), 28 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache index 3f00411d422..0d7d2a564f4 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache @@ -46,7 +46,8 @@ namespace {{packageName}}.{{clientPackage}} {{/isEnum}} {{/model}} {{/models}} - _services.AddSingleton(new JsonSerializerOptionsProvider(_jsonOptions)); + JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new{{^net60OrLater}} JsonSerializerOptionsProvider{{/net60OrLater}}(_jsonOptions); + _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton();{{#apiInfo}}{{#apis}} _services.AddSingleton<{{classname}}Events>(); _services.AddTransient<{{interfacePrefix}}{{classname}}, {{classname}}>();{{/apis}}{{/apiInfo}} diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/model.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/model.mustache index cd592f97867..d71ab08c93d 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/model.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/model.mustache @@ -24,6 +24,7 @@ using System.ComponentModel.DataAnnotations; using OpenAPIClientUtils = {{packageName}}.Client.ClientUtils; {{/useCompareNetObjects}} {{#models}} +{{#lambda.trimTrailingWithNewLine}} {{#model}} namespace {{packageName}}.{{modelPackage}} @@ -37,5 +38,6 @@ namespace {{packageName}}.{{modelPackage}} {{>JsonConverter}} {{/isEnum}} {{/model}} +{{/lambda.trimTrailingWithNewLine}} {{/models}} } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs index ebe379c73b0..927a2c06f2b 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -136,7 +136,8 @@ namespace Org.OpenAPITools.Client _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); - _services.AddSingleton(new JsonSerializerOptionsProvider(_jsonOptions)); + JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); + _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); _services.AddSingleton(); _services.AddTransient(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumClass.cs index 2ade854ef2e..76dcba15b39 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumClass.cs @@ -186,5 +186,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(enumClass?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnum.cs index 15a4d1009a0..01f4f467627 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -186,5 +186,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(outerEnum?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index 800a21dcb68..7903c829648 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -186,5 +186,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(outerEnumDefaultValue?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index a1d2c65a85a..a09978af1c3 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -177,5 +177,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(outerEnumInteger?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index 69c8e8b1b18..4a73f8886ac 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -177,5 +177,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(outerEnumIntegerDefaultValue?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumTest.cs index 8ea3aa491ec..9a549df1f0a 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -256,5 +256,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(outerEnumTest?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index a1d7fdee998..60223b9ff74 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -172,5 +172,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(zeroBasedEnum?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs index 0231a97627a..ae2f48b2b79 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -134,7 +134,8 @@ namespace Org.OpenAPITools.Client _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); - _services.AddSingleton(new JsonSerializerOptionsProvider(_jsonOptions)); + JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); + _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); _services.AddSingleton(); _services.AddTransient(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumClass.cs index 574ab62f9c7..94c2361c881 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumClass.cs @@ -184,5 +184,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(enumClass?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnum.cs index 9d28158c2a1..a4ec335bb38 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -184,5 +184,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(outerEnum?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index 3c22b5335be..7c67db5ddca 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -184,5 +184,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(outerEnumDefaultValue?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index 24e751f6c5d..84ea65297ab 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -175,5 +175,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(outerEnumInteger?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index c733a5befd6..983d194a199 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -175,5 +175,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(outerEnumIntegerDefaultValue?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumTest.cs index 9654f24d072..51d8bee407e 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -254,5 +254,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(outerEnumTest?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index 7020c2d7fbd..20e184f02b2 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -170,5 +170,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(zeroBasedEnum?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index 4dbe03c9dd9..a059b5a4de4 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -44,7 +44,8 @@ namespace Org.OpenAPITools.Client _jsonOptions.Converters.Add(new AdultJsonConverter()); _jsonOptions.Converters.Add(new ChildJsonConverter()); _jsonOptions.Converters.Add(new PersonJsonConverter()); - _services.AddSingleton(new JsonSerializerOptionsProvider(_jsonOptions)); + JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); + _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); _services.AddSingleton(); _services.AddTransient(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index a8f8d90ce21..3dfc3e38131 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -44,7 +44,8 @@ namespace Org.OpenAPITools.Client _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new BananaJsonConverter()); _jsonOptions.Converters.Add(new FruitJsonConverter()); - _services.AddSingleton(new JsonSerializerOptionsProvider(_jsonOptions)); + JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); + _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); _services.AddSingleton(); _services.AddTransient(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index a8f8d90ce21..3dfc3e38131 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -44,7 +44,8 @@ namespace Org.OpenAPITools.Client _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new BananaJsonConverter()); _jsonOptions.Converters.Add(new FruitJsonConverter()); - _services.AddSingleton(new JsonSerializerOptionsProvider(_jsonOptions)); + JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); + _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); _services.AddSingleton(); _services.AddTransient(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs index 0231a97627a..5e1acbfcca4 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -134,7 +134,8 @@ namespace Org.OpenAPITools.Client _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); - _services.AddSingleton(new JsonSerializerOptionsProvider(_jsonOptions)); + JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new JsonSerializerOptionsProvider(_jsonOptions); + _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); _services.AddSingleton(); _services.AddTransient(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumClass.cs index 574ab62f9c7..94c2361c881 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumClass.cs @@ -184,5 +184,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(enumClass?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnum.cs index 9d28158c2a1..a4ec335bb38 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -184,5 +184,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(outerEnum?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index 3c22b5335be..7c67db5ddca 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -184,5 +184,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(outerEnumDefaultValue?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index 24e751f6c5d..84ea65297ab 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -175,5 +175,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(outerEnumInteger?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index c733a5befd6..983d194a199 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -175,5 +175,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(outerEnumIntegerDefaultValue?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumTest.cs index 9654f24d072..51d8bee407e 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -254,5 +254,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(outerEnumTest?.ToString() ?? "null"); } } - } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index 7020c2d7fbd..20e184f02b2 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -170,5 +170,4 @@ namespace Org.OpenAPITools.Model writer.WriteStringValue(zeroBasedEnum?.ToString() ?? "null"); } } - }