diff --git a/bin/configs/csharp-restsharp-net4.7-multipleFrameworks.yaml b/bin/configs/csharp-restsharp-net4.7-multipleFrameworks.yaml
index bdd64742026c..0b7b6bad3f3f 100644
--- a/bin/configs/csharp-restsharp-net4.7-multipleFrameworks.yaml
+++ b/bin/configs/csharp-restsharp-net4.7-multipleFrameworks.yaml
@@ -4,6 +4,6 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
templateDir: modules/openapi-generator/src/main/resources/csharp
additionalProperties:
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
- targetFramework: netstandard2.1;net47
+ targetFramework: netstandard2.1;net47;net8.0
useCompareNetObjects: "true"
equatable: true
diff --git a/modules/openapi-generator/src/main/resources/csharp-functions/Project.csproj.mustache.bak b/modules/openapi-generator/src/main/resources/csharp-functions/Project.csproj.mustache.bak
deleted file mode 100644
index ab4ad28ede66..000000000000
--- a/modules/openapi-generator/src/main/resources/csharp-functions/Project.csproj.mustache.bak
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
- {{packageDescription}}{{^packageDescription}}{{packageName}}{{/packageDescription}}
- {{packageCopyright}}
- {{packageAuthors}}
- {{targetFramework}}
- true
- true
- {{packageVersion}}
- {{azureFunctionsVersion}}
-{{#nullableReferenceTypes}}
- annotations
-{{/nullableReferenceTypes}}
-{{#isLibrary}}
- Library
-{{/isLibrary}}
- {{packageName}}
- {{packageName}}
- {{userSecretsGuid}}
- Linux
- ..\..
-
-
-
-
-
-
-
- PreserveNewest
-
-
- PreserveNewest
- Never
-
-
-
diff --git a/modules/openapi-generator/src/main/resources/csharp-functions/function.mustache.bak b/modules/openapi-generator/src/main/resources/csharp-functions/function.mustache.bak
deleted file mode 100644
index 397ba84eb774..000000000000
--- a/modules/openapi-generator/src/main/resources/csharp-functions/function.mustache.bak
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.IO;
-using System.Net;
-using System.Threading.Tasks;
-using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Azure.WebJobs;
-using Microsoft.Azure.WebJobs.Extensions.Http;
-using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Attributes;
-using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Enums;
-using Microsoft.Extensions.Logging;
-using Microsoft.OpenApi.Models;
-using Newtonsoft.Json;
-
-namespace {{apiPackage}}
-{ {{#operations}}
- public partial {{#classModifier}}{{classModifier}} {{/classModifier}}class {{classname}}
- { {{#operation}}
- [FunctionName("{{classname}}_{{operationId}}")]
- public async Task _{{operationId}}([HttpTrigger(AuthorizationLevel.Anonymous, "{{httpMethod}}", Route = "{{{path}}}")]HttpRequest req, ExecutionContext context{{#allParams}}{{#isPathParam}}, {{>pathParam}}{{/isPathParam}}{{/allParams}}){{^generateBody}};{{/generateBody}}
- {{#generateBody}}
- {
- var method = this.GetType().GetMethod("{{operationId}}");
-
- return method != null
- ? (await ((Task)method.Invoke(this, new object[] { req, context{{#allParams}}{{#isPathParam}}, {{>paramName}}{{/isPathParam}}{{/allParams}} })).ConfigureAwait(false))
- : new StatusCodeResult((int)HttpStatusCode.NotImplemented);
- }
- {{/generateBody}}
- {{/operation}}
- }
-{{/operations}}
-}
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/AsModel.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/AsModel.mustache
index dd7ce036f3ff..69a673e0c7c3 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/AsModel.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/AsModel.mustache
@@ -3,7 +3,7 @@ return Is{{vendorExtensions.x-http-status}}
? System.Text.Json.JsonSerializer.Deserialize<{{#isModel}}{{^containerType}}{{packageName}}.{{modelPackage}}.{{/containerType}}{{/isModel}}{{{dataType}}}>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
-#endif;
+ default;
+#endif
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache
index 25abe72ca737..1e5f688a90bf 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache
@@ -629,7 +629,7 @@ namespace {{packageName}}.{{apiPackage}}
ILogger<{{#vendorExtensions.x-duplicates}}{{.}}.{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse> apiResponseLoggerLocalVar = LoggerFactory.CreateLogger<{{#vendorExtensions.x-duplicates}}{{.}}.{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse>();
- {{#vendorExtensions.x-duplicates}}{{.}}.{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse apiResponseLocalVar = new {{operationId}}ApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "{{{path}}}", requestedAtLocalVar, _jsonSerializerOptions);
+ {{#vendorExtensions.x-duplicates}}{{.}}.{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse apiResponseLocalVar = new {{#vendorExtensions.x-duplicates}}{{.}}.{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "{{{path}}}", requestedAtLocalVar, _jsonSerializerOptions);
After{{operationId}}DefaultImplementation({{#lambda.joinWithComma}}apiResponseLocalVar {{#allParams}}{{paramName}} {{/allParams}}{{/lambda.joinWithComma}});
diff --git a/modules/openapi-generator/src/main/resources/csharp/netcore_project.mustache b/modules/openapi-generator/src/main/resources/csharp/netcore_project.mustache
index 5769512aa877..1f3c37c0b4d7 100644
--- a/modules/openapi-generator/src/main/resources/csharp/netcore_project.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/netcore_project.mustache
@@ -1,5 +1,4 @@
-
{{#useGenericHost}}
true {{/useGenericHost}}{{^useGenericHost}}
false{{/useGenericHost}}
@@ -24,6 +23,16 @@
false
+
+
+ true
+
+
+ true
+
+
+
+
{{#useCompareNetObjects}}
@@ -33,52 +42,42 @@
{{/useGenericHost}}
{{#useRestSharp}}
-
+
+
{{/useRestSharp}}
{{#useGenericHost}}
-
-
+
+
+
{{#supportsRetry}}
-
+
{{/supportsRetry}}
{{#net80OrLater}}
{{/net80OrLater}}
{{^net60OrLater}}
- {{#net47OrLater}}
-
- {{/net47OrLater}}
{{/net60OrLater}}
{{/useGenericHost}}
{{^useGenericHost}}
{{#supportsRetry}}
-
+
{{/supportsRetry}}
{{/useGenericHost}}
- {{#validatable}}
- {{^net60OrLater}}
+
+{{#validatable}}
+
- {{/net60OrLater}}
- {{/validatable}}
+{{/validatable}}
-{{^useGenericHost}}
-
- {{^net60OrLater}}
+
- {{/net60OrLater}}
- {{#net48}}
-
- {{/net48}}
+
+
- {{^net60OrLater}}
-
- {{/net60OrLater}}
- {{#net48}}
-
- {{/net48}}
+
+
-{{/useGenericHost}}
{{>netcore_project.additions}}
diff --git a/modules/openapi-generator/src/main/resources/csharp/netcore_testproject.mustache b/modules/openapi-generator/src/main/resources/csharp/netcore_testproject.mustache
index eb8bd548d1e0..4b108acaa81e 100644
--- a/modules/openapi-generator/src/main/resources/csharp/netcore_testproject.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/netcore_testproject.mustache
@@ -9,9 +9,9 @@
-
-
-
+
+
+
diff --git a/samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
index a381e6a2f3cf..3bc135471dba 100644
--- a/samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index a5a6bf6200b9..4a5f5a0cc9c3 100644
--- a/samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -1,5 +1,4 @@
-
false
net6.0
@@ -21,15 +20,34 @@
false
+
+
+ true
+
+
+ true
+
+
+
+
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
diff --git a/samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
index 66dc542c5c2c..8fd7adbef647 100644
--- a/samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -8,9 +8,9 @@
-
-
-
+
+
+
diff --git a/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 05f8f0bf135f..ef7e07f7ec0d 100644
--- a/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -1,5 +1,4 @@
-
false
netstandard2.0
@@ -20,19 +19,35 @@
false
+
+
+ true
+
+
+ true
+
+
+
+
-
-
+
+
+
+
+
-
+
+
+
-
+
+
diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
index 05ce7e5830d8..67a08dd23ebd 100644
--- a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs
index 460d35e8eada..a94e240b04b0 100644
--- a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs
+++ b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs
@@ -240,7 +240,7 @@ public async Task GetApiKeysIdAsync(int id, System.Thr
ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger();
- APIKEYSApi.GetApiKeysIdApiResponse apiResponseLocalVar = new GetApiKeysIdApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/api_keys/{id}", requestedAtLocalVar, _jsonSerializerOptions);
+ APIKEYSApi.GetApiKeysIdApiResponse apiResponseLocalVar = new APIKEYSApi.GetApiKeysIdApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/api_keys/{id}", requestedAtLocalVar, _jsonSerializerOptions);
AfterGetApiKeysIdDefaultImplementation(apiResponseLocalVar, id);
diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs
index aea1a62eff64..ffe4572e649e 100644
--- a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs
+++ b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs
@@ -240,7 +240,7 @@ public async Task GetApiKeysIdAsync(int id, System.Thr
ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger();
- APIKEYSApi.GetApiKeysIdApiResponse apiResponseLocalVar = new GetApiKeysIdApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/api_keys/{id}", requestedAtLocalVar, _jsonSerializerOptions);
+ APIKEYSApi.GetApiKeysIdApiResponse apiResponseLocalVar = new APIKEYSApi.GetApiKeysIdApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/api_keys/{id}", requestedAtLocalVar, _jsonSerializerOptions);
AfterGetApiKeysIdDefaultImplementation(apiResponseLocalVar, id);
diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 9f99b6957b6d..a17cb4f5dad5 100644
--- a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -1,5 +1,4 @@
-
true
net8.0
@@ -21,11 +20,34 @@
false
+
+
+ true
+
+
+ true
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
index 6e2e462b8a72..ef4192ba81be 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs
index c1d9901db861..41c6c080c5cb 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs
@@ -328,10 +328,10 @@ public Org.OpenAPITools.Model.Person Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index c6529e054024..3fb29411d2be 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -1,5 +1,4 @@
-
true
net47
@@ -20,14 +19,35 @@
false
+
+
+ true
+
+
+ true
+
+
+
+
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
index 6e2e462b8a72..ef4192ba81be 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs
index 74252a406259..7f4f27d1b912 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs
@@ -302,10 +302,10 @@ public Org.OpenAPITools.Model.Fruit Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index c6529e054024..3fb29411d2be 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -1,5 +1,4 @@
-
true
net47
@@ -20,14 +19,35 @@
false
+
+
+ true
+
+
+ true
+
+
+
+
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
index 6e2e462b8a72..ef4192ba81be 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs
index 74252a406259..7f4f27d1b912 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs
@@ -302,10 +302,10 @@ public Org.OpenAPITools.Model.Fruit Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 201640a24d33..caadbe462ab4 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -1,5 +1,4 @@
-
true
net47
@@ -20,13 +19,34 @@
false
+
+
+ true
+
+
+ true
+
+
+
+
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
index 6e2e462b8a72..ef4192ba81be 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
index 490d20d1a61a..85bc1aac5dab 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -375,10 +375,10 @@ public Org.OpenAPITools.Model.ModelClient Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs
index db3d9888945c..6277311b345b 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs
@@ -551,10 +551,10 @@ public Org.OpenAPITools.Model.FooGetDefaultResponse Default()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -964,10 +964,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1174,10 +1174,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1384,10 +1384,10 @@ public Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
index 144226daaa88..4a95c19fae8f 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -1460,10 +1460,10 @@ public Org.OpenAPITools.Model.HealthCheckResult Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1694,10 +1694,10 @@ public FakeOuterBooleanSerializeApiResponse(ILogger(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1941,10 +1941,10 @@ public Org.OpenAPITools.Model.OuterComposite Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2175,10 +2175,10 @@ public FakeOuterNumberSerializeApiResponse(ILogger(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2434,10 +2434,10 @@ public string Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2644,10 +2644,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2854,10 +2854,10 @@ public Org.OpenAPITools.Model.MixedAnyOf Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -3064,10 +3064,10 @@ public Org.OpenAPITools.Model.MixedOneOf Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -3917,10 +3917,10 @@ public Org.OpenAPITools.Model.ModelClient Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
index 99add155ed62..846351642739 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
@@ -388,10 +388,10 @@ public Org.OpenAPITools.Model.ModelClient Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
index a414c4420ddd..6c0676ac7785 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
@@ -1325,10 +1325,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1622,10 +1622,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1867,10 +1867,10 @@ public Org.OpenAPITools.Model.Pet Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2629,10 +2629,10 @@ public Org.OpenAPITools.Model.ApiResponse Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2911,10 +2911,10 @@ public Org.OpenAPITools.Model.ApiResponse Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs
index d96b8f3f429f..19048fd0b3dd 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -725,10 +725,10 @@ public Dictionary Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -947,10 +947,10 @@ public Org.OpenAPITools.Model.Order Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1206,10 +1206,10 @@ public Org.OpenAPITools.Model.Order Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/UserApi.cs
index 30d4f2f1aad1..bb6d746bb65b 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/UserApi.cs
@@ -1574,10 +1574,10 @@ public Org.OpenAPITools.Model.User Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1639,10 +1639,10 @@ public Org.OpenAPITools.Model.User CustomHttpStatusCode599()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1890,10 +1890,10 @@ public string Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index c6529e054024..3fb29411d2be 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -1,5 +1,4 @@
-
true
net47
@@ -20,14 +19,35 @@
false
+
+
+ true
+
+
+ true
+
+
+
+
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
index 6e2e462b8a72..ef4192ba81be 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs
index 74252a406259..7f4f27d1b912 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs
@@ -302,10 +302,10 @@ public Org.OpenAPITools.Model.Fruit Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index c6529e054024..3fb29411d2be 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -1,5 +1,4 @@
-
true
net47
@@ -20,14 +19,35 @@
false
+
+
+ true
+
+
+ true
+
+
+
+
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
index 6e2e462b8a72..ef4192ba81be 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
index 490d20d1a61a..85bc1aac5dab 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -375,10 +375,10 @@ public Org.OpenAPITools.Model.ModelClient Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs
index db3d9888945c..6277311b345b 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs
@@ -551,10 +551,10 @@ public Org.OpenAPITools.Model.FooGetDefaultResponse Default()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -964,10 +964,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1174,10 +1174,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1384,10 +1384,10 @@ public Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
index 882649ce655c..ca72c476a8bc 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -1460,10 +1460,10 @@ public Org.OpenAPITools.Model.HealthCheckResult Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1694,10 +1694,10 @@ public FakeOuterBooleanSerializeApiResponse(ILogger(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1941,10 +1941,10 @@ public Org.OpenAPITools.Model.OuterComposite Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2175,10 +2175,10 @@ public FakeOuterNumberSerializeApiResponse(ILogger(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2434,10 +2434,10 @@ public string Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2644,10 +2644,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2854,10 +2854,10 @@ public Org.OpenAPITools.Model.MixedAnyOf Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -3064,10 +3064,10 @@ public Org.OpenAPITools.Model.MixedOneOf Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -3917,10 +3917,10 @@ public Org.OpenAPITools.Model.ModelClient Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
index 99add155ed62..846351642739 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
@@ -388,10 +388,10 @@ public Org.OpenAPITools.Model.ModelClient Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
index 0f1ebce15075..9cbf2bbd0852 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
@@ -1325,10 +1325,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1622,10 +1622,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1867,10 +1867,10 @@ public Org.OpenAPITools.Model.Pet Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2629,10 +2629,10 @@ public Org.OpenAPITools.Model.ApiResponse Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2911,10 +2911,10 @@ public Org.OpenAPITools.Model.ApiResponse Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs
index d96b8f3f429f..19048fd0b3dd 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -725,10 +725,10 @@ public Dictionary Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -947,10 +947,10 @@ public Org.OpenAPITools.Model.Order Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1206,10 +1206,10 @@ public Org.OpenAPITools.Model.Order Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/UserApi.cs
index 30d4f2f1aad1..bb6d746bb65b 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/UserApi.cs
@@ -1574,10 +1574,10 @@ public Org.OpenAPITools.Model.User Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1639,10 +1639,10 @@ public Org.OpenAPITools.Model.User CustomHttpStatusCode599()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1890,10 +1890,10 @@ public string Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index c6529e054024..3fb29411d2be 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -1,5 +1,4 @@
-
true
net47
@@ -20,14 +19,35 @@
false
+
+
+ true
+
+
+ true
+
+
+
+
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
index 6e2e462b8a72..ef4192ba81be 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs
index 395d3f77aeea..d82feadf56b2 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs
@@ -302,10 +302,10 @@ public Org.OpenAPITools.Model.NowGet200Response Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 201640a24d33..caadbe462ab4 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -1,5 +1,4 @@
-
true
net47
@@ -20,13 +19,34 @@
false
+
+
+ true
+
+
+ true
+
+
+
+
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
index a136411ab795..69917ecc99b1 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs
index c1d9901db861..41c6c080c5cb 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs
@@ -328,10 +328,10 @@ public Org.OpenAPITools.Model.Person Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 73a85280057e..121628b7fea1 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -1,5 +1,4 @@
-
true
net48
@@ -20,14 +19,35 @@
false
+
+
+ true
+
+
+ true
+
+
+
+
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
index a136411ab795..69917ecc99b1 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs
index 74252a406259..7f4f27d1b912 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs
@@ -302,10 +302,10 @@ public Org.OpenAPITools.Model.Fruit Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 73a85280057e..121628b7fea1 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -1,5 +1,4 @@
-
true
net48
@@ -20,14 +19,35 @@
false
+
+
+ true
+
+
+ true
+
+
+
+
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
index a136411ab795..69917ecc99b1 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs
index 74252a406259..7f4f27d1b912 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs
@@ -302,10 +302,10 @@ public Org.OpenAPITools.Model.Fruit Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 82bb1c228e8a..4a62f8f05df7 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -1,5 +1,4 @@
-
true
net48
@@ -20,13 +19,34 @@
false
+
+
+ true
+
+
+ true
+
+
+
+
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
index a136411ab795..69917ecc99b1 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
index 490d20d1a61a..85bc1aac5dab 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -375,10 +375,10 @@ public Org.OpenAPITools.Model.ModelClient Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs
index db3d9888945c..6277311b345b 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs
@@ -551,10 +551,10 @@ public Org.OpenAPITools.Model.FooGetDefaultResponse Default()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -964,10 +964,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1174,10 +1174,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1384,10 +1384,10 @@ public Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
index 144226daaa88..4a95c19fae8f 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -1460,10 +1460,10 @@ public Org.OpenAPITools.Model.HealthCheckResult Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1694,10 +1694,10 @@ public FakeOuterBooleanSerializeApiResponse(ILogger(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1941,10 +1941,10 @@ public Org.OpenAPITools.Model.OuterComposite Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2175,10 +2175,10 @@ public FakeOuterNumberSerializeApiResponse(ILogger(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2434,10 +2434,10 @@ public string Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2644,10 +2644,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2854,10 +2854,10 @@ public Org.OpenAPITools.Model.MixedAnyOf Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -3064,10 +3064,10 @@ public Org.OpenAPITools.Model.MixedOneOf Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -3917,10 +3917,10 @@ public Org.OpenAPITools.Model.ModelClient Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
index 99add155ed62..846351642739 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
@@ -388,10 +388,10 @@ public Org.OpenAPITools.Model.ModelClient Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
index a414c4420ddd..6c0676ac7785 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
@@ -1325,10 +1325,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1622,10 +1622,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1867,10 +1867,10 @@ public Org.OpenAPITools.Model.Pet Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2629,10 +2629,10 @@ public Org.OpenAPITools.Model.ApiResponse Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2911,10 +2911,10 @@ public Org.OpenAPITools.Model.ApiResponse Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs
index d96b8f3f429f..19048fd0b3dd 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -725,10 +725,10 @@ public Dictionary Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -947,10 +947,10 @@ public Org.OpenAPITools.Model.Order Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1206,10 +1206,10 @@ public Org.OpenAPITools.Model.Order Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs
index 30d4f2f1aad1..bb6d746bb65b 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs
@@ -1574,10 +1574,10 @@ public Org.OpenAPITools.Model.User Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1639,10 +1639,10 @@ public Org.OpenAPITools.Model.User CustomHttpStatusCode599()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1890,10 +1890,10 @@ public string Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 73a85280057e..121628b7fea1 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -1,5 +1,4 @@
-
true
net48
@@ -20,14 +19,35 @@
false
+
+
+ true
+
+
+ true
+
+
+
+
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
index a136411ab795..69917ecc99b1 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs
index 74252a406259..7f4f27d1b912 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs
@@ -302,10 +302,10 @@ public Org.OpenAPITools.Model.Fruit Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 73a85280057e..121628b7fea1 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -1,5 +1,4 @@
-
true
net48
@@ -20,14 +19,35 @@
false
+
+
+ true
+
+
+ true
+
+
+
+
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
index a136411ab795..69917ecc99b1 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
index 490d20d1a61a..85bc1aac5dab 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
@@ -375,10 +375,10 @@ public Org.OpenAPITools.Model.ModelClient Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs
index db3d9888945c..6277311b345b 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs
@@ -551,10 +551,10 @@ public Org.OpenAPITools.Model.FooGetDefaultResponse Default()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -964,10 +964,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1174,10 +1174,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1384,10 +1384,10 @@ public Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
index 882649ce655c..ca72c476a8bc 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -1460,10 +1460,10 @@ public Org.OpenAPITools.Model.HealthCheckResult Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1694,10 +1694,10 @@ public FakeOuterBooleanSerializeApiResponse(ILogger(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1941,10 +1941,10 @@ public Org.OpenAPITools.Model.OuterComposite Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2175,10 +2175,10 @@ public FakeOuterNumberSerializeApiResponse(ILogger(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2434,10 +2434,10 @@ public string Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2644,10 +2644,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2854,10 +2854,10 @@ public Org.OpenAPITools.Model.MixedAnyOf Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -3064,10 +3064,10 @@ public Org.OpenAPITools.Model.MixedOneOf Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -3917,10 +3917,10 @@ public Org.OpenAPITools.Model.ModelClient Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
index 99add155ed62..846351642739 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
@@ -388,10 +388,10 @@ public Org.OpenAPITools.Model.ModelClient Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
index 0f1ebce15075..9cbf2bbd0852 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
@@ -1325,10 +1325,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1622,10 +1622,10 @@ public List Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1867,10 +1867,10 @@ public Org.OpenAPITools.Model.Pet Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2629,10 +2629,10 @@ public Org.OpenAPITools.Model.ApiResponse Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -2911,10 +2911,10 @@ public Org.OpenAPITools.Model.ApiResponse Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs
index d96b8f3f429f..19048fd0b3dd 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -725,10 +725,10 @@ public Dictionary Ok()
? System.Text.Json.JsonSerializer.Deserialize>(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -947,10 +947,10 @@ public Org.OpenAPITools.Model.Order Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
@@ -1206,10 +1206,10 @@ public Org.OpenAPITools.Model.Order Ok()
? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions)
:
#if NET6_0_OR_GREATER
- null
+ null;
#else
- default
- #endif;
+ default;
+ #endif
}
///
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs
index 30d4f2f1aad1..bb6d746bb65b 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs
@@ -1574,10 +1574,10 @@ public Org.OpenAPITools.Model.User Ok()
? System.Text.Json.JsonSerializer.Deserialize