[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

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<IApiFactory, ApiFactory>();{{#apiInfo}}{{#apis}}
             _services.AddSingleton<{{classname}}Events>();
             _services.AddTransient<{{interfacePrefix}}{{classname}}, {{classname}}>();{{/apis}}{{/apiInfo}}

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}}
 }

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<IApiFactory, ApiFactory>();
             _services.AddSingleton<AnotherFakeApiEvents>();
             _services.AddTransient<IAnotherFakeApi, AnotherFakeApi>();

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");
         }
     }
-
 }

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");
         }
     }
-
 }

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");
         }
     }
-
 }

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");
         }
     }
-
 }

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");
         }
     }
-
 }

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");
         }
     }
-
 }

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");
         }
     }
-
 }

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<IApiFactory, ApiFactory>();
             _services.AddSingleton<AnotherFakeApiEvents>();
             _services.AddTransient<IAnotherFakeApi, AnotherFakeApi>();

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");
         }
     }
-
 }

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");
         }
     }
-
 }

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");
         }
     }
-
 }

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");
         }
     }
-
 }

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");
         }
     }
-
 }

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");
         }
     }
-
 }

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");
         }
     }
-
 }

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<IApiFactory, ApiFactory>();
             _services.AddSingleton<DefaultApiEvents>();
             _services.AddTransient<IDefaultApi, DefaultApi>();

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<IApiFactory, ApiFactory>();
             _services.AddSingleton<DefaultApiEvents>();
             _services.AddTransient<IDefaultApi, DefaultApi>();

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<IApiFactory, ApiFactory>();
             _services.AddSingleton<DefaultApiEvents>();
             _services.AddTransient<IDefaultApi, DefaultApi>();

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<IApiFactory, ApiFactory>();
             _services.AddSingleton<AnotherFakeApiEvents>();
             _services.AddTransient<IAnotherFakeApi, AnotherFakeApi>();

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");
         }
     }
-
 }

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");
         }
     }
-
 }

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");
         }
     }
-
 }

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");
         }
     }
-
 }

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");
         }
     }
-
 }

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");
         }
     }
-
 }

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");
         }
     }
-
 }