From 11caad92dfa0912a8609ad50b1938d897ccba207 Mon Sep 17 00:00:00 2001
From: Anakael <shemeldima2@yandex.ru>
Date: Wed, 10 Jan 2024 06:34:14 +0300
Subject: [PATCH] [CSharp] feat!: add useDateOnly flag (#17471)

* feat: DateOnly for client

* fix: generated doc for csharp

* doc: fix generators README for csharp

* add DateOnly option for aspnet

* refactor: update csharp docs

* refactor: fix typo

* finish

* finish

* finish

* regenerate

* rebuild and regenerate

* fix build error

* finish

* revert path

* regenerate

* remove exceed samples

* regenerate

* add DateOnly to nullable

* remove obsolete file from list

* update test files list

* remove obsolete sample build

* revert manual tests

* revert samples to master and regenerate

* remove new samples

* remove eol

* remove eol

* add new specs

* try fix test

* update tests

* update files

* remove eol

* revert

* remove eol

* regenerate

* add net6+ support to aspnetcore

* add jobs
---
 .github/workflows/samples-dotnet.yaml         |   4 +
 ...generichost-net7.0-useDateTimeForDate.yaml |   9 +
 ...p-restsharp-net7.0-useDateTimeForDate.yaml |   9 +
 docs/generators/README.md                     |   2 +-
 docs/generators/aspnetcore.md                 |   3 +
 docs/generators/csharp-functions.md           |   3 +
 docs/generators/csharp.md                     |   3 +
 .../codegen/CodegenConstants.java             |   3 +
 .../languages/AbstractCSharpCodegen.java      |  35 +-
 .../languages/AspNetServerCodegen.java        |  37 +-
 .../languages/CSharpClientCodegen.java        |  23 +
 .../CSharpFunctionsServerCodegen.java         |  26 +-
 .../generichost/DateFormats.mustache          |   2 +
 .../DateOnlyJsonConverter.mustache            |  51 ++
 .../DateOnlyNullableJsonConverter.mustache    |  56 ++
 .../generichost/DateTimeFormats.mustache      |   6 +-
 .../DateTimeJsonConverter.mustache            |   2 +-
 .../DateTimeNullableJsonConverter.mustache    |   2 +-
 .../generichost/HostConfiguration.mustache    |   4 +
 .../generichost/JsonConverter.mustache        |   2 +-
 .../test/resources/3_0/csharp/dates-api.yaml  |  25 +
 .../csharp-restsharp/docs/QueryApi.md         |   6 +-
 .../src/Org.OpenAPITools/Api/QueryApi.cs      |  16 +-
 .../.openapi-generator/FILES                  |   2 +
 .../docs/apis/FakeApi.md                      |   6 +-
 .../docs/models/DateOnlyClass.md              |   2 +-
 .../docs/models/FormatTest.md                 |   2 +-
 .../docs/models/NullableClass.md              |   2 +-
 .../docs/models/RequiredClass.md              |   8 +-
 .../src/UseSourceGeneration/Api/FakeApi.cs    |  18 +-
 .../Client/DateOnlyJsonConverter.cs           |  61 ++
 .../Client/DateOnlyNullableJsonConverter.cs   |  66 ++
 .../Client/DateTimeJsonConverter.cs           |   5 +-
 .../Client/DateTimeNullableJsonConverter.cs   |   5 +-
 .../Client/HostConfiguration.cs               |   2 +
 .../Model/DateOnlyClass.cs                    |  10 +-
 .../UseSourceGeneration/Model/FormatTest.cs   |   8 +-
 .../Model/NullableClass.cs                    |  10 +-
 .../Model/RequiredClass.cs                    |  30 +-
 .../.openapi-generator/FILES                  |   2 +
 .../docs/apis/FakeApi.md                      |   6 +-
 .../docs/models/DateOnlyClass.md              |   2 +-
 .../docs/models/FormatTest.md                 |   2 +-
 .../docs/models/NullableClass.md              |   2 +-
 .../docs/models/RequiredClass.md              |   8 +-
 .../Org.OpenAPITools.Test/Api/FakeApiTests.cs |   2 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       |  18 +-
 .../Client/DateOnlyJsonConverter.cs           |  61 ++
 .../Client/DateOnlyNullableJsonConverter.cs   |  66 ++
 .../Client/DateTimeJsonConverter.cs           |   5 +-
 .../Client/DateTimeNullableJsonConverter.cs   |   5 +-
 .../Client/HostConfiguration.cs               |   2 +
 .../Org.OpenAPITools/Model/DateOnlyClass.cs   |  10 +-
 .../src/Org.OpenAPITools/Model/FormatTest.cs  |   8 +-
 .../Org.OpenAPITools/Model/NullableClass.cs   |  10 +-
 .../Org.OpenAPITools/Model/RequiredClass.cs   |  30 +-
 .../.openapi-generator/FILES                  |   2 +
 .../docs/apis/FakeApi.md                      |   6 +-
 .../docs/models/DateOnlyClass.md              |   2 +-
 .../docs/models/FormatTest.md                 |   2 +-
 .../docs/models/NullableClass.md              |   2 +-
 .../docs/models/RequiredClass.md              |   8 +-
 .../Org.OpenAPITools.Test/Api/FakeApiTests.cs |   2 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       |  18 +-
 .../Client/DateOnlyJsonConverter.cs           |  61 ++
 .../Client/DateOnlyNullableJsonConverter.cs   |  66 ++
 .../Client/DateTimeJsonConverter.cs           |   5 +-
 .../Client/DateTimeNullableJsonConverter.cs   |   5 +-
 .../Client/HostConfiguration.cs               |   2 +
 .../Org.OpenAPITools/Model/DateOnlyClass.cs   |  10 +-
 .../src/Org.OpenAPITools/Model/FormatTest.cs  |   8 +-
 .../Org.OpenAPITools/Model/NullableClass.cs   |  10 +-
 .../Org.OpenAPITools/Model/RequiredClass.cs   |  30 +-
 .../.gitignore                                | 362 ++++++++
 .../.openapi-generator-ignore                 |  23 +
 .../.openapi-generator/FILES                  |  36 +
 .../.openapi-generator/VERSION                |   1 +
 .../Org.OpenAPITools.sln                      |  27 +
 .../README.md                                 |   1 +
 .../api/openapi.yaml                          |  35 +
 .../appveyor.yml                              |   9 +
 .../docs/apis/DefaultApi.md                   |  90 ++
 .../docs/models/NowGet200Response.md          |  11 +
 .../docs/scripts/git_push.ps1                 |  75 ++
 .../docs/scripts/git_push.sh                  |  49 ++
 .../Org.OpenAPITools.Test/Api/ApiTestsBase.cs |  58 ++
 .../Api/DefaultApiTests.cs                    |  64 ++
 .../Api/DependencyInjectionTests.cs           | 103 +++
 .../Model/NowGet200ResponseTests.cs           |  74 ++
 .../Org.OpenAPITools.Test.csproj              |  20 +
 .../src/Org.OpenAPITools.Test/README.md       |   0
 .../src/Org.OpenAPITools/Api/DefaultApi.cs    | 332 +++++++
 .../src/Org.OpenAPITools/Api/IApi.cs          |  15 +
 .../Org.OpenAPITools/Client/ApiException.cs   |  52 ++
 .../src/Org.OpenAPITools/Client/ApiFactory.cs |  49 ++
 .../Client/ApiResponseEventArgs.cs            |  24 +
 .../Org.OpenAPITools/Client/ApiResponse`1.cs  | 172 ++++
 .../Org.OpenAPITools/Client/ClientUtils.cs    | 279 ++++++
 .../Client/CookieContainer.cs                 |  20 +
 .../Client/DateTimeJsonConverter.cs           |  77 ++
 .../Client/DateTimeNullableJsonConverter.cs   |  82 ++
 .../Client/ExceptionEventArgs.cs              |  24 +
 .../Client/HostConfiguration.cs               | 131 +++
 .../Client/JsonSerializerOptionsProvider.cs   |  27 +
 .../src/Org.OpenAPITools/Client/Option.cs     |  53 ++
 .../Client/RateLimitProvider`1.cs             |  57 ++
 .../src/Org.OpenAPITools/Client/TokenBase.cs  |  71 ++
 .../Client/TokenContainer`1.cs                |  37 +
 .../Client/TokenProvider`1.cs                 |  44 +
 .../Extensions/IHostBuilderExtensions.cs      |  59 ++
 .../IHttpClientBuilderExtensions.cs           |  79 ++
 .../IServiceCollectionExtensions.cs           |  73 ++
 .../Model/NowGet200Response.cs                | 203 +++++
 .../Org.OpenAPITools/Org.OpenAPITools.csproj  |  30 +
 .../src/Org.OpenAPITools/README.md            | 176 ++++
 .../.openapi-generator/FILES                  |   2 +
 .../Client/DateOnlyJsonConverter.cs           |  61 ++
 .../Client/DateOnlyNullableJsonConverter.cs   |  66 ++
 .../Client/DateTimeJsonConverter.cs           |   5 +-
 .../Client/DateTimeNullableJsonConverter.cs   |   5 +-
 .../Client/HostConfiguration.cs               |   2 +
 .../.openapi-generator/FILES                  |   2 +
 .../Client/DateOnlyJsonConverter.cs           |  61 ++
 .../Client/DateOnlyNullableJsonConverter.cs   |  66 ++
 .../Client/DateTimeJsonConverter.cs           |   5 +-
 .../Client/DateTimeNullableJsonConverter.cs   |   5 +-
 .../Client/HostConfiguration.cs               |   2 +
 .../.openapi-generator/FILES                  |   2 +
 .../Client/DateOnlyJsonConverter.cs           |  61 ++
 .../Client/DateOnlyNullableJsonConverter.cs   |  66 ++
 .../Client/DateTimeJsonConverter.cs           |   5 +-
 .../Client/DateTimeNullableJsonConverter.cs   |   5 +-
 .../Client/HostConfiguration.cs               |   2 +
 .../Client/DateTimeJsonConverter.cs           |   3 +-
 .../Client/DateTimeNullableJsonConverter.cs   |   3 +-
 .../docs/DateOnlyClass.md                     |   2 +-
 .../OpenAPIClient-net5.0/docs/FakeApi.md      |   6 +-
 .../OpenAPIClient-net5.0/docs/FormatTest.md   |   2 +-
 .../docs/NullableClass.md                     |   2 +-
 .../docs/RequiredClass.md                     |   8 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       |  16 +-
 .../Org.OpenAPITools/Model/DateOnlyClass.cs   |   4 +-
 .../src/Org.OpenAPITools/Model/FormatTest.cs  |   9 +-
 .../Org.OpenAPITools/Model/NullableClass.cs   |   4 +-
 .../Org.OpenAPITools/Model/RequiredClass.cs   |  15 +-
 .../.gitignore                                | 362 ++++++++
 .../.openapi-generator-ignore                 |  23 +
 .../.openapi-generator/FILES                  |  29 +
 .../.openapi-generator/VERSION                |   1 +
 .../Org.OpenAPITools.sln                      |  27 +
 .../README.md                                 | 127 +++
 .../api/openapi.yaml                          |  35 +
 .../appveyor.yml                              |   9 +
 .../docs/DefaultApi.md                        |  90 ++
 .../docs/NowGet200Response.md                 |  11 +
 .../git_push.sh                               |  57 ++
 .../Api/DefaultApiTests.cs                    |  68 ++
 .../Model/NowGet200ResponseTests.cs           |  75 ++
 .../Org.OpenAPITools.Test.csproj              |  20 +
 .../src/Org.OpenAPITools/Api/DefaultApi.cs    | 326 +++++++
 .../src/Org.OpenAPITools/Client/ApiClient.cs  | 833 ++++++++++++++++++
 .../Org.OpenAPITools/Client/ApiException.cs   |  68 ++
 .../Org.OpenAPITools/Client/ApiResponse.cs    | 166 ++++
 .../Org.OpenAPITools/Client/ClientUtils.cs    | 247 ++++++
 .../Org.OpenAPITools/Client/Configuration.cs  | 612 +++++++++++++
 .../Client/ExceptionFactory.cs                |  22 +
 .../Client/GlobalConfiguration.cs             |  67 ++
 .../src/Org.OpenAPITools/Client/HttpMethod.cs |  33 +
 .../Org.OpenAPITools/Client/IApiAccessor.cs   |  37 +
 .../Client/IAsynchronousClient.cs             | 100 +++
 .../Client/IReadableConfiguration.cs          | 141 +++
 .../Client/ISynchronousClient.cs              |  93 ++
 .../src/Org.OpenAPITools/Client/Multimap.cs   | 295 +++++++
 .../Client/OpenAPIDateConverter.cs            |  29 +
 .../Org.OpenAPITools/Client/RequestOptions.cs |  84 ++
 .../Client/RetryConfiguration.cs              |  31 +
 .../Model/AbstractOpenAPISchema.cs            |  76 ++
 .../Model/NowGet200Response.cs                |  92 ++
 .../Org.OpenAPITools/Org.OpenAPITools.csproj  |  36 +
 .../OpenAPIClientCore/docs/DateOnlyClass.md   |   2 +-
 .../csharp/OpenAPIClientCore/docs/FakeApi.md  |   6 +-
 .../OpenAPIClientCore/docs/FormatTest.md      |   2 +-
 .../OpenAPIClientCore/docs/NullableClass.md   |   2 +-
 .../OpenAPIClientCore/docs/RequiredClass.md   |   8 +-
 .../src/Org.OpenAPITools/Api/FakeApi.cs       |  16 +-
 .../Org.OpenAPITools/Model/DateOnlyClass.cs   |   4 +-
 .../src/Org.OpenAPITools/Model/FormatTest.cs  |   9 +-
 .../Org.OpenAPITools/Model/NullableClass.cs   |   4 +-
 .../Org.OpenAPITools/Model/RequiredClass.cs   |  15 +-
 189 files changed, 8858 insertions(+), 277 deletions(-)
 create mode 100644 bin/configs/csharp-generichost-net7.0-useDateTimeForDate.yaml
 create mode 100644 bin/configs/csharp-restsharp-net7.0-useDateTimeForDate.yaml
 create mode 100644 modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateFormats.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateOnlyJsonConverter.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateOnlyNullableJsonConverter.mustache
 create mode 100644 modules/openapi-generator/src/test/resources/3_0/csharp/dates-api.yaml
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateOnlyJsonConverter.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateOnlyNullableJsonConverter.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.gitignore
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.openapi-generator-ignore
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.openapi-generator/FILES
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.openapi-generator/VERSION
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/Org.OpenAPITools.sln
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/README.md
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/api/openapi.yaml
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/appveyor.yml
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/apis/DefaultApi.md
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/models/NowGet200Response.md
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/scripts/git_push.ps1
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/scripts/git_push.sh
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Model/NowGet200ResponseTests.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/README.md
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/IApi.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiException.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiFactory.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponse`1.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ClientUtils.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/CookieContainer.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Option.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/TokenContainer`1.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/NowGet200Response.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/README.md
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.gitignore
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator-ignore
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator/FILES
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator/VERSION
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/Org.OpenAPITools.sln
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/README.md
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/api/openapi.yaml
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/appveyor.yml
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/docs/DefaultApi.md
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/docs/NowGet200Response.md
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/git_push.sh
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Model/NowGet200ResponseTests.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiClient.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiException.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponse.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ClientUtils.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Configuration.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ExceptionFactory.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/GlobalConfiguration.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/HttpMethod.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IApiAccessor.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IAsynchronousClient.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ISynchronousClient.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Multimap.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RequestOptions.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RetryConfiguration.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/NowGet200Response.cs
 create mode 100644 samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj

diff --git a/.github/workflows/samples-dotnet.yaml b/.github/workflows/samples-dotnet.yaml
index 5751b7fb725..9d2c9b1bc53 100644
--- a/.github/workflows/samples-dotnet.yaml
+++ b/.github/workflows/samples-dotnet.yaml
@@ -4,6 +4,7 @@ on:
   push:
     paths:
       - 'samples/client/petstore/csharp/**net6.0**/'
+      - 'samples/client/petstore/csharp/**net7.0**/'
       - 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/'
       - 'samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**'
       - 'samples/server/petstore/aspnetcore-6.0/**'
@@ -12,6 +13,7 @@ on:
   pull_request:
     paths:
       - 'samples/client/petstore/csharp/**net6.0**/'
+      - 'samples/client/petstore/csharp/**net7.0**/'
       - 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/'
       - 'samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**'
       - 'samples/server/petstore/aspnetcore-6.0/**'
@@ -35,6 +37,8 @@ jobs:
           - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf
           - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf
           - samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate
+          - samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate
           - samples/server/petstore/aspnetcore-6.0
           - samples/server/petstore/aspnetcore-6.0-pocoModels
           - samples/server/petstore/aspnetcore-6.0-project4Models
diff --git a/bin/configs/csharp-generichost-net7.0-useDateTimeForDate.yaml b/bin/configs/csharp-generichost-net7.0-useDateTimeForDate.yaml
new file mode 100644
index 00000000000..c20fcdcd7f7
--- /dev/null
+++ b/bin/configs/csharp-generichost-net7.0-useDateTimeForDate.yaml
@@ -0,0 +1,9 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate
+inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/dates-api.yaml
+library: generichost
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{2E60EF87-DB0B-4D01-A36E-F5E90F7EC757}'
+  useDateTimeForDate: true
diff --git a/bin/configs/csharp-restsharp-net7.0-useDateTimeForDate.yaml b/bin/configs/csharp-restsharp-net7.0-useDateTimeForDate.yaml
new file mode 100644
index 00000000000..e5c65c57d20
--- /dev/null
+++ b/bin/configs/csharp-restsharp-net7.0-useDateTimeForDate.yaml
@@ -0,0 +1,9 @@
+# for .net standard
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate
+inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/dates-api.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{D0A67E81-4061-48EB-B4B8-C73BDF8B2D95}'
+  targetFramework: net7.0
+  useDateTimeForDate: true
diff --git a/docs/generators/README.md b/docs/generators/README.md
index adf500bdace..3b624bd8b8f 100644
--- a/docs/generators/README.md
+++ b/docs/generators/README.md
@@ -12,7 +12,7 @@ The following generators are available:
 * [cpp-restsdk](cpp-restsdk.md)  
 * [cpp-tizen](cpp-tizen.md)  
 * [csharp](csharp.md)  
-* [csharp-netcore](csharp-netcore.md)  
+* [csharp-functions](csharp-functions.md)  
 * [dart](dart.md)  
 * [dart-dio](dart-dio.md)  
 * [eiffel](eiffel.md)  
diff --git a/docs/generators/aspnetcore.md b/docs/generators/aspnetcore.md
index 4937e49beb1..5dbedb169c5 100644
--- a/docs/generators/aspnetcore.md
+++ b/docs/generators/aspnetcore.md
@@ -47,6 +47,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |sourceFolder|source folder for generated code| |src|
 |swashbuckleVersion|Swashbuckle version: 3.0.0 (deprecated), 4.0.0 (deprecated), 5.0.0 (deprecated), 6.4.0|<dl><dt>**3.0.0**</dt><dd>Swashbuckle 3.0.0</dd><dt>**4.0.0**</dt><dd>Swashbuckle 4.0.0</dd><dt>**5.0.0**</dt><dd>Swashbuckle 5.0.0</dd><dt>**6.4.0**</dt><dd>Swashbuckle 6.4.0</dd></dl>|3.0.0|
 |useCollection|Deserialize array types to Collection&lt;T&gt; instead of List&lt;T&gt;.| |false|
+|useDateTimeForDate|Use DateTime to model date properties even if DateOnly supported. (.net 6.0+ only)| |false|
 |useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
 |useDefaultRouting|Use default routing for the ASP.NET Core version.| |true|
 |useFrameworkReference|Use frameworkReference for ASP.NET Core 3.0+ and PackageReference ASP.NET Core 2.2 or earlier.| |false|
@@ -74,6 +75,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <ul class="column-ul">
 <li>Boolean</li>
 <li>Collection</li>
+<li>DateOnly</li>
+<li>DateOnly?</li>
 <li>DateTime</li>
 <li>DateTime?</li>
 <li>DateTimeOffset</li>
diff --git a/docs/generators/csharp-functions.md b/docs/generators/csharp-functions.md
index 16b6a650816..8e6a6a98726 100644
--- a/docs/generators/csharp-functions.md
+++ b/docs/generators/csharp-functions.md
@@ -44,6 +44,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
 |sourceFolder|source folder for generated code| |src|
 |useCollection|Deserialize array types to Collection&lt;T&gt; instead of List&lt;T&gt;.| |false|
+|useDateTimeForDate|Use DateTime to model date properties even if DateOnly supported. (.net 6.0+ only)| |false|
 |useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
 |useNewtonsoft|Uses the Newtonsoft JSON library.| |true|
 
@@ -67,6 +68,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <ul class="column-ul">
 <li>Boolean</li>
 <li>Collection</li>
+<li>DateOnly</li>
+<li>DateOnly?</li>
 <li>DateTime</li>
 <li>DateTime?</li>
 <li>DateTimeOffset</li>
diff --git a/docs/generators/csharp.md b/docs/generators/csharp.md
index 461bfc4c28e..97122c15677 100644
--- a/docs/generators/csharp.md
+++ b/docs/generators/csharp.md
@@ -47,6 +47,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |sourceFolder|source folder for generated code| |src|
 |targetFramework|The target .NET framework version. To target multiple frameworks, use `;` as the separator, e.g. `netstandard2.1;netcoreapp3.1`|<dl><dt>**netstandard1.3**</dt><dd>.NET Standard 1.3</dd><dt>**netstandard1.4**</dt><dd>.NET Standard 1.4</dd><dt>**netstandard1.5**</dt><dd>.NET Standard 1.5</dd><dt>**netstandard1.6**</dt><dd>.NET Standard 1.6</dd><dt>**netstandard2.0**</dt><dd>.NET Standard 2.0</dd><dt>**netstandard2.1**</dt><dd>.NET Standard 2.1</dd><dt>**net47**</dt><dd>.NET Framework 4.7</dd><dt>**net48**</dt><dd>.NET Framework 4.8</dd><dt>**net6.0**</dt><dd>.NET 6.0 (End of Support 12 November 2024)</dd><dt>**net7.0**</dt><dd>.NET 7.0</dd><dt>**net8.0**</dt><dd>.NET 8.0</dd></dl>|net8.0|
 |useCollection|Deserialize array types to Collection&lt;T&gt; instead of List&lt;T&gt;.| |false|
+|useDateTimeForDate|Use DateTime to model date properties even if DateOnly supported. (.net 6.0+ only)| |false|
 |useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
 |useOneOfDiscriminatorLookup|Use the discriminator's mapping in oneOf to speed up the model lookup. IMPORTANT: Validation (e.g. one and only one match in oneOf's schemas) will be skipped.| |false|
 |useSourceGeneration|Use source generation where available (only `generichost` library supports this option).| |false|
@@ -73,6 +74,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <ul class="column-ul">
 <li>Boolean</li>
 <li>Collection</li>
+<li>DateOnly</li>
+<li>DateOnly?</li>
 <li>DateTime</li>
 <li>DateTime?</li>
 <li>DateTimeOffset</li>
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java
index 545fea104f4..39a22bb458a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java
@@ -156,6 +156,9 @@ public class CodegenConstants {
     public static final String USE_DATETIME_OFFSET = "useDateTimeOffset";
     public static final String USE_DATETIME_OFFSET_DESC = "Use DateTimeOffset to model date-time properties";
 
+    public static final String USE_DATETIME_FOR_DATE = "useDateTimeForDate";
+    public static final String USE_DATETIME_FOR_DATE_DESC = "Use DateTime to model date properties even if DateOnly supported. (.net 6.0+ only)";
+
     public static final String ENSURE_UNIQUE_PARAMS = "ensureUniqueParams";
     public static final String ENSURE_UNIQUE_PARAMS_DESC = "Whether to ensure parameter names are unique in an operation (rename parameters that are not).";
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
index 576a254cc3f..59584728003 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
@@ -55,6 +55,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
     protected boolean optionalProjectFileFlag = true;
     protected boolean optionalMethodArgumentFlag = true;
     protected boolean useDateTimeOffsetFlag = false;
+    protected boolean useDateTimeForDateFlag = false;
     protected boolean useCollection = false;
     protected boolean returnICollection = false;
     protected boolean netCoreProjectFileFlag = false;
@@ -186,6 +187,8 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
                         "DateTime",
                         "DateTimeOffset?",
                         "DateTimeOffset",
+                        "DateOnly?",
+                        "DateOnly",
                         "Boolean",
                         "Double",
                         "Decimal",
@@ -234,6 +237,11 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
         this.setTypeMapping();
     }
 
+    public void useDateTimeForDate(boolean flag) {
+        this.useDateTimeForDateFlag = flag;
+        this.setTypeMapping();
+    }
+
     @Override
     protected void addParentFromContainer(CodegenModel model, Schema schema) {
         // we do not want to inherit simply because additionalProperties is true
@@ -354,6 +362,13 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
             additionalProperties.put(CodegenConstants.USE_DATETIME_OFFSET, useDateTimeOffsetFlag);
         }
 
+        // {{useDateTimeForDate}}
+        if (additionalProperties.containsKey(CodegenConstants.USE_DATETIME_FOR_DATE)) {
+            useDateTimeForDate(convertPropertyToBooleanAndWriteBack(CodegenConstants.USE_DATETIME_FOR_DATE));
+        } else {
+            additionalProperties.put(CodegenConstants.USE_DATETIME_FOR_DATE, useDateTimeForDateFlag);
+        }
+
         if (additionalProperties.containsKey(CodegenConstants.USE_COLLECTION)) {
             setUseCollection(convertPropertyToBooleanAndWriteBack(CodegenConstants.USE_COLLECTION));
         } else {
@@ -1756,6 +1771,12 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
         return (this.getValueTypes().contains(var.dataType) || var.isEnum);
     }
 
+    protected boolean useNet60OrLater() { return false; }
+
+    protected boolean useDateOnly() {
+        return useNet60OrLater() && !useDateTimeForDateFlag;
+    }
+
     @Override
     public void setParameterExampleValue(CodegenParameter p) {
         String example;
@@ -1820,16 +1841,18 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
             }
             example = "System.Text.Encoding.ASCII.GetBytes(\"" + escapeText(example) + "\")";
         } else if (p.isDate) {
+            String dateType = typeMapping.get("date");
             if (example == null) {
-                example = "DateTime.Parse(\"2013-10-20\")";
+                example = dateType + ".Parse(\"2013-10-20\")";
             } else {
-                example = "DateTime.Parse(\"" + example + "\")";
+                example = dateType + ".Parse(\"" + example + "\")";
             }
         } else if (p.isDateTime) {
+            String dateType = typeMapping.get("DateTime");
             if (example == null) {
-                example = "DateTime.Parse(\"2013-10-20T19:20:30+01:00\")";
+                example = dateType + ".Parse(\"2013-10-20T19:20:30+01:00\")";
             } else {
-                example = "DateTime.Parse(\"" + example + "\")";
+                example = dateType + ".Parse(\"" + example + "\")";
             }
         } else if (p.isDecimal) {
             if (example == null) {
@@ -1993,7 +2016,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
     }
 
     protected Set<String> getValueTypes() {
-        return new HashSet<>(Arrays.asList("decimal", "bool", "int", "uint", "long", "ulong", "float", "double", "DateTime", "DateTimeOffset", "Guid"));
+        return new HashSet<>(Arrays.asList("decimal", "bool", "int", "uint", "long", "ulong", "float", "double", "DateTime", "DateOnly", "DateTimeOffset", "Guid"));
     }
 
     protected void setTypeMapping() {
@@ -2012,7 +2035,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
         typeMapping.put("decimal", "decimal");
         typeMapping.put("BigDecimal", "decimal");
         typeMapping.put("DateTime", this.useDateTimeOffsetFlag ? "DateTimeOffset" : "DateTime");
-        typeMapping.put("date", "DateTime");
+        typeMapping.put("date", this.useDateOnly() ? "DateOnly" : "DateTime");
         typeMapping.put("file", "System.IO.Stream");
         typeMapping.put("array", "List");
         typeMapping.put("list", "List");
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetServerCodegen.java
index 9afd271def0..4248ad52050 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetServerCodegen.java
@@ -52,6 +52,7 @@ public class AspNetServerCodegen extends AbstractCSharpCodegen {
     public static final String BUILD_TARGET = "buildTarget";
     public static final String MODEL_CLASS_MODIFIER = "modelClassModifier";
     public static final String TARGET_FRAMEWORK = "targetFramework";
+    public static final String NET_60_OR_LATER = "net60OrLater";
 
     public static final String PROJECT_SDK = "projectSdk";
     public static final String SDK_WEB = "Microsoft.NET.Sdk.Web";
@@ -209,6 +210,10 @@ public class AspNetServerCodegen extends AbstractCSharpCodegen {
                 CodegenConstants.USE_DATETIME_OFFSET_DESC,
                 useDateTimeOffsetFlag);
 
+        addSwitch(CodegenConstants.USE_DATETIME_FOR_DATE,
+                CodegenConstants.USE_DATETIME_FOR_DATE_DESC,
+                useDateTimeForDateFlag);
+
         addSwitch(CodegenConstants.USE_COLLECTION,
                 CodegenConstants.USE_COLLECTION_DESC,
                 useCollection);
@@ -299,7 +304,7 @@ public class AspNetServerCodegen extends AbstractCSharpCodegen {
     @Override
     protected Set<String> getNullableTypes() {
         return new HashSet<>(Arrays.asList("decimal", "bool", "int", "uint", "long", "ulong", "float", "double",
-            "DateTime", "DateTimeOffset", "Guid"));
+            "DateTime", "DateOnly", "DateTimeOffset", "Guid"));
     }
 
     @Override
@@ -462,6 +467,11 @@ public class AspNetServerCodegen extends AbstractCSharpCodegen {
         this.setTypeMapping();
     }
 
+    @Override
+    protected boolean useNet60OrLater() {
+        return additionalProperties.containsKey(NET_60_OR_LATER);
+    }
+
     public void setPackageGuid(String packageGuid) {
         this.packageGuid = packageGuid;
     }
@@ -775,6 +785,20 @@ public class AspNetServerCodegen extends AbstractCSharpCodegen {
             useFrameworkReference = true;
             additionalProperties.put(USE_FRAMEWORK_REFERENCE, useFrameworkReference);
             additionalProperties.put(TARGET_FRAMEWORK, "net6.0");
+        } else if (aspnetCoreVersion.getOptValue().startsWith("7.")) {
+            LOGGER.warn(
+                    "ASP.NET core version is {} so changing to use frameworkReference instead of packageReference ",
+                    aspnetCoreVersion.getOptValue());
+            useFrameworkReference = true;
+            additionalProperties.put(USE_FRAMEWORK_REFERENCE, useFrameworkReference);
+            additionalProperties.put(TARGET_FRAMEWORK, "net7.0");
+        } else if (aspnetCoreVersion.getOptValue().startsWith("8.")) {
+            LOGGER.warn(
+                    "ASP.NET core version is {} so changing to use frameworkReference instead of packageReference ",
+                    aspnetCoreVersion.getOptValue());
+            useFrameworkReference = true;
+            additionalProperties.put(USE_FRAMEWORK_REFERENCE, useFrameworkReference);
+            additionalProperties.put(TARGET_FRAMEWORK, "net8.0");
         } else {
             if (additionalProperties.containsKey(USE_FRAMEWORK_REFERENCE)) {
                 useFrameworkReference = convertPropertyToBooleanAndWriteBack(USE_FRAMEWORK_REFERENCE);
@@ -783,6 +807,17 @@ public class AspNetServerCodegen extends AbstractCSharpCodegen {
             }
             additionalProperties.put(TARGET_FRAMEWORK, "netcoreapp" + aspnetCoreVersion);
         }
+
+        setAddititonalPropertyForFramework();
+    }
+
+    private void setAddititonalPropertyForFramework() {
+        String targetFramework = ((String)additionalProperties.get(TARGET_FRAMEWORK));
+        if (targetFramework.startsWith("net6.0") ||
+            targetFramework.startsWith("net7.0") || 
+            targetFramework.startsWith("net8.0")) {
+            additionalProperties.put(NET_60_OR_LATER, true);
+        }
     }
 
     private void setUseNewtonsoft() {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
index 20576ede388..f084de1cc73 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
@@ -114,6 +114,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
     protected boolean supportsAsync = Boolean.TRUE;
     protected boolean netStandard = Boolean.FALSE;
     protected boolean supportsFileParameters = Boolean.TRUE;
+    protected boolean supportsDateOnly = Boolean.FALSE;
 
     protected boolean validatable = Boolean.TRUE;
     protected boolean equatable = Boolean.FALSE;
@@ -264,6 +265,10 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
                 CodegenConstants.USE_DATETIME_OFFSET_DESC,
                 this.useDateTimeOffsetFlag);
 
+        addSwitch(CodegenConstants.USE_DATETIME_FOR_DATE,
+                CodegenConstants.USE_DATETIME_FOR_DATE_DESC,
+                useDateTimeForDateFlag);
+
         addSwitch(CodegenConstants.USE_COLLECTION,
                 CodegenConstants.USE_COLLECTION_DESC,
                 this.useCollection);
@@ -359,6 +364,11 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
                 : new HashSet<>(Arrays.asList("decimal", "bool", "int", "uint", "long", "ulong", "float", "double"));
     }
 
+    @Override
+    protected boolean useNet60OrLater() {
+        return additionalProperties.containsKey(NET_60_OR_LATER);
+    }
+
     @Override
     protected void setTypeMapping() {
         super.setTypeMapping();
@@ -782,6 +792,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
         syncBooleanProperty(additionalProperties, CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP, this::setUseOneOfDiscriminatorLookup, this.useOneOfDiscriminatorLookup);
         syncBooleanProperty(additionalProperties, "supportsFileParameters", this::setSupportsFileParameters, this.supportsFileParameters);
         syncBooleanProperty(additionalProperties, "useSourceGeneration", this::setUseSourceGeneration, this.useSourceGeneration);
+        syncBooleanProperty(additionalProperties, "supportsDateOnly", this::setSupportsDateOnly, this.supportsDateOnly);
 
         final String testPackageName = testPackageName();
         String packageFolder = sourceFolder + File.separator + packageName;
@@ -843,6 +854,10 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
             }
         }
 
+        if (useDateOnly()) {
+            setSupportsDateOnly(true);
+            additionalProperties.put("supportsDateOnly", true);
+        }
         // include the spec in the output
         supportingFiles.add(new SupportingFile("openapi.mustache", "api", "openapi.yaml"));
 
@@ -988,6 +1003,10 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
         supportingFiles.add(new SupportingFile("ApiFactory.mustache", clientPackageDir, "ApiFactory.cs"));
         supportingFiles.add(new SupportingFile("DateTimeJsonConverter.mustache", clientPackageDir, "DateTimeJsonConverter.cs"));
         supportingFiles.add(new SupportingFile("DateTimeNullableJsonConverter.mustache", clientPackageDir, "DateTimeNullableJsonConverter.cs"));
+        if (useDateOnly()) {
+            supportingFiles.add(new SupportingFile("DateOnlyJsonConverter.mustache", clientPackageDir, "DateOnlyJsonConverter.cs"));
+            supportingFiles.add(new SupportingFile("DateOnlyNullableJsonConverter.mustache", clientPackageDir, "DateOnlyNullableJsonConverter.cs"));
+        }
         supportingFiles.add(new SupportingFile("ApiResponseEventArgs`1.mustache", clientPackageDir, "ApiResponseEventArgs.cs"));
         supportingFiles.add(new SupportingFile("ExceptionEventArgs.mustache", clientPackageDir, "ExceptionEventArgs.cs"));
         supportingFiles.add(new SupportingFile("JsonSerializerOptionsProvider.mustache", clientPackageDir, "JsonSerializerOptionsProvider.cs"));
@@ -1092,6 +1111,10 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
         this.supportsFileParameters = supportsFileParameters;
     }
 
+    public void setSupportsDateOnly(Boolean supportsDateOnly) {
+        this.supportsDateOnly = supportsDateOnly;
+    }
+
     public void setSupportsRetry(Boolean supportsRetry) {
         this.supportsRetry = supportsRetry;
     }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpFunctionsServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpFunctionsServerCodegen.java
index 0052dbb0470..9aaffde2c10 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpFunctionsServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpFunctionsServerCodegen.java
@@ -53,6 +53,7 @@ public class CSharpFunctionsServerCodegen extends AbstractCSharpCodegen {
     public static final String COMPATIBILITY_VERSION = "compatibilityVersion";
     public static final String USE_NEWTONSOFT = "useNewtonsoft";
     public static final String NEWTONSOFT_VERSION = "newtonsoftVersion";
+    public static final String NET_60_OR_LATER = "net60OrLater";
 
     private String packageGuid = "{" + randomUUID().toString().toUpperCase(Locale.ROOT) + "}";
     private String userSecretsGuid = randomUUID().toString();
@@ -188,6 +189,10 @@ public class CSharpFunctionsServerCodegen extends AbstractCSharpCodegen {
                 CodegenConstants.USE_DATETIME_OFFSET_DESC,
                 useDateTimeOffsetFlag);
 
+        addSwitch(CodegenConstants.USE_DATETIME_FOR_DATE,
+                CodegenConstants.USE_DATETIME_FOR_DATE_DESC,
+                useDateTimeForDateFlag);
+
         addSwitch(CodegenConstants.USE_COLLECTION,
                 CodegenConstants.USE_COLLECTION_DESC,
                 useCollection);
@@ -263,18 +268,8 @@ public class CSharpFunctionsServerCodegen extends AbstractCSharpCodegen {
     }
 
     @Override
-    protected void setTypeMapping() {
-        super.setTypeMapping();
-        typeMapping.put("boolean", "bool");
-        typeMapping.put("integer", "int");
-        typeMapping.put("float", "float");
-        typeMapping.put("long", "long");
-        typeMapping.put("double", "double");
-        typeMapping.put("number", "decimal");
-        typeMapping.put("DateTime", "DateTime");
-        typeMapping.put("date", "DateTime");
-        typeMapping.put("UUID", "Guid");
-        typeMapping.put("URI", "string");
+    protected boolean useNet60OrLater() {
+        return additionalProperties.containsKey(NET_60_OR_LATER);
     }
 
     @Override
@@ -607,6 +602,13 @@ public class CSharpFunctionsServerCodegen extends AbstractCSharpCodegen {
         //set .NET target version
         String targetFrameworkVersion = "net" + netCoreVersion.getOptValue();
         additionalProperties.put(TARGET_FRAMEWORK, targetFrameworkVersion);
+        setAddititonalPropertyForFramework();
+    }
+
+    private void setAddititonalPropertyForFramework() {
+        if (((String)additionalProperties.get(TARGET_FRAMEWORK)).startsWith("net6.0")) {
+            additionalProperties.put(NET_60_OR_LATER, true);
+        }
     }
 
     private void setOperationIsAsync() {
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateFormats.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateFormats.mustache
new file mode 100644
index 00000000000..920ecda88fa
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateFormats.mustache
@@ -0,0 +1,2 @@
+            "yyyy'-'MM'-'dd",
+            "yyyyMMdd"
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateOnlyJsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateOnlyJsonConverter.mustache
new file mode 100644
index 00000000000..209979c8db4
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateOnlyJsonConverter.mustache
@@ -0,0 +1,51 @@
+{{>partial_header}}
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace {{packageName}}.{{clientPackage}}
+{
+    /// <summary>
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    {{>visibility}} class DateOnlyJsonConverter : JsonConverter<DateOnly>
+    {
+        /// <summary>
+        /// The formats used to deserialize the date
+        /// </summary>
+        public static string[] Formats { get; } = {
+{{>DateFormats}}
+        };
+
+        /// <summary>
+        /// Returns a DateOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override DateOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+            if (reader.TokenType == JsonTokenType.Null)
+                throw new NotSupportedException();
+
+            string value = reader.GetString(){{nrt!}};
+
+            foreach(string format in Formats)
+                if (DateOnly.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateOnly result))
+                    return result;
+
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Writes the DateOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="dateOnlyValue"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, DateOnly dateOnlyValue, JsonSerializerOptions options) =>
+            writer.WriteStringValue(dateOnlyValue.ToString("{{{dateFormat}}}", CultureInfo.InvariantCulture));
+    }
+}
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateOnlyNullableJsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateOnlyNullableJsonConverter.mustache
new file mode 100644
index 00000000000..17c84736536
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateOnlyNullableJsonConverter.mustache
@@ -0,0 +1,56 @@
+{{>partial_header}}
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace {{packageName}}.{{clientPackage}}
+{
+    /// <summary>
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    {{>visibility}} class DateOnlyNullableJsonConverter : JsonConverter<DateOnly?>
+    {
+        /// <summary>
+        /// The formats used to deserialize the date
+        /// </summary>
+        public static string[] Formats { get; } = {
+{{>DateFormats}}
+        };
+
+        /// <summary>
+        /// Returns a DateOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override DateOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+            if (reader.TokenType == JsonTokenType.Null)
+                return null;
+
+            string value = reader.GetString(){{nrt!}};
+
+            foreach(string format in Formats)
+                if (DateOnly.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateOnly result))
+                    return result;
+
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Writes the DateOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="dateOnlyValue"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, DateOnly? dateOnlyValue, JsonSerializerOptions options)
+        {
+            if (dateOnlyValue == null)
+                writer.WriteNullValue();
+            else
+                writer.WriteStringValue(dateOnlyValue.Value.ToString("{{{dateFormat}}}", CultureInfo.InvariantCulture));
+        }
+    }
+}
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeFormats.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeFormats.mustache
index c8887e20859..85ed99a2c9e 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeFormats.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeFormats.mustache
@@ -6,7 +6,9 @@
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ssK",
+        {{^supportsDateOnly}}
             "yyyy'-'MM'-'dd",
+        {{/supportsDateOnly}}
             "yyyyMMddTHHmmss.fffffffK",
             "yyyyMMddTHHmmss.ffffffK",
             "yyyyMMddTHHmmss.fffffK",
@@ -15,4 +17,6 @@
             "yyyyMMddTHHmmss.ffK",
             "yyyyMMddTHHmmss.fK",
             "yyyyMMddTHHmmssK",
-            "yyyyMMdd"
\ No newline at end of file
+        {{^supportsDateOnly}}
+            "yyyyMMdd"
+        {{/supportsDateOnly}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeJsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeJsonConverter.mustache
index 21d35ec2302..c5187f50815 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeJsonConverter.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeJsonConverter.mustache
@@ -7,7 +7,7 @@ using System.Text.Json.Serialization;
 namespace {{packageName}}.{{clientPackage}}
 {
     /// <summary>
-    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// Formatter for {{#supportsDateOnly}}'date-time'{{/supportsDateOnly}}{{^supportsDateOnly}}'date' and 'date-time'{{/supportsDateOnly}} openapi formats ss defined by full-date - RFC3339
     /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
     /// </summary>
     {{>visibility}} class DateTimeJsonConverter : JsonConverter<DateTime>
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeNullableJsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeNullableJsonConverter.mustache
index 52e2afa0b7a..646c729478d 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeNullableJsonConverter.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeNullableJsonConverter.mustache
@@ -7,7 +7,7 @@ using System.Text.Json.Serialization;
 namespace {{packageName}}.{{clientPackage}}
 {
     /// <summary>
-    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// Formatter for {{#supportsDateOnly}}'date-time'{{/supportsDateOnly}}{{^supportsDateOnly}}'date' and 'date-time'{{/supportsDateOnly}} openapi formats ss defined by full-date - RFC3339
     /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
     /// </summary>
     {{>visibility}} class DateTimeNullableJsonConverter : JsonConverter<DateTime?>
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 1e848862a8b..d7d1e3bf3a8 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
@@ -35,6 +35,10 @@ namespace {{packageName}}.{{clientPackage}}
             _jsonOptions.Converters.Add(new JsonStringEnumConverter());
             _jsonOptions.Converters.Add(new DateTimeJsonConverter());
             _jsonOptions.Converters.Add(new DateTimeNullableJsonConverter());
+            {{#supportsDateOnly}}
+            _jsonOptions.Converters.Add(new DateOnlyJsonConverter());
+            _jsonOptions.Converters.Add(new DateOnlyNullableJsonConverter());
+            {{/supportsDateOnly}}
             {{#models}}
             {{#model}}
             {{#isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache
index 09c544ac52f..e136dd4d5be 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache
@@ -208,7 +208,7 @@
                         {{/isNumeric}}
                         {{#isDate}}
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{>OptionProperty}}JsonSerializer.Deserialize<DateTime{{#isNullable}}?{{/isNullable}}>(ref utf8JsonReader, jsonSerializerOptions));
+                                {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{>OptionProperty}}JsonSerializer.Deserialize<{{#supportsDateOnly}}DateOnly{{/supportsDateOnly}}{{^supportsDateOnly}}DateTime{{/supportsDateOnly}}{{#isNullable}}?{{/isNullable}}>(ref utf8JsonReader, jsonSerializerOptions));
                         {{/isDate}}
                         {{#isDateTime}}
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
diff --git a/modules/openapi-generator/src/test/resources/3_0/csharp/dates-api.yaml b/modules/openapi-generator/src/test/resources/3_0/csharp/dates-api.yaml
new file mode 100644
index 00000000000..34fd6fa65d7
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/csharp/dates-api.yaml
@@ -0,0 +1,25 @@
+openapi: 3.0.0
+info:
+  title: OpenAPI Dates
+  version: 1.0.0
+  description: Thic spec contains endpoints with dates in different formats
+  license:
+    name: Apache-2.0
+    url: 'https://www.apache.org/licenses/LICENSE-2.0.html'
+paths:
+  /now:
+    get:
+      responses:
+        '200':
+          description: now dates
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  today:
+                    type: string
+                    format: date
+                  now:
+                    type: string
+                    format: date-time
diff --git a/samples/client/echo_api/csharp-restsharp/docs/QueryApi.md b/samples/client/echo_api/csharp-restsharp/docs/QueryApi.md
index 681e00fa5fe..227f3fa7494 100644
--- a/samples/client/echo_api/csharp-restsharp/docs/QueryApi.md
+++ b/samples/client/echo_api/csharp-restsharp/docs/QueryApi.md
@@ -108,7 +108,7 @@ No authorization required
 
 <a id="testquerydatetimedatestring"></a>
 # **TestQueryDatetimeDateString**
-> string TestQueryDatetimeDateString (DateTime? datetimeQuery = null, DateTime? dateQuery = null, string? stringQuery = null)
+> string TestQueryDatetimeDateString (DateTime? datetimeQuery = null, DateOnly? dateQuery = null, string? stringQuery = null)
 
 Test query parameter(s)
 
@@ -132,7 +132,7 @@ namespace Example
             config.BasePath = "http://localhost:3000";
             var apiInstance = new QueryApi(config);
             var datetimeQuery = DateTime.Parse("2013-10-20T19:20:30+01:00");  // DateTime? |  (optional) 
-            var dateQuery = DateTime.Parse("2013-10-20");  // DateTime? |  (optional) 
+            var dateQuery = DateOnly.Parse("2013-10-20");  // DateOnly? |  (optional) 
             var stringQuery = "stringQuery_example";  // string? |  (optional) 
 
             try
@@ -177,7 +177,7 @@ catch (ApiException e)
 | Name | Type | Description | Notes |
 |------|------|-------------|-------|
 | **datetimeQuery** | **DateTime?** |  | [optional]  |
-| **dateQuery** | **DateTime?** |  | [optional]  |
+| **dateQuery** | **DateOnly?** |  | [optional]  |
 | **stringQuery** | **string?** |  | [optional]  |
 
 ### Return type
diff --git a/samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools/Api/QueryApi.cs b/samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools/Api/QueryApi.cs
index a19c0ef303c..9b54b9048f6 100644
--- a/samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools/Api/QueryApi.cs
+++ b/samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools/Api/QueryApi.cs
@@ -64,7 +64,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="stringQuery"> (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns>string</returns>
-        string TestQueryDatetimeDateString(DateTime? datetimeQuery = default(DateTime?), DateTime? dateQuery = default(DateTime?), string? stringQuery = default(string?), int operationIndex = 0);
+        string TestQueryDatetimeDateString(DateTime? datetimeQuery = default(DateTime?), DateOnly? dateQuery = default(DateOnly?), string? stringQuery = default(string?), int operationIndex = 0);
 
         /// <summary>
         /// Test query parameter(s)
@@ -78,7 +78,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="stringQuery"> (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns>ApiResponse of string</returns>
-        ApiResponse<string> TestQueryDatetimeDateStringWithHttpInfo(DateTime? datetimeQuery = default(DateTime?), DateTime? dateQuery = default(DateTime?), string? stringQuery = default(string?), int operationIndex = 0);
+        ApiResponse<string> TestQueryDatetimeDateStringWithHttpInfo(DateTime? datetimeQuery = default(DateTime?), DateOnly? dateQuery = default(DateOnly?), string? stringQuery = default(string?), int operationIndex = 0);
         /// <summary>
         /// Test query parameter(s)
         /// </summary>
@@ -270,7 +270,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of string</returns>
-        System.Threading.Tasks.Task<string> TestQueryDatetimeDateStringAsync(DateTime? datetimeQuery = default(DateTime?), DateTime? dateQuery = default(DateTime?), string? stringQuery = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<string> TestQueryDatetimeDateStringAsync(DateTime? datetimeQuery = default(DateTime?), DateOnly? dateQuery = default(DateOnly?), string? stringQuery = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <summary>
         /// Test query parameter(s)
@@ -285,7 +285,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (string)</returns>
-        System.Threading.Tasks.Task<ApiResponse<string>> TestQueryDatetimeDateStringWithHttpInfoAsync(DateTime? datetimeQuery = default(DateTime?), DateTime? dateQuery = default(DateTime?), string? stringQuery = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ApiResponse<string>> TestQueryDatetimeDateStringWithHttpInfoAsync(DateTime? datetimeQuery = default(DateTime?), DateOnly? dateQuery = default(DateOnly?), string? stringQuery = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
         /// <summary>
         /// Test query parameter(s)
         /// </summary>
@@ -719,7 +719,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="stringQuery"> (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns>string</returns>
-        public string TestQueryDatetimeDateString(DateTime? datetimeQuery = default(DateTime?), DateTime? dateQuery = default(DateTime?), string? stringQuery = default(string?), int operationIndex = 0)
+        public string TestQueryDatetimeDateString(DateTime? datetimeQuery = default(DateTime?), DateOnly? dateQuery = default(DateOnly?), string? stringQuery = default(string?), int operationIndex = 0)
         {
             Org.OpenAPITools.Client.ApiResponse<string> localVarResponse = TestQueryDatetimeDateStringWithHttpInfo(datetimeQuery, dateQuery, stringQuery);
             return localVarResponse.Data;
@@ -734,7 +734,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="stringQuery"> (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns>ApiResponse of string</returns>
-        public Org.OpenAPITools.Client.ApiResponse<string> TestQueryDatetimeDateStringWithHttpInfo(DateTime? datetimeQuery = default(DateTime?), DateTime? dateQuery = default(DateTime?), string? stringQuery = default(string?), int operationIndex = 0)
+        public Org.OpenAPITools.Client.ApiResponse<string> TestQueryDatetimeDateStringWithHttpInfo(DateTime? datetimeQuery = default(DateTime?), DateOnly? dateQuery = default(DateOnly?), string? stringQuery = default(string?), int operationIndex = 0)
         {
             Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions();
 
@@ -799,7 +799,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of string</returns>
-        public async System.Threading.Tasks.Task<string> TestQueryDatetimeDateStringAsync(DateTime? datetimeQuery = default(DateTime?), DateTime? dateQuery = default(DateTime?), string? stringQuery = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<string> TestQueryDatetimeDateStringAsync(DateTime? datetimeQuery = default(DateTime?), DateOnly? dateQuery = default(DateOnly?), string? stringQuery = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
             Org.OpenAPITools.Client.ApiResponse<string> localVarResponse = await TestQueryDatetimeDateStringWithHttpInfoAsync(datetimeQuery, dateQuery, stringQuery, operationIndex, cancellationToken).ConfigureAwait(false);
             return localVarResponse.Data;
@@ -815,7 +815,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (string)</returns>
-        public async System.Threading.Tasks.Task<Org.OpenAPITools.Client.ApiResponse<string>> TestQueryDatetimeDateStringWithHttpInfoAsync(DateTime? datetimeQuery = default(DateTime?), DateTime? dateQuery = default(DateTime?), string? stringQuery = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Org.OpenAPITools.Client.ApiResponse<string>> TestQueryDatetimeDateStringWithHttpInfoAsync(DateTime? datetimeQuery = default(DateTime?), DateOnly? dateQuery = default(DateOnly?), string? stringQuery = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
 
             Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions();
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/.openapi-generator/FILES
index 96f2ef1bc1c..f26dd3d19b8 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/.openapi-generator/FILES
@@ -122,6 +122,8 @@ src/UseSourceGeneration/Client/BasicToken.cs
 src/UseSourceGeneration/Client/BearerToken.cs
 src/UseSourceGeneration/Client/ClientUtils.cs
 src/UseSourceGeneration/Client/CookieContainer.cs
+src/UseSourceGeneration/Client/DateOnlyJsonConverter.cs
+src/UseSourceGeneration/Client/DateOnlyNullableJsonConverter.cs
 src/UseSourceGeneration/Client/DateTimeJsonConverter.cs
 src/UseSourceGeneration/Client/DateTimeNullableJsonConverter.cs
 src/UseSourceGeneration/Client/ExceptionEventArgs.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/apis/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/apis/FakeApi.md
index fdb257f14d2..2549af1e984 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/apis/FakeApi.md
@@ -896,7 +896,7 @@ No authorization required
 
 <a id="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, DateTime date = null, System.IO.Stream binary = null, float varFloat = null, int integer = null, int int32 = null, long int64 = null, string varString = null, string password = null, string callback = null, DateTime dateTime = null)
+> void TestEndpointParameters (byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, DateOnly date = null, System.IO.Stream binary = null, float varFloat = null, int integer = null, int int32 = null, long int64 = null, string varString = null, string password = null, string callback = null, DateTime dateTime = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -927,7 +927,7 @@ namespace Example
             var number = 8.14D;  // decimal | None
             var varDouble = 1.2D;  // double | None
             var patternWithoutDelimiter = "patternWithoutDelimiter_example";  // string | None
-            var date = DateTime.Parse("2013-10-20");  // DateTime | None (optional) 
+            var date = DateOnly.Parse("2013-10-20");  // DateOnly | None (optional) 
             var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
             var varFloat = 3.4F;  // float | None (optional) 
             var integer = 56;  // int | None (optional) 
@@ -979,7 +979,7 @@ catch (ApiException e)
 | **number** | **decimal** | None |  |
 | **varDouble** | **double** | None |  |
 | **patternWithoutDelimiter** | **string** | None |  |
-| **date** | **DateTime** | None | [optional]  |
+| **date** | **DateOnly** | None | [optional]  |
 | **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
 | **varFloat** | **float** | None | [optional]  |
 | **integer** | **int** | None | [optional]  |
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/DateOnlyClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/DateOnlyClass.md
index 6a98ffe33b9..1efce906ea2 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/DateOnlyClass.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/DateOnlyClass.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**DateOnlyProperty** | **DateTime** |  | [optional] 
+**DateOnlyProperty** | **DateOnly** |  | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FormatTest.md
index 98fa755fce0..3540ad007d2 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FormatTest.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FormatTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **VarByte** | **byte[]** |  | 
-**Date** | **DateTime** |  | 
+**Date** | **DateOnly** |  | 
 **Number** | **decimal** |  | 
 **Password** | **string** |  | 
 **Binary** | **System.IO.Stream** |  | [optional] 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/NullableClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/NullableClass.md
index ce95a131e6c..9c5ff428a98 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/NullableClass.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/NullableClass.md
@@ -8,7 +8,7 @@ Name | Type | Description | Notes
 **ArrayItemsNullable** | **List&lt;Object&gt;** |  | [optional] 
 **ArrayNullableProp** | **List&lt;Object&gt;** |  | [optional] 
 **BooleanProp** | **bool** |  | [optional] 
-**DateProp** | **DateTime** |  | [optional] 
+**DateProp** | **DateOnly** |  | [optional] 
 **DatetimeProp** | **DateTime** |  | [optional] 
 **IntegerProp** | **int** |  | [optional] 
 **NumberProp** | **decimal** |  | [optional] 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/RequiredClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/RequiredClass.md
index fa83b86d571..27f01c16af1 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/RequiredClass.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/RequiredClass.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**RequiredNotNullableDateProp** | **DateTime** |  | 
+**RequiredNotNullableDateProp** | **DateOnly** |  | 
 **RequiredNotnullableArrayOfString** | **List&lt;string&gt;** |  | 
 **RequiredNotnullableBooleanProp** | **bool** |  | 
 **RequiredNotnullableDatetimeProp** | **DateTime** |  | 
@@ -17,7 +17,7 @@ Name | Type | Description | Notes
 **RequiredNotnullableintegerProp** | **int** |  | 
 **RequiredNullableArrayOfString** | **List&lt;string&gt;** |  | 
 **RequiredNullableBooleanProp** | **bool** |  | 
-**RequiredNullableDateProp** | **DateTime** |  | 
+**RequiredNullableDateProp** | **DateOnly** |  | 
 **RequiredNullableDatetimeProp** | **DateTime** |  | 
 **RequiredNullableEnumInteger** | **int** |  | 
 **RequiredNullableEnumIntegerOnly** | **int** |  | 
@@ -26,9 +26,9 @@ Name | Type | Description | Notes
 **RequiredNullableOuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | 
 **RequiredNullableStringProp** | **string** |  | 
 **RequiredNullableUuid** | **Guid** |  | 
-**NotRequiredNotnullableDateProp** | **DateTime** |  | [optional] 
+**NotRequiredNotnullableDateProp** | **DateOnly** |  | [optional] 
 **NotRequiredNotnullableintegerProp** | **int** |  | [optional] 
-**NotRequiredNullableDateProp** | **DateTime** |  | [optional] 
+**NotRequiredNullableDateProp** | **DateOnly** |  | [optional] 
 **NotRequiredNullableIntegerProp** | **int** |  | [optional] 
 **NotrequiredNotnullableArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **NotrequiredNotnullableBooleanProp** | **bool** |  | [optional] 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/FakeApi.cs
index d4140341ae8..3d39a5b433d 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/FakeApi.cs
@@ -288,7 +288,7 @@ namespace UseSourceGeneration.Api
         /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -312,7 +312,7 @@ namespace UseSourceGeneration.Api
         /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>?&gt;</returns>
-        Task<ITestEndpointParametersApiResponse?> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse?> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -3243,7 +3243,7 @@ namespace UseSourceGeneration.Api
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEndpointParameters(ref byte[] varByte, ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref Option<DateTime> date, ref Option<System.IO.Stream> binary, ref Option<float> varFloat, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<string> varString, ref Option<string> password, ref Option<string> callback, ref Option<DateTime> dateTime);
+        partial void FormatTestEndpointParameters(ref byte[] varByte, ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref Option<DateOnly> date, ref Option<System.IO.Stream> binary, ref Option<float> varFloat, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<string> varString, ref Option<string> password, ref Option<string> callback, ref Option<DateTime> dateTime);
 
         /// <summary>
         /// Validates the request parameters
@@ -3294,7 +3294,7 @@ namespace UseSourceGeneration.Api
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
         {
             bool suppressDefaultLog = false;
             AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
@@ -3321,7 +3321,7 @@ namespace UseSourceGeneration.Api
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3343,7 +3343,7 @@ namespace UseSourceGeneration.Api
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
         {
             bool suppressDefaultLog = false;
             OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
@@ -3372,7 +3372,7 @@ namespace UseSourceGeneration.Api
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -3393,7 +3393,7 @@ namespace UseSourceGeneration.Api
         /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse?> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse?> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
@@ -3425,7 +3425,7 @@ namespace UseSourceGeneration.Api
         /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateOnlyJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateOnlyJsonConverter.cs
new file mode 100644
index 00000000000..7bcb8ec3897
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateOnlyJsonConverter.cs
@@ -0,0 +1,61 @@
+/*
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace UseSourceGeneration.Client
+{
+    /// <summary>
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    public class DateOnlyJsonConverter : JsonConverter<DateOnly>
+    {
+        /// <summary>
+        /// The formats used to deserialize the date
+        /// </summary>
+        public static string[] Formats { get; } = {
+            "yyyy'-'MM'-'dd",
+            "yyyyMMdd"
+
+        };
+
+        /// <summary>
+        /// Returns a DateOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override DateOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+            if (reader.TokenType == JsonTokenType.Null)
+                throw new NotSupportedException();
+
+            string value = reader.GetString()!;
+
+            foreach(string format in Formats)
+                if (DateOnly.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateOnly result))
+                    return result;
+
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Writes the DateOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="dateOnlyValue"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, DateOnly dateOnlyValue, JsonSerializerOptions options) =>
+            writer.WriteStringValue(dateOnlyValue.ToString("yyyy'-'MM'-'dd", CultureInfo.InvariantCulture));
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateOnlyNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateOnlyNullableJsonConverter.cs
new file mode 100644
index 00000000000..b12272beb82
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateOnlyNullableJsonConverter.cs
@@ -0,0 +1,66 @@
+/*
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace UseSourceGeneration.Client
+{
+    /// <summary>
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    public class DateOnlyNullableJsonConverter : JsonConverter<DateOnly?>
+    {
+        /// <summary>
+        /// The formats used to deserialize the date
+        /// </summary>
+        public static string[] Formats { get; } = {
+            "yyyy'-'MM'-'dd",
+            "yyyyMMdd"
+
+        };
+
+        /// <summary>
+        /// Returns a DateOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override DateOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+            if (reader.TokenType == JsonTokenType.Null)
+                return null;
+
+            string value = reader.GetString()!;
+
+            foreach(string format in Formats)
+                if (DateOnly.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateOnly result))
+                    return result;
+
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Writes the DateOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="dateOnlyValue"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, DateOnly? dateOnlyValue, JsonSerializerOptions options)
+        {
+            if (dateOnlyValue == null)
+                writer.WriteNullValue();
+            else
+                writer.WriteStringValue(dateOnlyValue.Value.ToString("yyyy'-'MM'-'dd", CultureInfo.InvariantCulture));
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateTimeJsonConverter.cs
index 4c66712a3e3..47944cd6613 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateTimeJsonConverter.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateTimeJsonConverter.cs
@@ -15,7 +15,7 @@ using System.Text.Json.Serialization;
 namespace UseSourceGeneration.Client
 {
     /// <summary>
-    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// Formatter for 'date-time' openapi formats ss defined by full-date - RFC3339
     /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
     /// </summary>
     public class DateTimeJsonConverter : JsonConverter<DateTime>
@@ -32,7 +32,6 @@ namespace UseSourceGeneration.Client
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ssK",
-            "yyyy'-'MM'-'dd",
             "yyyyMMddTHHmmss.fffffffK",
             "yyyyMMddTHHmmss.ffffffK",
             "yyyyMMddTHHmmss.fffffK",
@@ -41,7 +40,7 @@ namespace UseSourceGeneration.Client
             "yyyyMMddTHHmmss.ffK",
             "yyyyMMddTHHmmss.fK",
             "yyyyMMddTHHmmssK",
-            "yyyyMMdd"
+
         };
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateTimeNullableJsonConverter.cs
index e341a77d5cd..03e2a747e15 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateTimeNullableJsonConverter.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateTimeNullableJsonConverter.cs
@@ -15,7 +15,7 @@ using System.Text.Json.Serialization;
 namespace UseSourceGeneration.Client
 {
     /// <summary>
-    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// Formatter for 'date-time' openapi formats ss defined by full-date - RFC3339
     /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
     /// </summary>
     public class DateTimeNullableJsonConverter : JsonConverter<DateTime?>
@@ -32,7 +32,6 @@ namespace UseSourceGeneration.Client
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ssK",
-            "yyyy'-'MM'-'dd",
             "yyyyMMddTHHmmss.fffffffK",
             "yyyyMMddTHHmmss.ffffffK",
             "yyyyMMddTHHmmss.fffffK",
@@ -41,7 +40,7 @@ namespace UseSourceGeneration.Client
             "yyyyMMddTHHmmss.ffK",
             "yyyyMMddTHHmmss.fK",
             "yyyyMMddTHHmmssK",
-            "yyyyMMdd"
+
          };
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/HostConfiguration.cs
index a1bc8ed1289..615be479166 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/HostConfiguration.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/HostConfiguration.cs
@@ -41,6 +41,8 @@ namespace UseSourceGeneration.Client
             _jsonOptions.Converters.Add(new JsonStringEnumConverter());
             _jsonOptions.Converters.Add(new DateTimeJsonConverter());
             _jsonOptions.Converters.Add(new DateTimeNullableJsonConverter());
+            _jsonOptions.Converters.Add(new DateOnlyJsonConverter());
+            _jsonOptions.Converters.Add(new DateOnlyNullableJsonConverter());
             _jsonOptions.Converters.Add(new ActivityJsonConverter());
             _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter());
             _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter());
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/DateOnlyClass.cs
index dcfcc06467a..d5cd3f8c074 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/DateOnlyClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/DateOnlyClass.cs
@@ -37,7 +37,7 @@ namespace UseSourceGeneration.Model
         /// </summary>
         /// <param name="dateOnlyProperty">dateOnlyProperty</param>
         [JsonConstructor]
-        public DateOnlyClass(Option<DateTime?> dateOnlyProperty = default)
+        public DateOnlyClass(Option<DateOnly?> dateOnlyProperty = default)
         {
             DateOnlyPropertyOption = dateOnlyProperty;
             OnCreated();
@@ -50,14 +50,14 @@ namespace UseSourceGeneration.Model
         /// </summary>
         [JsonIgnore]
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<DateTime?> DateOnlyPropertyOption { get; private set; }
+        public Option<DateOnly?> DateOnlyPropertyOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets DateOnlyProperty
         /// </summary>
         /// <example>Fri Jul 21 00:00:00 UTC 2017</example>
         [JsonPropertyName("dateOnlyProperty")]
-        public DateTime? DateOnlyProperty { get { return this. DateOnlyPropertyOption; } set { this.DateOnlyPropertyOption = new(value); } }
+        public DateOnly? DateOnlyProperty { get { return this. DateOnlyPropertyOption; } set { this.DateOnlyPropertyOption = new(value); } }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -117,7 +117,7 @@ namespace UseSourceGeneration.Model
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<DateTime?> dateOnlyProperty = default;
+            Option<DateOnly?> dateOnlyProperty = default;
 
             while (utf8JsonReader.Read())
             {
@@ -136,7 +136,7 @@ namespace UseSourceGeneration.Model
                     {
                         case "dateOnlyProperty":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                dateOnlyProperty = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                dateOnlyProperty = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         default:
                             break;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FormatTest.cs
index 43006afbbb0..254504ca937 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FormatTest.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FormatTest.cs
@@ -55,7 +55,7 @@ namespace UseSourceGeneration.Model
         /// <param name="unsignedLong">unsignedLong</param>
         /// <param name="uuid">uuid</param>
         [JsonConstructor]
-        public FormatTest(byte[] varByte, DateTime date, decimal number, string password, Option<System.IO.Stream?> binary = default, Option<DateTime?> dateTime = default, Option<decimal?> varDecimal = default, Option<double?> varDouble = default, Option<float?> varFloat = default, Option<int?> int32 = default, Option<long?> int64 = default, Option<int?> integer = default, Option<string?> patternWithBackslash = default, Option<string?> patternWithDigits = default, Option<string?> patternWithDigitsAndDelimiter = default, Option<string?> varString = default, Option<uint?> unsignedInteger = default, Option<ulong?> unsignedLong = default, Option<Guid?> uuid = default)
+        public FormatTest(byte[] varByte, DateOnly date, decimal number, string password, Option<System.IO.Stream?> binary = default, Option<DateTime?> dateTime = default, Option<decimal?> varDecimal = default, Option<double?> varDouble = default, Option<float?> varFloat = default, Option<int?> int32 = default, Option<long?> int64 = default, Option<int?> integer = default, Option<string?> patternWithBackslash = default, Option<string?> patternWithDigits = default, Option<string?> patternWithDigitsAndDelimiter = default, Option<string?> varString = default, Option<uint?> unsignedInteger = default, Option<ulong?> unsignedLong = default, Option<Guid?> uuid = default)
         {
             VarByte = varByte;
             Date = date;
@@ -92,7 +92,7 @@ namespace UseSourceGeneration.Model
         /// </summary>
         /// <example>Sun Feb 02 00:00:00 UTC 2020</example>
         [JsonPropertyName("date")]
-        public DateTime Date { get; set; }
+        public DateOnly Date { get; set; }
 
         /// <summary>
         /// Gets or Sets Number
@@ -512,7 +512,7 @@ namespace UseSourceGeneration.Model
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
             Option<byte[]?> varByte = default;
-            Option<DateTime?> date = default;
+            Option<DateOnly?> date = default;
             Option<decimal?> number = default;
             Option<string?> password = default;
             Option<System.IO.Stream?> binary = default;
@@ -552,7 +552,7 @@ namespace UseSourceGeneration.Model
                             break;
                         case "date":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                date = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                date = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "number":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NullableClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NullableClass.cs
index 934c5750d5b..1b496faaa43 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NullableClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NullableClass.cs
@@ -48,7 +48,7 @@ namespace UseSourceGeneration.Model
         /// <param name="objectNullableProp">objectNullableProp</param>
         /// <param name="stringProp">stringProp</param>
         [JsonConstructor]
-        public NullableClass(Option<List<Object>?> arrayAndItemsNullableProp = default, Option<List<Object>?> arrayItemsNullable = default, Option<List<Object>?> arrayNullableProp = default, Option<bool?> booleanProp = default, Option<DateTime?> dateProp = default, Option<DateTime?> datetimeProp = default, Option<int?> integerProp = default, Option<decimal?> numberProp = default, Option<Dictionary<string, Object>?> objectAndItemsNullableProp = default, Option<Dictionary<string, Object>?> objectItemsNullable = default, Option<Dictionary<string, Object>?> objectNullableProp = default, Option<string?> stringProp = default)
+        public NullableClass(Option<List<Object>?> arrayAndItemsNullableProp = default, Option<List<Object>?> arrayItemsNullable = default, Option<List<Object>?> arrayNullableProp = default, Option<bool?> booleanProp = default, Option<DateOnly?> dateProp = default, Option<DateTime?> datetimeProp = default, Option<int?> integerProp = default, Option<decimal?> numberProp = default, Option<Dictionary<string, Object>?> objectAndItemsNullableProp = default, Option<Dictionary<string, Object>?> objectItemsNullable = default, Option<Dictionary<string, Object>?> objectNullableProp = default, Option<string?> stringProp = default)
         {
             ArrayAndItemsNullablePropOption = arrayAndItemsNullableProp;
             ArrayItemsNullableOption = arrayItemsNullable;
@@ -124,13 +124,13 @@ namespace UseSourceGeneration.Model
         /// </summary>
         [JsonIgnore]
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<DateTime?> DatePropOption { get; private set; }
+        public Option<DateOnly?> DatePropOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets DateProp
         /// </summary>
         [JsonPropertyName("date_prop")]
-        public DateTime? DateProp { get { return this. DatePropOption; } set { this.DatePropOption = new(value); } }
+        public DateOnly? DateProp { get { return this. DatePropOption; } set { this.DatePropOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of DatetimeProp
@@ -301,7 +301,7 @@ namespace UseSourceGeneration.Model
             Option<List<Object>?> arrayItemsNullable = default;
             Option<List<Object>?> arrayNullableProp = default;
             Option<bool?> booleanProp = default;
-            Option<DateTime?> dateProp = default;
+            Option<DateOnly?> dateProp = default;
             Option<DateTime?> datetimeProp = default;
             Option<int?> integerProp = default;
             Option<decimal?> numberProp = default;
@@ -343,7 +343,7 @@ namespace UseSourceGeneration.Model
                             break;
                         case "date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                dateProp = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime?>(ref utf8JsonReader, jsonSerializerOptions));
+                                dateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly?>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "datetime_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/RequiredClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/RequiredClass.cs
index feb433e908e..aa44204c380 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/RequiredClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/RequiredClass.cs
@@ -80,7 +80,7 @@ namespace UseSourceGeneration.Model
         /// <param name="notrequiredNullableStringProp">notrequiredNullableStringProp</param>
         /// <param name="notrequiredNullableUuid">notrequiredNullableUuid</param>
         [JsonConstructor]
-        public RequiredClass(DateTime requiredNotNullableDateProp, List<string> requiredNotnullableArrayOfString, bool requiredNotnullableBooleanProp, DateTime requiredNotnullableDatetimeProp, RequiredNotnullableEnumIntegerEnum requiredNotnullableEnumInteger, RequiredNotnullableEnumIntegerOnlyEnum requiredNotnullableEnumIntegerOnly, RequiredNotnullableEnumStringEnum requiredNotnullableEnumString, OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue, string requiredNotnullableStringProp, Guid requiredNotnullableUuid, int requiredNotnullableintegerProp, List<string>? requiredNullableArrayOfString = default, bool? requiredNullableBooleanProp = default, DateTime? requiredNullableDateProp = default, DateTime? requiredNullableDatetimeProp = default, RequiredNullableEnumIntegerEnum? requiredNullableEnumInteger = default, RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnly = default, RequiredNullableEnumStringEnum? requiredNullableEnumString = default, int? requiredNullableIntegerProp = default, OuterEnumDefaultValue? requiredNullableOuterEnumDefaultValue = default, string? requiredNullableStringProp = default, Guid? requiredNullableUuid = default, Option<DateTime?> notRequiredNotnullableDateProp = default, Option<int?> notRequiredNotnullableintegerProp = default, Option<DateTime?> notRequiredNullableDateProp = default, Option<int?> notRequiredNullableIntegerProp = default, Option<List<string>?> notrequiredNotnullableArrayOfString = default, Option<bool?> notrequiredNotnullableBooleanProp = default, Option<DateTime?> notrequiredNotnullableDatetimeProp = default, Option<NotrequiredNotnullableEnumIntegerEnum?> notrequiredNotnullableEnumInteger = default, Option<NotrequiredNotnullableEnumIntegerOnlyEnum?> notrequiredNotnullableEnumIntegerOnly = default, Option<NotrequiredNotnullableEnumStringEnum?> notrequiredNotnullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default, Option<string?> notrequiredNotnullableStringProp = default, Option<Guid?> notrequiredNotnullableUuid = default, Option<List<string>?> notrequiredNullableArrayOfString = default, Option<bool?> notrequiredNullableBooleanProp = default, Option<DateTime?> notrequiredNullableDatetimeProp = default, Option<NotrequiredNullableEnumIntegerEnum?> notrequiredNullableEnumInteger = default, Option<NotrequiredNullableEnumIntegerOnlyEnum?> notrequiredNullableEnumIntegerOnly = default, Option<NotrequiredNullableEnumStringEnum?> notrequiredNullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default, Option<string?> notrequiredNullableStringProp = default, Option<Guid?> notrequiredNullableUuid = default)
+        public RequiredClass(DateOnly requiredNotNullableDateProp, List<string> requiredNotnullableArrayOfString, bool requiredNotnullableBooleanProp, DateTime requiredNotnullableDatetimeProp, RequiredNotnullableEnumIntegerEnum requiredNotnullableEnumInteger, RequiredNotnullableEnumIntegerOnlyEnum requiredNotnullableEnumIntegerOnly, RequiredNotnullableEnumStringEnum requiredNotnullableEnumString, OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue, string requiredNotnullableStringProp, Guid requiredNotnullableUuid, int requiredNotnullableintegerProp, List<string>? requiredNullableArrayOfString = default, bool? requiredNullableBooleanProp = default, DateOnly? requiredNullableDateProp = default, DateTime? requiredNullableDatetimeProp = default, RequiredNullableEnumIntegerEnum? requiredNullableEnumInteger = default, RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnly = default, RequiredNullableEnumStringEnum? requiredNullableEnumString = default, int? requiredNullableIntegerProp = default, OuterEnumDefaultValue? requiredNullableOuterEnumDefaultValue = default, string? requiredNullableStringProp = default, Guid? requiredNullableUuid = default, Option<DateOnly?> notRequiredNotnullableDateProp = default, Option<int?> notRequiredNotnullableintegerProp = default, Option<DateOnly?> notRequiredNullableDateProp = default, Option<int?> notRequiredNullableIntegerProp = default, Option<List<string>?> notrequiredNotnullableArrayOfString = default, Option<bool?> notrequiredNotnullableBooleanProp = default, Option<DateTime?> notrequiredNotnullableDatetimeProp = default, Option<NotrequiredNotnullableEnumIntegerEnum?> notrequiredNotnullableEnumInteger = default, Option<NotrequiredNotnullableEnumIntegerOnlyEnum?> notrequiredNotnullableEnumIntegerOnly = default, Option<NotrequiredNotnullableEnumStringEnum?> notrequiredNotnullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default, Option<string?> notrequiredNotnullableStringProp = default, Option<Guid?> notrequiredNotnullableUuid = default, Option<List<string>?> notrequiredNullableArrayOfString = default, Option<bool?> notrequiredNullableBooleanProp = default, Option<DateTime?> notrequiredNullableDatetimeProp = default, Option<NotrequiredNullableEnumIntegerEnum?> notrequiredNullableEnumInteger = default, Option<NotrequiredNullableEnumIntegerOnlyEnum?> notrequiredNullableEnumIntegerOnly = default, Option<NotrequiredNullableEnumStringEnum?> notrequiredNullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default, Option<string?> notrequiredNullableStringProp = default, Option<Guid?> notrequiredNullableUuid = default)
         {
             RequiredNotNullableDateProp = requiredNotNullableDateProp;
             RequiredNotnullableArrayOfString = requiredNotnullableArrayOfString;
@@ -1365,7 +1365,7 @@ namespace UseSourceGeneration.Model
         /// Gets or Sets RequiredNotNullableDateProp
         /// </summary>
         [JsonPropertyName("required_not_nullable_date_prop")]
-        public DateTime RequiredNotNullableDateProp { get; set; }
+        public DateOnly RequiredNotNullableDateProp { get; set; }
 
         /// <summary>
         /// Gets or Sets RequiredNotnullableArrayOfString
@@ -1420,7 +1420,7 @@ namespace UseSourceGeneration.Model
         /// Gets or Sets RequiredNullableDateProp
         /// </summary>
         [JsonPropertyName("required_nullable_date_prop")]
-        public DateTime? RequiredNullableDateProp { get; set; }
+        public DateOnly? RequiredNullableDateProp { get; set; }
 
         /// <summary>
         /// Gets or Sets RequiredNullableDatetimeProp
@@ -1452,13 +1452,13 @@ namespace UseSourceGeneration.Model
         /// </summary>
         [JsonIgnore]
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<DateTime?> NotRequiredNotnullableDatePropOption { get; private set; }
+        public Option<DateOnly?> NotRequiredNotnullableDatePropOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotRequiredNotnullableDateProp
         /// </summary>
         [JsonPropertyName("not_required_notnullable_date_prop")]
-        public DateTime? NotRequiredNotnullableDateProp { get { return this. NotRequiredNotnullableDatePropOption; } set { this.NotRequiredNotnullableDatePropOption = new(value); } }
+        public DateOnly? NotRequiredNotnullableDateProp { get { return this. NotRequiredNotnullableDatePropOption; } set { this.NotRequiredNotnullableDatePropOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotRequiredNotnullableintegerProp
@@ -1478,13 +1478,13 @@ namespace UseSourceGeneration.Model
         /// </summary>
         [JsonIgnore]
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<DateTime?> NotRequiredNullableDatePropOption { get; private set; }
+        public Option<DateOnly?> NotRequiredNullableDatePropOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotRequiredNullableDateProp
         /// </summary>
         [JsonPropertyName("not_required_nullable_date_prop")]
-        public DateTime? NotRequiredNullableDateProp { get { return this. NotRequiredNullableDatePropOption; } set { this.NotRequiredNullableDatePropOption = new(value); } }
+        public DateOnly? NotRequiredNullableDateProp { get { return this. NotRequiredNullableDatePropOption; } set { this.NotRequiredNullableDatePropOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotRequiredNullableIntegerProp
@@ -1767,7 +1767,7 @@ namespace UseSourceGeneration.Model
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<DateTime?> requiredNotNullableDateProp = default;
+            Option<DateOnly?> requiredNotNullableDateProp = default;
             Option<List<string>?> requiredNotnullableArrayOfString = default;
             Option<bool?> requiredNotnullableBooleanProp = default;
             Option<DateTime?> requiredNotnullableDatetimeProp = default;
@@ -1780,7 +1780,7 @@ namespace UseSourceGeneration.Model
             Option<int?> requiredNotnullableintegerProp = default;
             Option<List<string>?> requiredNullableArrayOfString = default;
             Option<bool?> requiredNullableBooleanProp = default;
-            Option<DateTime?> requiredNullableDateProp = default;
+            Option<DateOnly?> requiredNullableDateProp = default;
             Option<DateTime?> requiredNullableDatetimeProp = default;
             Option<RequiredClass.RequiredNullableEnumIntegerEnum?> requiredNullableEnumInteger = default;
             Option<RequiredClass.RequiredNullableEnumIntegerOnlyEnum?> requiredNullableEnumIntegerOnly = default;
@@ -1789,9 +1789,9 @@ namespace UseSourceGeneration.Model
             Option<OuterEnumDefaultValue?> requiredNullableOuterEnumDefaultValue = default;
             Option<string?> requiredNullableStringProp = default;
             Option<Guid?> requiredNullableUuid = default;
-            Option<DateTime?> notRequiredNotnullableDateProp = default;
+            Option<DateOnly?> notRequiredNotnullableDateProp = default;
             Option<int?> notRequiredNotnullableintegerProp = default;
-            Option<DateTime?> notRequiredNullableDateProp = default;
+            Option<DateOnly?> notRequiredNullableDateProp = default;
             Option<int?> notRequiredNullableIntegerProp = default;
             Option<List<string>?> notrequiredNotnullableArrayOfString = default;
             Option<bool?> notrequiredNotnullableBooleanProp = default;
@@ -1829,7 +1829,7 @@ namespace UseSourceGeneration.Model
                     {
                         case "required_not_nullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                requiredNotNullableDateProp = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                requiredNotNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "required_notnullable_array_of_string":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
@@ -1882,7 +1882,7 @@ namespace UseSourceGeneration.Model
                             break;
                         case "required_nullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                requiredNullableDateProp = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime?>(ref utf8JsonReader, jsonSerializerOptions));
+                                requiredNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly?>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "required_nullable_datetime_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
@@ -1919,7 +1919,7 @@ namespace UseSourceGeneration.Model
                             break;
                         case "not_required_notnullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                notRequiredNotnullableDateProp = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                notRequiredNotnullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "not_required_notnullableinteger_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
@@ -1927,7 +1927,7 @@ namespace UseSourceGeneration.Model
                             break;
                         case "not_required_nullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                notRequiredNullableDateProp = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime?>(ref utf8JsonReader, jsonSerializerOptions));
+                                notRequiredNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly?>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "not_required_nullable_integer_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES
index 05049077c2a..0c900b9c260 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES
@@ -122,6 +122,8 @@ src/Org.OpenAPITools/Client/BasicToken.cs
 src/Org.OpenAPITools/Client/BearerToken.cs
 src/Org.OpenAPITools/Client/ClientUtils.cs
 src/Org.OpenAPITools/Client/CookieContainer.cs
+src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
+src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
 src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
 src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
 src/Org.OpenAPITools/Client/ExceptionEventArgs.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md
index b5ba5edafde..a89b1cda5ac 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md
@@ -896,7 +896,7 @@ No authorization required
 
 <a id="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, DateTime date = null, System.IO.Stream binary = null, float varFloat = null, int integer = null, int int32 = null, long int64 = null, string varString = null, string password = null, string callback = null, DateTime dateTime = null)
+> void TestEndpointParameters (byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, DateOnly date = null, System.IO.Stream binary = null, float varFloat = null, int integer = null, int int32 = null, long int64 = null, string varString = null, string password = null, string callback = null, DateTime dateTime = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -927,7 +927,7 @@ namespace Example
             var number = 8.14D;  // decimal | None
             var varDouble = 1.2D;  // double | None
             var patternWithoutDelimiter = "patternWithoutDelimiter_example";  // string | None
-            var date = DateTime.Parse("2013-10-20");  // DateTime | None (optional) 
+            var date = DateOnly.Parse("2013-10-20");  // DateOnly | None (optional) 
             var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
             var varFloat = 3.4F;  // float | None (optional) 
             var integer = 56;  // int | None (optional) 
@@ -979,7 +979,7 @@ catch (ApiException e)
 | **number** | **decimal** | None |  |
 | **varDouble** | **double** | None |  |
 | **patternWithoutDelimiter** | **string** | None |  |
-| **date** | **DateTime** | None | [optional]  |
+| **date** | **DateOnly** | None | [optional]  |
 | **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
 | **varFloat** | **float** | None | [optional]  |
 | **integer** | **int** | None | [optional]  |
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/DateOnlyClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/DateOnlyClass.md
index 5dd63b313cc..4fc3775ed87 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/DateOnlyClass.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/DateOnlyClass.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**DateOnlyProperty** | **DateTime** |  | [optional] 
+**DateOnlyProperty** | **DateOnly** |  | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md
index ab628ed7bc0..849cd26c0b6 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **VarByte** | **byte[]** |  | 
-**Date** | **DateTime** |  | 
+**Date** | **DateOnly** |  | 
 **Number** | **decimal** |  | 
 **Password** | **string** |  | 
 **Binary** | **System.IO.Stream** |  | [optional] 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableClass.md
index 5d9965f55c0..c9afe86510d 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableClass.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableClass.md
@@ -8,7 +8,7 @@ Name | Type | Description | Notes
 **ArrayItemsNullable** | **List&lt;Object&gt;** |  | [optional] 
 **ArrayNullableProp** | **List&lt;Object&gt;** |  | [optional] 
 **BooleanProp** | **bool** |  | [optional] 
-**DateProp** | **DateTime** |  | [optional] 
+**DateProp** | **DateOnly** |  | [optional] 
 **DatetimeProp** | **DateTime** |  | [optional] 
 **IntegerProp** | **int** |  | [optional] 
 **NumberProp** | **decimal** |  | [optional] 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/RequiredClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/RequiredClass.md
index 8f148be840b..bbdf6d8407b 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/RequiredClass.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/RequiredClass.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**RequiredNotNullableDateProp** | **DateTime** |  | 
+**RequiredNotNullableDateProp** | **DateOnly** |  | 
 **RequiredNotnullableArrayOfString** | **List&lt;string&gt;** |  | 
 **RequiredNotnullableBooleanProp** | **bool** |  | 
 **RequiredNotnullableDatetimeProp** | **DateTime** |  | 
@@ -17,7 +17,7 @@ Name | Type | Description | Notes
 **RequiredNotnullableintegerProp** | **int** |  | 
 **RequiredNullableArrayOfString** | **List&lt;string&gt;** |  | 
 **RequiredNullableBooleanProp** | **bool** |  | 
-**RequiredNullableDateProp** | **DateTime** |  | 
+**RequiredNullableDateProp** | **DateOnly** |  | 
 **RequiredNullableDatetimeProp** | **DateTime** |  | 
 **RequiredNullableEnumInteger** | **int** |  | 
 **RequiredNullableEnumIntegerOnly** | **int** |  | 
@@ -26,9 +26,9 @@ Name | Type | Description | Notes
 **RequiredNullableOuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | 
 **RequiredNullableStringProp** | **string** |  | 
 **RequiredNullableUuid** | **Guid** |  | 
-**NotRequiredNotnullableDateProp** | **DateTime** |  | [optional] 
+**NotRequiredNotnullableDateProp** | **DateOnly** |  | [optional] 
 **NotRequiredNotnullableintegerProp** | **int** |  | [optional] 
-**NotRequiredNullableDateProp** | **DateTime** |  | [optional] 
+**NotRequiredNullableDateProp** | **DateOnly** |  | [optional] 
 **NotRequiredNullableIntegerProp** | **int** |  | [optional] 
 **NotrequiredNotnullableArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **NotrequiredNotnullableBooleanProp** | **bool** |  | [optional] 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index feaae2e6718..19d536890f1 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -164,7 +164,7 @@ namespace Org.OpenAPITools.Test.Api
             decimal number = default!;
             double varDouble = default!;
             string patternWithoutDelimiter = default!;
-            Client.Option<DateTime> date = default!;
+            Client.Option<DateOnly> date = default!;
             Client.Option<System.IO.Stream> binary = default!;
             Client.Option<float> varFloat = default!;
             Client.Option<int> integer = default!;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs
index ce4dd3855eb..baaa0177696 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -288,7 +288,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -312,7 +312,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>?&gt;</returns>
-        Task<ITestEndpointParametersApiResponse?> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse?> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -3243,7 +3243,7 @@ namespace Org.OpenAPITools.Api
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEndpointParameters(ref byte[] varByte, ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref Option<DateTime> date, ref Option<System.IO.Stream> binary, ref Option<float> varFloat, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<string> varString, ref Option<string> password, ref Option<string> callback, ref Option<DateTime> dateTime);
+        partial void FormatTestEndpointParameters(ref byte[] varByte, ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref Option<DateOnly> date, ref Option<System.IO.Stream> binary, ref Option<float> varFloat, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<string> varString, ref Option<string> password, ref Option<string> callback, ref Option<DateTime> dateTime);
 
         /// <summary>
         /// Validates the request parameters
@@ -3294,7 +3294,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
         {
             bool suppressDefaultLog = false;
             AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
@@ -3321,7 +3321,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3343,7 +3343,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
         {
             bool suppressDefaultLog = false;
             OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
@@ -3372,7 +3372,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -3393,7 +3393,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse?> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse?> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
@@ -3425,7 +3425,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
new file mode 100644
index 00000000000..c9dc766e463
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
@@ -0,0 +1,61 @@
+/*
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    public class DateOnlyJsonConverter : JsonConverter<DateOnly>
+    {
+        /// <summary>
+        /// The formats used to deserialize the date
+        /// </summary>
+        public static string[] Formats { get; } = {
+            "yyyy'-'MM'-'dd",
+            "yyyyMMdd"
+
+        };
+
+        /// <summary>
+        /// Returns a DateOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override DateOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+            if (reader.TokenType == JsonTokenType.Null)
+                throw new NotSupportedException();
+
+            string value = reader.GetString()!;
+
+            foreach(string format in Formats)
+                if (DateOnly.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateOnly result))
+                    return result;
+
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Writes the DateOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="dateOnlyValue"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, DateOnly dateOnlyValue, JsonSerializerOptions options) =>
+            writer.WriteStringValue(dateOnlyValue.ToString("yyyy'-'MM'-'dd", CultureInfo.InvariantCulture));
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
new file mode 100644
index 00000000000..5e42c9efb85
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
@@ -0,0 +1,66 @@
+/*
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    public class DateOnlyNullableJsonConverter : JsonConverter<DateOnly?>
+    {
+        /// <summary>
+        /// The formats used to deserialize the date
+        /// </summary>
+        public static string[] Formats { get; } = {
+            "yyyy'-'MM'-'dd",
+            "yyyyMMdd"
+
+        };
+
+        /// <summary>
+        /// Returns a DateOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override DateOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+            if (reader.TokenType == JsonTokenType.Null)
+                return null;
+
+            string value = reader.GetString()!;
+
+            foreach(string format in Formats)
+                if (DateOnly.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateOnly result))
+                    return result;
+
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Writes the DateOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="dateOnlyValue"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, DateOnly? dateOnlyValue, JsonSerializerOptions options)
+        {
+            if (dateOnlyValue == null)
+                writer.WriteNullValue();
+            else
+                writer.WriteStringValue(dateOnlyValue.Value.ToString("yyyy'-'MM'-'dd", CultureInfo.InvariantCulture));
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
index 71992dc8d86..de6a37a17df 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
@@ -15,7 +15,7 @@ using System.Text.Json.Serialization;
 namespace Org.OpenAPITools.Client
 {
     /// <summary>
-    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// Formatter for 'date-time' openapi formats ss defined by full-date - RFC3339
     /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
     /// </summary>
     public class DateTimeJsonConverter : JsonConverter<DateTime>
@@ -32,7 +32,6 @@ namespace Org.OpenAPITools.Client
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ssK",
-            "yyyy'-'MM'-'dd",
             "yyyyMMddTHHmmss.fffffffK",
             "yyyyMMddTHHmmss.ffffffK",
             "yyyyMMddTHHmmss.fffffK",
@@ -41,7 +40,7 @@ namespace Org.OpenAPITools.Client
             "yyyyMMddTHHmmss.ffK",
             "yyyyMMddTHHmmss.fK",
             "yyyyMMddTHHmmssK",
-            "yyyyMMdd"
+
         };
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
index 90d2174e4a3..02b767330d0 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
@@ -15,7 +15,7 @@ using System.Text.Json.Serialization;
 namespace Org.OpenAPITools.Client
 {
     /// <summary>
-    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// Formatter for 'date-time' openapi formats ss defined by full-date - RFC3339
     /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
     /// </summary>
     public class DateTimeNullableJsonConverter : JsonConverter<DateTime?>
@@ -32,7 +32,6 @@ namespace Org.OpenAPITools.Client
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ssK",
-            "yyyy'-'MM'-'dd",
             "yyyyMMddTHHmmss.fffffffK",
             "yyyyMMddTHHmmss.ffffffK",
             "yyyyMMddTHHmmss.fffffK",
@@ -41,7 +40,7 @@ namespace Org.OpenAPITools.Client
             "yyyyMMddTHHmmss.ffK",
             "yyyyMMddTHHmmss.fK",
             "yyyyMMddTHHmmssK",
-            "yyyyMMdd"
+
          };
 
         /// <summary>
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 a26741d84b7..6ab2ad09bbd 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
@@ -41,6 +41,8 @@ namespace Org.OpenAPITools.Client
             _jsonOptions.Converters.Add(new JsonStringEnumConverter());
             _jsonOptions.Converters.Add(new DateTimeJsonConverter());
             _jsonOptions.Converters.Add(new DateTimeNullableJsonConverter());
+            _jsonOptions.Converters.Add(new DateOnlyJsonConverter());
+            _jsonOptions.Converters.Add(new DateOnlyNullableJsonConverter());
             _jsonOptions.Converters.Add(new ActivityJsonConverter());
             _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter());
             _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter());
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs
index ee5fb40abb3..354931e975f 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs
@@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         /// <param name="dateOnlyProperty">dateOnlyProperty</param>
         [JsonConstructor]
-        public DateOnlyClass(Option<DateTime?> dateOnlyProperty = default)
+        public DateOnlyClass(Option<DateOnly?> dateOnlyProperty = default)
         {
             DateOnlyPropertyOption = dateOnlyProperty;
             OnCreated();
@@ -49,14 +49,14 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         [JsonIgnore]
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<DateTime?> DateOnlyPropertyOption { get; private set; }
+        public Option<DateOnly?> DateOnlyPropertyOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets DateOnlyProperty
         /// </summary>
         /// <example>Fri Jul 21 00:00:00 UTC 2017</example>
         [JsonPropertyName("dateOnlyProperty")]
-        public DateTime? DateOnlyProperty { get { return this. DateOnlyPropertyOption; } set { this.DateOnlyPropertyOption = new(value); } }
+        public DateOnly? DateOnlyProperty { get { return this. DateOnlyPropertyOption; } set { this.DateOnlyPropertyOption = new(value); } }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -116,7 +116,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<DateTime?> dateOnlyProperty = default;
+            Option<DateOnly?> dateOnlyProperty = default;
 
             while (utf8JsonReader.Read())
             {
@@ -135,7 +135,7 @@ namespace Org.OpenAPITools.Model
                     {
                         case "dateOnlyProperty":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                dateOnlyProperty = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                dateOnlyProperty = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         default:
                             break;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs
index 5a8af6da0de..8b590db2f66 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs
@@ -54,7 +54,7 @@ namespace Org.OpenAPITools.Model
         /// <param name="unsignedLong">unsignedLong</param>
         /// <param name="uuid">uuid</param>
         [JsonConstructor]
-        public FormatTest(byte[] varByte, DateTime date, decimal number, string password, Option<System.IO.Stream?> binary = default, Option<DateTime?> dateTime = default, Option<decimal?> varDecimal = default, Option<double?> varDouble = default, Option<float?> varFloat = default, Option<int?> int32 = default, Option<long?> int64 = default, Option<int?> integer = default, Option<string?> patternWithBackslash = default, Option<string?> patternWithDigits = default, Option<string?> patternWithDigitsAndDelimiter = default, Option<string?> varString = default, Option<uint?> unsignedInteger = default, Option<ulong?> unsignedLong = default, Option<Guid?> uuid = default)
+        public FormatTest(byte[] varByte, DateOnly date, decimal number, string password, Option<System.IO.Stream?> binary = default, Option<DateTime?> dateTime = default, Option<decimal?> varDecimal = default, Option<double?> varDouble = default, Option<float?> varFloat = default, Option<int?> int32 = default, Option<long?> int64 = default, Option<int?> integer = default, Option<string?> patternWithBackslash = default, Option<string?> patternWithDigits = default, Option<string?> patternWithDigitsAndDelimiter = default, Option<string?> varString = default, Option<uint?> unsignedInteger = default, Option<ulong?> unsignedLong = default, Option<Guid?> uuid = default)
         {
             VarByte = varByte;
             Date = date;
@@ -91,7 +91,7 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         /// <example>Sun Feb 02 00:00:00 UTC 2020</example>
         [JsonPropertyName("date")]
-        public DateTime Date { get; set; }
+        public DateOnly Date { get; set; }
 
         /// <summary>
         /// Gets or Sets Number
@@ -511,7 +511,7 @@ namespace Org.OpenAPITools.Model
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
             Option<byte[]?> varByte = default;
-            Option<DateTime?> date = default;
+            Option<DateOnly?> date = default;
             Option<decimal?> number = default;
             Option<string?> password = default;
             Option<System.IO.Stream?> binary = default;
@@ -551,7 +551,7 @@ namespace Org.OpenAPITools.Model
                             break;
                         case "date":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                date = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                date = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "number":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs
index d6a09847156..bfb530b894c 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs
@@ -47,7 +47,7 @@ namespace Org.OpenAPITools.Model
         /// <param name="objectNullableProp">objectNullableProp</param>
         /// <param name="stringProp">stringProp</param>
         [JsonConstructor]
-        public NullableClass(Option<List<Object>?> arrayAndItemsNullableProp = default, Option<List<Object>?> arrayItemsNullable = default, Option<List<Object>?> arrayNullableProp = default, Option<bool?> booleanProp = default, Option<DateTime?> dateProp = default, Option<DateTime?> datetimeProp = default, Option<int?> integerProp = default, Option<decimal?> numberProp = default, Option<Dictionary<string, Object>?> objectAndItemsNullableProp = default, Option<Dictionary<string, Object>?> objectItemsNullable = default, Option<Dictionary<string, Object>?> objectNullableProp = default, Option<string?> stringProp = default)
+        public NullableClass(Option<List<Object>?> arrayAndItemsNullableProp = default, Option<List<Object>?> arrayItemsNullable = default, Option<List<Object>?> arrayNullableProp = default, Option<bool?> booleanProp = default, Option<DateOnly?> dateProp = default, Option<DateTime?> datetimeProp = default, Option<int?> integerProp = default, Option<decimal?> numberProp = default, Option<Dictionary<string, Object>?> objectAndItemsNullableProp = default, Option<Dictionary<string, Object>?> objectItemsNullable = default, Option<Dictionary<string, Object>?> objectNullableProp = default, Option<string?> stringProp = default)
         {
             ArrayAndItemsNullablePropOption = arrayAndItemsNullableProp;
             ArrayItemsNullableOption = arrayItemsNullable;
@@ -123,13 +123,13 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         [JsonIgnore]
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<DateTime?> DatePropOption { get; private set; }
+        public Option<DateOnly?> DatePropOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets DateProp
         /// </summary>
         [JsonPropertyName("date_prop")]
-        public DateTime? DateProp { get { return this. DatePropOption; } set { this.DatePropOption = new(value); } }
+        public DateOnly? DateProp { get { return this. DatePropOption; } set { this.DatePropOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of DatetimeProp
@@ -300,7 +300,7 @@ namespace Org.OpenAPITools.Model
             Option<List<Object>?> arrayItemsNullable = default;
             Option<List<Object>?> arrayNullableProp = default;
             Option<bool?> booleanProp = default;
-            Option<DateTime?> dateProp = default;
+            Option<DateOnly?> dateProp = default;
             Option<DateTime?> datetimeProp = default;
             Option<int?> integerProp = default;
             Option<decimal?> numberProp = default;
@@ -342,7 +342,7 @@ namespace Org.OpenAPITools.Model
                             break;
                         case "date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                dateProp = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime?>(ref utf8JsonReader, jsonSerializerOptions));
+                                dateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly?>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "datetime_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/RequiredClass.cs
index 2d1f51cd978..8807eb698bf 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/RequiredClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/RequiredClass.cs
@@ -79,7 +79,7 @@ namespace Org.OpenAPITools.Model
         /// <param name="notrequiredNullableStringProp">notrequiredNullableStringProp</param>
         /// <param name="notrequiredNullableUuid">notrequiredNullableUuid</param>
         [JsonConstructor]
-        public RequiredClass(DateTime requiredNotNullableDateProp, List<string> requiredNotnullableArrayOfString, bool requiredNotnullableBooleanProp, DateTime requiredNotnullableDatetimeProp, RequiredNotnullableEnumIntegerEnum requiredNotnullableEnumInteger, RequiredNotnullableEnumIntegerOnlyEnum requiredNotnullableEnumIntegerOnly, RequiredNotnullableEnumStringEnum requiredNotnullableEnumString, OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue, string requiredNotnullableStringProp, Guid requiredNotnullableUuid, int requiredNotnullableintegerProp, List<string>? requiredNullableArrayOfString = default, bool? requiredNullableBooleanProp = default, DateTime? requiredNullableDateProp = default, DateTime? requiredNullableDatetimeProp = default, RequiredNullableEnumIntegerEnum? requiredNullableEnumInteger = default, RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnly = default, RequiredNullableEnumStringEnum? requiredNullableEnumString = default, int? requiredNullableIntegerProp = default, OuterEnumDefaultValue? requiredNullableOuterEnumDefaultValue = default, string? requiredNullableStringProp = default, Guid? requiredNullableUuid = default, Option<DateTime?> notRequiredNotnullableDateProp = default, Option<int?> notRequiredNotnullableintegerProp = default, Option<DateTime?> notRequiredNullableDateProp = default, Option<int?> notRequiredNullableIntegerProp = default, Option<List<string>?> notrequiredNotnullableArrayOfString = default, Option<bool?> notrequiredNotnullableBooleanProp = default, Option<DateTime?> notrequiredNotnullableDatetimeProp = default, Option<NotrequiredNotnullableEnumIntegerEnum?> notrequiredNotnullableEnumInteger = default, Option<NotrequiredNotnullableEnumIntegerOnlyEnum?> notrequiredNotnullableEnumIntegerOnly = default, Option<NotrequiredNotnullableEnumStringEnum?> notrequiredNotnullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default, Option<string?> notrequiredNotnullableStringProp = default, Option<Guid?> notrequiredNotnullableUuid = default, Option<List<string>?> notrequiredNullableArrayOfString = default, Option<bool?> notrequiredNullableBooleanProp = default, Option<DateTime?> notrequiredNullableDatetimeProp = default, Option<NotrequiredNullableEnumIntegerEnum?> notrequiredNullableEnumInteger = default, Option<NotrequiredNullableEnumIntegerOnlyEnum?> notrequiredNullableEnumIntegerOnly = default, Option<NotrequiredNullableEnumStringEnum?> notrequiredNullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default, Option<string?> notrequiredNullableStringProp = default, Option<Guid?> notrequiredNullableUuid = default)
+        public RequiredClass(DateOnly requiredNotNullableDateProp, List<string> requiredNotnullableArrayOfString, bool requiredNotnullableBooleanProp, DateTime requiredNotnullableDatetimeProp, RequiredNotnullableEnumIntegerEnum requiredNotnullableEnumInteger, RequiredNotnullableEnumIntegerOnlyEnum requiredNotnullableEnumIntegerOnly, RequiredNotnullableEnumStringEnum requiredNotnullableEnumString, OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue, string requiredNotnullableStringProp, Guid requiredNotnullableUuid, int requiredNotnullableintegerProp, List<string>? requiredNullableArrayOfString = default, bool? requiredNullableBooleanProp = default, DateOnly? requiredNullableDateProp = default, DateTime? requiredNullableDatetimeProp = default, RequiredNullableEnumIntegerEnum? requiredNullableEnumInteger = default, RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnly = default, RequiredNullableEnumStringEnum? requiredNullableEnumString = default, int? requiredNullableIntegerProp = default, OuterEnumDefaultValue? requiredNullableOuterEnumDefaultValue = default, string? requiredNullableStringProp = default, Guid? requiredNullableUuid = default, Option<DateOnly?> notRequiredNotnullableDateProp = default, Option<int?> notRequiredNotnullableintegerProp = default, Option<DateOnly?> notRequiredNullableDateProp = default, Option<int?> notRequiredNullableIntegerProp = default, Option<List<string>?> notrequiredNotnullableArrayOfString = default, Option<bool?> notrequiredNotnullableBooleanProp = default, Option<DateTime?> notrequiredNotnullableDatetimeProp = default, Option<NotrequiredNotnullableEnumIntegerEnum?> notrequiredNotnullableEnumInteger = default, Option<NotrequiredNotnullableEnumIntegerOnlyEnum?> notrequiredNotnullableEnumIntegerOnly = default, Option<NotrequiredNotnullableEnumStringEnum?> notrequiredNotnullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default, Option<string?> notrequiredNotnullableStringProp = default, Option<Guid?> notrequiredNotnullableUuid = default, Option<List<string>?> notrequiredNullableArrayOfString = default, Option<bool?> notrequiredNullableBooleanProp = default, Option<DateTime?> notrequiredNullableDatetimeProp = default, Option<NotrequiredNullableEnumIntegerEnum?> notrequiredNullableEnumInteger = default, Option<NotrequiredNullableEnumIntegerOnlyEnum?> notrequiredNullableEnumIntegerOnly = default, Option<NotrequiredNullableEnumStringEnum?> notrequiredNullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default, Option<string?> notrequiredNullableStringProp = default, Option<Guid?> notrequiredNullableUuid = default)
         {
             RequiredNotNullableDateProp = requiredNotNullableDateProp;
             RequiredNotnullableArrayOfString = requiredNotnullableArrayOfString;
@@ -1364,7 +1364,7 @@ namespace Org.OpenAPITools.Model
         /// Gets or Sets RequiredNotNullableDateProp
         /// </summary>
         [JsonPropertyName("required_not_nullable_date_prop")]
-        public DateTime RequiredNotNullableDateProp { get; set; }
+        public DateOnly RequiredNotNullableDateProp { get; set; }
 
         /// <summary>
         /// Gets or Sets RequiredNotnullableArrayOfString
@@ -1419,7 +1419,7 @@ namespace Org.OpenAPITools.Model
         /// Gets or Sets RequiredNullableDateProp
         /// </summary>
         [JsonPropertyName("required_nullable_date_prop")]
-        public DateTime? RequiredNullableDateProp { get; set; }
+        public DateOnly? RequiredNullableDateProp { get; set; }
 
         /// <summary>
         /// Gets or Sets RequiredNullableDatetimeProp
@@ -1451,13 +1451,13 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         [JsonIgnore]
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<DateTime?> NotRequiredNotnullableDatePropOption { get; private set; }
+        public Option<DateOnly?> NotRequiredNotnullableDatePropOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotRequiredNotnullableDateProp
         /// </summary>
         [JsonPropertyName("not_required_notnullable_date_prop")]
-        public DateTime? NotRequiredNotnullableDateProp { get { return this. NotRequiredNotnullableDatePropOption; } set { this.NotRequiredNotnullableDatePropOption = new(value); } }
+        public DateOnly? NotRequiredNotnullableDateProp { get { return this. NotRequiredNotnullableDatePropOption; } set { this.NotRequiredNotnullableDatePropOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotRequiredNotnullableintegerProp
@@ -1477,13 +1477,13 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         [JsonIgnore]
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<DateTime?> NotRequiredNullableDatePropOption { get; private set; }
+        public Option<DateOnly?> NotRequiredNullableDatePropOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotRequiredNullableDateProp
         /// </summary>
         [JsonPropertyName("not_required_nullable_date_prop")]
-        public DateTime? NotRequiredNullableDateProp { get { return this. NotRequiredNullableDatePropOption; } set { this.NotRequiredNullableDatePropOption = new(value); } }
+        public DateOnly? NotRequiredNullableDateProp { get { return this. NotRequiredNullableDatePropOption; } set { this.NotRequiredNullableDatePropOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotRequiredNullableIntegerProp
@@ -1766,7 +1766,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<DateTime?> requiredNotNullableDateProp = default;
+            Option<DateOnly?> requiredNotNullableDateProp = default;
             Option<List<string>?> requiredNotnullableArrayOfString = default;
             Option<bool?> requiredNotnullableBooleanProp = default;
             Option<DateTime?> requiredNotnullableDatetimeProp = default;
@@ -1779,7 +1779,7 @@ namespace Org.OpenAPITools.Model
             Option<int?> requiredNotnullableintegerProp = default;
             Option<List<string>?> requiredNullableArrayOfString = default;
             Option<bool?> requiredNullableBooleanProp = default;
-            Option<DateTime?> requiredNullableDateProp = default;
+            Option<DateOnly?> requiredNullableDateProp = default;
             Option<DateTime?> requiredNullableDatetimeProp = default;
             Option<RequiredClass.RequiredNullableEnumIntegerEnum?> requiredNullableEnumInteger = default;
             Option<RequiredClass.RequiredNullableEnumIntegerOnlyEnum?> requiredNullableEnumIntegerOnly = default;
@@ -1788,9 +1788,9 @@ namespace Org.OpenAPITools.Model
             Option<OuterEnumDefaultValue?> requiredNullableOuterEnumDefaultValue = default;
             Option<string?> requiredNullableStringProp = default;
             Option<Guid?> requiredNullableUuid = default;
-            Option<DateTime?> notRequiredNotnullableDateProp = default;
+            Option<DateOnly?> notRequiredNotnullableDateProp = default;
             Option<int?> notRequiredNotnullableintegerProp = default;
-            Option<DateTime?> notRequiredNullableDateProp = default;
+            Option<DateOnly?> notRequiredNullableDateProp = default;
             Option<int?> notRequiredNullableIntegerProp = default;
             Option<List<string>?> notrequiredNotnullableArrayOfString = default;
             Option<bool?> notrequiredNotnullableBooleanProp = default;
@@ -1828,7 +1828,7 @@ namespace Org.OpenAPITools.Model
                     {
                         case "required_not_nullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                requiredNotNullableDateProp = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                requiredNotNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "required_notnullable_array_of_string":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
@@ -1881,7 +1881,7 @@ namespace Org.OpenAPITools.Model
                             break;
                         case "required_nullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                requiredNullableDateProp = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime?>(ref utf8JsonReader, jsonSerializerOptions));
+                                requiredNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly?>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "required_nullable_datetime_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
@@ -1918,7 +1918,7 @@ namespace Org.OpenAPITools.Model
                             break;
                         case "not_required_notnullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                notRequiredNotnullableDateProp = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                notRequiredNotnullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "not_required_notnullableinteger_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
@@ -1926,7 +1926,7 @@ namespace Org.OpenAPITools.Model
                             break;
                         case "not_required_nullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                notRequiredNullableDateProp = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime?>(ref utf8JsonReader, jsonSerializerOptions));
+                                notRequiredNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly?>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "not_required_nullable_integer_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES
index 05049077c2a..0c900b9c260 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES
@@ -122,6 +122,8 @@ src/Org.OpenAPITools/Client/BasicToken.cs
 src/Org.OpenAPITools/Client/BearerToken.cs
 src/Org.OpenAPITools/Client/ClientUtils.cs
 src/Org.OpenAPITools/Client/CookieContainer.cs
+src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
+src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
 src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
 src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
 src/Org.OpenAPITools/Client/ExceptionEventArgs.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md
index b5ba5edafde..a89b1cda5ac 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md
@@ -896,7 +896,7 @@ No authorization required
 
 <a id="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, DateTime date = null, System.IO.Stream binary = null, float varFloat = null, int integer = null, int int32 = null, long int64 = null, string varString = null, string password = null, string callback = null, DateTime dateTime = null)
+> void TestEndpointParameters (byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, DateOnly date = null, System.IO.Stream binary = null, float varFloat = null, int integer = null, int int32 = null, long int64 = null, string varString = null, string password = null, string callback = null, DateTime dateTime = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -927,7 +927,7 @@ namespace Example
             var number = 8.14D;  // decimal | None
             var varDouble = 1.2D;  // double | None
             var patternWithoutDelimiter = "patternWithoutDelimiter_example";  // string | None
-            var date = DateTime.Parse("2013-10-20");  // DateTime | None (optional) 
+            var date = DateOnly.Parse("2013-10-20");  // DateOnly | None (optional) 
             var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | None (optional) 
             var varFloat = 3.4F;  // float | None (optional) 
             var integer = 56;  // int | None (optional) 
@@ -979,7 +979,7 @@ catch (ApiException e)
 | **number** | **decimal** | None |  |
 | **varDouble** | **double** | None |  |
 | **patternWithoutDelimiter** | **string** | None |  |
-| **date** | **DateTime** | None | [optional]  |
+| **date** | **DateOnly** | None | [optional]  |
 | **binary** | **System.IO.Stream****System.IO.Stream** | None | [optional]  |
 | **varFloat** | **float** | None | [optional]  |
 | **integer** | **int** | None | [optional]  |
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/DateOnlyClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/DateOnlyClass.md
index 5dd63b313cc..4fc3775ed87 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/DateOnlyClass.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/DateOnlyClass.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**DateOnlyProperty** | **DateTime** |  | [optional] 
+**DateOnlyProperty** | **DateOnly** |  | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md
index ab628ed7bc0..849cd26c0b6 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **VarByte** | **byte[]** |  | 
-**Date** | **DateTime** |  | 
+**Date** | **DateOnly** |  | 
 **Number** | **decimal** |  | 
 **Password** | **string** |  | 
 **Binary** | **System.IO.Stream** |  | [optional] 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableClass.md
index 5d9965f55c0..c9afe86510d 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableClass.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableClass.md
@@ -8,7 +8,7 @@ Name | Type | Description | Notes
 **ArrayItemsNullable** | **List&lt;Object&gt;** |  | [optional] 
 **ArrayNullableProp** | **List&lt;Object&gt;** |  | [optional] 
 **BooleanProp** | **bool** |  | [optional] 
-**DateProp** | **DateTime** |  | [optional] 
+**DateProp** | **DateOnly** |  | [optional] 
 **DatetimeProp** | **DateTime** |  | [optional] 
 **IntegerProp** | **int** |  | [optional] 
 **NumberProp** | **decimal** |  | [optional] 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/RequiredClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/RequiredClass.md
index 8f148be840b..bbdf6d8407b 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/RequiredClass.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/RequiredClass.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**RequiredNotNullableDateProp** | **DateTime** |  | 
+**RequiredNotNullableDateProp** | **DateOnly** |  | 
 **RequiredNotnullableArrayOfString** | **List&lt;string&gt;** |  | 
 **RequiredNotnullableBooleanProp** | **bool** |  | 
 **RequiredNotnullableDatetimeProp** | **DateTime** |  | 
@@ -17,7 +17,7 @@ Name | Type | Description | Notes
 **RequiredNotnullableintegerProp** | **int** |  | 
 **RequiredNullableArrayOfString** | **List&lt;string&gt;** |  | 
 **RequiredNullableBooleanProp** | **bool** |  | 
-**RequiredNullableDateProp** | **DateTime** |  | 
+**RequiredNullableDateProp** | **DateOnly** |  | 
 **RequiredNullableDatetimeProp** | **DateTime** |  | 
 **RequiredNullableEnumInteger** | **int** |  | 
 **RequiredNullableEnumIntegerOnly** | **int** |  | 
@@ -26,9 +26,9 @@ Name | Type | Description | Notes
 **RequiredNullableOuterEnumDefaultValue** | **OuterEnumDefaultValue** |  | 
 **RequiredNullableStringProp** | **string** |  | 
 **RequiredNullableUuid** | **Guid** |  | 
-**NotRequiredNotnullableDateProp** | **DateTime** |  | [optional] 
+**NotRequiredNotnullableDateProp** | **DateOnly** |  | [optional] 
 **NotRequiredNotnullableintegerProp** | **int** |  | [optional] 
-**NotRequiredNullableDateProp** | **DateTime** |  | [optional] 
+**NotRequiredNullableDateProp** | **DateOnly** |  | [optional] 
 **NotRequiredNullableIntegerProp** | **int** |  | [optional] 
 **NotrequiredNotnullableArrayOfString** | **List&lt;string&gt;** |  | [optional] 
 **NotrequiredNotnullableBooleanProp** | **bool** |  | [optional] 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index 62a5cdba43b..f5c8415481d 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -164,7 +164,7 @@ namespace Org.OpenAPITools.Test.Api
             decimal number = default;
             double varDouble = default;
             string patternWithoutDelimiter = default;
-            Client.Option<DateTime> date = default;
+            Client.Option<DateOnly> date = default;
             Client.Option<System.IO.Stream> binary = default;
             Client.Option<float> varFloat = default;
             Client.Option<int> integer = default;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs
index 252cfa496e9..c1c25a3577e 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -286,7 +286,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -310,7 +310,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -3241,7 +3241,7 @@ namespace Org.OpenAPITools.Api
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEndpointParameters(ref byte[] varByte, ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref Option<DateTime> date, ref Option<System.IO.Stream> binary, ref Option<float> varFloat, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<string> varString, ref Option<string> password, ref Option<string> callback, ref Option<DateTime> dateTime);
+        partial void FormatTestEndpointParameters(ref byte[] varByte, ref decimal number, ref double varDouble, ref string patternWithoutDelimiter, ref Option<DateOnly> date, ref Option<System.IO.Stream> binary, ref Option<float> varFloat, ref Option<int> integer, ref Option<int> int32, ref Option<long> int64, ref Option<string> varString, ref Option<string> password, ref Option<string> callback, ref Option<DateTime> dateTime);
 
         /// <summary>
         /// Validates the request parameters
@@ -3292,7 +3292,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
         {
             bool suppressDefaultLog = false;
             AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
@@ -3319,7 +3319,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void AfterTestEndpointParameters(ref bool suppressDefaultLog, ITestEndpointParametersApiResponse apiResponseLocalVar, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -3341,7 +3341,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
+        private void OnErrorTestEndpointParametersDefaultImplementation(Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime)
         {
             bool suppressDefaultLog = false;
             OnErrorTestEndpointParameters(ref suppressDefaultLog, exception, pathFormat, path, varByte, number, varDouble, patternWithoutDelimiter, date, binary, varFloat, integer, int32, int64, varString, password, callback, dateTime);
@@ -3370,7 +3370,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="password"></param>
         /// <param name="callback"></param>
         /// <param name="dateTime"></param>
-        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
+        partial void OnErrorTestEndpointParameters(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path, byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date, Option<System.IO.Stream> binary, Option<float> varFloat, Option<int> integer, Option<int> int32, Option<long> int64, Option<string> varString, Option<string> password, Option<string> callback, Option<DateTime> dateTime);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -3391,7 +3391,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersOrDefaultAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
@@ -3423,7 +3423,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="dateTime">None (optional, default to &quot;2010-02-01T10:20:10.111110+01:00&quot;)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEndpointParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateTime> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEndpointParametersApiResponse> TestEndpointParametersAsync(byte[] varByte, decimal number, double varDouble, string patternWithoutDelimiter, Option<DateOnly> date = default, Option<System.IO.Stream> binary = default, Option<float> varFloat = default, Option<int> integer = default, Option<int> int32 = default, Option<long> int64 = default, Option<string> varString = default, Option<string> password = default, Option<string> callback = default, Option<DateTime> dateTime = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
new file mode 100644
index 00000000000..11b10005651
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
@@ -0,0 +1,61 @@
+/*
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    public class DateOnlyJsonConverter : JsonConverter<DateOnly>
+    {
+        /// <summary>
+        /// The formats used to deserialize the date
+        /// </summary>
+        public static string[] Formats { get; } = {
+            "yyyy'-'MM'-'dd",
+            "yyyyMMdd"
+
+        };
+
+        /// <summary>
+        /// Returns a DateOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override DateOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+            if (reader.TokenType == JsonTokenType.Null)
+                throw new NotSupportedException();
+
+            string value = reader.GetString();
+
+            foreach(string format in Formats)
+                if (DateOnly.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateOnly result))
+                    return result;
+
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Writes the DateOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="dateOnlyValue"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, DateOnly dateOnlyValue, JsonSerializerOptions options) =>
+            writer.WriteStringValue(dateOnlyValue.ToString("yyyy'-'MM'-'dd", CultureInfo.InvariantCulture));
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
new file mode 100644
index 00000000000..92ef8f6c92b
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
@@ -0,0 +1,66 @@
+/*
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    public class DateOnlyNullableJsonConverter : JsonConverter<DateOnly?>
+    {
+        /// <summary>
+        /// The formats used to deserialize the date
+        /// </summary>
+        public static string[] Formats { get; } = {
+            "yyyy'-'MM'-'dd",
+            "yyyyMMdd"
+
+        };
+
+        /// <summary>
+        /// Returns a DateOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override DateOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+            if (reader.TokenType == JsonTokenType.Null)
+                return null;
+
+            string value = reader.GetString();
+
+            foreach(string format in Formats)
+                if (DateOnly.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateOnly result))
+                    return result;
+
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Writes the DateOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="dateOnlyValue"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, DateOnly? dateOnlyValue, JsonSerializerOptions options)
+        {
+            if (dateOnlyValue == null)
+                writer.WriteNullValue();
+            else
+                writer.WriteStringValue(dateOnlyValue.Value.ToString("yyyy'-'MM'-'dd", CultureInfo.InvariantCulture));
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
index e8291cb2e1e..623f3c18353 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
@@ -15,7 +15,7 @@ using System.Text.Json.Serialization;
 namespace Org.OpenAPITools.Client
 {
     /// <summary>
-    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// Formatter for 'date-time' openapi formats ss defined by full-date - RFC3339
     /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
     /// </summary>
     public class DateTimeJsonConverter : JsonConverter<DateTime>
@@ -32,7 +32,6 @@ namespace Org.OpenAPITools.Client
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ssK",
-            "yyyy'-'MM'-'dd",
             "yyyyMMddTHHmmss.fffffffK",
             "yyyyMMddTHHmmss.ffffffK",
             "yyyyMMddTHHmmss.fffffK",
@@ -41,7 +40,7 @@ namespace Org.OpenAPITools.Client
             "yyyyMMddTHHmmss.ffK",
             "yyyyMMddTHHmmss.fK",
             "yyyyMMddTHHmmssK",
-            "yyyyMMdd"
+
         };
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
index e26c40071cd..43730a86b86 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
@@ -15,7 +15,7 @@ using System.Text.Json.Serialization;
 namespace Org.OpenAPITools.Client
 {
     /// <summary>
-    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// Formatter for 'date-time' openapi formats ss defined by full-date - RFC3339
     /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
     /// </summary>
     public class DateTimeNullableJsonConverter : JsonConverter<DateTime?>
@@ -32,7 +32,6 @@ namespace Org.OpenAPITools.Client
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ssK",
-            "yyyy'-'MM'-'dd",
             "yyyyMMddTHHmmss.fffffffK",
             "yyyyMMddTHHmmss.ffffffK",
             "yyyyMMddTHHmmss.fffffK",
@@ -41,7 +40,7 @@ namespace Org.OpenAPITools.Client
             "yyyyMMddTHHmmss.ffK",
             "yyyyMMddTHHmmss.fK",
             "yyyyMMddTHHmmssK",
-            "yyyyMMdd"
+
          };
 
         /// <summary>
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 0cd32640adf..063d20ae7ac 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
@@ -39,6 +39,8 @@ namespace Org.OpenAPITools.Client
             _jsonOptions.Converters.Add(new JsonStringEnumConverter());
             _jsonOptions.Converters.Add(new DateTimeJsonConverter());
             _jsonOptions.Converters.Add(new DateTimeNullableJsonConverter());
+            _jsonOptions.Converters.Add(new DateOnlyJsonConverter());
+            _jsonOptions.Converters.Add(new DateOnlyNullableJsonConverter());
             _jsonOptions.Converters.Add(new ActivityJsonConverter());
             _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter());
             _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter());
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs
index 9b8aeb67815..c1f1b99a4f6 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs
@@ -34,7 +34,7 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         /// <param name="dateOnlyProperty">dateOnlyProperty</param>
         [JsonConstructor]
-        public DateOnlyClass(Option<DateTime?> dateOnlyProperty = default)
+        public DateOnlyClass(Option<DateOnly?> dateOnlyProperty = default)
         {
             DateOnlyPropertyOption = dateOnlyProperty;
             OnCreated();
@@ -47,14 +47,14 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         [JsonIgnore]
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<DateTime?> DateOnlyPropertyOption { get; private set; }
+        public Option<DateOnly?> DateOnlyPropertyOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets DateOnlyProperty
         /// </summary>
         /// <example>Fri Jul 21 00:00:00 UTC 2017</example>
         [JsonPropertyName("dateOnlyProperty")]
-        public DateTime? DateOnlyProperty { get { return this. DateOnlyPropertyOption; } set { this.DateOnlyPropertyOption = new(value); } }
+        public DateOnly? DateOnlyProperty { get { return this. DateOnlyPropertyOption; } set { this.DateOnlyPropertyOption = new(value); } }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -114,7 +114,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<DateTime?> dateOnlyProperty = default;
+            Option<DateOnly?> dateOnlyProperty = default;
 
             while (utf8JsonReader.Read())
             {
@@ -133,7 +133,7 @@ namespace Org.OpenAPITools.Model
                     {
                         case "dateOnlyProperty":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                dateOnlyProperty = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                dateOnlyProperty = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         default:
                             break;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs
index ccf7c37ed7c..779fb7f81b1 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs
@@ -52,7 +52,7 @@ namespace Org.OpenAPITools.Model
         /// <param name="unsignedLong">unsignedLong</param>
         /// <param name="uuid">uuid</param>
         [JsonConstructor]
-        public FormatTest(byte[] varByte, DateTime date, decimal number, string password, Option<System.IO.Stream> binary = default, Option<DateTime?> dateTime = default, Option<decimal?> varDecimal = default, Option<double?> varDouble = default, Option<float?> varFloat = default, Option<int?> int32 = default, Option<long?> int64 = default, Option<int?> integer = default, Option<string> patternWithBackslash = default, Option<string> patternWithDigits = default, Option<string> patternWithDigitsAndDelimiter = default, Option<string> varString = default, Option<uint?> unsignedInteger = default, Option<ulong?> unsignedLong = default, Option<Guid?> uuid = default)
+        public FormatTest(byte[] varByte, DateOnly date, decimal number, string password, Option<System.IO.Stream> binary = default, Option<DateTime?> dateTime = default, Option<decimal?> varDecimal = default, Option<double?> varDouble = default, Option<float?> varFloat = default, Option<int?> int32 = default, Option<long?> int64 = default, Option<int?> integer = default, Option<string> patternWithBackslash = default, Option<string> patternWithDigits = default, Option<string> patternWithDigitsAndDelimiter = default, Option<string> varString = default, Option<uint?> unsignedInteger = default, Option<ulong?> unsignedLong = default, Option<Guid?> uuid = default)
         {
             VarByte = varByte;
             Date = date;
@@ -89,7 +89,7 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         /// <example>Sun Feb 02 00:00:00 UTC 2020</example>
         [JsonPropertyName("date")]
-        public DateTime Date { get; set; }
+        public DateOnly Date { get; set; }
 
         /// <summary>
         /// Gets or Sets Number
@@ -509,7 +509,7 @@ namespace Org.OpenAPITools.Model
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
             Option<byte[]> varByte = default;
-            Option<DateTime?> date = default;
+            Option<DateOnly?> date = default;
             Option<decimal?> number = default;
             Option<string> password = default;
             Option<System.IO.Stream> binary = default;
@@ -549,7 +549,7 @@ namespace Org.OpenAPITools.Model
                             break;
                         case "date":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                date = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                date = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "number":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs
index e9d7ab25745..67f78b34285 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs
@@ -45,7 +45,7 @@ namespace Org.OpenAPITools.Model
         /// <param name="objectNullableProp">objectNullableProp</param>
         /// <param name="stringProp">stringProp</param>
         [JsonConstructor]
-        public NullableClass(Option<List<Object>> arrayAndItemsNullableProp = default, Option<List<Object>> arrayItemsNullable = default, Option<List<Object>> arrayNullableProp = default, Option<bool?> booleanProp = default, Option<DateTime?> dateProp = default, Option<DateTime?> datetimeProp = default, Option<int?> integerProp = default, Option<decimal?> numberProp = default, Option<Dictionary<string, Object>> objectAndItemsNullableProp = default, Option<Dictionary<string, Object>> objectItemsNullable = default, Option<Dictionary<string, Object>> objectNullableProp = default, Option<string> stringProp = default)
+        public NullableClass(Option<List<Object>> arrayAndItemsNullableProp = default, Option<List<Object>> arrayItemsNullable = default, Option<List<Object>> arrayNullableProp = default, Option<bool?> booleanProp = default, Option<DateOnly?> dateProp = default, Option<DateTime?> datetimeProp = default, Option<int?> integerProp = default, Option<decimal?> numberProp = default, Option<Dictionary<string, Object>> objectAndItemsNullableProp = default, Option<Dictionary<string, Object>> objectItemsNullable = default, Option<Dictionary<string, Object>> objectNullableProp = default, Option<string> stringProp = default)
         {
             ArrayAndItemsNullablePropOption = arrayAndItemsNullableProp;
             ArrayItemsNullableOption = arrayItemsNullable;
@@ -121,13 +121,13 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         [JsonIgnore]
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<DateTime?> DatePropOption { get; private set; }
+        public Option<DateOnly?> DatePropOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets DateProp
         /// </summary>
         [JsonPropertyName("date_prop")]
-        public DateTime? DateProp { get { return this. DatePropOption; } set { this.DatePropOption = new(value); } }
+        public DateOnly? DateProp { get { return this. DatePropOption; } set { this.DatePropOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of DatetimeProp
@@ -298,7 +298,7 @@ namespace Org.OpenAPITools.Model
             Option<List<Object>> arrayItemsNullable = default;
             Option<List<Object>> arrayNullableProp = default;
             Option<bool?> booleanProp = default;
-            Option<DateTime?> dateProp = default;
+            Option<DateOnly?> dateProp = default;
             Option<DateTime?> datetimeProp = default;
             Option<int?> integerProp = default;
             Option<decimal?> numberProp = default;
@@ -340,7 +340,7 @@ namespace Org.OpenAPITools.Model
                             break;
                         case "date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                dateProp = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime?>(ref utf8JsonReader, jsonSerializerOptions));
+                                dateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly?>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "datetime_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/RequiredClass.cs
index 2140e9c5ae5..89ed1e729c3 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/RequiredClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/RequiredClass.cs
@@ -77,7 +77,7 @@ namespace Org.OpenAPITools.Model
         /// <param name="notrequiredNullableStringProp">notrequiredNullableStringProp</param>
         /// <param name="notrequiredNullableUuid">notrequiredNullableUuid</param>
         [JsonConstructor]
-        public RequiredClass(DateTime requiredNotNullableDateProp, List<string> requiredNotnullableArrayOfString, bool requiredNotnullableBooleanProp, DateTime requiredNotnullableDatetimeProp, RequiredNotnullableEnumIntegerEnum requiredNotnullableEnumInteger, RequiredNotnullableEnumIntegerOnlyEnum requiredNotnullableEnumIntegerOnly, RequiredNotnullableEnumStringEnum requiredNotnullableEnumString, OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue, string requiredNotnullableStringProp, Guid requiredNotnullableUuid, int requiredNotnullableintegerProp, List<string> requiredNullableArrayOfString = default, bool? requiredNullableBooleanProp = default, DateTime? requiredNullableDateProp = default, DateTime? requiredNullableDatetimeProp = default, RequiredNullableEnumIntegerEnum? requiredNullableEnumInteger = default, RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnly = default, RequiredNullableEnumStringEnum? requiredNullableEnumString = default, int? requiredNullableIntegerProp = default, OuterEnumDefaultValue? requiredNullableOuterEnumDefaultValue = default, string requiredNullableStringProp = default, Guid? requiredNullableUuid = default, Option<DateTime?> notRequiredNotnullableDateProp = default, Option<int?> notRequiredNotnullableintegerProp = default, Option<DateTime?> notRequiredNullableDateProp = default, Option<int?> notRequiredNullableIntegerProp = default, Option<List<string>> notrequiredNotnullableArrayOfString = default, Option<bool?> notrequiredNotnullableBooleanProp = default, Option<DateTime?> notrequiredNotnullableDatetimeProp = default, Option<NotrequiredNotnullableEnumIntegerEnum?> notrequiredNotnullableEnumInteger = default, Option<NotrequiredNotnullableEnumIntegerOnlyEnum?> notrequiredNotnullableEnumIntegerOnly = default, Option<NotrequiredNotnullableEnumStringEnum?> notrequiredNotnullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default, Option<string> notrequiredNotnullableStringProp = default, Option<Guid?> notrequiredNotnullableUuid = default, Option<List<string>> notrequiredNullableArrayOfString = default, Option<bool?> notrequiredNullableBooleanProp = default, Option<DateTime?> notrequiredNullableDatetimeProp = default, Option<NotrequiredNullableEnumIntegerEnum?> notrequiredNullableEnumInteger = default, Option<NotrequiredNullableEnumIntegerOnlyEnum?> notrequiredNullableEnumIntegerOnly = default, Option<NotrequiredNullableEnumStringEnum?> notrequiredNullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default, Option<string> notrequiredNullableStringProp = default, Option<Guid?> notrequiredNullableUuid = default)
+        public RequiredClass(DateOnly requiredNotNullableDateProp, List<string> requiredNotnullableArrayOfString, bool requiredNotnullableBooleanProp, DateTime requiredNotnullableDatetimeProp, RequiredNotnullableEnumIntegerEnum requiredNotnullableEnumInteger, RequiredNotnullableEnumIntegerOnlyEnum requiredNotnullableEnumIntegerOnly, RequiredNotnullableEnumStringEnum requiredNotnullableEnumString, OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue, string requiredNotnullableStringProp, Guid requiredNotnullableUuid, int requiredNotnullableintegerProp, List<string> requiredNullableArrayOfString = default, bool? requiredNullableBooleanProp = default, DateOnly? requiredNullableDateProp = default, DateTime? requiredNullableDatetimeProp = default, RequiredNullableEnumIntegerEnum? requiredNullableEnumInteger = default, RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnly = default, RequiredNullableEnumStringEnum? requiredNullableEnumString = default, int? requiredNullableIntegerProp = default, OuterEnumDefaultValue? requiredNullableOuterEnumDefaultValue = default, string requiredNullableStringProp = default, Guid? requiredNullableUuid = default, Option<DateOnly?> notRequiredNotnullableDateProp = default, Option<int?> notRequiredNotnullableintegerProp = default, Option<DateOnly?> notRequiredNullableDateProp = default, Option<int?> notRequiredNullableIntegerProp = default, Option<List<string>> notrequiredNotnullableArrayOfString = default, Option<bool?> notrequiredNotnullableBooleanProp = default, Option<DateTime?> notrequiredNotnullableDatetimeProp = default, Option<NotrequiredNotnullableEnumIntegerEnum?> notrequiredNotnullableEnumInteger = default, Option<NotrequiredNotnullableEnumIntegerOnlyEnum?> notrequiredNotnullableEnumIntegerOnly = default, Option<NotrequiredNotnullableEnumStringEnum?> notrequiredNotnullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNotnullableOuterEnumDefaultValue = default, Option<string> notrequiredNotnullableStringProp = default, Option<Guid?> notrequiredNotnullableUuid = default, Option<List<string>> notrequiredNullableArrayOfString = default, Option<bool?> notrequiredNullableBooleanProp = default, Option<DateTime?> notrequiredNullableDatetimeProp = default, Option<NotrequiredNullableEnumIntegerEnum?> notrequiredNullableEnumInteger = default, Option<NotrequiredNullableEnumIntegerOnlyEnum?> notrequiredNullableEnumIntegerOnly = default, Option<NotrequiredNullableEnumStringEnum?> notrequiredNullableEnumString = default, Option<OuterEnumDefaultValue?> notrequiredNullableOuterEnumDefaultValue = default, Option<string> notrequiredNullableStringProp = default, Option<Guid?> notrequiredNullableUuid = default)
         {
             RequiredNotNullableDateProp = requiredNotNullableDateProp;
             RequiredNotnullableArrayOfString = requiredNotnullableArrayOfString;
@@ -1362,7 +1362,7 @@ namespace Org.OpenAPITools.Model
         /// Gets or Sets RequiredNotNullableDateProp
         /// </summary>
         [JsonPropertyName("required_not_nullable_date_prop")]
-        public DateTime RequiredNotNullableDateProp { get; set; }
+        public DateOnly RequiredNotNullableDateProp { get; set; }
 
         /// <summary>
         /// Gets or Sets RequiredNotnullableArrayOfString
@@ -1417,7 +1417,7 @@ namespace Org.OpenAPITools.Model
         /// Gets or Sets RequiredNullableDateProp
         /// </summary>
         [JsonPropertyName("required_nullable_date_prop")]
-        public DateTime? RequiredNullableDateProp { get; set; }
+        public DateOnly? RequiredNullableDateProp { get; set; }
 
         /// <summary>
         /// Gets or Sets RequiredNullableDatetimeProp
@@ -1449,13 +1449,13 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         [JsonIgnore]
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<DateTime?> NotRequiredNotnullableDatePropOption { get; private set; }
+        public Option<DateOnly?> NotRequiredNotnullableDatePropOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotRequiredNotnullableDateProp
         /// </summary>
         [JsonPropertyName("not_required_notnullable_date_prop")]
-        public DateTime? NotRequiredNotnullableDateProp { get { return this. NotRequiredNotnullableDatePropOption; } set { this.NotRequiredNotnullableDatePropOption = new(value); } }
+        public DateOnly? NotRequiredNotnullableDateProp { get { return this. NotRequiredNotnullableDatePropOption; } set { this.NotRequiredNotnullableDatePropOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotRequiredNotnullableintegerProp
@@ -1475,13 +1475,13 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         [JsonIgnore]
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        public Option<DateTime?> NotRequiredNullableDatePropOption { get; private set; }
+        public Option<DateOnly?> NotRequiredNullableDatePropOption { get; private set; }
 
         /// <summary>
         /// Gets or Sets NotRequiredNullableDateProp
         /// </summary>
         [JsonPropertyName("not_required_nullable_date_prop")]
-        public DateTime? NotRequiredNullableDateProp { get { return this. NotRequiredNullableDatePropOption; } set { this.NotRequiredNullableDatePropOption = new(value); } }
+        public DateOnly? NotRequiredNullableDateProp { get { return this. NotRequiredNullableDatePropOption; } set { this.NotRequiredNullableDatePropOption = new(value); } }
 
         /// <summary>
         /// Used to track the state of NotRequiredNullableIntegerProp
@@ -1764,7 +1764,7 @@ namespace Org.OpenAPITools.Model
 
             JsonTokenType startingTokenType = utf8JsonReader.TokenType;
 
-            Option<DateTime?> requiredNotNullableDateProp = default;
+            Option<DateOnly?> requiredNotNullableDateProp = default;
             Option<List<string>> requiredNotnullableArrayOfString = default;
             Option<bool?> requiredNotnullableBooleanProp = default;
             Option<DateTime?> requiredNotnullableDatetimeProp = default;
@@ -1777,7 +1777,7 @@ namespace Org.OpenAPITools.Model
             Option<int?> requiredNotnullableintegerProp = default;
             Option<List<string>> requiredNullableArrayOfString = default;
             Option<bool?> requiredNullableBooleanProp = default;
-            Option<DateTime?> requiredNullableDateProp = default;
+            Option<DateOnly?> requiredNullableDateProp = default;
             Option<DateTime?> requiredNullableDatetimeProp = default;
             Option<RequiredClass.RequiredNullableEnumIntegerEnum?> requiredNullableEnumInteger = default;
             Option<RequiredClass.RequiredNullableEnumIntegerOnlyEnum?> requiredNullableEnumIntegerOnly = default;
@@ -1786,9 +1786,9 @@ namespace Org.OpenAPITools.Model
             Option<OuterEnumDefaultValue?> requiredNullableOuterEnumDefaultValue = default;
             Option<string> requiredNullableStringProp = default;
             Option<Guid?> requiredNullableUuid = default;
-            Option<DateTime?> notRequiredNotnullableDateProp = default;
+            Option<DateOnly?> notRequiredNotnullableDateProp = default;
             Option<int?> notRequiredNotnullableintegerProp = default;
-            Option<DateTime?> notRequiredNullableDateProp = default;
+            Option<DateOnly?> notRequiredNullableDateProp = default;
             Option<int?> notRequiredNullableIntegerProp = default;
             Option<List<string>> notrequiredNotnullableArrayOfString = default;
             Option<bool?> notrequiredNotnullableBooleanProp = default;
@@ -1826,7 +1826,7 @@ namespace Org.OpenAPITools.Model
                     {
                         case "required_not_nullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                requiredNotNullableDateProp = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                requiredNotNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "required_notnullable_array_of_string":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
@@ -1879,7 +1879,7 @@ namespace Org.OpenAPITools.Model
                             break;
                         case "required_nullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                requiredNullableDateProp = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime?>(ref utf8JsonReader, jsonSerializerOptions));
+                                requiredNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly?>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "required_nullable_datetime_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
@@ -1916,7 +1916,7 @@ namespace Org.OpenAPITools.Model
                             break;
                         case "not_required_notnullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                notRequiredNotnullableDateProp = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                notRequiredNotnullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "not_required_notnullableinteger_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
@@ -1924,7 +1924,7 @@ namespace Org.OpenAPITools.Model
                             break;
                         case "not_required_nullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                notRequiredNullableDateProp = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime?>(ref utf8JsonReader, jsonSerializerOptions));
+                                notRequiredNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly?>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "not_required_nullable_integer_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.gitignore b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.gitignore
new file mode 100644
index 00000000000..1ee53850b84
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.gitignore
@@ -0,0 +1,362 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.openapi-generator-ignore b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.openapi-generator-ignore
new file mode 100644
index 00000000000..7484ee590a3
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.openapi-generator/FILES
new file mode 100644
index 00000000000..5abbcf46f35
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.openapi-generator/FILES
@@ -0,0 +1,36 @@
+.gitignore
+Org.OpenAPITools.sln
+README.md
+api/openapi.yaml
+appveyor.yml
+docs/apis/DefaultApi.md
+docs/models/NowGet200Response.md
+docs/scripts/git_push.ps1
+docs/scripts/git_push.sh
+src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs
+src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+src/Org.OpenAPITools.Test/README.md
+src/Org.OpenAPITools/Api/DefaultApi.cs
+src/Org.OpenAPITools/Api/IApi.cs
+src/Org.OpenAPITools/Client/ApiException.cs
+src/Org.OpenAPITools/Client/ApiFactory.cs
+src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs
+src/Org.OpenAPITools/Client/ApiResponse`1.cs
+src/Org.OpenAPITools/Client/ClientUtils.cs
+src/Org.OpenAPITools/Client/CookieContainer.cs
+src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
+src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
+src/Org.OpenAPITools/Client/ExceptionEventArgs.cs
+src/Org.OpenAPITools/Client/HostConfiguration.cs
+src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs
+src/Org.OpenAPITools/Client/Option.cs
+src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+src/Org.OpenAPITools/Client/TokenBase.cs
+src/Org.OpenAPITools/Client/TokenContainer`1.cs
+src/Org.OpenAPITools/Client/TokenProvider`1.cs
+src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs
+src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs
+src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs
+src/Org.OpenAPITools/Model/NowGet200Response.cs
+src/Org.OpenAPITools/Org.OpenAPITools.csproj
+src/Org.OpenAPITools/README.md
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.openapi-generator/VERSION
new file mode 100644
index 00000000000..fff4bdd7ab5
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.openapi-generator/VERSION
@@ -0,0 +1 @@
+7.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/Org.OpenAPITools.sln b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/Org.OpenAPITools.sln
new file mode 100644
index 00000000000..547505a9856
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/Org.OpenAPITools.sln
@@ -0,0 +1,27 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+VisualStudioVersion = 12.0.0.0
+MinimumVisualStudioVersion = 10.0.0.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Org.OpenAPITools", "src\Org.OpenAPITools\Org.OpenAPITools.csproj", "{2E60EF87-DB0B-4D01-A36E-F5E90F7EC757}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Org.OpenAPITools.Test", "src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2E60EF87-DB0B-4D01-A36E-F5E90F7EC757}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E60EF87-DB0B-4D01-A36E-F5E90F7EC757}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E60EF87-DB0B-4D01-A36E-F5E90F7EC757}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E60EF87-DB0B-4D01-A36E-F5E90F7EC757}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/README.md
new file mode 100644
index 00000000000..f9c1c7f7462
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/README.md
@@ -0,0 +1 @@
+# Created with Openapi Generator
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/api/openapi.yaml
new file mode 100644
index 00000000000..a84e041a00f
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/api/openapi.yaml
@@ -0,0 +1,35 @@
+openapi: 3.0.0
+info:
+  description: Thic spec contains endpoints with dates in different formats
+  license:
+    name: Apache-2.0
+    url: https://www.apache.org/licenses/LICENSE-2.0.html
+  title: OpenAPI Dates
+  version: 1.0.0
+servers:
+- url: /
+paths:
+  /now:
+    get:
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/_now_get_200_response'
+          description: now dates
+components:
+  schemas:
+    _now_get_200_response:
+      example:
+        today: 2000-01-23
+        now: 2000-01-23T04:56:07.000+00:00
+      properties:
+        today:
+          format: date
+          type: string
+        now:
+          format: date-time
+          type: string
+      type: object
+
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/appveyor.yml b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/appveyor.yml
new file mode 100644
index 00000000000..f76f63cee50
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/appveyor.yml
@@ -0,0 +1,9 @@
+# auto-generated by OpenAPI Generator (https://github.com/OpenAPITools/openapi-generator)
+#
+image: Visual Studio 2019
+clone_depth: 1
+build_script:
+- dotnet build -c Release
+- dotnet test -c Release
+after_build:
+- dotnet pack .\src\Org.OpenAPITools\Org.OpenAPITools.csproj -o ../../output -c Release --no-build
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/apis/DefaultApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/apis/DefaultApi.md
new file mode 100644
index 00000000000..6b1991021ac
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/apis/DefaultApi.md
@@ -0,0 +1,90 @@
+# Org.OpenAPITools.Api.DefaultApi
+
+All URIs are relative to *http://localhost*
+
+| Method | HTTP request | Description |
+|--------|--------------|-------------|
+| [**NowGet**](DefaultApi.md#nowget) | **GET** /now |  |
+
+<a id="nowget"></a>
+# **NowGet**
+> NowGet200Response NowGet ()
+
+
+
+### Example
+```csharp
+using System.Collections.Generic;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class NowGetExample
+    {
+        public static void Main()
+        {
+            Configuration config = new Configuration();
+            config.BasePath = "http://localhost";
+            var apiInstance = new DefaultApi(config);
+
+            try
+            {
+                NowGet200Response result = apiInstance.NowGet();
+                Debug.WriteLine(result);
+            }
+            catch (ApiException  e)
+            {
+                Debug.Print("Exception when calling DefaultApi.NowGet: " + e.Message);
+                Debug.Print("Status Code: " + e.ErrorCode);
+                Debug.Print(e.StackTrace);
+            }
+        }
+    }
+}
+```
+
+#### Using the NowGetWithHttpInfo variant
+This returns an ApiResponse object which contains the response data, status code and headers.
+
+```csharp
+try
+{
+    ApiResponse<NowGet200Response> response = apiInstance.NowGetWithHttpInfo();
+    Debug.Write("Status Code: " + response.StatusCode);
+    Debug.Write("Response Headers: " + response.Headers);
+    Debug.Write("Response Body: " + response.Data);
+}
+catch (ApiException e)
+{
+    Debug.Print("Exception when calling DefaultApi.NowGetWithHttpInfo: " + e.Message);
+    Debug.Print("Status Code: " + e.ErrorCode);
+    Debug.Print(e.StackTrace);
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+### Return type
+
+[**NowGet200Response**](NowGet200Response.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | now dates |  -  |
+
+[[Back to top]](#) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../README.md#documentation-for-models) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/models/NowGet200Response.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/models/NowGet200Response.md
new file mode 100644
index 00000000000..58b6c7c79f0
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/models/NowGet200Response.md
@@ -0,0 +1,11 @@
+# Org.OpenAPITools.Model.NowGet200Response
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Now** | **DateTime** |  | [optional] 
+**Today** | **DateTime** |  | [optional] 
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/scripts/git_push.ps1
new file mode 100644
index 00000000000..73ed35c2bb1
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/scripts/git_push.ps1
@@ -0,0 +1,75 @@
+param(
+    [Parameter()][Alias("g")][String]$GitHost = "github.com",
+    [Parameter()][Alias("u")][String]$GitUserId = "GIT_USER_ID",
+    [Parameter()][Alias("r")][String]$GitRepoId = "GIT_REPO_ID",
+    [Parameter()][Alias("m")][string]$Message = "Minor update",
+    [Parameter()][Alias("h")][switch]$Help
+)
+
+function Publish-ToGitHost{
+    if ([string]::IsNullOrWhiteSpace($Message) -or $Message -eq "Minor update"){
+        # it seems unlikely that we would want our git commit message to be the default, so lets prompt the user
+        $Message = Read-Host -Prompt "Please provide a commit message or press enter"
+        $Message = if([string]::IsNullOrWhiteSpace($Message)) { "no message provided" } else { $Message }
+    }
+
+    git init
+    git add .
+    git commit -am "${Message}"
+    $branchName=$(git rev-parse --abbrev-ref HEAD)
+    $gitRemote=$(git remote)
+
+    if([string]::IsNullOrWhiteSpace($gitRemote)){
+        git remote add origin https://${GitHost}/${GitUserId}/${GitRepoId}.git
+    }
+
+    Write-Output "Pulling from https://${GitHost}/${GitUserId}/${GitRepoId}.git"
+    git pull origin $branchName --ff-only
+
+    if ($LastExitCode -ne 0){
+        if (${GitHost} -eq "github.com"){
+            Write-Output "The ${GitRepoId} repository may not exist yet. Creating it now with the GitHub CLI."
+            gh auth login --hostname github.com --web
+            gh repo create $GitRepoId --private
+            # sleep 2 seconds to ensure git finishes creation of the repo
+            Start-Sleep -Seconds 2
+        }
+        else{
+            throw "There was an issue pulling the origin branch. The remote repository may not exist yet."
+        }
+    }
+
+    Write-Output "Pushing to https://${GitHost}/${GitUserId}/${GitRepoId}.git"
+    git push origin $branchName
+}
+
+$ErrorActionPreference = "Stop"
+Set-StrictMode -Version 3.0
+
+if ($Help){
+    Write-Output "
+    This script will initialize a git repository, then add and commit all files.
+    The local repository will then be pushed to your preferred git provider.
+    If the remote repository does not exist yet and you are using GitHub,
+    the repository will be created for you provided you have the GitHub CLI installed.
+    
+    Parameters:
+    -g | -GitHost   -> ex: github.com
+    -m | -Message   -> the git commit message
+    -r | -GitRepoId -> the name of the repository
+    -u | -GitUserId -> your user id
+    "
+
+    return
+}
+
+$rootPath=Resolve-Path -Path $PSScriptRoot/../..
+
+Push-Location $rootPath
+
+try {
+    Publish-ToGitHost $GitHost $GitUserId $GitRepoId $Message
+}
+finally{
+    Pop-Location
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/scripts/git_push.sh b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/scripts/git_push.sh
new file mode 100644
index 00000000000..88210492218
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/scripts/git_push.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
+
+git_user_id=${1:-GIT_USER_ID}
+git_repo_id=${2:-GIT_REPO_ID}
+release_note=${3:-Minor update}
+git_host=${4:-github.com}
+
+starting_directory=$(pwd)
+script_root="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+cd $script_root
+cd ../..
+
+if [ "$release_note" = "" ] || [ "$release_note" = "Minor update" ]; then
+    # it seems unlikely that we would want our git commit message to be the default, so lets prompt the user
+    echo "Please provide a commit message or press enter"
+    read user_input
+    release_note=$user_input
+    if [ "$release_note" = "" ]; then
+        release_note="no message provided"
+    fi
+fi
+
+git init
+git add .
+git commit -am "$release_note"
+branch_name=$(git rev-parse --abbrev-ref HEAD)
+git_remote=$(git remote)
+
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+echo "[INFO] Pulling from https://${git_host}/${git_user_id}/${git_repo_id}.git"
+git pull origin $branch_name --ff-only
+
+echo "[INFO] Pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
+git push origin $branch_name
+
+cd $starting_directory
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs
new file mode 100644
index 00000000000..40e1298ee62
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs
@@ -0,0 +1,58 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Security.Cryptography;
+using Microsoft.Extensions.Hosting;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Extensions;
+
+
+/* *********************************************************************************
+*              Follow these manual steps to construct tests.
+*              This file will not be overwritten.
+*  *********************************************************************************
+* 1. Navigate to ApiTests.Base.cs and ensure any tokens are being created correctly.
+*    Take care not to commit credentials to any repository.
+*
+* 2. Mocking is coordinated by ApiTestsBase#AddApiHttpClients.
+*    To mock the client, use the generic AddApiHttpClients.
+*    To mock the server, change the client's BaseAddress.
+*
+* 3. Locate the test you want below
+*      - remove the skip property from the Fact attribute
+*      - set the value of any variables if necessary
+*
+* 4. Run the tests and ensure they work.
+*
+*/
+
+
+namespace Org.OpenAPITools.Test.Api
+{
+    /// <summary>
+    ///  Base class for API tests
+    /// </summary>
+    public class ApiTestsBase
+    {
+        protected readonly IHost _host;
+
+        public ApiTestsBase(string[] args)
+        {
+            _host = CreateHostBuilder(args).Build();
+        }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args)
+            .ConfigureApi((context, services, options) =>
+            {
+
+            });
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
new file mode 100644
index 00000000000..05dc933c03b
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -0,0 +1,64 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Xunit;
+using Microsoft.Extensions.DependencyInjection;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+
+
+/* *********************************************************************************
+*              Follow these manual steps to construct tests.
+*              This file will not be overwritten.
+*  *********************************************************************************
+* 1. Navigate to ApiTests.Base.cs and ensure any tokens are being created correctly.
+*    Take care not to commit credentials to any repository.
+*
+* 2. Mocking is coordinated by ApiTestsBase#AddApiHttpClients.
+*    To mock the client, use the generic AddApiHttpClients.
+*    To mock the server, change the client's BaseAddress.
+*
+* 3. Locate the test you want below
+*      - remove the skip property from the Fact attribute
+*      - set the value of any variables if necessary
+*
+* 4. Run the tests and ensure they work.
+*
+*/
+
+
+namespace Org.OpenAPITools.Test.Api
+{
+    /// <summary>
+    ///  Class for testing DefaultApi
+    /// </summary>
+    public sealed class DefaultApiTests : ApiTestsBase
+    {
+        private readonly IDefaultApi _instance;
+
+        public DefaultApiTests(): base(Array.Empty<string>())
+        {
+            _instance = _host.Services.GetRequiredService<IDefaultApi>();
+        }
+
+        /// <summary>
+        /// Test NowGet
+        /// </summary>
+        [Fact (Skip = "not implemented")]
+        public async Task NowGetAsyncTest()
+        {
+            var response = await _instance.NowGetAsync();
+            var model = response.Ok();
+            Assert.IsType<NowGet200Response>(model);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs
new file mode 100644
index 00000000000..c910325e620
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs
@@ -0,0 +1,103 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using System.Collections.Generic;
+using System.Security.Cryptography;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Extensions;
+using Xunit;
+
+namespace Org.OpenAPITools.Test.Api
+{
+    /// <summary>
+    ///  Tests the dependency injection.
+    /// </summary>
+    public class DependencyInjectionTest
+    {
+        private readonly IHost _hostUsingConfigureWithoutAClient =
+            Host.CreateDefaultBuilder([]).ConfigureApi((context, services, options) =>
+            {
+
+            })
+            .Build();
+
+        private readonly IHost _hostUsingConfigureWithAClient =
+            Host.CreateDefaultBuilder([]).ConfigureApi((context, services, options) =>
+            {
+
+                options.AddApiHttpClients(client => client.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS));
+            })
+            .Build();
+
+        private readonly IHost _hostUsingAddWithoutAClient =
+            Host.CreateDefaultBuilder([]).ConfigureServices((host, services) =>
+            {
+                services.AddApi(options =>
+                {
+
+                });
+            })
+            .Build();
+
+        private readonly IHost _hostUsingAddWithAClient =
+            Host.CreateDefaultBuilder([]).ConfigureServices((host, services) =>
+            {
+                services.AddApi(options =>
+                {
+
+                    options.AddApiHttpClients(client => client.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS));
+                });
+            })
+            .Build();
+
+        /// <summary>
+        /// Test dependency injection when using the configure method
+        /// </summary>
+        [Fact]
+        public void ConfigureApiWithAClientTest()
+        {
+            var defaultApi = _hostUsingConfigureWithAClient.Services.GetRequiredService<IDefaultApi>();
+            Assert.True(defaultApi.HttpClient.BaseAddress != null);
+        }
+
+        /// <summary>
+        /// Test dependency injection when using the configure method
+        /// </summary>
+        [Fact]
+        public void ConfigureApiWithoutAClientTest()
+        {
+            var defaultApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService<IDefaultApi>();
+            Assert.True(defaultApi.HttpClient.BaseAddress != null);
+        }
+
+        /// <summary>
+        /// Test dependency injection when using the add method
+        /// </summary>
+        [Fact]
+        public void AddApiWithAClientTest()
+        {
+            var defaultApi = _hostUsingAddWithAClient.Services.GetRequiredService<IDefaultApi>();
+            Assert.True(defaultApi.HttpClient.BaseAddress != null);
+        }
+
+        /// <summary>
+        /// Test dependency injection when using the add method
+        /// </summary>
+        [Fact]
+        public void AddApiWithoutAClientTest()
+        {
+            var defaultApi = _hostUsingAddWithoutAClient.Services.GetRequiredService<IDefaultApi>();
+            Assert.True(defaultApi.HttpClient.BaseAddress != null);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Model/NowGet200ResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Model/NowGet200ResponseTests.cs
new file mode 100644
index 00000000000..920dfd9700e
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Model/NowGet200ResponseTests.cs
@@ -0,0 +1,74 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing NowGet200Response
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class NowGet200ResponseTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for NowGet200Response
+        //private NowGet200Response instance;
+
+        public NowGet200ResponseTests()
+        {
+            // TODO uncomment below to create an instance of NowGet200Response
+            //instance = new NowGet200Response();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of NowGet200Response
+        /// </summary>
+        [Fact]
+        public void NowGet200ResponseInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" NowGet200Response
+            //Assert.IsType<NowGet200Response>(instance);
+        }
+
+        /// <summary>
+        /// Test the property 'Now'
+        /// </summary>
+        [Fact]
+        public void NowTest()
+        {
+            // TODO unit test for the property 'Now'
+        }
+
+        /// <summary>
+        /// Test the property 'Today'
+        /// </summary>
+        [Fact]
+        public void TodayTest()
+        {
+            // TODO unit test for the property 'Today'
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
new file mode 100644
index 00000000000..872d1687aa2
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>Org.OpenAPITools.Test</AssemblyName>
+    <RootNamespace>Org.OpenAPITools.Test</RootNamespace>
+    <TargetFramework>net8.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.6.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Org.OpenAPITools\Org.OpenAPITools.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/README.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs
new file mode 100644
index 00000000000..53fa0582214
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs
@@ -0,0 +1,332 @@
+// <auto-generated>
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text.Json;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Org.OpenAPITools.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// This class is registered as transient.
+    /// </summary>
+    public interface IDefaultApi : IApi
+    {
+        /// <summary>
+        /// The class containing the events
+        /// </summary>
+        DefaultApiEvents Events { get; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="ApiException">Thrown when fails to make API call</exception>
+        /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
+        /// <returns><see cref="Task"/>&lt;<see cref="INowGetApiResponse"/>&gt;</returns>
+        Task<INowGetApiResponse> NowGetAsync(System.Threading.CancellationToken cancellationToken = default);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
+        /// <returns><see cref="Task"/>&lt;<see cref="INowGetApiResponse"/>?&gt;</returns>
+        Task<INowGetApiResponse?> NowGetOrDefaultAsync(System.Threading.CancellationToken cancellationToken = default);
+    }
+
+    /// <summary>
+    /// The <see cref="INowGetApiResponse"/>
+    /// </summary>
+    public interface INowGetApiResponse : Org.OpenAPITools.Client.IApiResponse, IOk<Org.OpenAPITools.Model.NowGet200Response?>
+    {
+        /// <summary>
+        /// Returns true if the response is 200 Ok
+        /// </summary>
+        /// <returns></returns>
+        bool IsOk { get; }
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public class DefaultApiEvents
+    {
+        /// <summary>
+        /// The event raised after the server response
+        /// </summary>
+        public event EventHandler<ApiResponseEventArgs>? OnNowGet;
+
+        /// <summary>
+        /// The event raised after an error querying the server
+        /// </summary>
+        public event EventHandler<ExceptionEventArgs>? OnErrorNowGet;
+
+        internal void ExecuteOnNowGet(DefaultApi.NowGetApiResponse apiResponse)
+        {
+            OnNowGet?.Invoke(this, new ApiResponseEventArgs(apiResponse));
+        }
+
+        internal void ExecuteOnErrorNowGet(Exception exception)
+        {
+            OnErrorNowGet?.Invoke(this, new ExceptionEventArgs(exception));
+        }
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public sealed partial class DefaultApi : IDefaultApi
+    {
+        private JsonSerializerOptions _jsonSerializerOptions;
+
+        /// <summary>
+        /// The logger factory
+        /// </summary>
+        public ILoggerFactory LoggerFactory { get; }
+
+        /// <summary>
+        /// The logger
+        /// </summary>
+        public ILogger<DefaultApi> Logger { get; }
+
+        /// <summary>
+        /// The HttpClient
+        /// </summary>
+        public HttpClient HttpClient { get; }
+
+        /// <summary>
+        /// The class containing the events
+        /// </summary>
+        public DefaultApiEvents Events { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DefaultApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public DefaultApi(ILogger<DefaultApi> logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents)
+        {
+            _jsonSerializerOptions = jsonSerializerOptionsProvider.Options;
+            LoggerFactory = loggerFactory;
+            Logger = LoggerFactory.CreateLogger<DefaultApi>();
+            HttpClient = httpClient;
+            Events = defaultApiEvents;
+        }
+
+        /// <summary>
+        /// Processes the server response
+        /// </summary>
+        /// <param name="apiResponseLocalVar"></param>
+        private void AfterNowGetDefaultImplementation(INowGetApiResponse apiResponseLocalVar)
+        {
+            bool suppressDefaultLog = false;
+            AfterNowGet(ref suppressDefaultLog, apiResponseLocalVar);
+            if (!suppressDefaultLog)
+                Logger.LogInformation("{0,-9} | {1} | {3}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path);
+        }
+
+        /// <summary>
+        /// Processes the server response
+        /// </summary>
+        /// <param name="suppressDefaultLog"></param>
+        /// <param name="apiResponseLocalVar"></param>
+        partial void AfterNowGet(ref bool suppressDefaultLog, INowGetApiResponse apiResponseLocalVar);
+
+        /// <summary>
+        /// Logs exceptions that occur while retrieving the server response
+        /// </summary>
+        /// <param name="exception"></param>
+        /// <param name="pathFormat"></param>
+        /// <param name="path"></param>
+        private void OnErrorNowGetDefaultImplementation(Exception exception, string pathFormat, string path)
+        {
+            bool suppressDefaultLog = false;
+            OnErrorNowGet(ref suppressDefaultLog, exception, pathFormat, path);
+            if (!suppressDefaultLog)
+                Logger.LogError(exception, "An error occurred while sending the request to the server.");
+        }
+
+        /// <summary>
+        /// A partial method that gives developers a way to provide customized exception handling
+        /// </summary>
+        /// <param name="suppressDefaultLog"></param>
+        /// <param name="exception"></param>
+        /// <param name="pathFormat"></param>
+        /// <param name="path"></param>
+        partial void OnErrorNowGet(ref bool suppressDefaultLog, Exception exception, string pathFormat, string path);
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
+        /// <returns><see cref="Task"/>&lt;<see cref="INowGetApiResponse"/>&gt;</returns>
+        public async Task<INowGetApiResponse?> NowGetOrDefaultAsync(System.Threading.CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                return await NowGetAsync(cancellationToken).ConfigureAwait(false);
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="ApiException">Thrown when fails to make API call</exception>
+        /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
+        /// <returns><see cref="Task"/>&lt;<see cref="INowGetApiResponse"/>&gt;</returns>
+        public async Task<INowGetApiResponse> NowGetAsync(System.Threading.CancellationToken cancellationToken = default)
+        {
+            UriBuilder uriBuilderLocalVar = new UriBuilder();
+
+            try
+            {
+                using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
+                {
+                    uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host;
+                    uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
+                    uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
+                    uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/now";
+
+                    httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
+
+                    string[] acceptLocalVars = new string[] {
+                        "application/json"
+                    };
+
+                    string? acceptLocalVar = ClientUtils.SelectHeaderAccept(acceptLocalVars);
+
+                    if (acceptLocalVar != null)
+                        httpRequestMessageLocalVar.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptLocalVar));
+
+                    httpRequestMessageLocalVar.Method = HttpMethod.Get;
+
+                    DateTime requestedAtLocalVar = DateTime.UtcNow;
+
+                    using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false))
+                    {
+                        string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+
+                        ILogger<NowGetApiResponse> apiResponseLoggerLocalVar = LoggerFactory.CreateLogger<NowGetApiResponse>();
+
+                        NowGetApiResponse apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/now", requestedAtLocalVar, _jsonSerializerOptions);
+
+                        AfterNowGetDefaultImplementation(apiResponseLocalVar);
+
+                        Events.ExecuteOnNowGet(apiResponseLocalVar);
+
+                        return apiResponseLocalVar;
+                    }
+                }
+            }
+            catch(Exception e)
+            {
+                OnErrorNowGetDefaultImplementation(e, "/now", uriBuilderLocalVar.Path);
+                Events.ExecuteOnErrorNowGet(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// The <see cref="NowGetApiResponse"/>
+        /// </summary>
+        public partial class NowGetApiResponse : Org.OpenAPITools.Client.ApiResponse, INowGetApiResponse
+        {
+            /// <summary>
+            /// The logger
+            /// </summary>
+            public ILogger<NowGetApiResponse> Logger { get; }
+
+            /// <summary>
+            /// The <see cref="NowGetApiResponse"/>
+            /// </summary>
+            /// <param name="logger"></param>
+            /// <param name="httpRequestMessage"></param>
+            /// <param name="httpResponseMessage"></param>
+            /// <param name="rawContent"></param>
+            /// <param name="path"></param>
+            /// <param name="requestedAt"></param>
+            /// <param name="jsonSerializerOptions"></param>
+            public NowGetApiResponse(ILogger<NowGetApiResponse> logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions)
+            {
+                Logger = logger;
+                OnCreated(httpRequestMessage, httpResponseMessage);
+            }
+
+            partial void OnCreated(System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage);
+
+            /// <summary>
+            /// Returns true if the response is 200 Ok
+            /// </summary>
+            /// <returns></returns>
+            public bool IsOk => 200 == (int)StatusCode;
+
+            /// <summary>
+            /// Deserializes the response if the response is 200 Ok
+            /// </summary>
+            /// <returns></returns>
+            public Org.OpenAPITools.Model.NowGet200Response? Ok()
+            {
+                // This logic may be modified with the AsModel.mustache template
+                return IsOk
+                    ? System.Text.Json.JsonSerializer.Deserialize<Org.OpenAPITools.Model.NowGet200Response>(RawContent, _jsonSerializerOptions)
+                    : null;
+            }
+
+            /// <summary>
+            /// Returns true if the response is 200 Ok and the deserialized response is not null
+            /// </summary>
+            /// <param name="result"></param>
+            /// <returns></returns>
+            public bool TryOk([NotNullWhen(true)]out Org.OpenAPITools.Model.NowGet200Response? result)
+            {
+                result = null;
+
+                try
+                {
+                    result = Ok();
+                } catch (Exception e)
+                {
+                    OnDeserializationErrorDefaultImplementation(e, (HttpStatusCode)200);
+                }
+
+                return result != null;
+            }
+
+            private void OnDeserializationErrorDefaultImplementation(Exception exception, HttpStatusCode httpStatusCode)
+            {
+                bool suppressDefaultLog = false;
+                OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode);
+                if (!suppressDefaultLog)
+                    Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode);
+            }
+
+            partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/IApi.cs
new file mode 100644
index 00000000000..28520f043f2
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/IApi.cs
@@ -0,0 +1,15 @@
+using System.Net.Http;
+
+namespace Org.OpenAPITools.Api
+{
+    /// <summary>
+    /// Any Api client
+    /// </summary>
+    public interface IApi
+    {
+        /// <summary>
+        /// The HttpClient
+        /// </summary>
+        HttpClient HttpClient { get; }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiException.cs
new file mode 100644
index 00000000000..f7cda3e72ce
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiException.cs
@@ -0,0 +1,52 @@
+// <auto-generated>
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+#nullable enable
+
+using System;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// API Exception
+    /// </summary>
+    public class ApiException : Exception
+    {
+        /// <summary>
+        /// The reason the api request failed
+        /// </summary>
+        public string? ReasonPhrase { get; }
+
+        /// <summary>
+        /// The HttpStatusCode
+        /// </summary>
+        public System.Net.HttpStatusCode StatusCode { get; }
+
+        /// <summary>
+        /// The raw data returned by the api
+        /// </summary>
+        public string RawContent { get; }
+        
+        /// <summary>
+        /// Construct the ApiException from parts of the response
+        /// </summary>
+        /// <param name="reasonPhrase"></param>
+        /// <param name="statusCode"></param>
+        /// <param name="rawContent"></param>
+        public ApiException(string? reasonPhrase, System.Net.HttpStatusCode statusCode, string rawContent) : base(reasonPhrase ?? rawContent)
+        {
+            ReasonPhrase = reasonPhrase;
+
+            StatusCode = statusCode;
+
+            RawContent = rawContent;
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiFactory.cs
new file mode 100644
index 00000000000..b9b27c613f8
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiFactory.cs
@@ -0,0 +1,49 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Org.OpenAPITools.Api;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// An IApiFactory interface
+    /// </summary>
+    public interface IApiFactory
+    {
+        /// <summary>
+        /// A method to create an IApi of type IResult
+        /// </summary>
+        /// <typeparam name="IResult"></typeparam>
+        /// <returns></returns>
+        IResult Create<IResult>() where IResult : IApi;
+    }
+
+    /// <summary>
+    /// An ApiFactory
+    /// </summary>
+    public class ApiFactory : IApiFactory
+    {
+        /// <summary>
+        /// The service provider
+        /// </summary>
+        public IServiceProvider Services { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiFactory"/> class.
+        /// </summary>
+        /// <param name="services"></param>
+        public ApiFactory(IServiceProvider services)
+        {
+            Services = services;
+        }
+
+        /// <summary>
+        /// A method to create an IApi of type IResult
+        /// </summary>
+        /// <typeparam name="IResult"></typeparam>
+        /// <returns></returns>
+        public IResult Create<IResult>() where IResult : IApi
+        {
+            return Services.GetRequiredService<IResult>();
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs
new file mode 100644
index 00000000000..3cb65e5adc0
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs
@@ -0,0 +1,24 @@
+using System;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Useful for tracking server health
+    /// </summary>
+    public class ApiResponseEventArgs : EventArgs
+    {
+        /// <summary>
+        /// The ApiResponse
+        /// </summary>
+        public ApiResponse ApiResponse { get; }
+
+        /// <summary>
+        /// The ApiResponseEventArgs
+        /// </summary>
+        /// <param name="apiResponse"></param>
+        public ApiResponseEventArgs(ApiResponse apiResponse)
+        {
+            ApiResponse = apiResponse;
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponse`1.cs
new file mode 100644
index 00000000000..7225050acf9
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponse`1.cs
@@ -0,0 +1,172 @@
+// <auto-generated>
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+#nullable enable
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Net;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Provides a non-generic contract for the ApiResponse wrapper.
+    /// </summary>
+    public partial interface IApiResponse
+    {
+        /// <summary>
+        /// The IsSuccessStatusCode from the api response
+        /// </summary>
+        bool IsSuccessStatusCode { get; }
+
+        /// <summary>
+        /// Gets the status code (HTTP status code)
+        /// </summary>
+        /// <value>The status code.</value>
+        HttpStatusCode StatusCode { get; }
+
+        /// <summary>
+        /// The raw content of this response.
+        /// </summary>
+        string RawContent { get; }
+
+        /// <summary>
+        /// The DateTime when the request was retrieved.
+        /// </summary>
+        DateTime DownloadedAt { get; }
+
+        /// <summary>
+        /// The headers contained in the api response
+        /// </summary>
+        System.Net.Http.Headers.HttpResponseHeaders Headers { get; }
+
+        /// <summary>
+        /// The path used when making the request.
+        /// </summary>
+        string Path { get; }
+
+        /// <summary>
+        /// The reason phrase contained in the api response
+        /// </summary>
+        string? ReasonPhrase { get; }
+
+        /// <summary>
+        /// The DateTime when the request was sent.
+        /// </summary>
+        DateTime RequestedAt { get; }
+
+        /// <summary>
+        /// The Uri used when making the request.
+        /// </summary>
+        Uri? RequestUri { get; }
+    }
+
+    /// <summary>
+    /// API Response
+    /// </summary>
+    public partial class ApiResponse : IApiResponse
+    {
+        /// <summary>
+        /// Gets the status code (HTTP status code)
+        /// </summary>
+        /// <value>The status code.</value>
+        public HttpStatusCode StatusCode { get; }
+
+        /// <summary>
+        /// The raw data
+        /// </summary>
+        public string RawContent { get; protected set; }
+
+        /// <summary>
+        /// The IsSuccessStatusCode from the api response
+        /// </summary>
+        public bool IsSuccessStatusCode { get; }
+
+        /// <summary>
+        /// The reason phrase contained in the api response
+        /// </summary>
+        public string? ReasonPhrase { get; }
+
+        /// <summary>
+        /// The headers contained in the api response
+        /// </summary>
+        public System.Net.Http.Headers.HttpResponseHeaders Headers { get; }
+
+        /// <summary>
+        /// The DateTime when the request was retrieved.
+        /// </summary>
+        public DateTime DownloadedAt { get; } = DateTime.UtcNow;
+
+        /// <summary>
+        /// The DateTime when the request was sent.
+        /// </summary>
+        public DateTime RequestedAt { get; }
+
+        /// <summary>
+        /// The path used when making the request.
+        /// </summary>
+        public string Path { get; }
+
+        /// <summary>
+        /// The Uri used when making the request.
+        /// </summary>
+        public Uri? RequestUri { get; }
+
+        /// <summary>
+        /// The <see cref="System.Text.Json.JsonSerializerOptions"/>
+        /// </summary>
+        protected System.Text.Json.JsonSerializerOptions _jsonSerializerOptions;
+
+        /// <summary>
+        /// Construct the response using an HttpResponseMessage
+        /// </summary>
+        /// <param name="httpRequestMessage"></param>
+        /// <param name="httpResponseMessage"></param>
+        /// <param name="rawContent"></param>
+        /// <param name="path"></param>
+        /// <param name="requestedAt"></param>
+        /// <param name="jsonSerializerOptions"></param>
+        public ApiResponse(System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions)
+        {
+            StatusCode = httpResponseMessage.StatusCode;
+            Headers = httpResponseMessage.Headers;
+            IsSuccessStatusCode = httpResponseMessage.IsSuccessStatusCode;
+            ReasonPhrase = httpResponseMessage.ReasonPhrase;
+            RawContent = rawContent;
+            Path = path;
+            RequestUri = httpRequestMessage.RequestUri;
+            RequestedAt = requestedAt;
+            _jsonSerializerOptions = jsonSerializerOptions;
+            OnCreated(httpRequestMessage, httpResponseMessage);
+        }
+
+        partial void OnCreated(System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage);
+    }
+
+    /// <summary>
+    /// An interface for responses of type 
+    /// </summary>
+    /// <typeparam name="TType"></typeparam>
+    public interface IOk<TType> : IApiResponse
+    {
+        /// <summary>
+        /// Deserializes the response if the response is Ok
+        /// </summary>
+        /// <returns></returns>
+        TType Ok();
+
+        /// <summary>
+        /// Returns true if the response is Ok and the deserialized response is not null
+        /// </summary>
+        /// <param name="result"></param>
+        /// <returns></returns>
+        bool TryOk([NotNullWhen(true)]out TType? result);
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ClientUtils.cs
new file mode 100644
index 00000000000..03822d5f806
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -0,0 +1,279 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+#nullable enable
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.Json;
+using System.Text.RegularExpressions;
+using Org.OpenAPITools.Model;
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Org.OpenAPITools.Test")]
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Utility functions providing some benefit to API client consumers.
+    /// </summary>
+    public static class ClientUtils
+    {
+
+        /// <summary>
+        /// A delegate for events.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <returns></returns>
+        public delegate void EventHandler<T>(object sender, T e) where T : EventArgs;
+
+        /// <summary>
+        /// Returns true when deserialization succeeds.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="json"></param>
+        /// <param name="options"></param>
+        /// <param name="result"></param>
+        /// <returns></returns>
+        public static bool TryDeserialize<T>(string json, JsonSerializerOptions options, [System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out T? result)
+        {
+            try
+            {
+                result = JsonSerializer.Deserialize<T>(json, options);
+                return result != null;
+            }
+            catch (Exception)
+            {
+                result = default;
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Returns true when deserialization succeeds.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="reader"></param>
+        /// <param name="options"></param>
+        /// <param name="result"></param>
+        /// <returns></returns>
+        public static bool TryDeserialize<T>(ref Utf8JsonReader reader, JsonSerializerOptions options, [System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out T? result)
+        {
+            try
+            {
+                result = JsonSerializer.Deserialize<T>(ref reader, options);
+                return result != null;
+            }
+            catch (Exception)
+            {
+                result = default;
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Sanitize filename by removing the path
+        /// </summary>
+        /// <param name="filename">Filename</param>
+        /// <returns>Filename</returns>
+        public static string SanitizeFilename(string filename)
+        {
+            Match match = Regex.Match(filename, @".*[/\\](.*)$");
+            return match.Success ? match.Groups[1].Value : filename;
+        }
+
+        /// <summary>
+        /// If parameter is DateTime, output in a formatted string (default ISO 8601), customizable with Configuration.DateTime.
+        /// If parameter is a list, join the list with ",".
+        /// Otherwise just return the string.
+        /// </summary>
+        /// <param name="obj">The parameter (header, path, query, form).</param>
+        /// <param name="format">The DateTime serialization format.</param>
+        /// <returns>Formatted string.</returns>
+        public static string? ParameterToString(object obj, string? format = ISO8601_DATETIME_FORMAT)
+        {
+            if (obj is DateTime dateTime)
+                // Return a formatted date string - Can be customized with Configuration.DateTimeFormat
+                // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o")
+                // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8
+                // For example: 2009-06-15T13:45:30.0000000
+                return dateTime.ToString(format);
+            if (obj is DateTimeOffset dateTimeOffset)
+                // Return a formatted date string - Can be customized with Configuration.DateTimeFormat
+                // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o")
+                // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8
+                // For example: 2009-06-15T13:45:30.0000000
+                return dateTimeOffset.ToString(format);
+            if (obj is bool boolean)
+                return boolean
+                    ? "true"
+                    : "false";
+            if (obj is ICollection collection)
+            {
+                List<string?> entries = new();
+                foreach (var entry in collection)
+                    entries.Add(ParameterToString(entry));
+                return string.Join(",", entries);
+            }
+
+            return Convert.ToString(obj, System.Globalization.CultureInfo.InvariantCulture);
+        }
+
+        /// <summary>
+        /// URL encode a string
+        /// Credit/Ref: https://github.com/restsharp/RestSharp/blob/master/RestSharp/Extensions/StringExtensions.cs#L50
+        /// </summary>
+        /// <param name="input">string to be URL encoded</param>
+        /// <returns>Byte array</returns>
+        public static string UrlEncode(string input)
+        {
+            const int maxLength = 32766;
+
+            if (input == null)
+            {
+                throw new ArgumentNullException("input");
+            }
+
+            if (input.Length <= maxLength)
+            {
+                return Uri.EscapeDataString(input);
+            }
+
+            StringBuilder sb = new StringBuilder(input.Length * 2);
+            int index = 0;
+
+            while (index < input.Length)
+            {
+                int length = Math.Min(input.Length - index, maxLength);
+                string subString = input.Substring(index, length);
+
+                sb.Append(Uri.EscapeDataString(subString));
+                index += subString.Length;
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Encode string in base64 format.
+        /// </summary>
+        /// <param name="text">string to be encoded.</param>
+        /// <returns>Encoded string.</returns>
+        public static string Base64Encode(string text)
+        {
+            return Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(text));
+        }
+
+        /// <summary>
+        /// Convert stream to byte array
+        /// </summary>
+        /// <param name="inputStream">Input stream to be converted</param>
+        /// <returns>Byte array</returns>
+        public static byte[] ReadAsBytes(Stream inputStream)
+        {
+            using (var ms = new MemoryStream())
+            {
+                inputStream.CopyTo(ms);
+                return ms.ToArray();
+            }
+        }
+
+        /// <summary>
+        /// Select the Content-Type header's value from the given content-type array:
+        /// if JSON type exists in the given array, use it;
+        /// otherwise use the first one defined in 'consumes'
+        /// </summary>
+        /// <param name="contentTypes">The Content-Type array to select from.</param>
+        /// <returns>The Content-Type header to use.</returns>
+        public static string? SelectHeaderContentType(string[] contentTypes)
+        {
+            if (contentTypes.Length == 0)
+                return null;
+
+            foreach (var contentType in contentTypes)
+            {
+                if (IsJsonMime(contentType))
+                    return contentType;
+            }
+
+            return contentTypes[0]; // use the first content type specified in 'consumes'
+        }
+
+        /// <summary>
+        /// Select the Accept header's value from the given accepts array:
+        /// if JSON exists in the given array, use it;
+        /// otherwise use all of them (joining into a string)
+        /// </summary>
+        /// <param name="accepts">The accepts array to select from.</param>
+        /// <returns>The Accept header to use.</returns>
+        public static string? SelectHeaderAccept(string[] accepts)
+        {
+            if (accepts.Length == 0)
+                return null;
+
+            if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase))
+                return "application/json";
+
+            return string.Join(",", accepts);
+        }
+
+        /// <summary>
+        /// Provides a case-insensitive check that a provided content type is a known JSON-like content type.
+        /// </summary>
+        public static readonly Regex JsonRegex = new Regex("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$");
+
+        /// <summary>
+        /// Check if the given MIME is a JSON MIME.
+        /// JSON MIME examples:
+        ///    application/json
+        ///    application/json; charset=UTF8
+        ///    APPLICATION/JSON
+        ///    application/vnd.company+json
+        /// </summary>
+        /// <param name="mime">MIME</param>
+        /// <returns>Returns True if MIME type is json.</returns>
+        public static bool IsJsonMime(string mime)
+        {
+            if (string.IsNullOrWhiteSpace(mime)) return false;
+
+            return JsonRegex.IsMatch(mime) || mime.Equals("application/json-patch+json");
+        }
+
+        /// <summary>
+        /// The base path of the API
+        /// </summary>
+        public const string BASE_ADDRESS = "http://localhost";
+
+        /// <summary>
+        /// The scheme of the API
+        /// </summary>
+        public const string SCHEME = "http";
+
+        /// <summary>
+        /// The context path of the API
+        /// </summary>
+        public const string CONTEXT_PATH = "";
+
+        /// <summary>
+        /// The host of the API
+        /// </summary>
+        public const string HOST = "localhost";
+
+        /// <summary>
+        /// The format to use for DateTime serialization
+        /// </summary>
+        public const string ISO8601_DATETIME_FORMAT = "o";
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/CookieContainer.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/CookieContainer.cs
new file mode 100644
index 00000000000..85093b0c1fe
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/CookieContainer.cs
@@ -0,0 +1,20 @@
+// <auto-generated>
+
+#nullable enable
+
+using System.Linq;
+using System.Collections.Generic;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// A class containing a CookieContainer
+    /// </summary>
+    public sealed class CookieContainer
+    {
+        /// <summary>
+        /// The collection of tokens
+        /// </summary>
+        public System.Net.CookieContainer Value { get; } = new System.Net.CookieContainer();
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
new file mode 100644
index 00000000000..1ebd1220b62
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
@@ -0,0 +1,77 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Formatter for 'date' and 'date-time' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    public class DateTimeJsonConverter : JsonConverter<DateTime>
+    {
+        /// <summary>
+        /// The formats used to deserialize the date
+        /// </summary>
+        public static string[] Formats { get; } = {
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK",
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffffffK",
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffK",
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffffK",
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffK",
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffK",
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fK",
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ssK",
+            "yyyy'-'MM'-'dd",
+            "yyyyMMddTHHmmss.fffffffK",
+            "yyyyMMddTHHmmss.ffffffK",
+            "yyyyMMddTHHmmss.fffffK",
+            "yyyyMMddTHHmmss.ffffK",
+            "yyyyMMddTHHmmss.fffK",
+            "yyyyMMddTHHmmss.ffK",
+            "yyyyMMddTHHmmss.fK",
+            "yyyyMMddTHHmmssK",
+            "yyyyMMdd"
+
+        };
+
+        /// <summary>
+        /// Returns a DateTime from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+            if (reader.TokenType == JsonTokenType.Null)
+                throw new NotSupportedException();
+
+            string value = reader.GetString()!;
+
+            foreach(string format in Formats)
+                if (DateTime.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateTime result))
+                    return result;
+
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Writes the DateTime to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="dateTimeValue"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, DateTime dateTimeValue, JsonSerializerOptions options) =>
+            writer.WriteStringValue(dateTimeValue.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK", CultureInfo.InvariantCulture));
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
new file mode 100644
index 00000000000..e92db186bb6
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
@@ -0,0 +1,82 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Formatter for 'date' and 'date-time' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    public class DateTimeNullableJsonConverter : JsonConverter<DateTime?>
+    {
+        /// <summary>
+        /// The formats used to deserialize the date
+        /// </summary>
+        public static string[] Formats { get; } = {
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK",
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffffffK",
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffK",
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffffK",
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffK",
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffK",
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fK",
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ssK",
+            "yyyy'-'MM'-'dd",
+            "yyyyMMddTHHmmss.fffffffK",
+            "yyyyMMddTHHmmss.ffffffK",
+            "yyyyMMddTHHmmss.fffffK",
+            "yyyyMMddTHHmmss.ffffK",
+            "yyyyMMddTHHmmss.fffK",
+            "yyyyMMddTHHmmss.ffK",
+            "yyyyMMddTHHmmss.fK",
+            "yyyyMMddTHHmmssK",
+            "yyyyMMdd"
+
+         };
+
+        /// <summary>
+        /// Returns a DateTime from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override DateTime? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+            if (reader.TokenType == JsonTokenType.Null)
+                return null;
+
+            string value = reader.GetString()!;
+
+            foreach(string format in Formats)
+                if (DateTime.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateTime result))
+                    return result;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Writes the DateTime to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="dateTimeValue"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, DateTime? dateTimeValue, JsonSerializerOptions options)
+        {
+            if (dateTimeValue == null)
+                writer.WriteNullValue();
+            else
+                writer.WriteStringValue(dateTimeValue.Value.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK", CultureInfo.InvariantCulture));
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs
new file mode 100644
index 00000000000..dcfab667823
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs
@@ -0,0 +1,24 @@
+using System;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Useful for tracking server health
+    /// </summary>
+    public class ExceptionEventArgs : EventArgs
+    {
+        /// <summary>
+        /// The ApiResponse
+        /// </summary>
+        public Exception Exception { get; }
+
+        /// <summary>
+        /// The ExcepetionEventArgs
+        /// </summary>
+        /// <param name="exception"></param>
+        public ExceptionEventArgs(Exception exception)
+        {
+            Exception = exception;
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs
new file mode 100644
index 00000000000..90dd61c2c49
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs
@@ -0,0 +1,131 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Net.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Provides hosting configuration for Org.OpenAPITools
+    /// </summary>
+    public class HostConfiguration
+    {
+        private readonly IServiceCollection _services;
+        private readonly JsonSerializerOptions _jsonOptions = new JsonSerializerOptions();
+
+        internal bool HttpClientsAdded { get; private set; }
+
+        /// <summary>
+        /// Instantiates the class 
+        /// </summary>
+        /// <param name="services"></param>
+        public HostConfiguration(IServiceCollection services)
+        {
+            _services = services;
+            _jsonOptions.Converters.Add(new JsonStringEnumConverter());
+            _jsonOptions.Converters.Add(new DateTimeJsonConverter());
+            _jsonOptions.Converters.Add(new DateTimeNullableJsonConverter());
+            _jsonOptions.Converters.Add(new NowGet200ResponseJsonConverter());
+            JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions);
+            _services.AddSingleton(jsonSerializerOptionsProvider);
+            _services.AddSingleton<IApiFactory, ApiFactory>();
+            _services.AddSingleton<DefaultApiEvents>();
+            _services.AddTransient<IDefaultApi, DefaultApi>();
+        }
+
+        /// <summary>
+        /// Configures the HttpClients.
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="builder"></param>
+        /// <returns></returns>
+        public HostConfiguration AddApiHttpClients
+        (
+            Action<HttpClient>? client = null, Action<IHttpClientBuilder>? builder = null)
+        {
+            if (client == null)
+                client = c => c.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS);
+
+            List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
+
+            builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>(client));
+            
+            if (builder != null)
+                foreach (IHttpClientBuilder instance in builders)
+                    builder(instance);
+
+            HttpClientsAdded = true;
+
+            return this;
+        }
+
+        /// <summary>
+        /// Configures the JsonSerializerSettings
+        /// </summary>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public HostConfiguration ConfigureJsonOptions(Action<JsonSerializerOptions> options)
+        {
+            options(_jsonOptions);
+
+            return this;
+        }
+
+        /// <summary>
+        /// Adds tokens to your IServiceCollection
+        /// </summary>
+        /// <typeparam name="TTokenBase"></typeparam>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        public HostConfiguration AddTokens<TTokenBase>(TTokenBase token) where TTokenBase : TokenBase
+        {
+            return AddTokens(new TTokenBase[]{ token });
+        }
+
+        /// <summary>
+        /// Adds tokens to your IServiceCollection
+        /// </summary>
+        /// <typeparam name="TTokenBase"></typeparam>
+        /// <param name="tokens"></param>
+        /// <returns></returns>
+        public HostConfiguration AddTokens<TTokenBase>(IEnumerable<TTokenBase> tokens) where TTokenBase : TokenBase
+        {
+            TokenContainer<TTokenBase> container = new TokenContainer<TTokenBase>(tokens);
+            _services.AddSingleton(services => container);
+
+            return this;
+        }
+
+        /// <summary>
+        /// Adds a token provider to your IServiceCollection
+        /// </summary>
+        /// <typeparam name="TTokenProvider"></typeparam>
+        /// <typeparam name="TTokenBase"></typeparam>
+        /// <returns></returns>
+        public HostConfiguration UseProvider<TTokenProvider, TTokenBase>() 
+            where TTokenProvider : TokenProvider<TTokenBase>
+            where TTokenBase : TokenBase
+        {
+            _services.AddSingleton<TTokenProvider>();
+            _services.AddSingleton<TokenProvider<TTokenBase>>(services => services.GetRequiredService<TTokenProvider>());
+
+            return this;
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs
new file mode 100644
index 00000000000..0184d9ad944
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs
@@ -0,0 +1,27 @@
+// <auto-generated>
+
+#nullable enable
+
+using System.Text.Json;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Provides the JsonSerializerOptions
+    /// </summary>
+    public class JsonSerializerOptionsProvider
+    {
+        /// <summary>
+        /// the JsonSerializerOptions
+        /// </summary>
+        public JsonSerializerOptions Options { get; }
+
+        /// <summary>
+        /// Instantiates a JsonSerializerOptionsProvider
+        /// </summary>
+        public JsonSerializerOptionsProvider(JsonSerializerOptions options)
+        {
+            Options = options;
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Option.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Option.cs
new file mode 100644
index 00000000000..1c1677e3e3c
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Option.cs
@@ -0,0 +1,53 @@
+// <auto-generated>
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+#nullable enable
+
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// A wrapper for operation parameters which are not required
+    /// </summary>
+    public struct Option<TType>
+    {
+        /// <summary>
+        /// The value to send to the server
+        /// </summary>
+        public TType Value { get; }
+
+        /// <summary>
+        /// When true the value will be sent to the server
+        /// </summary>
+        internal bool IsSet { get; }
+
+        /// <summary>
+        /// A wrapper for operation parameters which are not required
+        /// </summary>
+        /// <param name="value"></param>
+        public Option(TType value)
+        {
+            IsSet = true;
+            Value = value;
+        }
+
+        /// <summary>
+        /// Implicitly converts this option to the contained type
+        /// </summary>
+        /// <param name="option"></param>
+        public static implicit operator TType(Option<TType> option) => option.Value;
+
+        /// <summary>
+        /// Implicitly converts the provided value to an Option
+        /// </summary>
+        /// <param name="value"></param>
+        public static implicit operator Option<TType>(TType value) => new Option<TType>(value);
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
new file mode 100644
index 00000000000..30ef4703319
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -0,0 +1,57 @@
+// <auto-generated>
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Channels;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Provides a token to the api clients. Tokens will be rate limited based on the provided TimeSpan.
+    /// </summary>
+    /// <typeparam name="TTokenBase"></typeparam>
+    public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
+    {
+        internal Dictionary<string, Channel<TTokenBase>> AvailableTokens { get; } = new();
+
+        /// <summary>
+        /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
+        /// </summary>
+        /// <param name="container"></param>
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        {
+            foreach(TTokenBase token in _tokens)
+                token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
+
+            BoundedChannelOptions options = new BoundedChannelOptions(_tokens.Length)
+            {
+                FullMode = BoundedChannelFullMode.DropWrite
+            };
+
+            AvailableTokens.Add(string.Empty, Channel.CreateBounded<TTokenBase>(options));
+
+            foreach(Channel<TTokenBase> tokens in AvailableTokens.Values)
+                for (int i = 0; i < _tokens.Length; i++)
+                    _tokens[i].TokenBecameAvailable += ((sender) => tokens.Writer.TryWrite((TTokenBase) sender));
+        }
+
+        internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        {
+            if (!AvailableTokens.TryGetValue(header, out Channel<TTokenBase>? tokens))
+                throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
+
+            return await tokens.Reader.ReadAsync(cancellation).ConfigureAwait(false);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs
new file mode 100644
index 00000000000..3f713a2ef4b
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -0,0 +1,71 @@
+// <auto-generated>
+
+#nullable enable
+
+using System;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// The base for all tokens.
+    /// </summary>
+    public abstract class TokenBase
+    {
+        private DateTime _nextAvailable = DateTime.UtcNow;
+        private object _nextAvailableLock = new object();
+        private readonly System.Timers.Timer _timer = new System.Timers.Timer();
+
+
+        internal TimeSpan? Timeout { get; set; }
+        internal delegate void TokenBecameAvailableEventHandler(object sender);
+        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+
+
+        /// <summary>
+        /// Initialize a TokenBase object.
+        /// </summary>
+        /// <param name="timeout"></param>
+        internal TokenBase(TimeSpan? timeout = null)
+        {
+            Timeout = timeout;
+            
+            if (Timeout != null)
+                StartTimer(Timeout.Value);
+        }
+
+
+        /// <summary>
+        /// Starts the token's timer
+        /// </summary>
+        /// <param name="timeout"></param>
+        internal void StartTimer(TimeSpan timeout)
+        {
+            Timeout = timeout;
+            _timer.Interval = Timeout.Value.TotalMilliseconds;
+            _timer.Elapsed += OnTimer;
+            _timer.AutoReset = true;
+            _timer.Start();
+        }
+
+        /// <summary>
+        /// Returns true while the token is rate limited.
+        /// </summary>
+        public bool IsRateLimited => _nextAvailable > DateTime.UtcNow;
+
+        /// <summary>
+        /// Triggered when the server returns status code TooManyRequests
+        /// Once triggered the local timeout will be extended an arbitrary length of time.
+        /// </summary>
+        public void BeginRateLimit()
+        {
+            lock(_nextAvailableLock)
+                _nextAvailable = DateTime.UtcNow.AddSeconds(5);
+        }
+
+        private void OnTimer(object? sender, System.Timers.ElapsedEventArgs e)
+        {
+            if (TokenBecameAvailable != null && !IsRateLimited)
+                TokenBecameAvailable.Invoke(this);
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/TokenContainer`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/TokenContainer`1.cs
new file mode 100644
index 00000000000..3fba287ad9d
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/TokenContainer`1.cs
@@ -0,0 +1,37 @@
+// <auto-generated>
+
+#nullable enable
+
+using System.Linq;
+using System.Collections.Generic;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// A container for a collection of tokens.
+    /// </summary>
+    /// <typeparam name="TTokenBase"></typeparam>
+    public sealed class TokenContainer<TTokenBase> where TTokenBase : TokenBase
+    {
+        /// <summary>
+        /// The collection of tokens
+        /// </summary>
+        public List<TTokenBase> Tokens { get; } = new List<TTokenBase>();
+
+        /// <summary>
+        /// Instantiates a TokenContainer
+        /// </summary>
+        public TokenContainer()
+        {
+        }
+
+        /// <summary>
+        /// Instantiates a TokenContainer
+        /// </summary>
+        /// <param name="tokens"></param>
+        public TokenContainer(System.Collections.Generic.IEnumerable<TTokenBase> tokens)
+        {
+            Tokens = tokens.ToList();
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs
new file mode 100644
index 00000000000..d9c84d5cc77
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -0,0 +1,44 @@
+// <auto-generated>
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+#nullable enable
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools
+{
+    /// <summary>
+    /// A class which will provide tokens.
+    /// </summary>
+    public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
+    {
+        /// <summary>
+        /// The array of tokens.
+        /// </summary>
+        protected TTokenBase[] _tokens;
+
+        internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
+
+        /// <summary>
+        /// Instantiates a TokenProvider.
+        /// </summary>
+        /// <param name="tokens"></param>
+        public TokenProvider(IEnumerable<TTokenBase> tokens)
+        {
+            _tokens = tokens.ToArray();
+
+            if (_tokens.Length == 0)
+                throw new ArgumentException("You did not provide any tokens.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs
new file mode 100644
index 00000000000..2c150d1f66e
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs
@@ -0,0 +1,59 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+#nullable enable
+
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Extensions
+{
+    /// <summary>
+    /// Extension methods for IHostBuilder
+    /// </summary>
+    public static class IHostBuilderExtensions
+    {
+        /// <summary>
+        /// Add the api to your host builder.
+        /// </summary>
+        /// <param name="builder"></param>
+        public static IHostBuilder ConfigureApi(this IHostBuilder builder)
+        {
+            builder.ConfigureServices((context, services) => 
+            {
+                HostConfiguration config = new HostConfiguration(services);
+
+                IServiceCollectionExtensions.AddApi(services, config);
+            });
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Add the api to your host builder.
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <param name="options"></param>
+        public static IHostBuilder ConfigureApi(this IHostBuilder builder, Action<HostBuilderContext, IServiceCollection, HostConfiguration> options)
+        {
+            builder.ConfigureServices((context, services) => 
+            {
+                HostConfiguration config = new HostConfiguration(services);
+
+                options(context, services, config);
+
+                IServiceCollectionExtensions.AddApi(services, config);
+            });
+
+            return builder;
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs
new file mode 100644
index 00000000000..549b6e47333
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs
@@ -0,0 +1,79 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+#nullable enable
+
+using System;
+using System.Net.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Polly.Timeout;
+using Polly.Extensions.Http;
+using Polly;
+
+namespace Org.OpenAPITools.Extensions
+{
+    /// <summary>
+    /// Extension methods for IHttpClientBuilder
+    /// </summary>
+    public static class IHttpClientBuilderExtensions
+    {
+        /// <summary>
+        /// Adds a Polly retry policy to your clients.
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="retries"></param>
+        /// <returns></returns>
+        public static IHttpClientBuilder AddRetryPolicy(this IHttpClientBuilder client, int retries)
+        {
+            client.AddPolicyHandler(RetryPolicy(retries));
+
+            return client;
+        }
+
+        /// <summary>
+        /// Adds a Polly timeout policy to your clients.
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="timeout"></param>
+        /// <returns></returns>
+        public static IHttpClientBuilder AddTimeoutPolicy(this IHttpClientBuilder client, TimeSpan timeout)
+        {
+            client.AddPolicyHandler(TimeoutPolicy(timeout));
+
+            return client;
+        }
+
+        /// <summary>
+        /// Adds a Polly circuit breaker to your clients.
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="handledEventsAllowedBeforeBreaking"></param>
+        /// <param name="durationOfBreak"></param>
+        /// <returns></returns>
+        public static IHttpClientBuilder AddCircuitBreakerPolicy(this IHttpClientBuilder client, int handledEventsAllowedBeforeBreaking, TimeSpan durationOfBreak)
+        {
+            client.AddTransientHttpErrorPolicy(builder => CircuitBreakerPolicy(builder, handledEventsAllowedBeforeBreaking, durationOfBreak));
+
+            return client;
+        }
+
+        private static Polly.Retry.AsyncRetryPolicy<HttpResponseMessage> RetryPolicy(int retries)
+            => HttpPolicyExtensions
+                .HandleTransientHttpError()
+                .Or<TimeoutRejectedException>()
+                .RetryAsync(retries);
+
+        private static AsyncTimeoutPolicy<HttpResponseMessage> TimeoutPolicy(TimeSpan timeout)
+            => Policy.TimeoutAsync<HttpResponseMessage>(timeout);
+
+        private static Polly.CircuitBreaker.AsyncCircuitBreakerPolicy<HttpResponseMessage> CircuitBreakerPolicy(
+            PolicyBuilder<HttpResponseMessage> builder, int handledEventsAllowedBeforeBreaking, TimeSpan durationOfBreak)
+                => builder.CircuitBreakerAsync(handledEventsAllowedBeforeBreaking, durationOfBreak);
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs
new file mode 100644
index 00000000000..8b7c34900c0
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs
@@ -0,0 +1,73 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+#nullable enable
+
+using System;
+using System.Linq;
+using Microsoft.Extensions.DependencyInjection;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Extensions
+{
+    /// <summary>
+    /// Extension methods for IServiceCollection
+    /// </summary>
+    public static class IServiceCollectionExtensions
+    {
+        /// <summary>
+        /// Add the api to your host builder.
+        /// </summary>
+        /// <param name="services"></param>
+        public static void AddApi(this IServiceCollection services)
+        {
+            HostConfiguration config = new(services);
+            AddApi(services, config);
+        }
+
+        /// <summary>
+        /// Add the api to your host builder.
+        /// </summary>
+        /// <param name="services"></param>
+        /// <param name="options"></param>
+        public static void AddApi(this IServiceCollection services, Action<HostConfiguration> options)
+        {
+            HostConfiguration config = new(services);
+            options(config);
+            AddApi(services, config);
+        }
+
+        internal static void AddApi(IServiceCollection services, HostConfiguration host)
+        {
+            if (!host.HttpClientsAdded)
+                host.AddApiHttpClients();
+
+            services.AddSingleton<CookieContainer>();
+
+            // ensure that a token provider was provided for this token type
+            // if not, default to RateLimitProvider
+            var containerServices = services.Where(s => s.ServiceType.IsGenericType &&
+                s.ServiceType.GetGenericTypeDefinition().IsAssignableFrom(typeof(TokenContainer<>))).ToArray();
+
+            foreach(var containerService in containerServices)
+            {
+                var tokenType = containerService.ServiceType.GenericTypeArguments[0];
+
+                var provider = services.FirstOrDefault(s => s.ServiceType.IsAssignableFrom(typeof(TokenProvider<>).MakeGenericType(tokenType)));
+
+                if (provider == null)
+                {
+                    services.AddSingleton(typeof(RateLimitProvider<>).MakeGenericType(tokenType));
+                    services.AddSingleton(typeof(TokenProvider<>).MakeGenericType(tokenType), 
+                        s => s.GetRequiredService(typeof(RateLimitProvider<>).MakeGenericType(tokenType)));
+                }
+            }
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/NowGet200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/NowGet200Response.cs
new file mode 100644
index 00000000000..d603c50450d
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/NowGet200Response.cs
@@ -0,0 +1,203 @@
+// <auto-generated>
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+#nullable enable
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.ComponentModel.DataAnnotations;
+using Org.OpenAPITools.Client;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// NowGet200Response
+    /// </summary>
+    public partial class NowGet200Response : IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NowGet200Response" /> class.
+        /// </summary>
+        /// <param name="now">now</param>
+        /// <param name="today">today</param>
+        [JsonConstructor]
+        public NowGet200Response(Option<DateTime?> now = default, Option<DateTime?> today = default)
+        {
+            NowOption = now;
+            TodayOption = today;
+            OnCreated();
+        }
+
+        partial void OnCreated();
+
+        /// <summary>
+        /// Used to track the state of Now
+        /// </summary>
+        [JsonIgnore]
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public Option<DateTime?> NowOption { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets Now
+        /// </summary>
+        [JsonPropertyName("now")]
+        public DateTime? Now { get { return this. NowOption; } set { this.NowOption = new(value); } }
+
+        /// <summary>
+        /// Used to track the state of Today
+        /// </summary>
+        [JsonIgnore]
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public Option<DateTime?> TodayOption { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets Today
+        /// </summary>
+        [JsonPropertyName("today")]
+        public DateTime? Today { get { return this. TodayOption; } set { this.TodayOption = new(value); } }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("class NowGet200Response {\n");
+            sb.Append("  Now: ").Append(Now).Append("\n");
+            sb.Append("  Today: ").Append(Today).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+    /// <summary>
+    /// A Json converter for type <see cref="NowGet200Response" />
+    /// </summary>
+    public class NowGet200ResponseJsonConverter : JsonConverter<NowGet200Response>
+    {
+        /// <summary>
+        /// The format to use to serialize Now
+        /// </summary>
+        public static string NowFormat { get; set; } = "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK";
+
+        /// <summary>
+        /// The format to use to serialize Today
+        /// </summary>
+        public static string TodayFormat { get; set; } = "yyyy'-'MM'-'dd";
+
+        /// <summary>
+        /// Deserializes json to <see cref="NowGet200Response" />
+        /// </summary>
+        /// <param name="utf8JsonReader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="jsonSerializerOptions"></param>
+        /// <returns></returns>
+        /// <exception cref="JsonException"></exception>
+        public override NowGet200Response Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, JsonSerializerOptions jsonSerializerOptions)
+        {
+            int currentDepth = utf8JsonReader.CurrentDepth;
+
+            if (utf8JsonReader.TokenType != JsonTokenType.StartObject && utf8JsonReader.TokenType != JsonTokenType.StartArray)
+                throw new JsonException();
+
+            JsonTokenType startingTokenType = utf8JsonReader.TokenType;
+
+            Option<DateTime?> now = default;
+            Option<DateTime?> today = default;
+
+            while (utf8JsonReader.Read())
+            {
+                if (startingTokenType == JsonTokenType.StartObject && utf8JsonReader.TokenType == JsonTokenType.EndObject && currentDepth == utf8JsonReader.CurrentDepth)
+                    break;
+
+                if (startingTokenType == JsonTokenType.StartArray && utf8JsonReader.TokenType == JsonTokenType.EndArray && currentDepth == utf8JsonReader.CurrentDepth)
+                    break;
+
+                if (utf8JsonReader.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReader.CurrentDepth - 1)
+                {
+                    string? localVarJsonPropertyName = utf8JsonReader.GetString();
+                    utf8JsonReader.Read();
+
+                    switch (localVarJsonPropertyName)
+                    {
+                        case "now":
+                            if (utf8JsonReader.TokenType != JsonTokenType.Null)
+                                now = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                            break;
+                        case "today":
+                            if (utf8JsonReader.TokenType != JsonTokenType.Null)
+                                today = new Option<DateTime?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+
+            if (now.IsSet && now.Value == null)
+                throw new ArgumentNullException(nameof(now), "Property is not nullable for class NowGet200Response.");
+
+            if (today.IsSet && today.Value == null)
+                throw new ArgumentNullException(nameof(today), "Property is not nullable for class NowGet200Response.");
+
+            return new NowGet200Response(now, today);
+        }
+
+        /// <summary>
+        /// Serializes a <see cref="NowGet200Response" />
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="nowGet200Response"></param>
+        /// <param name="jsonSerializerOptions"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        public override void Write(Utf8JsonWriter writer, NowGet200Response nowGet200Response, JsonSerializerOptions jsonSerializerOptions)
+        {
+            writer.WriteStartObject();
+
+            WriteProperties(ref writer, nowGet200Response, jsonSerializerOptions);
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serializes the properties of <see cref="NowGet200Response" />
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="nowGet200Response"></param>
+        /// <param name="jsonSerializerOptions"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        public void WriteProperties(ref Utf8JsonWriter writer, NowGet200Response nowGet200Response, JsonSerializerOptions jsonSerializerOptions)
+        {
+            if (nowGet200Response.NowOption.IsSet)
+                writer.WriteString("now", nowGet200Response.NowOption.Value!.Value.ToString(NowFormat));
+
+            if (nowGet200Response.TodayOption.IsSet)
+                writer.WriteString("today", nowGet200Response.TodayOption.Value!.Value.ToString(TodayFormat));
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj
new file mode 100644
index 00000000000..2c9898be1de
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo> <!-- setting GenerateAssemblyInfo to false causes this bug https://github.com/dotnet/project-system/issues/3934 -->
+    <TargetFramework>net8.0</TargetFramework>
+    <AssemblyName>Org.OpenAPITools</AssemblyName>
+    <PackageId>Org.OpenAPITools</PackageId>
+    <OutputType>Library</OutputType>
+    <Authors>OpenAPI</Authors>
+    <Company>OpenAPI</Company>
+    <AssemblyTitle>OpenAPI Library</AssemblyTitle>
+    <Description>A library generated from a OpenAPI doc</Description>
+    <Copyright>No Copyright</Copyright>
+    <RootNamespace>Org.OpenAPITools</RootNamespace>
+    <Version>1.0.0</Version>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Org.OpenAPITools.xml</DocumentationFile>
+    <RepositoryUrl>https://github.com/GIT_USER_ID/GIT_REPO_ID.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageReleaseNotes>Minor update</PackageReleaseNotes>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Net.Http.Headers" Version="8.0.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/README.md
new file mode 100644
index 00000000000..a07dac693a6
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/README.md
@@ -0,0 +1,176 @@
+# Created with Openapi Generator
+
+<a id="cli"></a>
+## Run the following powershell command to generate the library
+
+```ps1
+$properties = @(
+    'apiName=Api',
+    'targetFramework=net8.0',
+    'validatable=true',
+    'nullableReferenceTypes=true',
+    'hideGenerationTimestamp=true',
+    'packageVersion=1.0.0',
+    'packageAuthors=OpenAPI',
+    'packageCompany=OpenAPI',
+    'packageCopyright=No Copyright',
+    'packageDescription=A library generated from a OpenAPI doc',
+    'packageName=Org.OpenAPITools',
+    'packageTags=',
+    'packageTitle=OpenAPI Library'
+) -join ","
+
+$global = @(
+    'apiDocs=true',
+    'modelDocs=true',
+    'apiTests=true',
+    'modelTests=true'
+) -join ","
+
+java -jar "<path>/openapi-generator/modules/openapi-generator-cli/target/openapi-generator-cli.jar" generate `
+    -g csharp-netcore `
+    -i <your-swagger-file>.yaml `
+    -o <your-output-folder> `
+    --library generichost `
+    --additional-properties $properties `
+    --global-property $global `
+    --git-host "github.com" `
+    --git-repo-id "GIT_REPO_ID" `
+    --git-user-id "GIT_USER_ID" `
+    --release-note "Minor update"
+    # -t templates
+```
+
+<a id="usage"></a>
+## Using the library in your project
+
+```cs
+using System;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace YourProject
+{
+    public class Program
+    {
+        public static async Task Main(string[] args)
+        {
+            var host = CreateHostBuilder(args).Build();
+            var api = host.Services.GetRequiredService<IDefaultApi>();
+            NowGetApiResponse apiResponse = await api.NowGetAsync("todo");
+            NowGet200Response model = apiResponse.Ok();
+        }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args)
+          .ConfigureApi((context, options) =>
+          {
+              options.ConfigureJsonOptions((jsonOptions) =>
+              {
+                  // your custom converters if any
+              });
+
+              options.AddApiHttpClients(builder: builder => builder
+                .AddRetryPolicy(2)
+                .AddTimeoutPolicy(TimeSpan.FromSeconds(5))
+                .AddCircuitBreakerPolicy(10, TimeSpan.FromSeconds(30))
+                // add whatever middleware you prefer
+              );
+          });
+    }
+}
+```
+<a id="questions"></a>
+## Questions
+
+- What about HttpRequest failures and retries?
+  If supportsRetry is enabled, you can configure Polly in the ConfigureClients method.
+- How are tokens used?
+  Tokens are provided by a TokenProvider class. The default is RateLimitProvider which will perform client side rate limiting.
+  Other providers can be used with the UseProvider method.
+- Does an HttpRequest throw an error when the server response is not Ok?
+  It depends how you made the request. If the return type is ApiResponse<T> no error will be thrown, though the Content property will be null. 
+  StatusCode and ReasonPhrase will contain information about the error.
+  If the return type is T, then it will throw. If the return type is TOrDefault, it will return null.
+- How do I validate requests and process responses?
+  Use the provided On and After methods in the Api class from the namespace Org.OpenAPITools.Rest.DefaultApi.
+  Or provide your own class by using the generic ConfigureApi method.
+
+<a id="dependencies"></a>
+## Dependencies
+
+- [Microsoft.Extensions.Hosting](https://www.nuget.org/packages/Microsoft.Extensions.Hosting/) - 5.0.0 or later
+- [Microsoft.Extensions.Http](https://www.nuget.org/packages/Microsoft.Extensions.Http/) - 5.0.0 or later
+- [Microsoft.Extensions.Http.Polly](https://www.nuget.org/packages/Microsoft.Extensions.Http.Polly/) - 5.0.1 or later
+- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 4.7.0 or later
+
+<a id="documentation-for-authorization"></a>
+## Documentation for Authorization
+
+Endpoints do not require authorization.
+
+
+## Build
+- SDK version: 1.0.0
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
+
+## Api Information
+- appName: OpenAPI Dates
+- appVersion: 1.0.0
+- appDescription: Thic spec contains endpoints with dates in different formats
+
+## [OpenApi Global properties](https://openapi-generator.tech/docs/globals)
+- generateAliasAsModel: 
+- supportingFiles: 
+- models: omitted for brevity
+- apis: omitted for brevity
+- apiDocs: true
+- modelDocs: true
+- apiTests: true
+- modelTests: true
+- withXml: 
+
+## [OpenApi Generator Parameters](https://openapi-generator.tech/docs/generators/csharp-netcore)
+- allowUnicodeIdentifiers: 
+- apiName: Api
+- caseInsensitiveResponseHeaders: 
+- conditionalSerialization: false
+- disallowAdditionalPropertiesIfNotPresent: 
+- gitHost: github.com
+- gitRepoId: GIT_REPO_ID
+- gitUserId: GIT_USER_ID
+- hideGenerationTimestamp: true
+- interfacePrefix: I
+- library: generichost
+- licenseId: 
+- modelPropertyNaming: 
+- netCoreProjectFile: false
+- nonPublicApi: false
+- nullableReferenceTypes: true
+- optionalAssemblyInfo: 
+- optionalEmitDefaultValues: false
+- optionalMethodArgument: true
+- optionalProjectFile: 
+- packageAuthors: OpenAPI
+- packageCompany: OpenAPI
+- packageCopyright: No Copyright
+- packageDescription: A library generated from a OpenAPI doc
+- packageGuid: {2E60EF87-DB0B-4D01-A36E-F5E90F7EC757}
+- packageName: Org.OpenAPITools
+- packageTags: 
+- packageTitle: OpenAPI Library
+- packageVersion: 1.0.0
+- releaseNote: Minor update
+- returnICollection: false
+- sortParamsByRequiredFlag: 
+- sourceFolder: src
+- targetFramework: net8.0
+- useCollection: false
+- useDateTimeOffset: false
+- useOneOfDiscriminatorLookup: false
+- validatable: true
+
+This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project.
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/FILES
index 47b2b9b5c4f..b9ab612bd8b 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/FILES
@@ -20,6 +20,8 @@ src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs
 src/Org.OpenAPITools/Client/ApiResponse`1.cs
 src/Org.OpenAPITools/Client/ClientUtils.cs
 src/Org.OpenAPITools/Client/CookieContainer.cs
+src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
+src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
 src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
 src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
 src/Org.OpenAPITools/Client/ExceptionEventArgs.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
new file mode 100644
index 00000000000..f7fe9362993
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
@@ -0,0 +1,61 @@
+/*
+ * Example
+ *
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    public class DateOnlyJsonConverter : JsonConverter<DateOnly>
+    {
+        /// <summary>
+        /// The formats used to deserialize the date
+        /// </summary>
+        public static string[] Formats { get; } = {
+            "yyyy'-'MM'-'dd",
+            "yyyyMMdd"
+
+        };
+
+        /// <summary>
+        /// Returns a DateOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override DateOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+            if (reader.TokenType == JsonTokenType.Null)
+                throw new NotSupportedException();
+
+            string value = reader.GetString()!;
+
+            foreach(string format in Formats)
+                if (DateOnly.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateOnly result))
+                    return result;
+
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Writes the DateOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="dateOnlyValue"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, DateOnly dateOnlyValue, JsonSerializerOptions options) =>
+            writer.WriteStringValue(dateOnlyValue.ToString("yyyy'-'MM'-'dd", CultureInfo.InvariantCulture));
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
new file mode 100644
index 00000000000..a5cb490f3ef
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
@@ -0,0 +1,66 @@
+/*
+ * Example
+ *
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    public class DateOnlyNullableJsonConverter : JsonConverter<DateOnly?>
+    {
+        /// <summary>
+        /// The formats used to deserialize the date
+        /// </summary>
+        public static string[] Formats { get; } = {
+            "yyyy'-'MM'-'dd",
+            "yyyyMMdd"
+
+        };
+
+        /// <summary>
+        /// Returns a DateOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override DateOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+            if (reader.TokenType == JsonTokenType.Null)
+                return null;
+
+            string value = reader.GetString()!;
+
+            foreach(string format in Formats)
+                if (DateOnly.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateOnly result))
+                    return result;
+
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Writes the DateOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="dateOnlyValue"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, DateOnly? dateOnlyValue, JsonSerializerOptions options)
+        {
+            if (dateOnlyValue == null)
+                writer.WriteNullValue();
+            else
+                writer.WriteStringValue(dateOnlyValue.Value.ToString("yyyy'-'MM'-'dd", CultureInfo.InvariantCulture));
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
index 245aaa03ef2..79fb8600e4b 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
@@ -15,7 +15,7 @@ using System.Text.Json.Serialization;
 namespace Org.OpenAPITools.Client
 {
     /// <summary>
-    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// Formatter for 'date-time' openapi formats ss defined by full-date - RFC3339
     /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
     /// </summary>
     public class DateTimeJsonConverter : JsonConverter<DateTime>
@@ -32,7 +32,6 @@ namespace Org.OpenAPITools.Client
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ssK",
-            "yyyy'-'MM'-'dd",
             "yyyyMMddTHHmmss.fffffffK",
             "yyyyMMddTHHmmss.ffffffK",
             "yyyyMMddTHHmmss.fffffK",
@@ -41,7 +40,7 @@ namespace Org.OpenAPITools.Client
             "yyyyMMddTHHmmss.ffK",
             "yyyyMMddTHHmmss.fK",
             "yyyyMMddTHHmmssK",
-            "yyyyMMdd"
+
         };
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
index 8f3c26a5869..26d8b0757ba 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
@@ -15,7 +15,7 @@ using System.Text.Json.Serialization;
 namespace Org.OpenAPITools.Client
 {
     /// <summary>
-    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// Formatter for 'date-time' openapi formats ss defined by full-date - RFC3339
     /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
     /// </summary>
     public class DateTimeNullableJsonConverter : JsonConverter<DateTime?>
@@ -32,7 +32,6 @@ namespace Org.OpenAPITools.Client
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ssK",
-            "yyyy'-'MM'-'dd",
             "yyyyMMddTHHmmss.fffffffK",
             "yyyyMMddTHHmmss.ffffffK",
             "yyyyMMddTHHmmss.fffffK",
@@ -41,7 +40,7 @@ namespace Org.OpenAPITools.Client
             "yyyyMMddTHHmmss.ffK",
             "yyyyMMddTHHmmss.fK",
             "yyyyMMddTHHmmssK",
-            "yyyyMMdd"
+
          };
 
         /// <summary>
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 a059b5a4de4..89dc36db666 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
@@ -41,6 +41,8 @@ namespace Org.OpenAPITools.Client
             _jsonOptions.Converters.Add(new JsonStringEnumConverter());
             _jsonOptions.Converters.Add(new DateTimeJsonConverter());
             _jsonOptions.Converters.Add(new DateTimeNullableJsonConverter());
+            _jsonOptions.Converters.Add(new DateOnlyJsonConverter());
+            _jsonOptions.Converters.Add(new DateOnlyNullableJsonConverter());
             _jsonOptions.Converters.Add(new AdultJsonConverter());
             _jsonOptions.Converters.Add(new ChildJsonConverter());
             _jsonOptions.Converters.Add(new PersonJsonConverter());
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/FILES
index 59cc1ea25a0..dc42a5d4709 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/FILES
@@ -20,6 +20,8 @@ src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs
 src/Org.OpenAPITools/Client/ApiResponse`1.cs
 src/Org.OpenAPITools/Client/ClientUtils.cs
 src/Org.OpenAPITools/Client/CookieContainer.cs
+src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
+src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
 src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
 src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
 src/Org.OpenAPITools/Client/ExceptionEventArgs.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
new file mode 100644
index 00000000000..5009ae5304f
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
@@ -0,0 +1,61 @@
+/*
+ * fruity
+ *
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 0.0.1
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    public class DateOnlyJsonConverter : JsonConverter<DateOnly>
+    {
+        /// <summary>
+        /// The formats used to deserialize the date
+        /// </summary>
+        public static string[] Formats { get; } = {
+            "yyyy'-'MM'-'dd",
+            "yyyyMMdd"
+
+        };
+
+        /// <summary>
+        /// Returns a DateOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override DateOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+            if (reader.TokenType == JsonTokenType.Null)
+                throw new NotSupportedException();
+
+            string value = reader.GetString()!;
+
+            foreach(string format in Formats)
+                if (DateOnly.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateOnly result))
+                    return result;
+
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Writes the DateOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="dateOnlyValue"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, DateOnly dateOnlyValue, JsonSerializerOptions options) =>
+            writer.WriteStringValue(dateOnlyValue.ToString("yyyy'-'MM'-'dd", CultureInfo.InvariantCulture));
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
new file mode 100644
index 00000000000..02dda463ab2
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
@@ -0,0 +1,66 @@
+/*
+ * fruity
+ *
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 0.0.1
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    public class DateOnlyNullableJsonConverter : JsonConverter<DateOnly?>
+    {
+        /// <summary>
+        /// The formats used to deserialize the date
+        /// </summary>
+        public static string[] Formats { get; } = {
+            "yyyy'-'MM'-'dd",
+            "yyyyMMdd"
+
+        };
+
+        /// <summary>
+        /// Returns a DateOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override DateOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+            if (reader.TokenType == JsonTokenType.Null)
+                return null;
+
+            string value = reader.GetString()!;
+
+            foreach(string format in Formats)
+                if (DateOnly.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateOnly result))
+                    return result;
+
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Writes the DateOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="dateOnlyValue"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, DateOnly? dateOnlyValue, JsonSerializerOptions options)
+        {
+            if (dateOnlyValue == null)
+                writer.WriteNullValue();
+            else
+                writer.WriteStringValue(dateOnlyValue.Value.ToString("yyyy'-'MM'-'dd", CultureInfo.InvariantCulture));
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
index c53e443828d..4be8e3a725e 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
@@ -15,7 +15,7 @@ using System.Text.Json.Serialization;
 namespace Org.OpenAPITools.Client
 {
     /// <summary>
-    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// Formatter for 'date-time' openapi formats ss defined by full-date - RFC3339
     /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
     /// </summary>
     public class DateTimeJsonConverter : JsonConverter<DateTime>
@@ -32,7 +32,6 @@ namespace Org.OpenAPITools.Client
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ssK",
-            "yyyy'-'MM'-'dd",
             "yyyyMMddTHHmmss.fffffffK",
             "yyyyMMddTHHmmss.ffffffK",
             "yyyyMMddTHHmmss.fffffK",
@@ -41,7 +40,7 @@ namespace Org.OpenAPITools.Client
             "yyyyMMddTHHmmss.ffK",
             "yyyyMMddTHHmmss.fK",
             "yyyyMMddTHHmmssK",
-            "yyyyMMdd"
+
         };
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
index fd867d948f1..06d46536f03 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
@@ -15,7 +15,7 @@ using System.Text.Json.Serialization;
 namespace Org.OpenAPITools.Client
 {
     /// <summary>
-    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// Formatter for 'date-time' openapi formats ss defined by full-date - RFC3339
     /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
     /// </summary>
     public class DateTimeNullableJsonConverter : JsonConverter<DateTime?>
@@ -32,7 +32,6 @@ namespace Org.OpenAPITools.Client
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ssK",
-            "yyyy'-'MM'-'dd",
             "yyyyMMddTHHmmss.fffffffK",
             "yyyyMMddTHHmmss.ffffffK",
             "yyyyMMddTHHmmss.fffffK",
@@ -41,7 +40,7 @@ namespace Org.OpenAPITools.Client
             "yyyyMMddTHHmmss.ffK",
             "yyyyMMddTHHmmss.fK",
             "yyyyMMddTHHmmssK",
-            "yyyyMMdd"
+
          };
 
         /// <summary>
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 3dfc3e38131..0cffc319590 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
@@ -41,6 +41,8 @@ namespace Org.OpenAPITools.Client
             _jsonOptions.Converters.Add(new JsonStringEnumConverter());
             _jsonOptions.Converters.Add(new DateTimeJsonConverter());
             _jsonOptions.Converters.Add(new DateTimeNullableJsonConverter());
+            _jsonOptions.Converters.Add(new DateOnlyJsonConverter());
+            _jsonOptions.Converters.Add(new DateOnlyNullableJsonConverter());
             _jsonOptions.Converters.Add(new AppleJsonConverter());
             _jsonOptions.Converters.Add(new BananaJsonConverter());
             _jsonOptions.Converters.Add(new FruitJsonConverter());
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/FILES
index 59cc1ea25a0..dc42a5d4709 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/FILES
@@ -20,6 +20,8 @@ src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs
 src/Org.OpenAPITools/Client/ApiResponse`1.cs
 src/Org.OpenAPITools/Client/ClientUtils.cs
 src/Org.OpenAPITools/Client/CookieContainer.cs
+src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
+src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
 src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
 src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
 src/Org.OpenAPITools/Client/ExceptionEventArgs.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
new file mode 100644
index 00000000000..5009ae5304f
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
@@ -0,0 +1,61 @@
+/*
+ * fruity
+ *
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 0.0.1
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    public class DateOnlyJsonConverter : JsonConverter<DateOnly>
+    {
+        /// <summary>
+        /// The formats used to deserialize the date
+        /// </summary>
+        public static string[] Formats { get; } = {
+            "yyyy'-'MM'-'dd",
+            "yyyyMMdd"
+
+        };
+
+        /// <summary>
+        /// Returns a DateOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override DateOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+            if (reader.TokenType == JsonTokenType.Null)
+                throw new NotSupportedException();
+
+            string value = reader.GetString()!;
+
+            foreach(string format in Formats)
+                if (DateOnly.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateOnly result))
+                    return result;
+
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Writes the DateOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="dateOnlyValue"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, DateOnly dateOnlyValue, JsonSerializerOptions options) =>
+            writer.WriteStringValue(dateOnlyValue.ToString("yyyy'-'MM'-'dd", CultureInfo.InvariantCulture));
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
new file mode 100644
index 00000000000..02dda463ab2
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
@@ -0,0 +1,66 @@
+/*
+ * fruity
+ *
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 0.0.1
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    public class DateOnlyNullableJsonConverter : JsonConverter<DateOnly?>
+    {
+        /// <summary>
+        /// The formats used to deserialize the date
+        /// </summary>
+        public static string[] Formats { get; } = {
+            "yyyy'-'MM'-'dd",
+            "yyyyMMdd"
+
+        };
+
+        /// <summary>
+        /// Returns a DateOnly from the Json object
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public override DateOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+            if (reader.TokenType == JsonTokenType.Null)
+                return null;
+
+            string value = reader.GetString()!;
+
+            foreach(string format in Formats)
+                if (DateOnly.TryParseExact(value, format, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal, out DateOnly result))
+                    return result;
+
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Writes the DateOnly to the json writer
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="dateOnlyValue"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, DateOnly? dateOnlyValue, JsonSerializerOptions options)
+        {
+            if (dateOnlyValue == null)
+                writer.WriteNullValue();
+            else
+                writer.WriteStringValue(dateOnlyValue.Value.ToString("yyyy'-'MM'-'dd", CultureInfo.InvariantCulture));
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
index c53e443828d..4be8e3a725e 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
@@ -15,7 +15,7 @@ using System.Text.Json.Serialization;
 namespace Org.OpenAPITools.Client
 {
     /// <summary>
-    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// Formatter for 'date-time' openapi formats ss defined by full-date - RFC3339
     /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
     /// </summary>
     public class DateTimeJsonConverter : JsonConverter<DateTime>
@@ -32,7 +32,6 @@ namespace Org.OpenAPITools.Client
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ssK",
-            "yyyy'-'MM'-'dd",
             "yyyyMMddTHHmmss.fffffffK",
             "yyyyMMddTHHmmss.ffffffK",
             "yyyyMMddTHHmmss.fffffK",
@@ -41,7 +40,7 @@ namespace Org.OpenAPITools.Client
             "yyyyMMddTHHmmss.ffK",
             "yyyyMMddTHHmmss.fK",
             "yyyyMMddTHHmmssK",
-            "yyyyMMdd"
+
         };
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
index fd867d948f1..06d46536f03 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
@@ -15,7 +15,7 @@ using System.Text.Json.Serialization;
 namespace Org.OpenAPITools.Client
 {
     /// <summary>
-    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// Formatter for 'date-time' openapi formats ss defined by full-date - RFC3339
     /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
     /// </summary>
     public class DateTimeNullableJsonConverter : JsonConverter<DateTime?>
@@ -32,7 +32,6 @@ namespace Org.OpenAPITools.Client
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fK",
             "yyyy'-'MM'-'dd'T'HH':'mm':'ssK",
-            "yyyy'-'MM'-'dd",
             "yyyyMMddTHHmmss.fffffffK",
             "yyyyMMddTHHmmss.ffffffK",
             "yyyyMMddTHHmmss.fffffK",
@@ -41,7 +40,7 @@ namespace Org.OpenAPITools.Client
             "yyyyMMddTHHmmss.ffK",
             "yyyyMMddTHHmmss.fK",
             "yyyyMMddTHHmmssK",
-            "yyyyMMdd"
+
          };
 
         /// <summary>
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 3dfc3e38131..0cffc319590 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
@@ -41,6 +41,8 @@ namespace Org.OpenAPITools.Client
             _jsonOptions.Converters.Add(new JsonStringEnumConverter());
             _jsonOptions.Converters.Add(new DateTimeJsonConverter());
             _jsonOptions.Converters.Add(new DateTimeNullableJsonConverter());
+            _jsonOptions.Converters.Add(new DateOnlyJsonConverter());
+            _jsonOptions.Converters.Add(new DateOnlyNullableJsonConverter());
             _jsonOptions.Converters.Add(new AppleJsonConverter());
             _jsonOptions.Converters.Add(new BananaJsonConverter());
             _jsonOptions.Converters.Add(new FruitJsonConverter());
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
index e8291cb2e1e..973f9e9d4e8 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
@@ -15,7 +15,7 @@ using System.Text.Json.Serialization;
 namespace Org.OpenAPITools.Client
 {
     /// <summary>
-    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// Formatter for 'date' and 'date-time' openapi formats ss defined by full-date - RFC3339
     /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
     /// </summary>
     public class DateTimeJsonConverter : JsonConverter<DateTime>
@@ -42,6 +42,7 @@ namespace Org.OpenAPITools.Client
             "yyyyMMddTHHmmss.fK",
             "yyyyMMddTHHmmssK",
             "yyyyMMdd"
+
         };
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
index e26c40071cd..b491c61f07f 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
@@ -15,7 +15,7 @@ using System.Text.Json.Serialization;
 namespace Org.OpenAPITools.Client
 {
     /// <summary>
-    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// Formatter for 'date' and 'date-time' openapi formats ss defined by full-date - RFC3339
     /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
     /// </summary>
     public class DateTimeNullableJsonConverter : JsonConverter<DateTime?>
@@ -42,6 +42,7 @@ namespace Org.OpenAPITools.Client
             "yyyyMMddTHHmmss.fK",
             "yyyyMMddTHHmmssK",
             "yyyyMMdd"
+
          };
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DateOnlyClass.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DateOnlyClass.md
index d0912d2ac41..8291b9cb6d7 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DateOnlyClass.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DateOnlyClass.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**DateOnlyProperty** | **DateTime** |  | [optional] 
+**DateOnlyProperty** | **DateOnly** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FakeApi.md
index 46dc77ec1a1..b939df0baf1 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FakeApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FakeApi.md
@@ -896,7 +896,7 @@ No authorization required
 
 <a id="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = null, int? int32 = null, long? int64 = null, float? varFloat = null, string? varString = null, System.IO.Stream? binary = null, DateTime? date = null, DateTime? dateTime = null, string? password = null, string? callback = null)
+> void TestEndpointParameters (decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = null, int? int32 = null, long? int64 = null, float? varFloat = null, string? varString = null, System.IO.Stream? binary = null, DateOnly? date = null, DateTime? dateTime = null, string? password = null, string? callback = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -933,7 +933,7 @@ namespace Example
             var varFloat = 3.4F;  // float? | None (optional) 
             var varString = "varString_example";  // string? | None (optional) 
             var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream? | None (optional) 
-            var date = DateTime.Parse("2013-10-20");  // DateTime? | None (optional) 
+            var date = DateOnly.Parse("2013-10-20");  // DateOnly? | None (optional) 
             var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime? | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
             var password = "password_example";  // string? | None (optional) 
             var callback = "callback_example";  // string? | None (optional) 
@@ -985,7 +985,7 @@ catch (ApiException e)
 | **varFloat** | **float?** | None | [optional]  |
 | **varString** | **string?** | None | [optional]  |
 | **binary** | **System.IO.Stream?****System.IO.Stream?** | None | [optional]  |
-| **date** | **DateTime?** | None | [optional]  |
+| **date** | **DateOnly?** | None | [optional]  |
 | **dateTime** | **DateTime?** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 | **password** | **string?** | None | [optional]  |
 | **callback** | **string?** | None | [optional]  |
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FormatTest.md
index 2d28c89fa30..1d09c0f37e4 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FormatTest.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FormatTest.md
@@ -16,7 +16,7 @@ Name | Type | Description | Notes
 **VarString** | **string** |  | [optional] 
 **VarByte** | **byte[]** |  | 
 **Binary** | **System.IO.Stream** |  | [optional] 
-**Date** | **DateTime** |  | 
+**Date** | **DateOnly** |  | 
 **DateTime** | **DateTime** |  | [optional] 
 **Uuid** | **Guid** |  | [optional] 
 **Password** | **string** |  | 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NullableClass.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NullableClass.md
index 7bab4fa20ee..67c1052fca9 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NullableClass.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NullableClass.md
@@ -8,7 +8,7 @@ Name | Type | Description | Notes
 **NumberProp** | **decimal?** |  | [optional] 
 **BooleanProp** | **bool?** |  | [optional] 
 **StringProp** | **string** |  | [optional] 
-**DateProp** | **DateTime?** |  | [optional] 
+**DateProp** | **DateOnly** |  | [optional] 
 **DatetimeProp** | **DateTime?** |  | [optional] 
 **ArrayNullableProp** | **List&lt;Object&gt;** |  | [optional] 
 **ArrayAndItemsNullableProp** | **List&lt;Object&gt;** |  | [optional] 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/RequiredClass.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/RequiredClass.md
index 07b6f018f6c..685c1c51e03 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/RequiredClass.md
+++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/RequiredClass.md
@@ -16,10 +16,10 @@ Name | Type | Description | Notes
 **RequiredNotnullableBooleanProp** | **bool** |  | 
 **NotrequiredNullableBooleanProp** | **bool?** |  | [optional] 
 **NotrequiredNotnullableBooleanProp** | **bool** |  | [optional] 
-**RequiredNullableDateProp** | **DateTime?** |  | 
-**RequiredNotNullableDateProp** | **DateTime** |  | 
-**NotRequiredNullableDateProp** | **DateTime?** |  | [optional] 
-**NotRequiredNotnullableDateProp** | **DateTime** |  | [optional] 
+**RequiredNullableDateProp** | **DateOnly** |  | 
+**RequiredNotNullableDateProp** | **DateOnly** |  | 
+**NotRequiredNullableDateProp** | **DateOnly** |  | [optional] 
+**NotRequiredNotnullableDateProp** | **DateOnly** |  | [optional] 
 **RequiredNotnullableDatetimeProp** | **DateTime** |  | 
 **RequiredNullableDatetimeProp** | **DateTime?** |  | 
 **NotrequiredNullableDatetimeProp** | **DateTime?** |  | [optional] 
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeApi.cs
index 50aba343ce4..785e887d37f 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -268,7 +268,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="callback">None (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns></returns>
-        void TestEndpointParameters(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0);
+        void TestEndpointParameters(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateOnly? date = default(DateOnly?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -293,7 +293,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="callback">None (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> TestEndpointParametersWithHttpInfo(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0);
+        ApiResponse<Object> TestEndpointParametersWithHttpInfo(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateOnly? date = default(DateOnly?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0);
         /// <summary>
         /// To test enum parameters
         /// </summary>
@@ -748,7 +748,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateOnly? date = default(DateOnly?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -774,7 +774,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> TestEndpointParametersWithHttpInfoAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ApiResponse<Object>> TestEndpointParametersWithHttpInfoAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateOnly? date = default(DateOnly?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
         /// <summary>
         /// To test enum parameters
         /// </summary>
@@ -2491,7 +2491,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="callback">None (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns></returns>
-        public void TestEndpointParameters(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0)
+        public void TestEndpointParameters(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateOnly? date = default(DateOnly?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0)
         {
             TestEndpointParametersWithHttpInfo(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
         }
@@ -2516,7 +2516,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="callback">None (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        public Org.OpenAPITools.Client.ApiResponse<Object> TestEndpointParametersWithHttpInfo(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0)
+        public Org.OpenAPITools.Client.ApiResponse<Object> TestEndpointParametersWithHttpInfo(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateOnly? date = default(DateOnly?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0)
         {
             // verify the required parameter 'patternWithoutDelimiter' is set
             if (patternWithoutDelimiter == null)
@@ -2642,7 +2642,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateOnly? date = default(DateOnly?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
             await TestEndpointParametersWithHttpInfoAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback, operationIndex, cancellationToken).ConfigureAwait(false);
         }
@@ -2668,7 +2668,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<Org.OpenAPITools.Client.ApiResponse<Object>> TestEndpointParametersWithHttpInfoAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Org.OpenAPITools.Client.ApiResponse<Object>> TestEndpointParametersWithHttpInfoAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateOnly? date = default(DateOnly?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
             // verify the required parameter 'patternWithoutDelimiter' is set
             if (patternWithoutDelimiter == null)
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs
index d618b5ba110..6fcef7bd704 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs
@@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model
         /// Initializes a new instance of the <see cref="DateOnlyClass" /> class.
         /// </summary>
         /// <param name="dateOnlyProperty">dateOnlyProperty.</param>
-        public DateOnlyClass(DateTime dateOnlyProperty = default(DateTime))
+        public DateOnlyClass(DateOnly dateOnlyProperty = default(DateOnly))
         {
             this.DateOnlyProperty = dateOnlyProperty;
             this.AdditionalProperties = new Dictionary<string, object>();
@@ -48,7 +48,7 @@ namespace Org.OpenAPITools.Model
         /// <example>Fri Jul 21 00:00:00 UTC 2017</example>
         [DataMember(Name = "dateOnlyProperty", EmitDefaultValue = false)]
         [JsonConverter(typeof(OpenAPIDateConverter))]
-        public DateTime DateOnlyProperty { get; set; }
+        public DateOnly DateOnlyProperty { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs
index 8a1f7d62fa2..e797509b92d 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs
@@ -62,7 +62,7 @@ namespace Org.OpenAPITools.Model
         /// <param name="patternWithDigits">A string that is a 10 digit number. Can have leading zeros..</param>
         /// <param name="patternWithDigitsAndDelimiter">A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01..</param>
         /// <param name="patternWithBackslash">None.</param>
-        public FormatTest(int integer = default(int), int int32 = default(int), uint unsignedInteger = default(uint), long int64 = default(long), ulong unsignedLong = default(ulong), decimal number = default(decimal), float varFloat = default(float), double varDouble = default(double), decimal varDecimal = default(decimal), string varString = default(string), byte[] varByte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string), string patternWithBackslash = default(string))
+        public FormatTest(int integer = default(int), int int32 = default(int), uint unsignedInteger = default(uint), long int64 = default(long), ulong unsignedLong = default(ulong), decimal number = default(decimal), float varFloat = default(float), double varDouble = default(double), decimal varDecimal = default(decimal), string varString = default(string), byte[] varByte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateOnly date = default(DateOnly), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string), string patternWithBackslash = default(string))
         {
             this.Number = number;
             // to ensure "varByte" is required (not null)
@@ -71,6 +71,11 @@ namespace Org.OpenAPITools.Model
                 throw new ArgumentNullException("varByte is a required property for FormatTest and cannot be null");
             }
             this.VarByte = varByte;
+            // to ensure "date" is required (not null)
+            if (date == null)
+            {
+                throw new ArgumentNullException("date is a required property for FormatTest and cannot be null");
+            }
             this.Date = date;
             // to ensure "password" is required (not null)
             if (password == null)
@@ -174,7 +179,7 @@ namespace Org.OpenAPITools.Model
         /// <example>Sun Feb 02 00:00:00 UTC 2020</example>
         [DataMember(Name = "date", IsRequired = true, EmitDefaultValue = true)]
         [JsonConverter(typeof(OpenAPIDateConverter))]
-        public DateTime Date { get; set; }
+        public DateOnly Date { get; set; }
 
         /// <summary>
         /// Gets or Sets DateTime
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableClass.cs
index 5c7b13e9b78..43fe8c92103 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableClass.cs
@@ -47,7 +47,7 @@ namespace Org.OpenAPITools.Model
         /// <param name="objectNullableProp">objectNullableProp.</param>
         /// <param name="objectAndItemsNullableProp">objectAndItemsNullableProp.</param>
         /// <param name="objectItemsNullable">objectItemsNullable.</param>
-        public NullableClass(int? integerProp = default(int?), decimal? numberProp = default(decimal?), bool? booleanProp = default(bool?), string stringProp = default(string), DateTime? dateProp = default(DateTime?), DateTime? datetimeProp = default(DateTime?), List<Object> arrayNullableProp = default(List<Object>), List<Object> arrayAndItemsNullableProp = default(List<Object>), List<Object> arrayItemsNullable = default(List<Object>), Dictionary<string, Object> objectNullableProp = default(Dictionary<string, Object>), Dictionary<string, Object> objectAndItemsNullableProp = default(Dictionary<string, Object>), Dictionary<string, Object> objectItemsNullable = default(Dictionary<string, Object>))
+        public NullableClass(int? integerProp = default(int?), decimal? numberProp = default(decimal?), bool? booleanProp = default(bool?), string stringProp = default(string), DateOnly dateProp = default(DateOnly), DateTime? datetimeProp = default(DateTime?), List<Object> arrayNullableProp = default(List<Object>), List<Object> arrayAndItemsNullableProp = default(List<Object>), List<Object> arrayItemsNullable = default(List<Object>), Dictionary<string, Object> objectNullableProp = default(Dictionary<string, Object>), Dictionary<string, Object> objectAndItemsNullableProp = default(Dictionary<string, Object>), Dictionary<string, Object> objectItemsNullable = default(Dictionary<string, Object>))
         {
             this.IntegerProp = integerProp;
             this.NumberProp = numberProp;
@@ -93,7 +93,7 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         [DataMember(Name = "date_prop", EmitDefaultValue = true)]
         [JsonConverter(typeof(OpenAPIDateConverter))]
-        public DateTime? DateProp { get; set; }
+        public DateOnly DateProp { get; set; }
 
         /// <summary>
         /// Gets or Sets DatetimeProp
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/RequiredClass.cs
index 90e0c44b40b..a1c904a838f 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/RequiredClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/RequiredClass.cs
@@ -533,7 +533,7 @@ namespace Org.OpenAPITools.Model
         /// <param name="requiredNotnullableArrayOfString">requiredNotnullableArrayOfString (required).</param>
         /// <param name="notrequiredNullableArrayOfString">notrequiredNullableArrayOfString.</param>
         /// <param name="notrequiredNotnullableArrayOfString">notrequiredNotnullableArrayOfString.</param>
-        public RequiredClass(int? requiredNullableIntegerProp = default(int?), int requiredNotnullableintegerProp = default(int), int? notRequiredNullableIntegerProp = default(int?), int notRequiredNotnullableintegerProp = default(int), string requiredNullableStringProp = default(string), string requiredNotnullableStringProp = default(string), string notrequiredNullableStringProp = default(string), string notrequiredNotnullableStringProp = default(string), bool? requiredNullableBooleanProp = default(bool?), bool requiredNotnullableBooleanProp = default(bool), bool? notrequiredNullableBooleanProp = default(bool?), bool notrequiredNotnullableBooleanProp = default(bool), DateTime? requiredNullableDateProp = default(DateTime?), DateTime requiredNotNullableDateProp = default(DateTime), DateTime? notRequiredNullableDateProp = default(DateTime?), DateTime notRequiredNotnullableDateProp = default(DateTime), DateTime requiredNotnullableDatetimeProp = default(DateTime), DateTime? requiredNullableDatetimeProp = default(DateTime?), DateTime? notrequiredNullableDatetimeProp = default(DateTime?), DateTime notrequiredNotnullableDatetimeProp = default(DateTime), RequiredNullableEnumIntegerEnum requiredNullableEnumInteger = default(RequiredNullableEnumIntegerEnum), RequiredNotnullableEnumIntegerEnum requiredNotnullableEnumInteger = default(RequiredNotnullableEnumIntegerEnum), NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumInteger = default(NotrequiredNullableEnumIntegerEnum?), NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumInteger = default(NotrequiredNotnullableEnumIntegerEnum?), RequiredNullableEnumIntegerOnlyEnum requiredNullableEnumIntegerOnly = default(RequiredNullableEnumIntegerOnlyEnum), RequiredNotnullableEnumIntegerOnlyEnum requiredNotnullableEnumIntegerOnly = default(RequiredNotnullableEnumIntegerOnlyEnum), NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnly = default(NotrequiredNullableEnumIntegerOnlyEnum?), NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnly = default(NotrequiredNotnullableEnumIntegerOnlyEnum?), RequiredNotnullableEnumStringEnum requiredNotnullableEnumString = default(RequiredNotnullableEnumStringEnum), RequiredNullableEnumStringEnum requiredNullableEnumString = default(RequiredNullableEnumStringEnum), NotrequiredNullableEnumStringEnum? notrequiredNullableEnumString = default(NotrequiredNullableEnumStringEnum?), NotrequiredNotnullableEnumStringEnum? notrequiredNotnullableEnumString = default(NotrequiredNotnullableEnumStringEnum?), OuterEnumDefaultValue requiredNullableOuterEnumDefaultValue = default(OuterEnumDefaultValue), OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue = default(OuterEnumDefaultValue), OuterEnumDefaultValue? notrequiredNullableOuterEnumDefaultValue = default(OuterEnumDefaultValue?), OuterEnumDefaultValue? notrequiredNotnullableOuterEnumDefaultValue = default(OuterEnumDefaultValue?), Guid? requiredNullableUuid = default(Guid?), Guid requiredNotnullableUuid = default(Guid), Guid? notrequiredNullableUuid = default(Guid?), Guid notrequiredNotnullableUuid = default(Guid), List<string> requiredNullableArrayOfString = default(List<string>), List<string> requiredNotnullableArrayOfString = default(List<string>), List<string> notrequiredNullableArrayOfString = default(List<string>), List<string> notrequiredNotnullableArrayOfString = default(List<string>))
+        public RequiredClass(int? requiredNullableIntegerProp = default(int?), int requiredNotnullableintegerProp = default(int), int? notRequiredNullableIntegerProp = default(int?), int notRequiredNotnullableintegerProp = default(int), string requiredNullableStringProp = default(string), string requiredNotnullableStringProp = default(string), string notrequiredNullableStringProp = default(string), string notrequiredNotnullableStringProp = default(string), bool? requiredNullableBooleanProp = default(bool?), bool requiredNotnullableBooleanProp = default(bool), bool? notrequiredNullableBooleanProp = default(bool?), bool notrequiredNotnullableBooleanProp = default(bool), DateOnly requiredNullableDateProp = default(DateOnly), DateOnly requiredNotNullableDateProp = default(DateOnly), DateOnly notRequiredNullableDateProp = default(DateOnly), DateOnly notRequiredNotnullableDateProp = default(DateOnly), DateTime requiredNotnullableDatetimeProp = default(DateTime), DateTime? requiredNullableDatetimeProp = default(DateTime?), DateTime? notrequiredNullableDatetimeProp = default(DateTime?), DateTime notrequiredNotnullableDatetimeProp = default(DateTime), RequiredNullableEnumIntegerEnum requiredNullableEnumInteger = default(RequiredNullableEnumIntegerEnum), RequiredNotnullableEnumIntegerEnum requiredNotnullableEnumInteger = default(RequiredNotnullableEnumIntegerEnum), NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumInteger = default(NotrequiredNullableEnumIntegerEnum?), NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumInteger = default(NotrequiredNotnullableEnumIntegerEnum?), RequiredNullableEnumIntegerOnlyEnum requiredNullableEnumIntegerOnly = default(RequiredNullableEnumIntegerOnlyEnum), RequiredNotnullableEnumIntegerOnlyEnum requiredNotnullableEnumIntegerOnly = default(RequiredNotnullableEnumIntegerOnlyEnum), NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnly = default(NotrequiredNullableEnumIntegerOnlyEnum?), NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnly = default(NotrequiredNotnullableEnumIntegerOnlyEnum?), RequiredNotnullableEnumStringEnum requiredNotnullableEnumString = default(RequiredNotnullableEnumStringEnum), RequiredNullableEnumStringEnum requiredNullableEnumString = default(RequiredNullableEnumStringEnum), NotrequiredNullableEnumStringEnum? notrequiredNullableEnumString = default(NotrequiredNullableEnumStringEnum?), NotrequiredNotnullableEnumStringEnum? notrequiredNotnullableEnumString = default(NotrequiredNotnullableEnumStringEnum?), OuterEnumDefaultValue requiredNullableOuterEnumDefaultValue = default(OuterEnumDefaultValue), OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue = default(OuterEnumDefaultValue), OuterEnumDefaultValue? notrequiredNullableOuterEnumDefaultValue = default(OuterEnumDefaultValue?), OuterEnumDefaultValue? notrequiredNotnullableOuterEnumDefaultValue = default(OuterEnumDefaultValue?), Guid? requiredNullableUuid = default(Guid?), Guid requiredNotnullableUuid = default(Guid), Guid? notrequiredNullableUuid = default(Guid?), Guid notrequiredNotnullableUuid = default(Guid), List<string> requiredNullableArrayOfString = default(List<string>), List<string> requiredNotnullableArrayOfString = default(List<string>), List<string> notrequiredNullableArrayOfString = default(List<string>), List<string> notrequiredNotnullableArrayOfString = default(List<string>))
         {
             // to ensure "requiredNullableIntegerProp" is required (not null)
             if (requiredNullableIntegerProp == null)
@@ -567,6 +567,11 @@ namespace Org.OpenAPITools.Model
                 throw new ArgumentNullException("requiredNullableDateProp is a required property for RequiredClass and cannot be null");
             }
             this.RequiredNullableDateProp = requiredNullableDateProp;
+            // to ensure "requiredNotNullableDateProp" is required (not null)
+            if (requiredNotNullableDateProp == null)
+            {
+                throw new ArgumentNullException("requiredNotNullableDateProp is a required property for RequiredClass and cannot be null");
+            }
             this.RequiredNotNullableDateProp = requiredNotNullableDateProp;
             this.RequiredNotnullableDatetimeProp = requiredNotnullableDatetimeProp;
             // to ensure "requiredNullableDatetimeProp" is required (not null)
@@ -704,28 +709,28 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         [DataMember(Name = "required_nullable_date_prop", IsRequired = true, EmitDefaultValue = true)]
         [JsonConverter(typeof(OpenAPIDateConverter))]
-        public DateTime? RequiredNullableDateProp { get; set; }
+        public DateOnly RequiredNullableDateProp { get; set; }
 
         /// <summary>
         /// Gets or Sets RequiredNotNullableDateProp
         /// </summary>
         [DataMember(Name = "required_not_nullable_date_prop", IsRequired = true, EmitDefaultValue = true)]
         [JsonConverter(typeof(OpenAPIDateConverter))]
-        public DateTime RequiredNotNullableDateProp { get; set; }
+        public DateOnly RequiredNotNullableDateProp { get; set; }
 
         /// <summary>
         /// Gets or Sets NotRequiredNullableDateProp
         /// </summary>
         [DataMember(Name = "not_required_nullable_date_prop", EmitDefaultValue = true)]
         [JsonConverter(typeof(OpenAPIDateConverter))]
-        public DateTime? NotRequiredNullableDateProp { get; set; }
+        public DateOnly NotRequiredNullableDateProp { get; set; }
 
         /// <summary>
         /// Gets or Sets NotRequiredNotnullableDateProp
         /// </summary>
         [DataMember(Name = "not_required_notnullable_date_prop", EmitDefaultValue = false)]
         [JsonConverter(typeof(OpenAPIDateConverter))]
-        public DateTime NotRequiredNotnullableDateProp { get; set; }
+        public DateOnly NotRequiredNotnullableDateProp { get; set; }
 
         /// <summary>
         /// Gets or Sets RequiredNotnullableDatetimeProp
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.gitignore b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.gitignore
new file mode 100644
index 00000000000..1ee53850b84
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.gitignore
@@ -0,0 +1,362 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator-ignore b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator-ignore
new file mode 100644
index 00000000000..7484ee590a3
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator/FILES
new file mode 100644
index 00000000000..2a2fc540705
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator/FILES
@@ -0,0 +1,29 @@
+.gitignore
+Org.OpenAPITools.sln
+README.md
+api/openapi.yaml
+appveyor.yml
+docs/DefaultApi.md
+docs/NowGet200Response.md
+git_push.sh
+src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
+src/Org.OpenAPITools/Api/DefaultApi.cs
+src/Org.OpenAPITools/Client/ApiClient.cs
+src/Org.OpenAPITools/Client/ApiException.cs
+src/Org.OpenAPITools/Client/ApiResponse.cs
+src/Org.OpenAPITools/Client/ClientUtils.cs
+src/Org.OpenAPITools/Client/Configuration.cs
+src/Org.OpenAPITools/Client/ExceptionFactory.cs
+src/Org.OpenAPITools/Client/GlobalConfiguration.cs
+src/Org.OpenAPITools/Client/HttpMethod.cs
+src/Org.OpenAPITools/Client/IApiAccessor.cs
+src/Org.OpenAPITools/Client/IAsynchronousClient.cs
+src/Org.OpenAPITools/Client/IReadableConfiguration.cs
+src/Org.OpenAPITools/Client/ISynchronousClient.cs
+src/Org.OpenAPITools/Client/Multimap.cs
+src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
+src/Org.OpenAPITools/Client/RequestOptions.cs
+src/Org.OpenAPITools/Client/RetryConfiguration.cs
+src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs
+src/Org.OpenAPITools/Model/NowGet200Response.cs
+src/Org.OpenAPITools/Org.OpenAPITools.csproj
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator/VERSION
new file mode 100644
index 00000000000..fff4bdd7ab5
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator/VERSION
@@ -0,0 +1 @@
+7.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/Org.OpenAPITools.sln b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/Org.OpenAPITools.sln
new file mode 100644
index 00000000000..ae868d9e2be
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/Org.OpenAPITools.sln
@@ -0,0 +1,27 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+VisualStudioVersion = 12.0.0.0
+MinimumVisualStudioVersion = 10.0.0.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Org.OpenAPITools", "src\Org.OpenAPITools\Org.OpenAPITools.csproj", "{D0A67E81-4061-48EB-B4B8-C73BDF8B2D95}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Org.OpenAPITools.Test", "src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D0A67E81-4061-48EB-B4B8-C73BDF8B2D95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0A67E81-4061-48EB-B4B8-C73BDF8B2D95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0A67E81-4061-48EB-B4B8-C73BDF8B2D95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0A67E81-4061-48EB-B4B8-C73BDF8B2D95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/README.md b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/README.md
new file mode 100644
index 00000000000..d4007cf506b
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/README.md
@@ -0,0 +1,127 @@
+# Org.OpenAPITools - the C# library for the OpenAPI Dates
+
+Thic spec contains endpoints with dates in different formats
+
+This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
+
+- API version: 1.0.0
+- SDK version: 1.0.0
+- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
+
+<a id="frameworks-supported"></a>
+## Frameworks supported
+
+<a id="dependencies"></a>
+## Dependencies
+
+- [RestSharp](https://www.nuget.org/packages/RestSharp) - 106.13.0 or later
+- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 13.0.2 or later
+- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.8.0 or later
+- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 5.0.0 or later
+
+The DLLs included in the package may not be the latest version. We recommend using [NuGet](https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
+```
+Install-Package RestSharp
+Install-Package Newtonsoft.Json
+Install-Package JsonSubTypes
+Install-Package System.ComponentModel.Annotations
+```
+
+NOTE: RestSharp versions greater than 105.1.0 have a bug which causes file uploads to fail. See [RestSharp#742](https://github.com/restsharp/RestSharp/issues/742).
+NOTE: RestSharp for .Net Core creates a new socket for each api call, which can lead to a socket exhaustion problem. See [RestSharp#1406](https://github.com/restsharp/RestSharp/issues/1406).
+
+<a id="installation"></a>
+## Installation
+Run the following command to generate the DLL
+- [Mac/Linux] `/bin/sh build.sh`
+- [Windows] `build.bat`
+
+Then include the DLL (under the `bin` folder) in the C# project, and use the namespaces:
+```csharp
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+```
+<a id="packaging"></a>
+## Packaging
+
+A `.nuspec` is included with the project. You can follow the Nuget quickstart to [create](https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package#create-the-package) and [publish](https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package#publish-the-package) packages.
+
+This `.nuspec` uses placeholders from the `.csproj`, so build the `.csproj` directly:
+
+```
+nuget pack -Build -OutputDirectory out Org.OpenAPITools.csproj
+```
+
+Then, publish to a [local feed](https://docs.microsoft.com/en-us/nuget/hosting-packages/local-feeds) or [other host](https://docs.microsoft.com/en-us/nuget/hosting-packages/overview) and consume the new package via Nuget as usual.
+
+<a id="usage"></a>
+## Usage
+
+To use the API client with a HTTP proxy, setup a `System.Net.WebProxy`
+```csharp
+Configuration c = new Configuration();
+System.Net.WebProxy webProxy = new System.Net.WebProxy("http://myProxyUrl:80/");
+webProxy.Credentials = System.Net.CredentialCache.DefaultCredentials;
+c.Proxy = webProxy;
+```
+
+<a id="getting-started"></a>
+## Getting Started
+
+```csharp
+using System.Collections.Generic;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class Example
+    {
+        public static void Main()
+        {
+
+            Configuration config = new Configuration();
+            config.BasePath = "http://localhost";
+            var apiInstance = new DefaultApi(config);
+
+            try
+            {
+                NowGet200Response result = apiInstance.NowGet();
+                Debug.WriteLine(result);
+            }
+            catch (ApiException e)
+            {
+                Debug.Print("Exception when calling DefaultApi.NowGet: " + e.Message );
+                Debug.Print("Status Code: "+ e.ErrorCode);
+                Debug.Print(e.StackTrace);
+            }
+
+        }
+    }
+}
+```
+
+<a id="documentation-for-api-endpoints"></a>
+## Documentation for API Endpoints
+
+All URIs are relative to *http://localhost*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*DefaultApi* | [**NowGet**](docs/DefaultApi.md#nowget) | **GET** /now | 
+
+
+<a id="documentation-for-models"></a>
+## Documentation for Models
+
+ - [Model.NowGet200Response](docs/NowGet200Response.md)
+
+
+<a id="documentation-for-authorization"></a>
+## Documentation for Authorization
+
+Endpoints do not require authorization.
+
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/api/openapi.yaml
new file mode 100644
index 00000000000..a84e041a00f
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/api/openapi.yaml
@@ -0,0 +1,35 @@
+openapi: 3.0.0
+info:
+  description: Thic spec contains endpoints with dates in different formats
+  license:
+    name: Apache-2.0
+    url: https://www.apache.org/licenses/LICENSE-2.0.html
+  title: OpenAPI Dates
+  version: 1.0.0
+servers:
+- url: /
+paths:
+  /now:
+    get:
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/_now_get_200_response'
+          description: now dates
+components:
+  schemas:
+    _now_get_200_response:
+      example:
+        today: 2000-01-23
+        now: 2000-01-23T04:56:07.000+00:00
+      properties:
+        today:
+          format: date
+          type: string
+        now:
+          format: date-time
+          type: string
+      type: object
+
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/appveyor.yml b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/appveyor.yml
new file mode 100644
index 00000000000..f76f63cee50
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/appveyor.yml
@@ -0,0 +1,9 @@
+# auto-generated by OpenAPI Generator (https://github.com/OpenAPITools/openapi-generator)
+#
+image: Visual Studio 2019
+clone_depth: 1
+build_script:
+- dotnet build -c Release
+- dotnet test -c Release
+after_build:
+- dotnet pack .\src\Org.OpenAPITools\Org.OpenAPITools.csproj -o ../../output -c Release --no-build
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/docs/DefaultApi.md b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/docs/DefaultApi.md
new file mode 100644
index 00000000000..33e7748827e
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/docs/DefaultApi.md
@@ -0,0 +1,90 @@
+# Org.OpenAPITools.Api.DefaultApi
+
+All URIs are relative to *http://localhost*
+
+| Method | HTTP request | Description |
+|--------|--------------|-------------|
+| [**NowGet**](DefaultApi.md#nowget) | **GET** /now |  |
+
+<a id="nowget"></a>
+# **NowGet**
+> NowGet200Response NowGet ()
+
+
+
+### Example
+```csharp
+using System.Collections.Generic;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class NowGetExample
+    {
+        public static void Main()
+        {
+            Configuration config = new Configuration();
+            config.BasePath = "http://localhost";
+            var apiInstance = new DefaultApi(config);
+
+            try
+            {
+                NowGet200Response result = apiInstance.NowGet();
+                Debug.WriteLine(result);
+            }
+            catch (ApiException  e)
+            {
+                Debug.Print("Exception when calling DefaultApi.NowGet: " + e.Message);
+                Debug.Print("Status Code: " + e.ErrorCode);
+                Debug.Print(e.StackTrace);
+            }
+        }
+    }
+}
+```
+
+#### Using the NowGetWithHttpInfo variant
+This returns an ApiResponse object which contains the response data, status code and headers.
+
+```csharp
+try
+{
+    ApiResponse<NowGet200Response> response = apiInstance.NowGetWithHttpInfo();
+    Debug.Write("Status Code: " + response.StatusCode);
+    Debug.Write("Response Headers: " + response.Headers);
+    Debug.Write("Response Body: " + response.Data);
+}
+catch (ApiException e)
+{
+    Debug.Print("Exception when calling DefaultApi.NowGetWithHttpInfo: " + e.Message);
+    Debug.Print("Status Code: " + e.ErrorCode);
+    Debug.Print(e.StackTrace);
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+### Return type
+
+[**NowGet200Response**](NowGet200Response.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | now dates |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/docs/NowGet200Response.md b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/docs/NowGet200Response.md
new file mode 100644
index 00000000000..932034b2af2
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/docs/NowGet200Response.md
@@ -0,0 +1,11 @@
+# Org.OpenAPITools.Model.NowGet200Response
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Today** | **DateTime** |  | [optional] 
+**Now** | **DateTime** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/git_push.sh b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/git_push.sh
new file mode 100644
index 00000000000..f53a75d4fab
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/git_push.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+git_host=$4
+
+if [ "$git_host" = "" ]; then
+    git_host="github.com"
+    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
+fi
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository.
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=$(git remote)
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
new file mode 100644
index 00000000000..5dfa62da67f
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -0,0 +1,68 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using RestSharp;
+using Xunit;
+
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Api;
+// uncomment below to import models
+//using Org.OpenAPITools.Model;
+
+namespace Org.OpenAPITools.Test.Api
+{
+    /// <summary>
+    ///  Class for testing DefaultApi
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the API endpoint.
+    /// </remarks>
+    public class DefaultApiTests : IDisposable
+    {
+        private DefaultApi instance;
+
+        public DefaultApiTests()
+        {
+            instance = new DefaultApi();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of DefaultApi
+        /// </summary>
+        [Fact]
+        public void InstanceTest()
+        {
+            // TODO uncomment below to test 'IsType' DefaultApi
+            //Assert.IsType<DefaultApi>(instance);
+        }
+
+        /// <summary>
+        /// Test NowGet
+        /// </summary>
+        [Fact]
+        public void NowGetTest()
+        {
+            // TODO uncomment below to test the method and replace null with proper value
+            //var response = instance.NowGet();
+            //Assert.IsType<NowGet200Response>(response);
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Model/NowGet200ResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Model/NowGet200ResponseTests.cs
new file mode 100644
index 00000000000..a91e45c60c8
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Model/NowGet200ResponseTests.cs
@@ -0,0 +1,75 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing NowGet200Response
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class NowGet200ResponseTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for NowGet200Response
+        //private NowGet200Response instance;
+
+        public NowGet200ResponseTests()
+        {
+            // TODO uncomment below to create an instance of NowGet200Response
+            //instance = new NowGet200Response();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of NowGet200Response
+        /// </summary>
+        [Fact]
+        public void NowGet200ResponseInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" NowGet200Response
+            //Assert.IsType<NowGet200Response>(instance);
+        }
+
+        /// <summary>
+        /// Test the property 'Today'
+        /// </summary>
+        [Fact]
+        public void TodayTest()
+        {
+            // TODO unit test for the property 'Today'
+        }
+
+        /// <summary>
+        /// Test the property 'Now'
+        /// </summary>
+        [Fact]
+        public void NowTest()
+        {
+            // TODO unit test for the property 'Now'
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
new file mode 100644
index 00000000000..3ddd6b44be5
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>Org.OpenAPITools.Test</AssemblyName>
+    <RootNamespace>Org.OpenAPITools.Test</RootNamespace>
+    <TargetFramework>net7.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <Nullable>annotations</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.6.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Org.OpenAPITools\Org.OpenAPITools.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs
new file mode 100644
index 00000000000..cb394b92ba4
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs
@@ -0,0 +1,326 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Net;
+using System.Net.Mime;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Org.OpenAPITools.Api
+{
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IDefaultApiSync : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="operationIndex">Index associated with the operation.</param>
+        /// <returns>NowGet200Response</returns>
+        NowGet200Response NowGet(int operationIndex = 0);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="operationIndex">Index associated with the operation.</param>
+        /// <returns>ApiResponse of NowGet200Response</returns>
+        ApiResponse<NowGet200Response> NowGetWithHttpInfo(int operationIndex = 0);
+        #endregion Synchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IDefaultApiAsync : IApiAccessor
+    {
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="operationIndex">Index associated with the operation.</param>
+        /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
+        /// <returns>Task of NowGet200Response</returns>
+        System.Threading.Tasks.Task<NowGet200Response> NowGetAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="operationIndex">Index associated with the operation.</param>
+        /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
+        /// <returns>Task of ApiResponse (NowGet200Response)</returns>
+        System.Threading.Tasks.Task<ApiResponse<NowGet200Response>> NowGetWithHttpInfoAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IDefaultApi : IDefaultApiSync, IDefaultApiAsync
+    {
+
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class DefaultApi : IDefaultApi
+    {
+        private Org.OpenAPITools.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DefaultApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public DefaultApi() : this((string)null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DefaultApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public DefaultApi(string basePath)
+        {
+            this.Configuration = Org.OpenAPITools.Client.Configuration.MergeConfigurations(
+                Org.OpenAPITools.Client.GlobalConfiguration.Instance,
+                new Org.OpenAPITools.Client.Configuration { BasePath = basePath }
+            );
+            this.Client = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath);
+            this.AsynchronousClient = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath);
+            this.ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DefaultApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public DefaultApi(Org.OpenAPITools.Client.Configuration configuration)
+        {
+            if (configuration == null) throw new ArgumentNullException("configuration");
+
+            this.Configuration = Org.OpenAPITools.Client.Configuration.MergeConfigurations(
+                Org.OpenAPITools.Client.GlobalConfiguration.Instance,
+                configuration
+            );
+            this.Client = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath);
+            this.AsynchronousClient = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath);
+            ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DefaultApi"/> class
+        /// using a Configuration object and client instance.
+        /// </summary>
+        /// <param name="client">The client interface for synchronous API access.</param>
+        /// <param name="asyncClient">The client interface for asynchronous API access.</param>
+        /// <param name="configuration">The configuration object.</param>
+        public DefaultApi(Org.OpenAPITools.Client.ISynchronousClient client, Org.OpenAPITools.Client.IAsynchronousClient asyncClient, Org.OpenAPITools.Client.IReadableConfiguration configuration)
+        {
+            if (client == null) throw new ArgumentNullException("client");
+            if (asyncClient == null) throw new ArgumentNullException("asyncClient");
+            if (configuration == null) throw new ArgumentNullException("configuration");
+
+            this.Client = client;
+            this.AsynchronousClient = asyncClient;
+            this.Configuration = configuration;
+            this.ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// The client for accessing this underlying API asynchronously.
+        /// </summary>
+        public Org.OpenAPITools.Client.IAsynchronousClient AsynchronousClient { get; set; }
+
+        /// <summary>
+        /// The client for accessing this underlying API synchronously.
+        /// </summary>
+        public Org.OpenAPITools.Client.ISynchronousClient Client { get; set; }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public string GetBasePath()
+        {
+            return this.Configuration.BasePath;
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Org.OpenAPITools.Client.IReadableConfiguration Configuration { get; set; }
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Org.OpenAPITools.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="operationIndex">Index associated with the operation.</param>
+        /// <returns>NowGet200Response</returns>
+        public NowGet200Response NowGet(int operationIndex = 0)
+        {
+            Org.OpenAPITools.Client.ApiResponse<NowGet200Response> localVarResponse = NowGetWithHttpInfo();
+            return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="operationIndex">Index associated with the operation.</param>
+        /// <returns>ApiResponse of NowGet200Response</returns>
+        public Org.OpenAPITools.Client.ApiResponse<NowGet200Response> NowGetWithHttpInfo(int operationIndex = 0)
+        {
+            Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions();
+
+            string[] _contentTypes = new string[] {
+            };
+
+            // to determine the Accept header
+            string[] _accepts = new string[] {
+                "application/json"
+            };
+
+            var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes);
+            if (localVarContentType != null)
+            {
+                localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType);
+            }
+
+            var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts);
+            if (localVarAccept != null)
+            {
+                localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
+            }
+
+
+            localVarRequestOptions.Operation = "DefaultApi.NowGet";
+            localVarRequestOptions.OperationIndex = operationIndex;
+
+
+            // make the HTTP request
+            var localVarResponse = this.Client.Get<NowGet200Response>("/now", localVarRequestOptions, this.Configuration);
+            if (this.ExceptionFactory != null)
+            {
+                Exception _exception = this.ExceptionFactory("NowGet", localVarResponse);
+                if (_exception != null)
+                {
+                    throw _exception;
+                }
+            }
+
+            return localVarResponse;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="operationIndex">Index associated with the operation.</param>
+        /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
+        /// <returns>Task of NowGet200Response</returns>
+        public async System.Threading.Tasks.Task<NowGet200Response> NowGetAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        {
+            Org.OpenAPITools.Client.ApiResponse<NowGet200Response> localVarResponse = await NowGetWithHttpInfoAsync(operationIndex, cancellationToken).ConfigureAwait(false);
+            return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="operationIndex">Index associated with the operation.</param>
+        /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
+        /// <returns>Task of ApiResponse (NowGet200Response)</returns>
+        public async System.Threading.Tasks.Task<Org.OpenAPITools.Client.ApiResponse<NowGet200Response>> NowGetWithHttpInfoAsync(int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        {
+
+            Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions();
+
+            string[] _contentTypes = new string[] {
+            };
+
+            // to determine the Accept header
+            string[] _accepts = new string[] {
+                "application/json"
+            };
+
+            var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes);
+            if (localVarContentType != null)
+            {
+                localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType);
+            }
+
+            var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts);
+            if (localVarAccept != null)
+            {
+                localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
+            }
+
+
+            localVarRequestOptions.Operation = "DefaultApi.NowGet";
+            localVarRequestOptions.OperationIndex = operationIndex;
+
+
+            // make the HTTP request
+            var localVarResponse = await this.AsynchronousClient.GetAsync<NowGet200Response>("/now", localVarRequestOptions, this.Configuration, cancellationToken).ConfigureAwait(false);
+
+            if (this.ExceptionFactory != null)
+            {
+                Exception _exception = this.ExceptionFactory("NowGet", localVarResponse);
+                if (_exception != null)
+                {
+                    throw _exception;
+                }
+            }
+
+            return localVarResponse;
+        }
+
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiClient.cs
new file mode 100644
index 00000000000..594bf890cb8
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -0,0 +1,833 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters;
+using System.Text;
+using System.Threading;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Web;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using RestSharp;
+using RestSharp.Serializers;
+using RestSharpMethod = RestSharp.Method;
+using Polly;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Allows RestSharp to Serialize/Deserialize JSON using our custom logic, but only when ContentType is JSON.
+    /// </summary>
+    internal class CustomJsonCodec : IRestSerializer, ISerializer, IDeserializer
+    {
+        private readonly IReadableConfiguration _configuration;
+        private readonly JsonSerializerSettings _serializerSettings = new JsonSerializerSettings
+        {
+            // OpenAPI generated types generally hide default constructors.
+            ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor,
+            ContractResolver = new DefaultContractResolver
+            {
+                NamingStrategy = new CamelCaseNamingStrategy
+                {
+                    OverrideSpecifiedNames = false
+                }
+            }
+        };
+
+        public CustomJsonCodec(IReadableConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public CustomJsonCodec(JsonSerializerSettings serializerSettings, IReadableConfiguration configuration)
+        {
+            _serializerSettings = serializerSettings;
+            _configuration = configuration;
+        }
+
+        /// <summary>
+        /// Serialize the object into a JSON string.
+        /// </summary>
+        /// <param name="obj">Object to be serialized.</param>
+        /// <returns>A JSON string.</returns>
+        public string Serialize(object obj)
+        {
+            if (obj != null && obj is Org.OpenAPITools.Model.AbstractOpenAPISchema)
+            {
+                // the object to be serialized is an oneOf/anyOf schema
+                return ((Org.OpenAPITools.Model.AbstractOpenAPISchema)obj).ToJson();
+            }
+            else
+            {
+                return JsonConvert.SerializeObject(obj, _serializerSettings);
+            }
+        }
+
+        public string Serialize(Parameter bodyParameter) => Serialize(bodyParameter.Value);
+
+        public T Deserialize<T>(RestResponse response)
+        {
+            var result = (T)Deserialize(response, typeof(T));
+            return result;
+        }
+
+        /// <summary>
+        /// Deserialize the JSON string into a proper object.
+        /// </summary>
+        /// <param name="response">The HTTP response.</param>
+        /// <param name="type">Object type.</param>
+        /// <returns>Object representation of the JSON string.</returns>
+        internal object Deserialize(RestResponse response, Type type)
+        {
+            if (type == typeof(byte[])) // return byte array
+            {
+                return response.RawBytes;
+            }
+
+            // TODO: ? if (type.IsAssignableFrom(typeof(Stream)))
+            if (type == typeof(Stream))
+            {
+                var bytes = response.RawBytes;
+                if (response.Headers != null)
+                {
+                    var filePath = string.IsNullOrEmpty(_configuration.TempFolderPath)
+                        ? Path.GetTempPath()
+                        : _configuration.TempFolderPath;
+                    var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");
+                    foreach (var header in response.Headers)
+                    {
+                        var match = regex.Match(header.ToString());
+                        if (match.Success)
+                        {
+                            string fileName = filePath + ClientUtils.SanitizeFilename(match.Groups[1].Value.Replace("\"", "").Replace("'", ""));
+                            File.WriteAllBytes(fileName, bytes);
+                            return new FileStream(fileName, FileMode.Open);
+                        }
+                    }
+                }
+                var stream = new MemoryStream(bytes);
+                return stream;
+            }
+
+            if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object
+            {
+                return DateTime.Parse(response.Content, null, System.Globalization.DateTimeStyles.RoundtripKind);
+            }
+
+            if (type == typeof(string) || type.Name.StartsWith("System.Nullable")) // return primitive type
+            {
+                return Convert.ChangeType(response.Content, type);
+            }
+
+            // at this point, it must be a model (json)
+            try
+            {
+                return JsonConvert.DeserializeObject(response.Content, type, _serializerSettings);
+            }
+            catch (Exception e)
+            {
+                throw new ApiException(500, e.Message);
+            }
+        }
+
+        public ISerializer Serializer => this;
+        public IDeserializer Deserializer => this;
+
+        public string[] AcceptedContentTypes => RestSharp.ContentType.JsonAccept;
+
+        public SupportsContentType SupportsContentType => contentType =>
+            contentType.Value.EndsWith("json", StringComparison.InvariantCultureIgnoreCase) ||
+            contentType.Value.EndsWith("javascript", StringComparison.InvariantCultureIgnoreCase);
+
+        public ContentType ContentType { get; set; } = RestSharp.ContentType.Json;
+
+        public DataFormat DataFormat => DataFormat.Json;
+    }
+    /// <summary>
+    /// Provides a default implementation of an Api client (both synchronous and asynchronous implementations),
+    /// encapsulating general REST accessor use cases.
+    /// </summary>
+    public partial class ApiClient : ISynchronousClient, IAsynchronousClient
+    {
+        private readonly string _baseUrl;
+
+        /// <summary>
+        /// Specifies the settings on a <see cref="JsonSerializer" /> object.
+        /// These settings can be adjusted to accommodate custom serialization rules.
+        /// </summary>
+        public JsonSerializerSettings SerializerSettings { get; set; } = new JsonSerializerSettings
+        {
+            // OpenAPI generated types generally hide default constructors.
+            ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor,
+            ContractResolver = new DefaultContractResolver
+            {
+                NamingStrategy = new CamelCaseNamingStrategy
+                {
+                    OverrideSpecifiedNames = false
+                }
+            }
+        };
+
+        /// <summary>
+        /// Allows for extending request processing for <see cref="ApiClient"/> generated code.
+        /// </summary>
+        /// <param name="request">The RestSharp request object</param>
+        partial void InterceptRequest(RestRequest request);
+
+        /// <summary>
+        /// Allows for extending response processing for <see cref="ApiClient"/> generated code.
+        /// </summary>
+        /// <param name="request">The RestSharp request object</param>
+        /// <param name="response">The RestSharp response object</param>
+        partial void InterceptResponse(RestRequest request, RestResponse response);
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiClient" />, defaulting to the global configurations' base url.
+        /// </summary>
+        public ApiClient()
+        {
+            _baseUrl = Org.OpenAPITools.Client.GlobalConfiguration.Instance.BasePath;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiClient" />
+        /// </summary>
+        /// <param name="basePath">The target service's base path in URL format.</param>
+        /// <exception cref="ArgumentException"></exception>
+        public ApiClient(string basePath)
+        {
+            if (string.IsNullOrEmpty(basePath))
+                throw new ArgumentException("basePath cannot be empty");
+
+            _baseUrl = basePath;
+        }
+
+        /// <summary>
+        /// Constructs the RestSharp version of an http method
+        /// </summary>
+        /// <param name="method">Swagger Client Custom HttpMethod</param>
+        /// <returns>RestSharp's HttpMethod instance.</returns>
+        /// <exception cref="ArgumentOutOfRangeException"></exception>
+        private RestSharpMethod Method(HttpMethod method)
+        {
+            RestSharpMethod other;
+            switch (method)
+            {
+                case HttpMethod.Get:
+                    other = RestSharpMethod.Get;
+                    break;
+                case HttpMethod.Post:
+                    other = RestSharpMethod.Post;
+                    break;
+                case HttpMethod.Put:
+                    other = RestSharpMethod.Put;
+                    break;
+                case HttpMethod.Delete:
+                    other = RestSharpMethod.Delete;
+                    break;
+                case HttpMethod.Head:
+                    other = RestSharpMethod.Head;
+                    break;
+                case HttpMethod.Options:
+                    other = RestSharpMethod.Options;
+                    break;
+                case HttpMethod.Patch:
+                    other = RestSharpMethod.Patch;
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException("method", method, null);
+            }
+
+            return other;
+        }
+
+        /// <summary>
+        /// Provides all logic for constructing a new RestSharp <see cref="RestRequest"/>.
+        /// At this point, all information for querying the service is known. Here, it is simply
+        /// mapped into the RestSharp request.
+        /// </summary>
+        /// <param name="method">The http verb.</param>
+        /// <param name="path">The target path (or resource).</param>
+        /// <param name="options">The additional request options.</param>
+        /// <param name="configuration">A per-request configuration object. It is assumed that any merge with
+        /// GlobalConfiguration has been done before calling this method.</param>
+        /// <returns>[private] A new RestRequest instance.</returns>
+        /// <exception cref="ArgumentNullException"></exception>
+        private RestRequest NewRequest(
+            HttpMethod method,
+            string path,
+            RequestOptions options,
+            IReadableConfiguration configuration)
+        {
+            if (path == null) throw new ArgumentNullException("path");
+            if (options == null) throw new ArgumentNullException("options");
+            if (configuration == null) throw new ArgumentNullException("configuration");
+
+            RestRequest request = new RestRequest(path, Method(method));
+
+            if (options.PathParameters != null)
+            {
+                foreach (var pathParam in options.PathParameters)
+                {
+                    request.AddParameter(pathParam.Key, pathParam.Value, ParameterType.UrlSegment);
+                }
+            }
+
+            if (options.QueryParameters != null)
+            {
+                foreach (var queryParam in options.QueryParameters)
+                {
+                    foreach (var value in queryParam.Value)
+                    {
+                        request.AddQueryParameter(queryParam.Key, value);
+                    }
+                }
+            }
+
+            if (configuration.DefaultHeaders != null)
+            {
+                foreach (var headerParam in configuration.DefaultHeaders)
+                {
+                    request.AddHeader(headerParam.Key, headerParam.Value);
+                }
+            }
+
+            if (options.HeaderParameters != null)
+            {
+                foreach (var headerParam in options.HeaderParameters)
+                {
+                    foreach (var value in headerParam.Value)
+                    {
+                        request.AddHeader(headerParam.Key, value);
+                    }
+                }
+            }
+
+            if (options.FormParameters != null)
+            {
+                foreach (var formParam in options.FormParameters)
+                {
+                    request.AddParameter(formParam.Key, formParam.Value);
+                }
+            }
+
+            if (options.Data != null)
+            {
+                if (options.Data is Stream stream)
+                {
+                    var contentType = "application/octet-stream";
+                    if (options.HeaderParameters != null)
+                    {
+                        var contentTypes = options.HeaderParameters["Content-Type"];
+                        contentType = contentTypes[0];
+                    }
+
+                    var bytes = ClientUtils.ReadAsBytes(stream);
+                    request.AddParameter(contentType, bytes, ParameterType.RequestBody);
+                }
+                else
+                {
+                    if (options.HeaderParameters != null)
+                    {
+                        var contentTypes = options.HeaderParameters["Content-Type"];
+                        if (contentTypes == null || contentTypes.Any(header => header.Contains("application/json")))
+                        {
+                            request.RequestFormat = DataFormat.Json;
+                        }
+                        else
+                        {
+                            // TODO: Generated client user should add additional handlers. RestSharp only supports XML and JSON, with XML as default.
+                        }
+                    }
+                    else
+                    {
+                        // Here, we'll assume JSON APIs are more common. XML can be forced by adding produces/consumes to openapi spec explicitly.
+                        request.RequestFormat = DataFormat.Json;
+                    }
+
+                    request.AddJsonBody(options.Data);
+                }
+            }
+
+            if (options.FileParameters != null)
+            {
+                foreach (var fileParam in options.FileParameters)
+                {
+                    foreach (var file in fileParam.Value)
+                    {
+                        var bytes = ClientUtils.ReadAsBytes(file);
+                        var fileStream = file as FileStream;
+                        if (fileStream != null)
+                            request.AddFile(fileParam.Key, bytes, System.IO.Path.GetFileName(fileStream.Name));
+                        else
+                            request.AddFile(fileParam.Key, bytes, "no_file_name_provided");
+                    }
+                }
+            }
+
+            return request;
+        }
+
+        private ApiResponse<T> ToApiResponse<T>(RestResponse<T> response)
+        {
+            T result = response.Data;
+            string rawContent = response.Content;
+
+            var transformed = new ApiResponse<T>(response.StatusCode, new Multimap<string, string>(), result, rawContent)
+            {
+                ErrorText = response.ErrorMessage,
+                Cookies = new List<Cookie>()
+            };
+
+            if (response.Headers != null)
+            {
+                foreach (var responseHeader in response.Headers)
+                {
+                    transformed.Headers.Add(responseHeader.Name, ClientUtils.ParameterToString(responseHeader.Value));
+                }
+            }
+
+            if (response.ContentHeaders != null)
+            {
+                foreach (var responseHeader in response.ContentHeaders)
+                {
+                    transformed.Headers.Add(responseHeader.Name, ClientUtils.ParameterToString(responseHeader.Value));
+                }
+            }
+
+            if (response.Cookies != null)
+            {
+                foreach (var responseCookies in response.Cookies.Cast<Cookie>())
+                {
+                    transformed.Cookies.Add(
+                        new Cookie(
+                            responseCookies.Name,
+                            responseCookies.Value,
+                            responseCookies.Path,
+                            responseCookies.Domain)
+                        );
+                }
+            }
+
+            return transformed;
+        }
+
+        private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration)
+        {
+            var baseUrl = configuration.GetOperationServerUrl(options.Operation, options.OperationIndex) ?? _baseUrl;
+
+            var cookies = new CookieContainer();
+
+            if (options.Cookies != null && options.Cookies.Count > 0)
+            {
+                foreach (var cookie in options.Cookies)
+                {
+                    cookies.Add(new Cookie(cookie.Name, cookie.Value));
+                }
+            }
+
+            var clientOptions = new RestClientOptions(baseUrl)
+            {
+                ClientCertificates = configuration.ClientCertificates,
+                CookieContainer = cookies,
+                MaxTimeout = configuration.Timeout,
+                Proxy = configuration.Proxy,
+                UserAgent = configuration.UserAgent,
+                UseDefaultCredentials = configuration.UseDefaultCredentials,
+                RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback
+            };
+
+            using (RestClient client = new RestClient(clientOptions,
+                configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
+            {
+                InterceptRequest(request);
+
+                RestResponse<T> response;
+                if (RetryConfiguration.RetryPolicy != null)
+                {
+                    var policy = RetryConfiguration.RetryPolicy;
+                    var policyResult = policy.ExecuteAndCapture(() => client.Execute(request));
+                    response = (policyResult.Outcome == OutcomeType.Successful) ? client.Deserialize<T>(policyResult.Result) : new RestResponse<T>(request)
+                    {
+                        ErrorException = policyResult.FinalException
+                    };
+                }
+                else
+                {
+                    response = client.Execute<T>(request);
+                }
+
+                // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
+                if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
+                {
+                    try
+                    {
+                        response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
+                    }
+                    catch (Exception ex)
+                    {
+                        throw ex.InnerException != null ? ex.InnerException : ex;
+                    }
+                }
+                else if (typeof(T).Name == "Stream") // for binary response
+                {
+                    response.Data = (T)(object)new MemoryStream(response.RawBytes);
+                }
+                else if (typeof(T).Name == "Byte[]") // for byte response
+                {
+                    response.Data = (T)(object)response.RawBytes;
+                }
+                else if (typeof(T).Name == "String") // for string response
+                {
+                    response.Data = (T)(object)response.Content;
+                }
+
+                InterceptResponse(request, response);
+
+                var result = ToApiResponse(response);
+                if (response.ErrorMessage != null)
+                {
+                    result.ErrorText = response.ErrorMessage;
+                }
+
+                if (response.Cookies != null && response.Cookies.Count > 0)
+                {
+                    if (result.Cookies == null) result.Cookies = new List<Cookie>();
+                    foreach (var restResponseCookie in response.Cookies.Cast<Cookie>())
+                    {
+                        var cookie = new Cookie(
+                            restResponseCookie.Name,
+                            restResponseCookie.Value,
+                            restResponseCookie.Path,
+                            restResponseCookie.Domain
+                        )
+                        {
+                            Comment = restResponseCookie.Comment,
+                            CommentUri = restResponseCookie.CommentUri,
+                            Discard = restResponseCookie.Discard,
+                            Expired = restResponseCookie.Expired,
+                            Expires = restResponseCookie.Expires,
+                            HttpOnly = restResponseCookie.HttpOnly,
+                            Port = restResponseCookie.Port,
+                            Secure = restResponseCookie.Secure,
+                            Version = restResponseCookie.Version
+                        };
+
+                        result.Cookies.Add(cookie);
+                    }
+                }
+                return result;
+            }
+        }
+
+        private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        {
+            var baseUrl = configuration.GetOperationServerUrl(options.Operation, options.OperationIndex) ?? _baseUrl;
+
+            var clientOptions = new RestClientOptions(baseUrl)
+            {
+                ClientCertificates = configuration.ClientCertificates,
+                MaxTimeout = configuration.Timeout,
+                Proxy = configuration.Proxy,
+                UserAgent = configuration.UserAgent,
+                UseDefaultCredentials = configuration.UseDefaultCredentials,
+                RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback
+            };
+
+            using (RestClient client = new RestClient(clientOptions,
+                configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
+            {
+                InterceptRequest(request);
+
+                RestResponse<T> response;
+                if (RetryConfiguration.AsyncRetryPolicy != null)
+                {
+                    var policy = RetryConfiguration.AsyncRetryPolicy;
+                    var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
+                    response = (policyResult.Outcome == OutcomeType.Successful) ? client.Deserialize<T>(policyResult.Result) : new RestResponse<T>(request)
+                    {
+                        ErrorException = policyResult.FinalException
+                    };
+                }
+                else
+                {
+                    response = await client.ExecuteAsync<T>(request, cancellationToken).ConfigureAwait(false);
+                }
+
+                // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
+                if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
+                {
+                    response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
+                }
+                else if (typeof(T).Name == "Stream") // for binary response
+                {
+                    response.Data = (T)(object)new MemoryStream(response.RawBytes);
+                }
+                else if (typeof(T).Name == "Byte[]") // for byte response
+                {
+                    response.Data = (T)(object)response.RawBytes;
+                }
+
+                InterceptResponse(request, response);
+
+                var result = ToApiResponse(response);
+                if (response.ErrorMessage != null)
+                {
+                    result.ErrorText = response.ErrorMessage;
+                }
+
+                if (response.Cookies != null && response.Cookies.Count > 0)
+                {
+                    if (result.Cookies == null) result.Cookies = new List<Cookie>();
+                    foreach (var restResponseCookie in response.Cookies.Cast<Cookie>())
+                    {
+                        var cookie = new Cookie(
+                            restResponseCookie.Name,
+                            restResponseCookie.Value,
+                            restResponseCookie.Path,
+                            restResponseCookie.Domain
+                        )
+                        {
+                            Comment = restResponseCookie.Comment,
+                            CommentUri = restResponseCookie.CommentUri,
+                            Discard = restResponseCookie.Discard,
+                            Expired = restResponseCookie.Expired,
+                            Expires = restResponseCookie.Expires,
+                            HttpOnly = restResponseCookie.HttpOnly,
+                            Port = restResponseCookie.Port,
+                            Secure = restResponseCookie.Secure,
+                            Version = restResponseCookie.Version
+                        };
+
+                        result.Cookies.Add(cookie);
+                    }
+                }
+                return result;
+            }
+        }
+
+        #region IAsynchronousClient
+        /// <summary>
+        /// Make a HTTP GET request (async).
+        /// </summary>
+        /// <param name="path">The target path (or resource).</param>
+        /// <param name="options">The additional request options.</param>
+        /// <param name="configuration">A per-request configuration object. It is assumed that any merge with
+        /// GlobalConfiguration has been done before calling this method.</param>
+        /// <param name="cancellationToken">Token that enables callers to cancel the request.</param>
+        /// <returns>A Task containing ApiResponse</returns>
+        public Task<ApiResponse<T>> GetAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        {
+            var config = configuration ?? GlobalConfiguration.Instance;
+            return ExecAsync<T>(NewRequest(HttpMethod.Get, path, options, config), options, config, cancellationToken);
+        }
+
+        /// <summary>
+        /// Make a HTTP POST request (async).
+        /// </summary>
+        /// <param name="path">The target path (or resource).</param>
+        /// <param name="options">The additional request options.</param>
+        /// <param name="configuration">A per-request configuration object. It is assumed that any merge with
+        /// GlobalConfiguration has been done before calling this method.</param>
+        /// <param name="cancellationToken">Token that enables callers to cancel the request.</param>
+        /// <returns>A Task containing ApiResponse</returns>
+        public Task<ApiResponse<T>> PostAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        {
+            var config = configuration ?? GlobalConfiguration.Instance;
+            return ExecAsync<T>(NewRequest(HttpMethod.Post, path, options, config), options, config, cancellationToken);
+        }
+
+        /// <summary>
+        /// Make a HTTP PUT request (async).
+        /// </summary>
+        /// <param name="path">The target path (or resource).</param>
+        /// <param name="options">The additional request options.</param>
+        /// <param name="configuration">A per-request configuration object. It is assumed that any merge with
+        /// GlobalConfiguration has been done before calling this method.</param>
+        /// <param name="cancellationToken">Token that enables callers to cancel the request.</param>
+        /// <returns>A Task containing ApiResponse</returns>
+        public Task<ApiResponse<T>> PutAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        {
+            var config = configuration ?? GlobalConfiguration.Instance;
+            return ExecAsync<T>(NewRequest(HttpMethod.Put, path, options, config), options, config, cancellationToken);
+        }
+
+        /// <summary>
+        /// Make a HTTP DELETE request (async).
+        /// </summary>
+        /// <param name="path">The target path (or resource).</param>
+        /// <param name="options">The additional request options.</param>
+        /// <param name="configuration">A per-request configuration object. It is assumed that any merge with
+        /// GlobalConfiguration has been done before calling this method.</param>
+        /// <param name="cancellationToken">Token that enables callers to cancel the request.</param>
+        /// <returns>A Task containing ApiResponse</returns>
+        public Task<ApiResponse<T>> DeleteAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        {
+            var config = configuration ?? GlobalConfiguration.Instance;
+            return ExecAsync<T>(NewRequest(HttpMethod.Delete, path, options, config), options, config, cancellationToken);
+        }
+
+        /// <summary>
+        /// Make a HTTP HEAD request (async).
+        /// </summary>
+        /// <param name="path">The target path (or resource).</param>
+        /// <param name="options">The additional request options.</param>
+        /// <param name="configuration">A per-request configuration object. It is assumed that any merge with
+        /// GlobalConfiguration has been done before calling this method.</param>
+        /// <param name="cancellationToken">Token that enables callers to cancel the request.</param>
+        /// <returns>A Task containing ApiResponse</returns>
+        public Task<ApiResponse<T>> HeadAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        {
+            var config = configuration ?? GlobalConfiguration.Instance;
+            return ExecAsync<T>(NewRequest(HttpMethod.Head, path, options, config), options, config, cancellationToken);
+        }
+
+        /// <summary>
+        /// Make a HTTP OPTION request (async).
+        /// </summary>
+        /// <param name="path">The target path (or resource).</param>
+        /// <param name="options">The additional request options.</param>
+        /// <param name="configuration">A per-request configuration object. It is assumed that any merge with
+        /// GlobalConfiguration has been done before calling this method.</param>
+        /// <param name="cancellationToken">Token that enables callers to cancel the request.</param>
+        /// <returns>A Task containing ApiResponse</returns>
+        public Task<ApiResponse<T>> OptionsAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        {
+            var config = configuration ?? GlobalConfiguration.Instance;
+            return ExecAsync<T>(NewRequest(HttpMethod.Options, path, options, config), options, config, cancellationToken);
+        }
+
+        /// <summary>
+        /// Make a HTTP PATCH request (async).
+        /// </summary>
+        /// <param name="path">The target path (or resource).</param>
+        /// <param name="options">The additional request options.</param>
+        /// <param name="configuration">A per-request configuration object. It is assumed that any merge with
+        /// GlobalConfiguration has been done before calling this method.</param>
+        /// <param name="cancellationToken">Token that enables callers to cancel the request.</param>
+        /// <returns>A Task containing ApiResponse</returns>
+        public Task<ApiResponse<T>> PatchAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        {
+            var config = configuration ?? GlobalConfiguration.Instance;
+            return ExecAsync<T>(NewRequest(HttpMethod.Patch, path, options, config), options, config, cancellationToken);
+        }
+        #endregion IAsynchronousClient
+
+        #region ISynchronousClient
+        /// <summary>
+        /// Make a HTTP GET request (synchronous).
+        /// </summary>
+        /// <param name="path">The target path (or resource).</param>
+        /// <param name="options">The additional request options.</param>
+        /// <param name="configuration">A per-request configuration object. It is assumed that any merge with
+        /// GlobalConfiguration has been done before calling this method.</param>
+        /// <returns>A Task containing ApiResponse</returns>
+        public ApiResponse<T> Get<T>(string path, RequestOptions options, IReadableConfiguration configuration = null)
+        {
+            var config = configuration ?? GlobalConfiguration.Instance;
+            return Exec<T>(NewRequest(HttpMethod.Get, path, options, config), options, config);
+        }
+
+        /// <summary>
+        /// Make a HTTP POST request (synchronous).
+        /// </summary>
+        /// <param name="path">The target path (or resource).</param>
+        /// <param name="options">The additional request options.</param>
+        /// <param name="configuration">A per-request configuration object. It is assumed that any merge with
+        /// GlobalConfiguration has been done before calling this method.</param>
+        /// <returns>A Task containing ApiResponse</returns>
+        public ApiResponse<T> Post<T>(string path, RequestOptions options, IReadableConfiguration configuration = null)
+        {
+            var config = configuration ?? GlobalConfiguration.Instance;
+            return Exec<T>(NewRequest(HttpMethod.Post, path, options, config), options, config);
+        }
+
+        /// <summary>
+        /// Make a HTTP PUT request (synchronous).
+        /// </summary>
+        /// <param name="path">The target path (or resource).</param>
+        /// <param name="options">The additional request options.</param>
+        /// <param name="configuration">A per-request configuration object. It is assumed that any merge with
+        /// GlobalConfiguration has been done before calling this method.</param>
+        /// <returns>A Task containing ApiResponse</returns>
+        public ApiResponse<T> Put<T>(string path, RequestOptions options, IReadableConfiguration configuration = null)
+        {
+            var config = configuration ?? GlobalConfiguration.Instance;
+            return Exec<T>(NewRequest(HttpMethod.Put, path, options, config), options, config);
+        }
+
+        /// <summary>
+        /// Make a HTTP DELETE request (synchronous).
+        /// </summary>
+        /// <param name="path">The target path (or resource).</param>
+        /// <param name="options">The additional request options.</param>
+        /// <param name="configuration">A per-request configuration object. It is assumed that any merge with
+        /// GlobalConfiguration has been done before calling this method.</param>
+        /// <returns>A Task containing ApiResponse</returns>
+        public ApiResponse<T> Delete<T>(string path, RequestOptions options, IReadableConfiguration configuration = null)
+        {
+            var config = configuration ?? GlobalConfiguration.Instance;
+            return Exec<T>(NewRequest(HttpMethod.Delete, path, options, config), options, config);
+        }
+
+        /// <summary>
+        /// Make a HTTP HEAD request (synchronous).
+        /// </summary>
+        /// <param name="path">The target path (or resource).</param>
+        /// <param name="options">The additional request options.</param>
+        /// <param name="configuration">A per-request configuration object. It is assumed that any merge with
+        /// GlobalConfiguration has been done before calling this method.</param>
+        /// <returns>A Task containing ApiResponse</returns>
+        public ApiResponse<T> Head<T>(string path, RequestOptions options, IReadableConfiguration configuration = null)
+        {
+            var config = configuration ?? GlobalConfiguration.Instance;
+            return Exec<T>(NewRequest(HttpMethod.Head, path, options, config), options, config);
+        }
+
+        /// <summary>
+        /// Make a HTTP OPTION request (synchronous).
+        /// </summary>
+        /// <param name="path">The target path (or resource).</param>
+        /// <param name="options">The additional request options.</param>
+        /// <param name="configuration">A per-request configuration object. It is assumed that any merge with
+        /// GlobalConfiguration has been done before calling this method.</param>
+        /// <returns>A Task containing ApiResponse</returns>
+        public ApiResponse<T> Options<T>(string path, RequestOptions options, IReadableConfiguration configuration = null)
+        {
+            var config = configuration ?? GlobalConfiguration.Instance;
+            return Exec<T>(NewRequest(HttpMethod.Options, path, options, config), options, config);
+        }
+
+        /// <summary>
+        /// Make a HTTP PATCH request (synchronous).
+        /// </summary>
+        /// <param name="path">The target path (or resource).</param>
+        /// <param name="options">The additional request options.</param>
+        /// <param name="configuration">A per-request configuration object. It is assumed that any merge with
+        /// GlobalConfiguration has been done before calling this method.</param>
+        /// <returns>A Task containing ApiResponse</returns>
+        public ApiResponse<T> Patch<T>(string path, RequestOptions options, IReadableConfiguration configuration = null)
+        {
+            var config = configuration ?? GlobalConfiguration.Instance;
+            return Exec<T>(NewRequest(HttpMethod.Patch, path, options, config), options, config);
+        }
+        #endregion ISynchronousClient
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiException.cs
new file mode 100644
index 00000000000..64872847b83
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiException.cs
@@ -0,0 +1,68 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// API Exception
+    /// </summary>
+    public class ApiException : Exception
+    {
+        /// <summary>
+        /// Gets or sets the error code (HTTP status code)
+        /// </summary>
+        /// <value>The error code (HTTP status code).</value>
+        public int ErrorCode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the error content (body json object)
+        /// </summary>
+        /// <value>The error content (Http response body).</value>
+        public object ErrorContent { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the HTTP headers
+        /// </summary>
+        /// <value>HTTP headers</value>
+        public Multimap<string, string> Headers { get; private set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiException"/> class.
+        /// </summary>
+        public ApiException() { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiException"/> class.
+        /// </summary>
+        /// <param name="errorCode">HTTP status code.</param>
+        /// <param name="message">Error message.</param>
+        public ApiException(int errorCode, string message) : base(message)
+        {
+            this.ErrorCode = errorCode;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiException"/> class.
+        /// </summary>
+        /// <param name="errorCode">HTTP status code.</param>
+        /// <param name="message">Error message.</param>
+        /// <param name="errorContent">Error content.</param>
+        /// <param name="headers">HTTP Headers.</param>
+        public ApiException(int errorCode, string message, object errorContent = null, Multimap<string, string> headers = null) : base(message)
+        {
+            this.ErrorCode = errorCode;
+            this.ErrorContent = errorContent;
+            this.Headers = headers;
+        }
+    }
+
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponse.cs
new file mode 100644
index 00000000000..62640a59049
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponse.cs
@@ -0,0 +1,166 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Provides a non-generic contract for the ApiResponse wrapper.
+    /// </summary>
+    public interface IApiResponse
+    {
+        /// <summary>
+        /// The data type of <see cref="Content"/>
+        /// </summary>
+        Type ResponseType { get; }
+
+        /// <summary>
+        /// The content of this response
+        /// </summary>
+        Object Content { get; }
+
+        /// <summary>
+        /// Gets or sets the status code (HTTP status code)
+        /// </summary>
+        /// <value>The status code.</value>
+        HttpStatusCode StatusCode { get; }
+
+        /// <summary>
+        /// Gets or sets the HTTP headers
+        /// </summary>
+        /// <value>HTTP headers</value>
+        Multimap<string, string> Headers { get; }
+
+        /// <summary>
+        /// Gets or sets any error text defined by the calling client.
+        /// </summary>
+        string ErrorText { get; set; }
+
+        /// <summary>
+        /// Gets or sets any cookies passed along on the response.
+        /// </summary>
+        List<Cookie> Cookies { get; set; }
+
+        /// <summary>
+        /// The raw content of this response
+        /// </summary>
+        string RawContent { get; }
+    }
+
+    /// <summary>
+    /// API Response
+    /// </summary>
+    public class ApiResponse<T> : IApiResponse
+    {
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the status code (HTTP status code)
+        /// </summary>
+        /// <value>The status code.</value>
+        public HttpStatusCode StatusCode { get; }
+
+        /// <summary>
+        /// Gets or sets the HTTP headers
+        /// </summary>
+        /// <value>HTTP headers</value>
+        public Multimap<string, string> Headers { get; }
+
+        /// <summary>
+        /// Gets or sets the data (parsed HTTP body)
+        /// </summary>
+        /// <value>The data.</value>
+        public T Data { get; }
+
+        /// <summary>
+        /// Gets or sets any error text defined by the calling client.
+        /// </summary>
+        public string ErrorText { get; set; }
+
+        /// <summary>
+        /// Gets or sets any cookies passed along on the response.
+        /// </summary>
+        public List<Cookie> Cookies { get; set; }
+
+        /// <summary>
+        /// The content of this response
+        /// </summary>
+        public Type ResponseType
+        {
+            get { return typeof(T); }
+        }
+
+        /// <summary>
+        /// The data type of <see cref="Content"/>
+        /// </summary>
+        public object Content
+        {
+            get { return Data; }
+        }
+
+        /// <summary>
+        /// The raw content
+        /// </summary>
+        public string RawContent { get; }
+
+        #endregion Properties
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiResponse{T}" /> class.
+        /// </summary>
+        /// <param name="statusCode">HTTP status code.</param>
+        /// <param name="headers">HTTP headers.</param>
+        /// <param name="data">Data (parsed HTTP body)</param>
+        /// <param name="rawContent">Raw content.</param>
+        public ApiResponse(HttpStatusCode statusCode, Multimap<string, string> headers, T data, string rawContent)
+        {
+            StatusCode = statusCode;
+            Headers = headers;
+            Data = data;
+            RawContent = rawContent;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiResponse{T}" /> class.
+        /// </summary>
+        /// <param name="statusCode">HTTP status code.</param>
+        /// <param name="headers">HTTP headers.</param>
+        /// <param name="data">Data (parsed HTTP body)</param>
+        public ApiResponse(HttpStatusCode statusCode, Multimap<string, string> headers, T data) : this(statusCode, headers, data, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiResponse{T}" /> class.
+        /// </summary>
+        /// <param name="statusCode">HTTP status code.</param>
+        /// <param name="data">Data (parsed HTTP body)</param>
+        /// <param name="rawContent">Raw content.</param>
+        public ApiResponse(HttpStatusCode statusCode, T data, string rawContent) : this(statusCode, null, data, rawContent)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiResponse{T}" /> class.
+        /// </summary>
+        /// <param name="statusCode">HTTP status code.</param>
+        /// <param name="data">Data (parsed HTTP body)</param>
+        public ApiResponse(HttpStatusCode statusCode, T data) : this(statusCode, data, null)
+        {
+        }
+
+        #endregion Constructors
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ClientUtils.cs
new file mode 100644
index 00000000000..3cdbe063929
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -0,0 +1,247 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Utility functions providing some benefit to API client consumers.
+    /// </summary>
+    public static class ClientUtils
+    {
+        /// <summary>
+        /// Sanitize filename by removing the path
+        /// </summary>
+        /// <param name="filename">Filename</param>
+        /// <returns>Filename</returns>
+        public static string SanitizeFilename(string filename)
+        {
+            Match match = Regex.Match(filename, @".*[/\\](.*)$");
+            return match.Success ? match.Groups[1].Value : filename;
+        }
+
+        /// <summary>
+        /// Convert params to key/value pairs.
+        /// Use collectionFormat to properly format lists and collections.
+        /// </summary>
+        /// <param name="collectionFormat">The swagger-supported collection format, one of: csv, tsv, ssv, pipes, multi</param>
+        /// <param name="name">Key name.</param>
+        /// <param name="value">Value object.</param>
+        /// <returns>A multimap of keys with 1..n associated values.</returns>
+        public static Multimap<string, string> ParameterToMultiMap(string collectionFormat, string name, object value)
+        {
+            var parameters = new Multimap<string, string>();
+
+            if (value is ICollection collection && collectionFormat == "multi")
+            {
+                foreach (var item in collection)
+                {
+                    parameters.Add(name, ParameterToString(item));
+                }
+            }
+            else if (value is IDictionary dictionary)
+            {
+                if(collectionFormat == "deepObject") {
+                    foreach (DictionaryEntry entry in dictionary)
+                    {
+                        parameters.Add(name + "[" + entry.Key + "]", ParameterToString(entry.Value));
+                    }
+                }
+                else {
+                    foreach (DictionaryEntry entry in dictionary)
+                    {
+                        parameters.Add(entry.Key.ToString(), ParameterToString(entry.Value));
+                    }
+                }
+            }
+            else
+            {
+                parameters.Add(name, ParameterToString(value));
+            }
+
+            return parameters;
+        }
+
+        /// <summary>
+        /// If parameter is DateTime, output in a formatted string (default ISO 8601), customizable with Configuration.DateTime.
+        /// If parameter is a list, join the list with ",".
+        /// Otherwise just return the string.
+        /// </summary>
+        /// <param name="obj">The parameter (header, path, query, form).</param>
+        /// <param name="configuration">An optional configuration instance, providing formatting options used in processing.</param>
+        /// <returns>Formatted string.</returns>
+        public static string ParameterToString(object obj, IReadableConfiguration configuration = null)
+        {
+            if (obj is DateTime dateTime)
+                // Return a formatted date string - Can be customized with Configuration.DateTimeFormat
+                // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o")
+                // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8
+                // For example: 2009-06-15T13:45:30.0000000
+                return dateTime.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat);
+            if (obj is DateTimeOffset dateTimeOffset)
+                // Return a formatted date string - Can be customized with Configuration.DateTimeFormat
+                // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o")
+                // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8
+                // For example: 2009-06-15T13:45:30.0000000
+                return dateTimeOffset.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat);
+            if (obj is bool boolean)
+                return boolean ? "true" : "false";
+            if (obj is ICollection collection) {
+                List<string> entries = new List<string>();
+                foreach (var entry in collection)
+                    entries.Add(ParameterToString(entry, configuration));
+                return string.Join(",", entries);
+            }
+            if (obj is Enum && HasEnumMemberAttrValue(obj))
+                return GetEnumMemberAttrValue(obj);
+
+            return Convert.ToString(obj, CultureInfo.InvariantCulture);
+        }
+
+        /// <summary>
+        /// Serializes the given object when not null. Otherwise return null.
+        /// </summary>
+        /// <param name="obj">The object to serialize.</param>
+        /// <returns>Serialized string.</returns>
+        public static string Serialize(object obj)
+        {
+            return obj != null ? Newtonsoft.Json.JsonConvert.SerializeObject(obj) : null;
+        }
+
+        /// <summary>
+        /// Encode string in base64 format.
+        /// </summary>
+        /// <param name="text">string to be encoded.</param>
+        /// <returns>Encoded string.</returns>
+        public static string Base64Encode(string text)
+        {
+            return Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(text));
+        }
+
+        /// <summary>
+        /// Convert stream to byte array
+        /// </summary>
+        /// <param name="inputStream">Input stream to be converted</param>
+        /// <returns>Byte array</returns>
+        public static byte[] ReadAsBytes(Stream inputStream)
+        {
+            using (var ms = new MemoryStream())
+            {
+                inputStream.CopyTo(ms);
+                return ms.ToArray();
+            }
+        }
+
+        /// <summary>
+        /// Select the Content-Type header's value from the given content-type array:
+        /// if JSON type exists in the given array, use it;
+        /// otherwise use the first one defined in 'consumes'
+        /// </summary>
+        /// <param name="contentTypes">The Content-Type array to select from.</param>
+        /// <returns>The Content-Type header to use.</returns>
+        public static string SelectHeaderContentType(string[] contentTypes)
+        {
+            if (contentTypes.Length == 0)
+                return null;
+
+            foreach (var contentType in contentTypes)
+            {
+                if (IsJsonMime(contentType))
+                    return contentType;
+            }
+
+            return contentTypes[0]; // use the first content type specified in 'consumes'
+        }
+
+        /// <summary>
+        /// Select the Accept header's value from the given accepts array:
+        /// if JSON exists in the given array, use it;
+        /// otherwise use all of them (joining into a string)
+        /// </summary>
+        /// <param name="accepts">The accepts array to select from.</param>
+        /// <returns>The Accept header to use.</returns>
+        public static string SelectHeaderAccept(string[] accepts)
+        {
+            if (accepts.Length == 0)
+                return null;
+
+            if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase))
+                return "application/json";
+
+            return string.Join(",", accepts);
+        }
+
+        /// <summary>
+        /// Provides a case-insensitive check that a provided content type is a known JSON-like content type.
+        /// </summary>
+        public static readonly Regex JsonRegex = new Regex("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$");
+
+        /// <summary>
+        /// Check if the given MIME is a JSON MIME.
+        /// JSON MIME examples:
+        ///    application/json
+        ///    application/json; charset=UTF8
+        ///    APPLICATION/JSON
+        ///    application/vnd.company+json
+        /// </summary>
+        /// <param name="mime">MIME</param>
+        /// <returns>Returns True if MIME type is json.</returns>
+        public static bool IsJsonMime(string mime)
+        {
+            if (string.IsNullOrWhiteSpace(mime)) return false;
+
+            return JsonRegex.IsMatch(mime) || mime.Equals("application/json-patch+json");
+        }
+
+        /// <summary>
+        /// Is the Enum decorated with EnumMember Attribute
+        /// </summary>
+        /// <param name="enumVal"></param>
+        /// <returns>true if found</returns>
+        private static bool HasEnumMemberAttrValue(object enumVal)
+        {
+            if (enumVal == null)
+                throw new ArgumentNullException(nameof(enumVal));
+            var enumType = enumVal.GetType();
+            var memInfo = enumType.GetMember(enumVal.ToString() ?? throw new InvalidOperationException());
+            var attr = memInfo.FirstOrDefault()?.GetCustomAttributes(false).OfType<EnumMemberAttribute>().FirstOrDefault();
+            if (attr != null) return true;
+                return false;
+        }
+
+        /// <summary>
+        /// Get the EnumMember value
+        /// </summary>
+        /// <param name="enumVal"></param>
+        /// <returns>EnumMember value as string otherwise null</returns>
+        private static string GetEnumMemberAttrValue(object enumVal)
+        {
+            if (enumVal == null)
+                throw new ArgumentNullException(nameof(enumVal));
+            var enumType = enumVal.GetType();
+            var memInfo = enumType.GetMember(enumVal.ToString() ?? throw new InvalidOperationException());
+            var attr = memInfo.FirstOrDefault()?.GetCustomAttributes(false).OfType<EnumMemberAttribute>().FirstOrDefault();
+            if (attr != null)
+            {
+                return attr.Value;
+            }
+            return null;
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Configuration.cs
new file mode 100644
index 00000000000..37ef8246397
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Configuration.cs
@@ -0,0 +1,612 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Reflection;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+using System.Net.Http;
+using System.Net.Security;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Represents a set of configuration settings
+    /// </summary>
+    public class Configuration : IReadableConfiguration
+    {
+        #region Constants
+
+        /// <summary>
+        /// Version of the package.
+        /// </summary>
+        /// <value>Version of the package.</value>
+        public const string Version = "1.0.0";
+
+        /// <summary>
+        /// Identifier for ISO 8601 DateTime Format
+        /// </summary>
+        /// <remarks>See https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8 for more information.</remarks>
+        // ReSharper disable once InconsistentNaming
+        public const string ISO8601_DATETIME_FORMAT = "o";
+
+        #endregion Constants
+
+        #region Static Members
+
+        /// <summary>
+        /// Default creation of exceptions for a given method name and response object
+        /// </summary>
+        public static readonly ExceptionFactory DefaultExceptionFactory = (methodName, response) =>
+        {
+            var status = (int)response.StatusCode;
+            if (status >= 400)
+            {
+                return new ApiException(status,
+                    string.Format("Error calling {0}: {1}", methodName, response.RawContent),
+                    response.RawContent, response.Headers);
+            }
+            if (status == 0)
+            {
+                return new ApiException(status,
+                    string.Format("Error calling {0}: {1}", methodName, response.ErrorText), response.ErrorText);
+            }
+            return null;
+        };
+
+        #endregion Static Members
+
+        #region Private Members
+
+        /// <summary>
+        /// Defines the base path of the target API server.
+        /// Example: http://localhost:3000/v1/
+        /// </summary>
+        private string _basePath;
+
+        private bool _useDefaultCredentials = false;
+
+        /// <summary>
+        /// Gets or sets the API key based on the authentication name.
+        /// This is the key and value comprising the "secret" for accessing an API.
+        /// </summary>
+        /// <value>The API key.</value>
+        private IDictionary<string, string> _apiKey;
+
+        /// <summary>
+        /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name.
+        /// </summary>
+        /// <value>The prefix of the API key.</value>
+        private IDictionary<string, string> _apiKeyPrefix;
+
+        private string _dateTimeFormat = ISO8601_DATETIME_FORMAT;
+        private string _tempFolderPath = Path.GetTempPath();
+
+        /// <summary>
+        /// Gets or sets the servers defined in the OpenAPI spec.
+        /// </summary>
+        /// <value>The servers</value>
+        private IList<IReadOnlyDictionary<string, object>> _servers;
+
+        /// <summary>
+        /// Gets or sets the operation servers defined in the OpenAPI spec.
+        /// </summary>
+        /// <value>The operation servers</value>
+        private IReadOnlyDictionary<string, List<IReadOnlyDictionary<string, object>>> _operationServers;
+
+        #endregion Private Members
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Configuration" /> class
+        /// </summary>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("ReSharper", "VirtualMemberCallInConstructor")]
+        public Configuration()
+        {
+            Proxy = null;
+            UserAgent = WebUtility.UrlEncode("OpenAPI-Generator/1.0.0/csharp");
+            BasePath = "http://localhost";
+            DefaultHeaders = new ConcurrentDictionary<string, string>();
+            ApiKey = new ConcurrentDictionary<string, string>();
+            ApiKeyPrefix = new ConcurrentDictionary<string, string>();
+            Servers = new List<IReadOnlyDictionary<string, object>>()
+            {
+                {
+                    new Dictionary<string, object> {
+                        {"url", ""},
+                        {"description", "No description provided"},
+                    }
+                }
+            };
+            OperationServers = new Dictionary<string, List<IReadOnlyDictionary<string, object>>>()
+            {
+            };
+
+            // Setting Timeout has side effects (forces ApiClient creation).
+            Timeout = 100000;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Configuration" /> class
+        /// </summary>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("ReSharper", "VirtualMemberCallInConstructor")]
+        public Configuration(
+            IDictionary<string, string> defaultHeaders,
+            IDictionary<string, string> apiKey,
+            IDictionary<string, string> apiKeyPrefix,
+            string basePath = "http://localhost") : this()
+        {
+            if (string.IsNullOrWhiteSpace(basePath))
+                throw new ArgumentException("The provided basePath is invalid.", "basePath");
+            if (defaultHeaders == null)
+                throw new ArgumentNullException("defaultHeaders");
+            if (apiKey == null)
+                throw new ArgumentNullException("apiKey");
+            if (apiKeyPrefix == null)
+                throw new ArgumentNullException("apiKeyPrefix");
+
+            BasePath = basePath;
+
+            foreach (var keyValuePair in defaultHeaders)
+            {
+                DefaultHeaders.Add(keyValuePair);
+            }
+
+            foreach (var keyValuePair in apiKey)
+            {
+                ApiKey.Add(keyValuePair);
+            }
+
+            foreach (var keyValuePair in apiKeyPrefix)
+            {
+                ApiKeyPrefix.Add(keyValuePair);
+            }
+        }
+
+        #endregion Constructors
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the base path for API access.
+        /// </summary>
+        public virtual string BasePath 
+        {
+            get { return _basePath; }
+            set { _basePath = value; }
+        }
+
+        /// <summary>
+        /// Determine whether or not the "default credentials" (e.g. the user account under which the current process is running) will be sent along to the server. The default is false.
+        /// </summary>
+        public virtual bool UseDefaultCredentials
+        {
+            get { return _useDefaultCredentials; }
+            set { _useDefaultCredentials = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the default header.
+        /// </summary>
+        [Obsolete("Use DefaultHeaders instead.")]
+        public virtual IDictionary<string, string> DefaultHeader
+        {
+            get
+            {
+                return DefaultHeaders;
+            }
+            set
+            {
+                DefaultHeaders = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the default headers.
+        /// </summary>
+        public virtual IDictionary<string, string> DefaultHeaders { get; set; }
+
+        /// <summary>
+        /// Gets or sets the HTTP timeout (milliseconds) of ApiClient. Default to 100000 milliseconds.
+        /// </summary>
+        public virtual int Timeout { get; set; }
+
+        /// <summary>
+        /// Gets or sets the proxy
+        /// </summary>
+        /// <value>Proxy.</value>
+        public virtual WebProxy Proxy { get; set; }
+
+        /// <summary>
+        /// Gets or sets the HTTP user agent.
+        /// </summary>
+        /// <value>Http user agent.</value>
+        public virtual string UserAgent { get; set; }
+
+        /// <summary>
+        /// Gets or sets the username (HTTP basic authentication).
+        /// </summary>
+        /// <value>The username.</value>
+        public virtual string Username { get; set; }
+
+        /// <summary>
+        /// Gets or sets the password (HTTP basic authentication).
+        /// </summary>
+        /// <value>The password.</value>
+        public virtual string Password { get; set; }
+
+        /// <summary>
+        /// Gets the API key with prefix.
+        /// </summary>
+        /// <param name="apiKeyIdentifier">API key identifier (authentication scheme).</param>
+        /// <returns>API key with prefix.</returns>
+        public string GetApiKeyWithPrefix(string apiKeyIdentifier)
+        {
+            string apiKeyValue;
+            ApiKey.TryGetValue(apiKeyIdentifier, out apiKeyValue);
+            string apiKeyPrefix;
+            if (ApiKeyPrefix.TryGetValue(apiKeyIdentifier, out apiKeyPrefix))
+            {
+                return apiKeyPrefix + " " + apiKeyValue;
+            }
+
+            return apiKeyValue;
+        }
+
+        /// <summary>
+        /// Gets or sets certificate collection to be sent with requests.
+        /// </summary>
+        /// <value>X509 Certificate collection.</value>
+        public X509CertificateCollection ClientCertificates { get; set; }
+
+        /// <summary>
+        /// Gets or sets the access token for OAuth2 authentication.
+        ///
+        /// This helper property simplifies code generation.
+        /// </summary>
+        /// <value>The access token.</value>
+        public virtual string AccessToken { get; set; }
+
+        /// <summary>
+        /// Gets or sets the temporary folder path to store the files downloaded from the server.
+        /// </summary>
+        /// <value>Folder path.</value>
+        public virtual string TempFolderPath
+        {
+            get { return _tempFolderPath; }
+
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                {
+                    _tempFolderPath = Path.GetTempPath();
+                    return;
+                }
+
+                // create the directory if it does not exist
+                if (!Directory.Exists(value))
+                {
+                    Directory.CreateDirectory(value);
+                }
+
+                // check if the path contains directory separator at the end
+                if (value[value.Length - 1] == Path.DirectorySeparatorChar)
+                {
+                    _tempFolderPath = value;
+                }
+                else
+                {
+                    _tempFolderPath = value + Path.DirectorySeparatorChar;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the date time format used when serializing in the ApiClient
+        /// By default, it's set to ISO 8601 - "o", for others see:
+        /// https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx
+        /// and https://msdn.microsoft.com/en-us/library/8kb3ddd4(v=vs.110).aspx
+        /// No validation is done to ensure that the string you're providing is valid
+        /// </summary>
+        /// <value>The DateTimeFormat string</value>
+        public virtual string DateTimeFormat
+        {
+            get { return _dateTimeFormat; }
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                {
+                    // Never allow a blank or null string, go back to the default
+                    _dateTimeFormat = ISO8601_DATETIME_FORMAT;
+                    return;
+                }
+
+                // Caution, no validation when you choose date time format other than ISO 8601
+                // Take a look at the above links
+                _dateTimeFormat = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name.
+        ///
+        /// Whatever you set here will be prepended to the value defined in AddApiKey.
+        ///
+        /// An example invocation here might be:
+        /// <example>
+        /// ApiKeyPrefix["Authorization"] = "Bearer";
+        /// </example>
+        /// … where ApiKey["Authorization"] would then be used to set the value of your bearer token.
+        ///
+        /// <remarks>
+        /// OAuth2 workflows should set tokens via AccessToken.
+        /// </remarks>
+        /// </summary>
+        /// <value>The prefix of the API key.</value>
+        public virtual IDictionary<string, string> ApiKeyPrefix
+        {
+            get { return _apiKeyPrefix; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new InvalidOperationException("ApiKeyPrefix collection may not be null.");
+                }
+                _apiKeyPrefix = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the API key based on the authentication name.
+        /// </summary>
+        /// <value>The API key.</value>
+        public virtual IDictionary<string, string> ApiKey
+        {
+            get { return _apiKey; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new InvalidOperationException("ApiKey collection may not be null.");
+                }
+                _apiKey = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the servers.
+        /// </summary>
+        /// <value>The servers.</value>
+        public virtual IList<IReadOnlyDictionary<string, object>> Servers
+        {
+            get { return _servers; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new InvalidOperationException("Servers may not be null.");
+                }
+                _servers = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the operation servers.
+        /// </summary>
+        /// <value>The operation servers.</value>
+        public virtual IReadOnlyDictionary<string, List<IReadOnlyDictionary<string, object>>> OperationServers
+        {
+            get { return _operationServers; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new InvalidOperationException("Operation servers may not be null.");
+                }
+                _operationServers = value;
+            }
+        }
+
+        /// <summary>
+        /// Returns URL based on server settings without providing values
+        /// for the variables
+        /// </summary>
+        /// <param name="index">Array index of the server settings.</param>
+        /// <return>The server URL.</return>
+        public string GetServerUrl(int index)
+        {
+            return GetServerUrl(Servers, index, null);
+        }
+
+        /// <summary>
+        /// Returns URL based on server settings.
+        /// </summary>
+        /// <param name="index">Array index of the server settings.</param>
+        /// <param name="inputVariables">Dictionary of the variables and the corresponding values.</param>
+        /// <return>The server URL.</return>
+        public string GetServerUrl(int index, Dictionary<string, string> inputVariables)
+        {
+            return GetServerUrl(Servers, index, inputVariables);
+        }
+
+        /// <summary>
+        /// Returns URL based on operation server settings.
+        /// </summary>
+        /// <param name="operation">Operation associated with the request path.</param>
+        /// <param name="index">Array index of the server settings.</param>
+        /// <return>The operation server URL.</return>
+        public string GetOperationServerUrl(string operation, int index)
+        {
+            return GetOperationServerUrl(operation, index, null);
+        }
+
+        /// <summary>
+        /// Returns URL based on operation server settings.
+        /// </summary>
+        /// <param name="operation">Operation associated with the request path.</param>
+        /// <param name="index">Array index of the server settings.</param>
+        /// <param name="inputVariables">Dictionary of the variables and the corresponding values.</param>
+        /// <return>The operation server URL.</return>
+        public string GetOperationServerUrl(string operation, int index, Dictionary<string, string> inputVariables)
+        {
+            if (operation != null && OperationServers.TryGetValue(operation, out var operationServer))
+            {
+                return GetServerUrl(operationServer, index, inputVariables);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Returns URL based on server settings.
+        /// </summary>
+        /// <param name="servers">Dictionary of server settings.</param>
+        /// <param name="index">Array index of the server settings.</param>
+        /// <param name="inputVariables">Dictionary of the variables and the corresponding values.</param>
+        /// <return>The server URL.</return>
+        private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers, int index, Dictionary<string, string> inputVariables)
+        {
+            if (index < 0 || index >= servers.Count)
+            {
+                throw new InvalidOperationException($"Invalid index {index} when selecting the server. Must be less than {servers.Count}.");
+            }
+
+            if (inputVariables == null)
+            {
+                inputVariables = new Dictionary<string, string>();
+            }
+
+            IReadOnlyDictionary<string, object> server = servers[index];
+            string url = (string)server["url"];
+
+            if (server.ContainsKey("variables"))
+            {
+                // go through each variable and assign a value
+                foreach (KeyValuePair<string, object> variable in (IReadOnlyDictionary<string, object>)server["variables"])
+                {
+
+                    IReadOnlyDictionary<string, object> serverVariables = (IReadOnlyDictionary<string, object>)(variable.Value);
+
+                    if (inputVariables.ContainsKey(variable.Key))
+                    {
+                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        {
+                            url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]);
+                        }
+                        else
+                        {
+                            throw new InvalidOperationException($"The variable `{variable.Key}` in the server URL has invalid value #{inputVariables[variable.Key]}. Must be {(List<string>)serverVariables["enum_values"]}");
+                        }
+                    }
+                    else
+                    {
+                        // use default value
+                        url = url.Replace("{" + variable.Key + "}", (string)serverVariables["default_value"]);
+                    }
+                }
+            }
+
+            return url;
+        }
+        
+        /// <summary>
+        /// Gets and Sets the RemoteCertificateValidationCallback
+        /// </summary>
+        public RemoteCertificateValidationCallback RemoteCertificateValidationCallback { get; set; }
+
+        #endregion Properties
+
+        #region Methods
+
+        /// <summary>
+        /// Returns a string with essential information for debugging.
+        /// </summary>
+        public static string ToDebugReport()
+        {
+            string report = "C# SDK (Org.OpenAPITools) Debug Report:\n";
+            report += "    OS: " + System.Environment.OSVersion + "\n";
+            report += "    .NET Framework Version: " + System.Environment.Version  + "\n";
+            report += "    Version of the API: 1.0.0\n";
+            report += "    SDK Package Version: 1.0.0\n";
+
+            return report;
+        }
+
+        /// <summary>
+        /// Add Api Key Header.
+        /// </summary>
+        /// <param name="key">Api Key name.</param>
+        /// <param name="value">Api Key value.</param>
+        /// <returns></returns>
+        public void AddApiKey(string key, string value)
+        {
+            ApiKey[key] = value;
+        }
+
+        /// <summary>
+        /// Sets the API key prefix.
+        /// </summary>
+        /// <param name="key">Api Key name.</param>
+        /// <param name="value">Api Key value.</param>
+        public void AddApiKeyPrefix(string key, string value)
+        {
+            ApiKeyPrefix[key] = value;
+        }
+
+        #endregion Methods
+
+        #region Static Members
+        /// <summary>
+        /// Merge configurations.
+        /// </summary>
+        /// <param name="first">First configuration.</param>
+        /// <param name="second">Second configuration.</param>
+        /// <return>Merged configuration.</return>
+        public static IReadableConfiguration MergeConfigurations(IReadableConfiguration first, IReadableConfiguration second)
+        {
+            if (second == null) return first ?? GlobalConfiguration.Instance;
+
+            Dictionary<string, string> apiKey = first.ApiKey.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+            Dictionary<string, string> apiKeyPrefix = first.ApiKeyPrefix.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+            Dictionary<string, string> defaultHeaders = first.DefaultHeaders.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+
+            foreach (var kvp in second.ApiKey) apiKey[kvp.Key] = kvp.Value;
+            foreach (var kvp in second.ApiKeyPrefix) apiKeyPrefix[kvp.Key] = kvp.Value;
+            foreach (var kvp in second.DefaultHeaders) defaultHeaders[kvp.Key] = kvp.Value;
+
+            var config = new Configuration
+            {
+                ApiKey = apiKey,
+                ApiKeyPrefix = apiKeyPrefix,
+                DefaultHeaders = defaultHeaders,
+                BasePath = second.BasePath ?? first.BasePath,
+                Timeout = second.Timeout,
+                Proxy = second.Proxy ?? first.Proxy,
+                UserAgent = second.UserAgent ?? first.UserAgent,
+                Username = second.Username ?? first.Username,
+                Password = second.Password ?? first.Password,
+                AccessToken = second.AccessToken ?? first.AccessToken,
+                TempFolderPath = second.TempFolderPath ?? first.TempFolderPath,
+                DateTimeFormat = second.DateTimeFormat ?? first.DateTimeFormat,
+                ClientCertificates = second.ClientCertificates ?? first.ClientCertificates,
+                UseDefaultCredentials = second.UseDefaultCredentials,
+                RemoteCertificateValidationCallback = second.RemoteCertificateValidationCallback ?? first.RemoteCertificateValidationCallback,
+            };
+            return config;
+        }
+        #endregion Static Members
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ExceptionFactory.cs
new file mode 100644
index 00000000000..12d2e18f66e
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ExceptionFactory.cs
@@ -0,0 +1,22 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// A delegate to ExceptionFactory method
+    /// </summary>
+    /// <param name="methodName">Method name</param>
+    /// <param name="response">Response</param>
+    /// <returns>Exceptions</returns>
+    public delegate Exception ExceptionFactory(string methodName, IApiResponse response);
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/GlobalConfiguration.cs
new file mode 100644
index 00000000000..c0351acf121
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/GlobalConfiguration.cs
@@ -0,0 +1,67 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System.Collections.Generic;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// <see cref="GlobalConfiguration"/> provides a compile-time extension point for globally configuring
+    /// API Clients.
+    /// </summary>
+    /// <remarks>
+    /// A customized implementation via partial class may reside in another file and may
+    /// be excluded from automatic generation via a .openapi-generator-ignore file.
+    /// </remarks>
+    public partial class GlobalConfiguration : Configuration
+    {
+        #region Private Members
+
+        private static readonly object GlobalConfigSync = new { };
+        private static IReadableConfiguration _globalConfiguration;
+
+        #endregion Private Members
+
+        #region Constructors
+
+        /// <inheritdoc />
+        private GlobalConfiguration()
+        {
+        }
+
+        /// <inheritdoc />
+        public GlobalConfiguration(IDictionary<string, string> defaultHeader, IDictionary<string, string> apiKey, IDictionary<string, string> apiKeyPrefix, string basePath = "http://localhost:3000/api") : base(defaultHeader, apiKey, apiKeyPrefix, basePath)
+        {
+        }
+
+        static GlobalConfiguration()
+        {
+            Instance = new GlobalConfiguration();
+        }
+
+        #endregion Constructors
+
+        /// <summary>
+        /// Gets or sets the default Configuration.
+        /// </summary>
+        /// <value>Configuration.</value>
+        public static IReadableConfiguration Instance
+        {
+            get { return _globalConfiguration; }
+            set
+            {
+                lock (GlobalConfigSync)
+                {
+                    _globalConfiguration = value;
+                }
+            }
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/HttpMethod.cs
new file mode 100644
index 00000000000..e06a7dbd6cc
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/HttpMethod.cs
@@ -0,0 +1,33 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Http methods supported by swagger
+    /// </summary>
+    public enum HttpMethod
+    {
+        /// <summary>HTTP GET request.</summary>
+        Get,
+        /// <summary>HTTP POST request.</summary>
+        Post,
+        /// <summary>HTTP PUT request.</summary>
+        Put,
+        /// <summary>HTTP DELETE request.</summary>
+        Delete,
+        /// <summary>HTTP HEAD request.</summary>
+        Head,
+        /// <summary>HTTP OPTIONS request.</summary>
+        Options,
+        /// <summary>HTTP PATCH request.</summary>
+        Patch
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IApiAccessor.cs
new file mode 100644
index 00000000000..e31d64e704a
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IApiAccessor.cs
@@ -0,0 +1,37 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Represents configuration aspects required to interact with the API endpoints.
+    /// </summary>
+    public interface IApiAccessor
+    {
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        IReadableConfiguration Configuration { get; set; }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        string GetBasePath();
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        ExceptionFactory ExceptionFactory { get; set; }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IAsynchronousClient.cs
new file mode 100644
index 00000000000..b1c5178bca6
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IAsynchronousClient.cs
@@ -0,0 +1,100 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.Threading.Tasks;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Contract for Asynchronous RESTful API interactions.
+    ///
+    /// This interface allows consumers to provide a custom API accessor client.
+    /// </summary>
+    public interface IAsynchronousClient
+    {
+        /// <summary>
+        /// Executes a non-blocking call to some <paramref name="path"/> using the GET http verb.
+        /// </summary>
+        /// <param name="path">The relative path to invoke.</param>
+        /// <param name="options">The request parameters to pass along to the client.</param>
+        /// <param name="configuration">Per-request configurable settings.</param>
+        /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
+        /// <typeparam name="T">The return type.</typeparam>
+        /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
+        Task<ApiResponse<T>> GetAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+
+        /// <summary>
+        /// Executes a non-blocking call to some <paramref name="path"/> using the POST http verb.
+        /// </summary>
+        /// <param name="path">The relative path to invoke.</param>
+        /// <param name="options">The request parameters to pass along to the client.</param>
+        /// <param name="configuration">Per-request configurable settings.</param>
+        /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
+        /// <typeparam name="T">The return type.</typeparam>
+        /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
+        Task<ApiResponse<T>> PostAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+
+        /// <summary>
+        /// Executes a non-blocking call to some <paramref name="path"/> using the PUT http verb.
+        /// </summary>
+        /// <param name="path">The relative path to invoke.</param>
+        /// <param name="options">The request parameters to pass along to the client.</param>
+        /// <param name="configuration">Per-request configurable settings.</param>
+        /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
+        /// <typeparam name="T">The return type.</typeparam>
+        /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
+        Task<ApiResponse<T>> PutAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+
+        /// <summary>
+        /// Executes a non-blocking call to some <paramref name="path"/> using the DELETE http verb.
+        /// </summary>
+        /// <param name="path">The relative path to invoke.</param>
+        /// <param name="options">The request parameters to pass along to the client.</param>
+        /// <param name="configuration">Per-request configurable settings.</param>
+        /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
+        /// <typeparam name="T">The return type.</typeparam>
+        /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
+        Task<ApiResponse<T>> DeleteAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+
+        /// <summary>
+        /// Executes a non-blocking call to some <paramref name="path"/> using the HEAD http verb.
+        /// </summary>
+        /// <param name="path">The relative path to invoke.</param>
+        /// <param name="options">The request parameters to pass along to the client.</param>
+        /// <param name="configuration">Per-request configurable settings.</param>
+        /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
+        /// <typeparam name="T">The return type.</typeparam>
+        /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
+        Task<ApiResponse<T>> HeadAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+
+        /// <summary>
+        /// Executes a non-blocking call to some <paramref name="path"/> using the OPTIONS http verb.
+        /// </summary>
+        /// <param name="path">The relative path to invoke.</param>
+        /// <param name="options">The request parameters to pass along to the client.</param>
+        /// <param name="configuration">Per-request configurable settings.</param>
+        /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
+        /// <typeparam name="T">The return type.</typeparam>
+        /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
+        Task<ApiResponse<T>> OptionsAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+
+        /// <summary>
+        /// Executes a non-blocking call to some <paramref name="path"/> using the PATCH http verb.
+        /// </summary>
+        /// <param name="path">The relative path to invoke.</param>
+        /// <param name="options">The request parameters to pass along to the client.</param>
+        /// <param name="configuration">Per-request configurable settings.</param>
+        /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
+        /// <typeparam name="T">The return type.</typeparam>
+        /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
+        Task<ApiResponse<T>> PatchAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
new file mode 100644
index 00000000000..b5ffbc06997
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
@@ -0,0 +1,141 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Represents a readable-only configuration contract.
+    /// </summary>
+    public interface IReadableConfiguration
+    {
+        /// <summary>
+        /// Gets the access token.
+        /// </summary>
+        /// <value>Access token.</value>
+        string AccessToken { get; }
+
+        /// <summary>
+        /// Gets the API key.
+        /// </summary>
+        /// <value>API key.</value>
+        IDictionary<string, string> ApiKey { get; }
+
+        /// <summary>
+        /// Gets the API key prefix.
+        /// </summary>
+        /// <value>API key prefix.</value>
+        IDictionary<string, string> ApiKeyPrefix { get; }
+
+        /// <summary>
+        /// Gets the base path.
+        /// </summary>
+        /// <value>Base path.</value>
+        string BasePath { get; }
+
+        /// <summary>
+        /// Gets the date time format.
+        /// </summary>
+        /// <value>Date time format.</value>
+        string DateTimeFormat { get; }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <value>Default header.</value>
+        [Obsolete("Use DefaultHeaders instead.")]
+        IDictionary<string, string> DefaultHeader { get; }
+
+        /// <summary>
+        /// Gets the default headers.
+        /// </summary>
+        /// <value>Default headers.</value>
+        IDictionary<string, string> DefaultHeaders { get; }
+
+        /// <summary>
+        /// Gets the temp folder path.
+        /// </summary>
+        /// <value>Temp folder path.</value>
+        string TempFolderPath { get; }
+
+        /// <summary>
+        /// Gets the HTTP connection timeout (in milliseconds)
+        /// </summary>
+        /// <value>HTTP connection timeout.</value>
+        int Timeout { get; }
+
+        /// <summary>
+        /// Gets the proxy.
+        /// </summary>
+        /// <value>Proxy.</value>
+        WebProxy Proxy { get; }
+
+        /// <summary>
+        /// Gets the user agent.
+        /// </summary>
+        /// <value>User agent.</value>
+        string UserAgent { get; }
+
+        /// <summary>
+        /// Gets the username.
+        /// </summary>
+        /// <value>Username.</value>
+        string Username { get; }
+
+        /// <summary>
+        /// Gets the password.
+        /// </summary>
+        /// <value>Password.</value>
+        string Password { get; }
+
+        /// <summary>
+        /// Determine whether or not the "default credentials" (e.g. the user account under which the current process is running) will be sent along to the server. The default is false.
+        /// </summary>
+        bool UseDefaultCredentials { get; }
+
+        /// <summary>
+        /// Get the servers associated with the operation.
+        /// </summary>
+        /// <value>Operation servers.</value>
+        IReadOnlyDictionary<string, List<IReadOnlyDictionary<string, object>>> OperationServers { get; }
+
+        /// <summary>
+        /// Gets the API key with prefix.
+        /// </summary>
+        /// <param name="apiKeyIdentifier">API key identifier (authentication scheme).</param>
+        /// <returns>API key with prefix.</returns>
+        string GetApiKeyWithPrefix(string apiKeyIdentifier);
+
+        /// <summary>
+        /// Gets the Operation server url at the provided index.
+        /// </summary>
+        /// <param name="operation">Operation server name.</param>
+        /// <param name="index">Index of the operation server settings.</param>
+        /// <returns></returns>
+        string GetOperationServerUrl(string operation, int index);
+
+        /// <summary>
+        /// Gets certificate collection to be sent with requests.
+        /// </summary>
+        /// <value>X509 Certificate collection.</value>
+        X509CertificateCollection ClientCertificates { get; }
+
+        /// <summary>
+        /// Callback function for handling the validation of remote certificates. Useful for certificate pinning and
+        /// overriding certificate errors in the scope of a request.
+        /// </summary>
+        RemoteCertificateValidationCallback RemoteCertificateValidationCallback { get; }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ISynchronousClient.cs
new file mode 100644
index 00000000000..965cec3b043
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ISynchronousClient.cs
@@ -0,0 +1,93 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.IO;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Contract for Synchronous RESTful API interactions.
+    ///
+    /// This interface allows consumers to provide a custom API accessor client.
+    /// </summary>
+    public interface ISynchronousClient
+    {
+        /// <summary>
+        /// Executes a blocking call to some <paramref name="path"/> using the GET http verb.
+        /// </summary>
+        /// <param name="path">The relative path to invoke.</param>
+        /// <param name="options">The request parameters to pass along to the client.</param>
+        /// <param name="configuration">Per-request configurable settings.</param>
+        /// <typeparam name="T">The return type.</typeparam>
+        /// <returns>The response data, decorated with <see cref="ApiResponse{T}"/></returns>
+        ApiResponse<T> Get<T>(string path, RequestOptions options, IReadableConfiguration configuration = null);
+
+        /// <summary>
+        /// Executes a blocking call to some <paramref name="path"/> using the POST http verb.
+        /// </summary>
+        /// <param name="path">The relative path to invoke.</param>
+        /// <param name="options">The request parameters to pass along to the client.</param>
+        /// <param name="configuration">Per-request configurable settings.</param>
+        /// <typeparam name="T">The return type.</typeparam>
+        /// <returns>The response data, decorated with <see cref="ApiResponse{T}"/></returns>
+        ApiResponse<T> Post<T>(string path, RequestOptions options, IReadableConfiguration configuration = null);
+
+        /// <summary>
+        /// Executes a blocking call to some <paramref name="path"/> using the PUT http verb.
+        /// </summary>
+        /// <param name="path">The relative path to invoke.</param>
+        /// <param name="options">The request parameters to pass along to the client.</param>
+        /// <param name="configuration">Per-request configurable settings.</param>
+        /// <typeparam name="T">The return type.</typeparam>
+        /// <returns>The response data, decorated with <see cref="ApiResponse{T}"/></returns>
+        ApiResponse<T> Put<T>(string path, RequestOptions options, IReadableConfiguration configuration = null);
+
+        /// <summary>
+        /// Executes a blocking call to some <paramref name="path"/> using the DELETE http verb.
+        /// </summary>
+        /// <param name="path">The relative path to invoke.</param>
+        /// <param name="options">The request parameters to pass along to the client.</param>
+        /// <param name="configuration">Per-request configurable settings.</param>
+        /// <typeparam name="T">The return type.</typeparam>
+        /// <returns>The response data, decorated with <see cref="ApiResponse{T}"/></returns>
+        ApiResponse<T> Delete<T>(string path, RequestOptions options, IReadableConfiguration configuration = null);
+
+        /// <summary>
+        /// Executes a blocking call to some <paramref name="path"/> using the HEAD http verb.
+        /// </summary>
+        /// <param name="path">The relative path to invoke.</param>
+        /// <param name="options">The request parameters to pass along to the client.</param>
+        /// <param name="configuration">Per-request configurable settings.</param>
+        /// <typeparam name="T">The return type.</typeparam>
+        /// <returns>The response data, decorated with <see cref="ApiResponse{T}"/></returns>
+        ApiResponse<T> Head<T>(string path, RequestOptions options, IReadableConfiguration configuration = null);
+
+        /// <summary>
+        /// Executes a blocking call to some <paramref name="path"/> using the OPTIONS http verb.
+        /// </summary>
+        /// <param name="path">The relative path to invoke.</param>
+        /// <param name="options">The request parameters to pass along to the client.</param>
+        /// <param name="configuration">Per-request configurable settings.</param>
+        /// <typeparam name="T">The return type.</typeparam>
+        /// <returns>The response data, decorated with <see cref="ApiResponse{T}"/></returns>
+        ApiResponse<T> Options<T>(string path, RequestOptions options, IReadableConfiguration configuration = null);
+
+        /// <summary>
+        /// Executes a blocking call to some <paramref name="path"/> using the PATCH http verb.
+        /// </summary>
+        /// <param name="path">The relative path to invoke.</param>
+        /// <param name="options">The request parameters to pass along to the client.</param>
+        /// <param name="configuration">Per-request configurable settings.</param>
+        /// <typeparam name="T">The return type.</typeparam>
+        /// <returns>The response data, decorated with <see cref="ApiResponse{T}"/></returns>
+        ApiResponse<T> Patch<T>(string path, RequestOptions options, IReadableConfiguration configuration = null);
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Multimap.cs
new file mode 100644
index 00000000000..b3fdf6b71a3
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Multimap.cs
@@ -0,0 +1,295 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// A dictionary in which one key has many associated values.
+    /// </summary>
+    /// <typeparam name="TKey">The type of the key</typeparam>
+    /// <typeparam name="TValue">The type of the value associated with the key.</typeparam>
+    public class Multimap<TKey, TValue> : IDictionary<TKey, IList<TValue>>
+    {
+        #region Private Fields
+
+        private readonly Dictionary<TKey, IList<TValue>> _dictionary;
+
+        #endregion Private Fields
+
+        #region Constructors
+
+        /// <summary>
+        /// Empty Constructor.
+        /// </summary>
+        public Multimap()
+        {
+            _dictionary = new Dictionary<TKey, IList<TValue>>();
+        }
+
+        /// <summary>
+        /// Constructor with comparer.
+        /// </summary>
+        /// <param name="comparer"></param>
+        public Multimap(IEqualityComparer<TKey> comparer)
+        {
+            _dictionary = new Dictionary<TKey, IList<TValue>>(comparer);
+        }
+
+        #endregion Constructors
+
+        #region Enumerators
+
+        /// <summary>
+        /// To get the enumerator.
+        /// </summary>
+        /// <returns>Enumerator</returns>
+        public IEnumerator<KeyValuePair<TKey, IList<TValue>>> GetEnumerator()
+        {
+            return _dictionary.GetEnumerator();
+        }
+
+        /// <summary>
+        /// To get the enumerator.
+        /// </summary>
+        /// <returns>Enumerator</returns>
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return _dictionary.GetEnumerator();
+        }
+
+        #endregion Enumerators
+
+        #region Public Members
+        /// <summary>
+        /// Add values to Multimap
+        /// </summary>
+        /// <param name="item">Key value pair</param>
+        public void Add(KeyValuePair<TKey, IList<TValue>> item)
+        {
+            if (!TryAdd(item.Key, item.Value))
+                throw new InvalidOperationException("Could not add values to Multimap.");
+        }
+
+        /// <summary>
+        /// Add Multimap to Multimap
+        /// </summary>
+        /// <param name="multimap">Multimap</param>
+        public void Add(Multimap<TKey, TValue> multimap)
+        {
+            foreach (var item in multimap)
+            {
+                if (!TryAdd(item.Key, item.Value))
+                    throw new InvalidOperationException("Could not add values to Multimap.");
+            }
+        }
+
+        /// <summary>
+        /// Clear Multimap
+        /// </summary>
+        public void Clear()
+        {
+            _dictionary.Clear();
+        }
+
+        /// <summary>
+        /// Determines whether Multimap contains the specified item.
+        /// </summary>
+        /// <param name="item">Key value pair</param>
+        /// <exception cref="NotImplementedException">Method needs to be implemented</exception>
+        /// <returns>true if the Multimap contains the item; otherwise, false.</returns>
+        public bool Contains(KeyValuePair<TKey, IList<TValue>> item)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        ///  Copy items of the Multimap to an array,
+        ///     starting at a particular array index.
+        /// </summary>
+        /// <param name="array">The array that is the destination of the items copied
+        ///     from Multimap. The array must have zero-based indexing.</param>
+        /// <param name="arrayIndex">The zero-based index in array at which copying begins.</param>
+        /// <exception cref="NotImplementedException">Method needs to be implemented</exception>
+        public void CopyTo(KeyValuePair<TKey, IList<TValue>>[] array, int arrayIndex)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Removes the specified item from the Multimap.
+        /// </summary>
+        /// <param name="item">Key value pair</param>
+        /// <returns>true if the item is successfully removed; otherwise, false.</returns>
+        /// <exception cref="NotImplementedException">Method needs to be implemented</exception>
+        public bool Remove(KeyValuePair<TKey, IList<TValue>> item)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Gets the number of items contained in the Multimap.
+        /// </summary>
+        public int Count => _dictionary.Count;
+
+        /// <summary>
+        /// Gets a value indicating whether the Multimap is read-only.
+        /// </summary>
+        public bool IsReadOnly => false;
+
+        /// <summary>
+        /// Adds an item with the provided key and value to the Multimap.
+        /// </summary>
+        /// <param name="key">The object to use as the key of the item to add.</param>
+        /// <param name="value">The object to use as the value of the item to add.</param>
+        /// <exception cref="InvalidOperationException">Thrown when couldn't add the value to Multimap.</exception>
+        public void Add(TKey key, IList<TValue> value)
+        {
+            if (value != null && value.Count > 0)
+            {
+                if (_dictionary.TryGetValue(key, out var list))
+                {
+                    foreach (var k in value) list.Add(k);
+                }
+                else
+                {
+                    list = new List<TValue>(value);
+                    if (!TryAdd(key, list))
+                        throw new InvalidOperationException("Could not add values to Multimap.");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the Multimap contains an item with the specified key.
+        /// </summary>
+        /// <param name="key">The key to locate in the Multimap.</param>
+        /// <returns>true if the Multimap contains an item with
+        ///     the key; otherwise, false.</returns>
+        public bool ContainsKey(TKey key)
+        {
+            return _dictionary.ContainsKey(key);
+        }
+
+        /// <summary>
+        /// Removes item with the specified key from the Multimap.
+        /// </summary>
+        /// <param name="key">The key to locate in the Multimap.</param>
+        /// <returns>true if the item is successfully removed; otherwise, false.</returns>
+        public bool Remove(TKey key)
+        {
+            return TryRemove(key, out var _);
+        }
+
+        /// <summary>
+        /// Gets the value associated with the specified key.
+        /// </summary>
+        /// <param name="key">The key whose value to get.</param>
+        /// <param name="value">When this method returns, the value associated with the specified key, if the
+        ///     key is found; otherwise, the default value for the type of the value parameter.
+        ///     This parameter is passed uninitialized.</param>
+        /// <returns> true if the object that implements Multimap contains
+        ///     an item with the specified key; otherwise, false.</returns>
+        public bool TryGetValue(TKey key, out IList<TValue> value)
+        {
+            return _dictionary.TryGetValue(key, out value);
+        }
+
+        /// <summary>
+        /// Gets or sets the item with the specified key.
+        /// </summary>
+        /// <param name="key">The key of the item to get or set.</param>
+        /// <returns>The value of the specified key.</returns>
+        public IList<TValue> this[TKey key]
+        {
+            get => _dictionary[key];
+            set => _dictionary[key] = value;
+        }
+
+        /// <summary>
+        /// Gets a System.Collections.Generic.ICollection containing the keys of the Multimap.
+        /// </summary>
+        public ICollection<TKey> Keys => _dictionary.Keys;
+
+        /// <summary>
+        /// Gets a System.Collections.Generic.ICollection containing the values of the Multimap.
+        /// </summary>
+        public ICollection<IList<TValue>> Values => _dictionary.Values;
+
+        /// <summary>
+        ///  Copy the items of the Multimap to an System.Array,
+        ///     starting at a particular System.Array index.
+        /// </summary>
+        /// <param name="array">The one-dimensional System.Array that is the destination of the items copied
+        ///     from Multimap. The System.Array must have zero-based indexing.</param>
+        /// <param name="index">The zero-based index in array at which copying begins.</param>
+        public void CopyTo(Array array, int index)
+        {
+            ((ICollection)_dictionary).CopyTo(array, index);
+        }
+
+        /// <summary>
+        /// Adds an item with the provided key and value to the Multimap.
+        /// </summary>
+        /// <param name="key">The object to use as the key of the item to add.</param>
+        /// <param name="value">The object to use as the value of the item to add.</param>
+        /// <exception cref="InvalidOperationException">Thrown when couldn't add value to Multimap.</exception>
+        public void Add(TKey key, TValue value)
+        {
+            if (value != null)
+            {
+                if (_dictionary.TryGetValue(key, out var list))
+                {
+                    list.Add(value);
+                }
+                else
+                {
+                    list = new List<TValue> { value };
+                    if (!TryAdd(key, list))
+                        throw new InvalidOperationException("Could not add value to Multimap.");
+                }
+            }
+        }
+
+        #endregion Public Members
+
+        #region Private Members
+
+        /**
+         * Helper method to encapsulate generator differences between dictionary types.
+         */
+        private bool TryRemove(TKey key, out IList<TValue> value)
+        {
+            _dictionary.TryGetValue(key, out value);
+            return _dictionary.Remove(key);
+        }
+
+        /**
+         * Helper method to encapsulate generator differences between dictionary types.
+         */
+        private bool TryAdd(TKey key, IList<TValue> value)
+        {
+            try
+            {
+                _dictionary.Add(key, value);
+            }
+            catch (ArgumentException)
+            {
+                return false;
+            }
+
+            return true;
+        }
+        #endregion Private Members
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
new file mode 100644
index 00000000000..b56476476ac
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
@@ -0,0 +1,29 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using Newtonsoft.Json.Converters;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339
+    /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types
+    /// </summary>
+    public class OpenAPIDateConverter : IsoDateTimeConverter
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenAPIDateConverter" /> class.
+        /// </summary>
+        public OpenAPIDateConverter()
+        {
+            // full-date   = date-fullyear "-" date-month "-" date-mday
+            DateTimeFormat = "yyyy-MM-dd";
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RequestOptions.cs
new file mode 100644
index 00000000000..2f65f902cff
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RequestOptions.cs
@@ -0,0 +1,84 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// A container for generalized request inputs. This type allows consumers to extend the request functionality
+    /// by abstracting away from the default (built-in) request framework (e.g. RestSharp).
+    /// </summary>
+    public class RequestOptions
+    {
+        /// <summary>
+        /// Parameters to be bound to path parts of the Request's URL
+        /// </summary>
+        public Dictionary<string, string> PathParameters { get; set; }
+
+        /// <summary>
+        /// Query parameters to be applied to the request.
+        /// Keys may have 1 or more values associated.
+        /// </summary>
+        public Multimap<string, string> QueryParameters { get; set; }
+
+        /// <summary>
+        /// Header parameters to be applied to the request.
+        /// Keys may have 1 or more values associated.
+        /// </summary>
+        public Multimap<string, string> HeaderParameters { get; set; }
+
+        /// <summary>
+        /// Form parameters to be sent along with the request.
+        /// </summary>
+        public Dictionary<string, string> FormParameters { get; set; }
+
+        /// <summary>
+        /// File parameters to be sent along with the request.
+        /// </summary>
+        public Multimap<string, Stream> FileParameters { get; set; }
+
+        /// <summary>
+        /// Cookies to be sent along with the request.
+        /// </summary>
+        public List<Cookie> Cookies { get; set; }
+
+        /// <summary>
+        /// Operation associated with the request path.
+        /// </summary>
+        public string Operation { get; set; }
+
+        /// <summary>
+        /// Index associated with the operation.
+        /// </summary>
+        public int OperationIndex { get; set; }
+
+        /// <summary>
+        /// Any data associated with a request body.
+        /// </summary>
+        public Object Data { get; set; }
+
+        /// <summary>
+        /// Constructs a new instance of <see cref="RequestOptions"/>
+        /// </summary>
+        public RequestOptions()
+        {
+            PathParameters = new Dictionary<string, string>();
+            QueryParameters = new Multimap<string, string>();
+            HeaderParameters = new Multimap<string, string>();
+            FormParameters = new Dictionary<string, string>();
+            FileParameters = new Multimap<string, Stream>();
+            Cookies = new List<Cookie>();
+        }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RetryConfiguration.cs
new file mode 100644
index 00000000000..ca42aee633b
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -0,0 +1,31 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using Polly;
+using RestSharp;
+
+namespace Org.OpenAPITools.Client
+{
+    /// <summary>
+    /// Configuration class to set the polly retry policies to be applied to the requests.
+    /// </summary>
+    public static class RetryConfiguration
+    {
+        /// <summary>
+        /// Retry policy
+        /// </summary>
+        public static Policy<RestResponse> RetryPolicy { get; set; }
+
+        /// <summary>
+        /// Async retry policy
+        /// </summary>
+        public static AsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs
new file mode 100644
index 00000000000..16a2db7a38a
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs
@@ -0,0 +1,76 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    ///  Abstract base class for oneOf, anyOf schemas in the OpenAPI specification
+    /// </summary>
+    public abstract partial class AbstractOpenAPISchema
+    {
+        /// <summary>
+        ///  Custom JSON serializer
+        /// </summary>
+        static public readonly JsonSerializerSettings SerializerSettings = new JsonSerializerSettings
+        {
+            // OpenAPI generated types generally hide default constructors.
+            ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor,
+            MissingMemberHandling = MissingMemberHandling.Error,
+            ContractResolver = new DefaultContractResolver
+            {
+                NamingStrategy = new CamelCaseNamingStrategy
+                {
+                    OverrideSpecifiedNames = false
+                }
+            }
+        };
+
+        /// <summary>
+        ///  Custom JSON serializer for objects with additional properties
+        /// </summary>
+        static public readonly JsonSerializerSettings AdditionalPropertiesSerializerSettings = new JsonSerializerSettings
+        {
+            // OpenAPI generated types generally hide default constructors.
+            ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor,
+            MissingMemberHandling = MissingMemberHandling.Ignore,
+            ContractResolver = new DefaultContractResolver
+            {
+                NamingStrategy = new CamelCaseNamingStrategy
+                {
+                    OverrideSpecifiedNames = false
+                }
+            }
+        };
+
+        /// <summary>
+        /// Gets or Sets the actual instance
+        /// </summary>
+        public abstract Object ActualInstance { get; set; }
+
+        /// <summary>
+        /// Gets or Sets IsNullable to indicate whether the instance is nullable
+        /// </summary>
+        public bool IsNullable { get; protected set; }
+
+        /// <summary>
+        /// Gets or Sets the schema type, which can be either `oneOf` or `anyOf`
+        /// </summary>
+        public string SchemaType { get; protected set; }
+
+        /// <summary>
+        /// Converts the instance into JSON string.
+        /// </summary>
+        public abstract string ToJson();
+    }
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/NowGet200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/NowGet200Response.cs
new file mode 100644
index 00000000000..08559efc770
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/NowGet200Response.cs
@@ -0,0 +1,92 @@
+/*
+ * OpenAPI Dates
+ *
+ * Thic spec contains endpoints with dates in different formats
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Text.RegularExpressions;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// NowGet200Response
+    /// </summary>
+    [DataContract(Name = "_now_get_200_response")]
+    public partial class NowGet200Response : IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NowGet200Response" /> class.
+        /// </summary>
+        /// <param name="today">today.</param>
+        /// <param name="now">now.</param>
+        public NowGet200Response(DateTime today = default(DateTime), DateTime now = default(DateTime))
+        {
+            this.Today = today;
+            this.Now = now;
+        }
+
+        /// <summary>
+        /// Gets or Sets Today
+        /// </summary>
+        [DataMember(Name = "today", EmitDefaultValue = false)]
+        [JsonConverter(typeof(OpenAPIDateConverter))]
+        public DateTime Today { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Now
+        /// </summary>
+        [DataMember(Name = "now", EmitDefaultValue = false)]
+        public DateTime Now { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("class NowGet200Response {\n");
+            sb.Append("  Today: ").Append(Today).Append("\n");
+            sb.Append("  Now: ").Append(Now).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj
new file mode 100644
index 00000000000..721eade2ad1
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo><!-- setting GenerateAssemblyInfo to false causes this bug https://github.com/dotnet/project-system/issues/3934 -->
+    <TargetFramework>net7.0</TargetFramework>
+    <AssemblyName>Org.OpenAPITools</AssemblyName>
+    <PackageId>Org.OpenAPITools</PackageId>
+    <OutputType>Library</OutputType>
+    <Authors>OpenAPI</Authors>
+    <Company>OpenAPI</Company>
+    <AssemblyTitle>OpenAPI Library</AssemblyTitle>
+    <Description>A library generated from a OpenAPI doc</Description>
+    <Copyright>No Copyright</Copyright>
+    <RootNamespace>Org.OpenAPITools</RootNamespace>
+    <Version>1.0.0</Version>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Org.OpenAPITools.xml</DocumentationFile>
+    <RepositoryUrl>https://github.com/GIT_USER_ID/GIT_REPO_ID.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageReleaseNotes>Minor update</PackageReleaseNotes>
+    <Nullable>annotations</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="JsonSubTypes" Version="2.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="RestSharp" Version="110.2.0" />
+    <PackageReference Include="Polly" Version="8.1.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="System.Web" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.Web" />
+  </ItemGroup>
+</Project>
diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/DateOnlyClass.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/DateOnlyClass.md
index d0912d2ac41..8291b9cb6d7 100644
--- a/samples/client/petstore/csharp/OpenAPIClientCore/docs/DateOnlyClass.md
+++ b/samples/client/petstore/csharp/OpenAPIClientCore/docs/DateOnlyClass.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**DateOnlyProperty** | **DateTime** |  | [optional] 
+**DateOnlyProperty** | **DateOnly** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/FakeApi.md
index 46dc77ec1a1..b939df0baf1 100644
--- a/samples/client/petstore/csharp/OpenAPIClientCore/docs/FakeApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClientCore/docs/FakeApi.md
@@ -896,7 +896,7 @@ No authorization required
 
 <a id="testendpointparameters"></a>
 # **TestEndpointParameters**
-> void TestEndpointParameters (decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = null, int? int32 = null, long? int64 = null, float? varFloat = null, string? varString = null, System.IO.Stream? binary = null, DateTime? date = null, DateTime? dateTime = null, string? password = null, string? callback = null)
+> void TestEndpointParameters (decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = null, int? int32 = null, long? int64 = null, float? varFloat = null, string? varString = null, System.IO.Stream? binary = null, DateOnly? date = null, DateTime? dateTime = null, string? password = null, string? callback = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -933,7 +933,7 @@ namespace Example
             var varFloat = 3.4F;  // float? | None (optional) 
             var varString = "varString_example";  // string? | None (optional) 
             var binary = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream? | None (optional) 
-            var date = DateTime.Parse("2013-10-20");  // DateTime? | None (optional) 
+            var date = DateOnly.Parse("2013-10-20");  // DateOnly? | None (optional) 
             var dateTime = DateTime.Parse(""2010-02-01T10:20:10.111110+01:00"");  // DateTime? | None (optional)  (default to "2010-02-01T10:20:10.111110+01:00")
             var password = "password_example";  // string? | None (optional) 
             var callback = "callback_example";  // string? | None (optional) 
@@ -985,7 +985,7 @@ catch (ApiException e)
 | **varFloat** | **float?** | None | [optional]  |
 | **varString** | **string?** | None | [optional]  |
 | **binary** | **System.IO.Stream?****System.IO.Stream?** | None | [optional]  |
-| **date** | **DateTime?** | None | [optional]  |
+| **date** | **DateOnly?** | None | [optional]  |
 | **dateTime** | **DateTime?** | None | [optional] [default to &quot;2010-02-01T10:20:10.111110+01:00&quot;] |
 | **password** | **string?** | None | [optional]  |
 | **callback** | **string?** | None | [optional]  |
diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/FormatTest.md
index 2d28c89fa30..1d09c0f37e4 100644
--- a/samples/client/petstore/csharp/OpenAPIClientCore/docs/FormatTest.md
+++ b/samples/client/petstore/csharp/OpenAPIClientCore/docs/FormatTest.md
@@ -16,7 +16,7 @@ Name | Type | Description | Notes
 **VarString** | **string** |  | [optional] 
 **VarByte** | **byte[]** |  | 
 **Binary** | **System.IO.Stream** |  | [optional] 
-**Date** | **DateTime** |  | 
+**Date** | **DateOnly** |  | 
 **DateTime** | **DateTime** |  | [optional] 
 **Uuid** | **Guid** |  | [optional] 
 **Password** | **string** |  | 
diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/NullableClass.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/NullableClass.md
index 7bab4fa20ee..67c1052fca9 100644
--- a/samples/client/petstore/csharp/OpenAPIClientCore/docs/NullableClass.md
+++ b/samples/client/petstore/csharp/OpenAPIClientCore/docs/NullableClass.md
@@ -8,7 +8,7 @@ Name | Type | Description | Notes
 **NumberProp** | **decimal?** |  | [optional] 
 **BooleanProp** | **bool?** |  | [optional] 
 **StringProp** | **string** |  | [optional] 
-**DateProp** | **DateTime?** |  | [optional] 
+**DateProp** | **DateOnly** |  | [optional] 
 **DatetimeProp** | **DateTime?** |  | [optional] 
 **ArrayNullableProp** | **List&lt;Object&gt;** |  | [optional] 
 **ArrayAndItemsNullableProp** | **List&lt;Object&gt;** |  | [optional] 
diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/RequiredClass.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/RequiredClass.md
index 07b6f018f6c..685c1c51e03 100644
--- a/samples/client/petstore/csharp/OpenAPIClientCore/docs/RequiredClass.md
+++ b/samples/client/petstore/csharp/OpenAPIClientCore/docs/RequiredClass.md
@@ -16,10 +16,10 @@ Name | Type | Description | Notes
 **RequiredNotnullableBooleanProp** | **bool** |  | 
 **NotrequiredNullableBooleanProp** | **bool?** |  | [optional] 
 **NotrequiredNotnullableBooleanProp** | **bool** |  | [optional] 
-**RequiredNullableDateProp** | **DateTime?** |  | 
-**RequiredNotNullableDateProp** | **DateTime** |  | 
-**NotRequiredNullableDateProp** | **DateTime?** |  | [optional] 
-**NotRequiredNotnullableDateProp** | **DateTime** |  | [optional] 
+**RequiredNullableDateProp** | **DateOnly** |  | 
+**RequiredNotNullableDateProp** | **DateOnly** |  | 
+**NotRequiredNullableDateProp** | **DateOnly** |  | [optional] 
+**NotRequiredNotnullableDateProp** | **DateOnly** |  | [optional] 
 **RequiredNotnullableDatetimeProp** | **DateTime** |  | 
 **RequiredNullableDatetimeProp** | **DateTime?** |  | 
 **NotrequiredNullableDatetimeProp** | **DateTime?** |  | [optional] 
diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs
index 50aba343ce4..785e887d37f 100644
--- a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -268,7 +268,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="callback">None (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns></returns>
-        void TestEndpointParameters(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0);
+        void TestEndpointParameters(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateOnly? date = default(DateOnly?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -293,7 +293,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="callback">None (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> TestEndpointParametersWithHttpInfo(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0);
+        ApiResponse<Object> TestEndpointParametersWithHttpInfo(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateOnly? date = default(DateOnly?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0);
         /// <summary>
         /// To test enum parameters
         /// </summary>
@@ -748,7 +748,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateOnly? date = default(DateOnly?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -774,7 +774,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> TestEndpointParametersWithHttpInfoAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ApiResponse<Object>> TestEndpointParametersWithHttpInfoAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateOnly? date = default(DateOnly?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
         /// <summary>
         /// To test enum parameters
         /// </summary>
@@ -2491,7 +2491,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="callback">None (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns></returns>
-        public void TestEndpointParameters(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0)
+        public void TestEndpointParameters(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateOnly? date = default(DateOnly?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0)
         {
             TestEndpointParametersWithHttpInfo(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback);
         }
@@ -2516,7 +2516,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="callback">None (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        public Org.OpenAPITools.Client.ApiResponse<Object> TestEndpointParametersWithHttpInfo(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0)
+        public Org.OpenAPITools.Client.ApiResponse<Object> TestEndpointParametersWithHttpInfo(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateOnly? date = default(DateOnly?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0)
         {
             // verify the required parameter 'patternWithoutDelimiter' is set
             if (patternWithoutDelimiter == null)
@@ -2642,7 +2642,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task TestEndpointParametersAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateOnly? date = default(DateOnly?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
             await TestEndpointParametersWithHttpInfoAsync(number, varDouble, patternWithoutDelimiter, varByte, integer, int32, int64, varFloat, varString, binary, date, dateTime, password, callback, operationIndex, cancellationToken).ConfigureAwait(false);
         }
@@ -2668,7 +2668,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<Org.OpenAPITools.Client.ApiResponse<Object>> TestEndpointParametersWithHttpInfoAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateTime? date = default(DateTime?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Org.OpenAPITools.Client.ApiResponse<Object>> TestEndpointParametersWithHttpInfoAsync(decimal number, double varDouble, string patternWithoutDelimiter, byte[] varByte, int? integer = default(int?), int? int32 = default(int?), long? int64 = default(long?), float? varFloat = default(float?), string? varString = default(string?), System.IO.Stream? binary = default(System.IO.Stream?), DateOnly? date = default(DateOnly?), DateTime? dateTime = default(DateTime?), string? password = default(string?), string? callback = default(string?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
             // verify the required parameter 'patternWithoutDelimiter' is set
             if (patternWithoutDelimiter == null)
diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs
index 3382d11be96..4b9ee8fe482 100644
--- a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs
@@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model
         /// Initializes a new instance of the <see cref="DateOnlyClass" /> class.
         /// </summary>
         /// <param name="dateOnlyProperty">dateOnlyProperty.</param>
-        public DateOnlyClass(DateTime dateOnlyProperty = default(DateTime))
+        public DateOnlyClass(DateOnly dateOnlyProperty = default(DateOnly))
         {
             this.DateOnlyProperty = dateOnlyProperty;
         }
@@ -47,7 +47,7 @@ namespace Org.OpenAPITools.Model
         /// <example>Fri Jul 21 00:00:00 UTC 2017</example>
         [DataMember(Name = "dateOnlyProperty", EmitDefaultValue = false)]
         [JsonConverter(typeof(OpenAPIDateConverter))]
-        public DateTime DateOnlyProperty { get; set; }
+        public DateOnly DateOnlyProperty { get; set; }
 
         /// <summary>
         /// Returns the string presentation of the object
diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs
index d5e9e3c94d4..082635330ad 100644
--- a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs
+++ b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs
@@ -59,7 +59,7 @@ namespace Org.OpenAPITools.Model
         /// <param name="patternWithDigits">A string that is a 10 digit number. Can have leading zeros..</param>
         /// <param name="patternWithDigitsAndDelimiter">A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01..</param>
         /// <param name="patternWithBackslash">None.</param>
-        public FormatTest(int integer = default(int), int int32 = default(int), uint unsignedInteger = default(uint), long int64 = default(long), ulong unsignedLong = default(ulong), decimal number = default(decimal), float varFloat = default(float), double varDouble = default(double), decimal varDecimal = default(decimal), string varString = default(string), byte[] varByte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateTime date = default(DateTime), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string), string patternWithBackslash = default(string))
+        public FormatTest(int integer = default(int), int int32 = default(int), uint unsignedInteger = default(uint), long int64 = default(long), ulong unsignedLong = default(ulong), decimal number = default(decimal), float varFloat = default(float), double varDouble = default(double), decimal varDecimal = default(decimal), string varString = default(string), byte[] varByte = default(byte[]), System.IO.Stream binary = default(System.IO.Stream), DateOnly date = default(DateOnly), DateTime dateTime = default(DateTime), Guid uuid = default(Guid), string password = default(string), string patternWithDigits = default(string), string patternWithDigitsAndDelimiter = default(string), string patternWithBackslash = default(string))
         {
             this.Number = number;
             // to ensure "varByte" is required (not null)
@@ -68,6 +68,11 @@ namespace Org.OpenAPITools.Model
                 throw new ArgumentNullException("varByte is a required property for FormatTest and cannot be null");
             }
             this.VarByte = varByte;
+            // to ensure "date" is required (not null)
+            if (date == null)
+            {
+                throw new ArgumentNullException("date is a required property for FormatTest and cannot be null");
+            }
             this.Date = date;
             // to ensure "password" is required (not null)
             if (password == null)
@@ -170,7 +175,7 @@ namespace Org.OpenAPITools.Model
         /// <example>Sun Feb 02 00:00:00 UTC 2020</example>
         [DataMember(Name = "date", IsRequired = true, EmitDefaultValue = true)]
         [JsonConverter(typeof(OpenAPIDateConverter))]
-        public DateTime Date { get; set; }
+        public DateOnly Date { get; set; }
 
         /// <summary>
         /// Gets or Sets DateTime
diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableClass.cs
index 5c7b13e9b78..43fe8c92103 100644
--- a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableClass.cs
@@ -47,7 +47,7 @@ namespace Org.OpenAPITools.Model
         /// <param name="objectNullableProp">objectNullableProp.</param>
         /// <param name="objectAndItemsNullableProp">objectAndItemsNullableProp.</param>
         /// <param name="objectItemsNullable">objectItemsNullable.</param>
-        public NullableClass(int? integerProp = default(int?), decimal? numberProp = default(decimal?), bool? booleanProp = default(bool?), string stringProp = default(string), DateTime? dateProp = default(DateTime?), DateTime? datetimeProp = default(DateTime?), List<Object> arrayNullableProp = default(List<Object>), List<Object> arrayAndItemsNullableProp = default(List<Object>), List<Object> arrayItemsNullable = default(List<Object>), Dictionary<string, Object> objectNullableProp = default(Dictionary<string, Object>), Dictionary<string, Object> objectAndItemsNullableProp = default(Dictionary<string, Object>), Dictionary<string, Object> objectItemsNullable = default(Dictionary<string, Object>))
+        public NullableClass(int? integerProp = default(int?), decimal? numberProp = default(decimal?), bool? booleanProp = default(bool?), string stringProp = default(string), DateOnly dateProp = default(DateOnly), DateTime? datetimeProp = default(DateTime?), List<Object> arrayNullableProp = default(List<Object>), List<Object> arrayAndItemsNullableProp = default(List<Object>), List<Object> arrayItemsNullable = default(List<Object>), Dictionary<string, Object> objectNullableProp = default(Dictionary<string, Object>), Dictionary<string, Object> objectAndItemsNullableProp = default(Dictionary<string, Object>), Dictionary<string, Object> objectItemsNullable = default(Dictionary<string, Object>))
         {
             this.IntegerProp = integerProp;
             this.NumberProp = numberProp;
@@ -93,7 +93,7 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         [DataMember(Name = "date_prop", EmitDefaultValue = true)]
         [JsonConverter(typeof(OpenAPIDateConverter))]
-        public DateTime? DateProp { get; set; }
+        public DateOnly DateProp { get; set; }
 
         /// <summary>
         /// Gets or Sets DatetimeProp
diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/RequiredClass.cs
index 9e1e2927135..93e4c273108 100644
--- a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/RequiredClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/RequiredClass.cs
@@ -530,7 +530,7 @@ namespace Org.OpenAPITools.Model
         /// <param name="requiredNotnullableArrayOfString">requiredNotnullableArrayOfString (required).</param>
         /// <param name="notrequiredNullableArrayOfString">notrequiredNullableArrayOfString.</param>
         /// <param name="notrequiredNotnullableArrayOfString">notrequiredNotnullableArrayOfString.</param>
-        public RequiredClass(int? requiredNullableIntegerProp = default(int?), int requiredNotnullableintegerProp = default(int), int? notRequiredNullableIntegerProp = default(int?), int notRequiredNotnullableintegerProp = default(int), string requiredNullableStringProp = default(string), string requiredNotnullableStringProp = default(string), string notrequiredNullableStringProp = default(string), string notrequiredNotnullableStringProp = default(string), bool? requiredNullableBooleanProp = default(bool?), bool requiredNotnullableBooleanProp = default(bool), bool? notrequiredNullableBooleanProp = default(bool?), bool notrequiredNotnullableBooleanProp = default(bool), DateTime? requiredNullableDateProp = default(DateTime?), DateTime requiredNotNullableDateProp = default(DateTime), DateTime? notRequiredNullableDateProp = default(DateTime?), DateTime notRequiredNotnullableDateProp = default(DateTime), DateTime requiredNotnullableDatetimeProp = default(DateTime), DateTime? requiredNullableDatetimeProp = default(DateTime?), DateTime? notrequiredNullableDatetimeProp = default(DateTime?), DateTime notrequiredNotnullableDatetimeProp = default(DateTime), RequiredNullableEnumIntegerEnum requiredNullableEnumInteger = default(RequiredNullableEnumIntegerEnum), RequiredNotnullableEnumIntegerEnum requiredNotnullableEnumInteger = default(RequiredNotnullableEnumIntegerEnum), NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumInteger = default(NotrequiredNullableEnumIntegerEnum?), NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumInteger = default(NotrequiredNotnullableEnumIntegerEnum?), RequiredNullableEnumIntegerOnlyEnum requiredNullableEnumIntegerOnly = default(RequiredNullableEnumIntegerOnlyEnum), RequiredNotnullableEnumIntegerOnlyEnum requiredNotnullableEnumIntegerOnly = default(RequiredNotnullableEnumIntegerOnlyEnum), NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnly = default(NotrequiredNullableEnumIntegerOnlyEnum?), NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnly = default(NotrequiredNotnullableEnumIntegerOnlyEnum?), RequiredNotnullableEnumStringEnum requiredNotnullableEnumString = default(RequiredNotnullableEnumStringEnum), RequiredNullableEnumStringEnum requiredNullableEnumString = default(RequiredNullableEnumStringEnum), NotrequiredNullableEnumStringEnum? notrequiredNullableEnumString = default(NotrequiredNullableEnumStringEnum?), NotrequiredNotnullableEnumStringEnum? notrequiredNotnullableEnumString = default(NotrequiredNotnullableEnumStringEnum?), OuterEnumDefaultValue requiredNullableOuterEnumDefaultValue = default(OuterEnumDefaultValue), OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue = default(OuterEnumDefaultValue), OuterEnumDefaultValue? notrequiredNullableOuterEnumDefaultValue = default(OuterEnumDefaultValue?), OuterEnumDefaultValue? notrequiredNotnullableOuterEnumDefaultValue = default(OuterEnumDefaultValue?), Guid? requiredNullableUuid = default(Guid?), Guid requiredNotnullableUuid = default(Guid), Guid? notrequiredNullableUuid = default(Guid?), Guid notrequiredNotnullableUuid = default(Guid), List<string> requiredNullableArrayOfString = default(List<string>), List<string> requiredNotnullableArrayOfString = default(List<string>), List<string> notrequiredNullableArrayOfString = default(List<string>), List<string> notrequiredNotnullableArrayOfString = default(List<string>))
+        public RequiredClass(int? requiredNullableIntegerProp = default(int?), int requiredNotnullableintegerProp = default(int), int? notRequiredNullableIntegerProp = default(int?), int notRequiredNotnullableintegerProp = default(int), string requiredNullableStringProp = default(string), string requiredNotnullableStringProp = default(string), string notrequiredNullableStringProp = default(string), string notrequiredNotnullableStringProp = default(string), bool? requiredNullableBooleanProp = default(bool?), bool requiredNotnullableBooleanProp = default(bool), bool? notrequiredNullableBooleanProp = default(bool?), bool notrequiredNotnullableBooleanProp = default(bool), DateOnly requiredNullableDateProp = default(DateOnly), DateOnly requiredNotNullableDateProp = default(DateOnly), DateOnly notRequiredNullableDateProp = default(DateOnly), DateOnly notRequiredNotnullableDateProp = default(DateOnly), DateTime requiredNotnullableDatetimeProp = default(DateTime), DateTime? requiredNullableDatetimeProp = default(DateTime?), DateTime? notrequiredNullableDatetimeProp = default(DateTime?), DateTime notrequiredNotnullableDatetimeProp = default(DateTime), RequiredNullableEnumIntegerEnum requiredNullableEnumInteger = default(RequiredNullableEnumIntegerEnum), RequiredNotnullableEnumIntegerEnum requiredNotnullableEnumInteger = default(RequiredNotnullableEnumIntegerEnum), NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumInteger = default(NotrequiredNullableEnumIntegerEnum?), NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumInteger = default(NotrequiredNotnullableEnumIntegerEnum?), RequiredNullableEnumIntegerOnlyEnum requiredNullableEnumIntegerOnly = default(RequiredNullableEnumIntegerOnlyEnum), RequiredNotnullableEnumIntegerOnlyEnum requiredNotnullableEnumIntegerOnly = default(RequiredNotnullableEnumIntegerOnlyEnum), NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnly = default(NotrequiredNullableEnumIntegerOnlyEnum?), NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnly = default(NotrequiredNotnullableEnumIntegerOnlyEnum?), RequiredNotnullableEnumStringEnum requiredNotnullableEnumString = default(RequiredNotnullableEnumStringEnum), RequiredNullableEnumStringEnum requiredNullableEnumString = default(RequiredNullableEnumStringEnum), NotrequiredNullableEnumStringEnum? notrequiredNullableEnumString = default(NotrequiredNullableEnumStringEnum?), NotrequiredNotnullableEnumStringEnum? notrequiredNotnullableEnumString = default(NotrequiredNotnullableEnumStringEnum?), OuterEnumDefaultValue requiredNullableOuterEnumDefaultValue = default(OuterEnumDefaultValue), OuterEnumDefaultValue requiredNotnullableOuterEnumDefaultValue = default(OuterEnumDefaultValue), OuterEnumDefaultValue? notrequiredNullableOuterEnumDefaultValue = default(OuterEnumDefaultValue?), OuterEnumDefaultValue? notrequiredNotnullableOuterEnumDefaultValue = default(OuterEnumDefaultValue?), Guid? requiredNullableUuid = default(Guid?), Guid requiredNotnullableUuid = default(Guid), Guid? notrequiredNullableUuid = default(Guid?), Guid notrequiredNotnullableUuid = default(Guid), List<string> requiredNullableArrayOfString = default(List<string>), List<string> requiredNotnullableArrayOfString = default(List<string>), List<string> notrequiredNullableArrayOfString = default(List<string>), List<string> notrequiredNotnullableArrayOfString = default(List<string>))
         {
             // to ensure "requiredNullableIntegerProp" is required (not null)
             if (requiredNullableIntegerProp == null)
@@ -564,6 +564,11 @@ namespace Org.OpenAPITools.Model
                 throw new ArgumentNullException("requiredNullableDateProp is a required property for RequiredClass and cannot be null");
             }
             this.RequiredNullableDateProp = requiredNullableDateProp;
+            // to ensure "requiredNotNullableDateProp" is required (not null)
+            if (requiredNotNullableDateProp == null)
+            {
+                throw new ArgumentNullException("requiredNotNullableDateProp is a required property for RequiredClass and cannot be null");
+            }
             this.RequiredNotNullableDateProp = requiredNotNullableDateProp;
             this.RequiredNotnullableDatetimeProp = requiredNotnullableDatetimeProp;
             // to ensure "requiredNullableDatetimeProp" is required (not null)
@@ -700,28 +705,28 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         [DataMember(Name = "required_nullable_date_prop", IsRequired = true, EmitDefaultValue = true)]
         [JsonConverter(typeof(OpenAPIDateConverter))]
-        public DateTime? RequiredNullableDateProp { get; set; }
+        public DateOnly RequiredNullableDateProp { get; set; }
 
         /// <summary>
         /// Gets or Sets RequiredNotNullableDateProp
         /// </summary>
         [DataMember(Name = "required_not_nullable_date_prop", IsRequired = true, EmitDefaultValue = true)]
         [JsonConverter(typeof(OpenAPIDateConverter))]
-        public DateTime RequiredNotNullableDateProp { get; set; }
+        public DateOnly RequiredNotNullableDateProp { get; set; }
 
         /// <summary>
         /// Gets or Sets NotRequiredNullableDateProp
         /// </summary>
         [DataMember(Name = "not_required_nullable_date_prop", EmitDefaultValue = true)]
         [JsonConverter(typeof(OpenAPIDateConverter))]
-        public DateTime? NotRequiredNullableDateProp { get; set; }
+        public DateOnly NotRequiredNullableDateProp { get; set; }
 
         /// <summary>
         /// Gets or Sets NotRequiredNotnullableDateProp
         /// </summary>
         [DataMember(Name = "not_required_notnullable_date_prop", EmitDefaultValue = false)]
         [JsonConverter(typeof(OpenAPIDateConverter))]
-        public DateTime NotRequiredNotnullableDateProp { get; set; }
+        public DateOnly NotRequiredNotnullableDateProp { get; set; }
 
         /// <summary>
         /// Gets or Sets RequiredNotnullableDatetimeProp