diff --git a/.github/workflows/samples-dotnet-standard.yaml b/.github/workflows/samples-dotnet-standard.yaml index 8d0beb67213..d1ba6e207eb 100644 --- a/.github/workflows/samples-dotnet-standard.yaml +++ b/.github/workflows/samples-dotnet-standard.yaml @@ -3,22 +3,16 @@ name: Samples C# .Net Standard Client on: push: paths: - # build C# API client (netstandard) - - samples/client/petstore/csharp/OpenAPIClient/** - - samples/client/petstore/csharp/*netstandard*/** - # build C# API client (netstandard with ConditionalSerialization) - - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/** - # build C# API client (netstandard httpclient) - - samples/client/petstore/csharp/OpenAPIClient-httpclient/** + - samples/client/petstore/csharp/generichost/standard2.0/** + - samples/client/petstore/csharp/httpclient/standard2.0/** + - samples/client/petstore/csharp/restsharp/standard2.0/** + - samples/client/petstore/csharp/unityWebRequest/standard2.0/** pull_request: paths: - # build C# API client (netstandard) - - samples/client/petstore/csharp/OpenAPIClient/** - - samples/client/petstore/csharp/*netstandard*/** - # build C# API client (netstandard with ConditionalSerialization) - - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/** - # build C# API client (netstandard httpclient) - - samples/client/petstore/csharp/OpenAPIClient-httpclient/** + - samples/client/petstore/csharp/generichost/standard2.0/** + - samples/client/petstore/csharp/httpclient/standard2.0/** + - samples/client/petstore/csharp/restsharp/standard2.0/** + - samples/client/petstore/csharp/unityWebRequest/standard2.0/** jobs: build: name: Build .Net projects @@ -27,13 +21,11 @@ jobs: fail-fast: false matrix: sample: - # build C# API client (netstandard) - - samples/client/petstore/csharp/OpenAPIClient/ - - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/ - # build C# API client (netstandard with ConditionalSerialization) - - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/ - # build C# API client (netstandard httpclient) - - samples/client/petstore/csharp/OpenAPIClient-httpclient/ + - samples/client/petstore/csharp/generichost/standard2.0/OpenAPIClient-generichost-netstandard2.0/ + - samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/ + - samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/ + - samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/ + - samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/ steps: - uses: actions/checkout@v4 - uses: actions/setup-dotnet@v4.0.0 diff --git a/.github/workflows/samples-dotnet.yaml b/.github/workflows/samples-dotnet.yaml index 3030cf1596e..95ae21214e8 100644 --- a/.github/workflows/samples-dotnet.yaml +++ b/.github/workflows/samples-dotnet.yaml @@ -3,16 +3,16 @@ name: Samples C# .Net 8 Clients on: push: paths: - - samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/** - - samples/client/petstore/csharp/*net6.0*/** - - samples/client/petstore/csharp/*net7.0*/** - - samples/client/petstore/csharp/OpenAPIClient-*latest*/** + - samples/client/petstore/csharp/generichost/net8/** + - samples/client/petstore/csharp/httpclient/net8/** + - samples/client/petstore/csharp/restsharp/net8/** + - samples/client/petstore/csharp/unityWebRequest/net8/** pull_request: paths: - - samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/** - - samples/client/petstore/csharp/*net6.0*/** - - samples/client/petstore/csharp/*net7.0*/** - - samples/client/petstore/csharp/OpenAPIClient-*latest*/** + - samples/client/petstore/csharp/generichost/net8/** + - samples/client/petstore/csharp/httpclient/net8/** + - samples/client/petstore/csharp/restsharp/net8/** + - samples/client/petstore/csharp/unityWebRequest/net8/** jobs: build: name: Build .Net projects @@ -21,16 +21,14 @@ jobs: fail-fast: false matrix: sample: - # clients - - samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests - - samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0 - - samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt - - samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration - - samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate - - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf - - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf - - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf - - samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate + - samples/client/petstore/csharp/generichost/net8/ManualTests + - samples/client/petstore/csharp/generichost/net8/Petstore + - samples/client/petstore/csharp/generichost/net8/NullReferenceTypes + - samples/client/petstore/csharp/generichost/net8/SourceGeneration + - samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate + - samples/client/petstore/csharp/generichost/net8/AllOf + - samples/client/petstore/csharp/generichost/net8/AnyOf + - samples/client/petstore/csharp/generichost/net8/OneOf steps: - uses: actions/checkout@v4 - uses: actions/setup-dotnet@v4.0.0 diff --git a/.github/workflows/samples-dotnet6-client.yaml b/.github/workflows/samples-dotnet6-client.yaml index cee008f5085..aab2c282d3f 100644 --- a/.github/workflows/samples-dotnet6-client.yaml +++ b/.github/workflows/samples-dotnet6-client.yaml @@ -3,28 +3,10 @@ name: Samples C# .Net 6 Client on: push: paths: - # build C# API client (httpclient) - - samples/client/petstore/csharp/OpenAPIClient-httpclient/** - # build C# API client (.net framework 4.7) - - samples/client/petstore/csharp/OpenAPIClient-net47/** - # build C# API client (.net framework 4.8) - - samples/client/petstore/csharp/OpenAPIClient-net48/** - # build C# API client (property, parameter name mappings) - - samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/** - # build C# API client (multiple frameworks) - - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/** + - samples/client/petstore/csharp/restsharp/net6/** pull_request: paths: - # build C# API client (httpclient) - - samples/client/petstore/csharp/OpenAPIClient-httpclient/** - # build C# API client (.net framework 4.7) - - samples/client/petstore/csharp/OpenAPIClient-net47/** - # build C# API client (.net framework 4.8) - - samples/client/petstore/csharp/OpenAPIClient-net48/** - # build C# API client (property, parameter name mappings) - - samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/** - # build C# API client (multiple frameworks) - - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/** + - samples/client/petstore/csharp/restsharp/net6/** jobs: build: name: Build .Net clients @@ -33,16 +15,7 @@ jobs: fail-fast: false matrix: sample: - # build C# API client (httpclient) - - samples/client/petstore/csharp/OpenAPIClient-httpclient/ - # build C# API client (.net framework 4.7) - - samples/client/petstore/csharp/OpenAPIClient-net47/ - # build C# API client (.net framework 4.8) - - samples/client/petstore/csharp/OpenAPIClient-net48/ - # build C# API client (property, parameter name mappings) - - samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/ - # build C# API client (multiple frameworks) - - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/ + - samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/ steps: - uses: actions/checkout@v4 - uses: actions/setup-dotnet@v4.0.0 diff --git a/.github/workflows/samples-spring.yaml b/.github/workflows/samples-spring.yaml index 42c29b3eaaf..598b59b163d 100644 --- a/.github/workflows/samples-spring.yaml +++ b/.github/workflows/samples-spring.yaml @@ -34,6 +34,7 @@ jobs: - samples/openapi3/client/petstore/spring-cloud-async - samples/openapi3/client/petstore/spring-cloud-spring-pageable - samples/client/petstore/spring-cloud-tags + - samples/client/petstore/spring-cloud-auth - samples/client/petstore/spring-cloud-deprecated # servers - samples/server/petstore/springboot diff --git a/appveyor.yml b/appveyor.yml index c3d56f5f7de..c3f5346bc92 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -44,22 +44,22 @@ build_script: test_script: # test c# API client (multiple frameworks) - - dotnet test samples\client\petstore\csharp\OpenAPIClientCoreAndNet47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj + - dotnet test samples\client\petstore\csharp\restsharp\net4.7\OpenAPIClientCoreAndNet47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj # test c# API client (httpclient) - - dotnet test samples\client\petstore\csharp\OpenAPIClient-httpclient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj + - dotnet test samples\client\petstore\csharp\httpclient\standard2.0\OpenAPIClient-httpclient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj # test c# API client (generichost) - - dotnet test samples\client\petstore\csharp\OpenAPIClient-generichost-netstandard2.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj + - dotnet test samples\client\petstore\csharp\generichost\standard2.0\OpenAPIClient-generichost-netstandard2.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj # test c# API client (netcore) - - dotnet test samples\client\petstore\csharp\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj + - dotnet test samples\client\petstore\csharp\restsharp\net7\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj #- dotnet test samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj # test C# API client (.net framework 4.7) - - dotnet test samples\client\petstore\csharp\OpenAPIClient-net47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj + - dotnet test samples\client\petstore\csharp\restsharp\net4.7\OpenAPIClient-net47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj # test C# API client (.net framework 4.8) - - dotnet test samples\client\petstore\csharp\OpenAPIClient-net48\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj + - dotnet test samples\client\petstore\csharp\restsharp\net4.8\OpenAPIClient-net48\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj # test C# API client (.net 5.0) - - dotnet test samples\client\petstore\csharp\OpenAPIClient-net5.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj + - dotnet test samples\client\petstore\csharp\restsharp\net7\OpenAPIClient-net5.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj # test C# API Client using conditional-serialization - - dotnet test samples\client\petstore\csharp\OpenAPIClient-ConditionalSerialization\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj + - dotnet test samples\client\petstore\csharp\restsharp\standard2.0\OpenAPIClient-ConditionalSerialization\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj ### TODO: Execute all generators via powershell or other # generate all petstore clients diff --git a/bin/configs/csharp-generichost-latest.yaml b/bin/configs/csharp-generichost-latest.yaml index 82360fcae46..04870438f3b 100644 --- a/bin/configs/csharp-generichost-latest.yaml +++ b/bin/configs/csharp-generichost-latest.yaml @@ -1,6 +1,6 @@ # for csharp generichost generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0 +outputDir: samples/client/petstore/csharp/generichost/net8/Petstore inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml library: generichost templateDir: modules/openapi-generator/src/main/resources/csharp @@ -10,3 +10,4 @@ additionalProperties: disallowAdditionalPropertiesIfNotPresent: false nullableReferenceTypes: false equatable: true + targetFramework: net8.0 diff --git a/bin/configs/csharp-generichost-latest-allOf.yaml b/bin/configs/csharp-generichost-net8-allOf.yaml similarity index 81% rename from bin/configs/csharp-generichost-latest-allOf.yaml rename to bin/configs/csharp-generichost-net8-allOf.yaml index 90a4f177ce3..33adf99fa2c 100644 --- a/bin/configs/csharp-generichost-latest-allOf.yaml +++ b/bin/configs/csharp-generichost-net8-allOf.yaml @@ -1,6 +1,6 @@ # for csharp generichost generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf +outputDir: samples/client/petstore/csharp/generichost/net8/AllOf inputSpec: modules/openapi-generator/src/test/resources/3_0/allOf.yaml library: generichost templateDir: modules/openapi-generator/src/main/resources/csharp @@ -10,3 +10,4 @@ additionalProperties: disallowAdditionalPropertiesIfNotPresent: false nullableReferenceTypes: true equatable: true + targetFramework: net8.0 diff --git a/bin/configs/csharp-generichost-latest-anyOf.yaml b/bin/configs/csharp-generichost-net8-anyOf.yaml similarity index 81% rename from bin/configs/csharp-generichost-latest-anyOf.yaml rename to bin/configs/csharp-generichost-net8-anyOf.yaml index e4b2f31aed2..dd67a9cee62 100644 --- a/bin/configs/csharp-generichost-latest-anyOf.yaml +++ b/bin/configs/csharp-generichost-net8-anyOf.yaml @@ -1,6 +1,6 @@ # for csharp generichost generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf +outputDir: samples/client/petstore/csharp/generichost/net8/AnyOf inputSpec: modules/openapi-generator/src/test/resources/3_0/anyOf.yaml library: generichost templateDir: modules/openapi-generator/src/main/resources/csharp @@ -10,3 +10,4 @@ additionalProperties: disallowAdditionalPropertiesIfNotPresent: false nullableReferenceTypes: true equatable: true + targetFramework: net8.0 diff --git a/bin/configs/csharp-generichost-latest-nrt-useSourceGeneration.yaml b/bin/configs/csharp-generichost-net8-nrt-useSourceGeneration.yaml similarity index 83% rename from bin/configs/csharp-generichost-latest-nrt-useSourceGeneration.yaml rename to bin/configs/csharp-generichost-net8-nrt-useSourceGeneration.yaml index 30c8ad9fcb2..efc5a042015 100644 --- a/bin/configs/csharp-generichost-latest-nrt-useSourceGeneration.yaml +++ b/bin/configs/csharp-generichost-net8-nrt-useSourceGeneration.yaml @@ -1,6 +1,6 @@ # for csharp generichost generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration +outputDir: samples/client/petstore/csharp/generichost/net8/SourceGeneration inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml library: generichost templateDir: modules/openapi-generator/src/main/resources/csharp @@ -11,3 +11,4 @@ additionalProperties: useSourceGeneration: true packageName: UseSourceGeneration equatable: true + targetFramework: net8.0 diff --git a/bin/configs/csharp-generichost-latest-nrt.yaml b/bin/configs/csharp-generichost-net8-nrt.yaml similarity index 82% rename from bin/configs/csharp-generichost-latest-nrt.yaml rename to bin/configs/csharp-generichost-net8-nrt.yaml index 699fd70d3f9..f3e328fff31 100644 --- a/bin/configs/csharp-generichost-latest-nrt.yaml +++ b/bin/configs/csharp-generichost-net8-nrt.yaml @@ -1,6 +1,6 @@ # for csharp generichost generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt +outputDir: samples/client/petstore/csharp/generichost/net8/NullReferenceTypes inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml library: generichost templateDir: modules/openapi-generator/src/main/resources/csharp @@ -10,3 +10,4 @@ additionalProperties: disallowAdditionalPropertiesIfNotPresent: false nullableReferenceTypes: true equatable: true + targetFramework: net8.0 diff --git a/bin/configs/csharp-generichost-latest-oneOf.yaml b/bin/configs/csharp-generichost-net8-oneOf.yaml similarity index 81% rename from bin/configs/csharp-generichost-latest-oneOf.yaml rename to bin/configs/csharp-generichost-net8-oneOf.yaml index 5b38dc3e7fb..11c0c6e2961 100644 --- a/bin/configs/csharp-generichost-latest-oneOf.yaml +++ b/bin/configs/csharp-generichost-net8-oneOf.yaml @@ -1,6 +1,6 @@ # for csharp generichost generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf +outputDir: samples/client/petstore/csharp/generichost/net8/OneOf inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf.yaml library: generichost templateDir: modules/openapi-generator/src/main/resources/csharp @@ -10,3 +10,4 @@ additionalProperties: disallowAdditionalPropertiesIfNotPresent: false nullableReferenceTypes: true equatable: true + targetFramework: net8.0 diff --git a/bin/configs/csharp-generichost-net7.0-useDateTimeForDate.yaml b/bin/configs/csharp-generichost-net8-useDateTimeForDate.yaml similarity index 75% rename from bin/configs/csharp-generichost-net7.0-useDateTimeForDate.yaml rename to bin/configs/csharp-generichost-net8-useDateTimeForDate.yaml index c20fcdcd7f7..1f986e61afc 100644 --- a/bin/configs/csharp-generichost-net7.0-useDateTimeForDate.yaml +++ b/bin/configs/csharp-generichost-net8-useDateTimeForDate.yaml @@ -1,9 +1,10 @@ # for csharp generichost generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate +outputDir: samples/client/petstore/csharp/generichost/net8/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 + targetFramework: net8.0 diff --git a/bin/configs/csharp-generichost-netstandard2.0.yaml b/bin/configs/csharp-generichost-netstandard2.0.yaml index 4c9c8828291..3450bcc67af 100644 --- a/bin/configs/csharp-generichost-netstandard2.0.yaml +++ b/bin/configs/csharp-generichost-netstandard2.0.yaml @@ -1,6 +1,6 @@ # for csharp generichost generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0 +outputDir: samples/client/petstore/csharp/generichost/standard2.0/Petstore inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml library: generichost templateDir: modules/openapi-generator/src/main/resources/csharp diff --git a/bin/configs/csharp-httpclient-netstandard2.0.yaml b/bin/configs/csharp-httpclient-netstandard2.0.yaml index 326f8df942b..a11bd237c8f 100644 --- a/bin/configs/csharp-httpclient-netstandard2.0.yaml +++ b/bin/configs/csharp-httpclient-netstandard2.0.yaml @@ -1,6 +1,6 @@ # for .net standard httpclient generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClient-httpclient +outputDir: samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml templateDir: modules/openapi-generator/src/main/resources/csharp library: httpclient diff --git a/bin/configs/csharp-restsharp-net4.7-multipleFrameworks.yaml b/bin/configs/csharp-restsharp-net4.7-multipleFrameworks.yaml index 9a44c923616..e04822b600d 100644 --- a/bin/configs/csharp-restsharp-net4.7-multipleFrameworks.yaml +++ b/bin/configs/csharp-restsharp-net4.7-multipleFrameworks.yaml @@ -1,5 +1,5 @@ generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClientCoreAndNet47 +outputDir: samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: diff --git a/bin/configs/csharp-restsharp-net4.7.yaml b/bin/configs/csharp-restsharp-net4.7.yaml index 8d60715bf95..6885d81e236 100644 --- a/bin/configs/csharp-restsharp-net4.7.yaml +++ b/bin/configs/csharp-restsharp-net4.7.yaml @@ -1,6 +1,6 @@ # for .net standard generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClient-net47 +outputDir: samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47 inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature-oneof-primitive-types.yaml templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: diff --git a/bin/configs/csharp-restsharp-net4.8.yaml b/bin/configs/csharp-restsharp-net4.8.yaml index 993e16a6546..c957c48c3b7 100644 --- a/bin/configs/csharp-restsharp-net4.8.yaml +++ b/bin/configs/csharp-restsharp-net4.8.yaml @@ -1,6 +1,6 @@ # for .net standard generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClient-net48 +outputDir: samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48 inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature-oneof-primitive-types.yaml templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: diff --git a/bin/configs/csharp-restsharp-net6.0-name-mappings.yaml b/bin/configs/csharp-restsharp-net6.0-name-mappings.yaml index 05ead2dc45a..e508aeb8aff 100644 --- a/bin/configs/csharp-restsharp-net6.0-name-mappings.yaml +++ b/bin/configs/csharp-restsharp-net6.0-name-mappings.yaml @@ -1,5 +1,5 @@ generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings +outputDir: samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings inputSpec: modules/openapi-generator/src/test/resources/3_0/name-parameter-mappings.yaml templateDir: modules/openapi-generator/src/main/resources/csharp nameMappings: diff --git a/bin/configs/csharp-restsharp-net7.0-compareNetObjects.yaml b/bin/configs/csharp-restsharp-net7.0-compareNetObjects.yaml index 7015e00a277..68192d01e6b 100644 --- a/bin/configs/csharp-restsharp-net7.0-compareNetObjects.yaml +++ b/bin/configs/csharp-restsharp-net7.0-compareNetObjects.yaml @@ -1,5 +1,5 @@ generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClientCore +outputDir: samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: diff --git a/bin/configs/csharp-restsharp-net7.0-useDateTimeForDate.yaml b/bin/configs/csharp-restsharp-net7.0-useDateTimeForDate.yaml index e5c65c57d20..bcce230d081 100644 --- a/bin/configs/csharp-restsharp-net7.0-useDateTimeForDate.yaml +++ b/bin/configs/csharp-restsharp-net7.0-useDateTimeForDate.yaml @@ -1,6 +1,6 @@ # for .net standard generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate +outputDir: samples/client/petstore/csharp/restsharp/net7/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: diff --git a/bin/configs/csharp-restsharp-net7.0.yaml b/bin/configs/csharp-restsharp-net7.0.yaml index 0364bc69415..e383c7816f6 100644 --- a/bin/configs/csharp-restsharp-net7.0.yaml +++ b/bin/configs/csharp-restsharp-net7.0.yaml @@ -1,6 +1,6 @@ # for .net standard generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClient-net5.0 +outputDir: samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0 inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature-oneof-primitive-types.yaml templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: diff --git a/bin/configs/csharp-restsharp-netstandard2.0-conditionalSerialization.yaml b/bin/configs/csharp-restsharp-netstandard2.0-conditionalSerialization.yaml index 100203b43a6..d27cd2fc31b 100644 --- a/bin/configs/csharp-restsharp-netstandard2.0-conditionalSerialization.yaml +++ b/bin/configs/csharp-restsharp-netstandard2.0-conditionalSerialization.yaml @@ -1,6 +1,6 @@ # for .net standard generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization +outputDir: samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: diff --git a/bin/configs/csharp-restsharp-netstandard2.0.yaml b/bin/configs/csharp-restsharp-netstandard2.0.yaml index 3734d9b2763..6de2858dd84 100644 --- a/bin/configs/csharp-restsharp-netstandard2.0.yaml +++ b/bin/configs/csharp-restsharp-netstandard2.0.yaml @@ -1,6 +1,6 @@ # for .net standard generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClient +outputDir: samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature-oneof-primitive-types.yaml templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: diff --git a/bin/configs/csharp-unityWebRequest-netstandard2.0.yaml b/bin/configs/csharp-unityWebRequest-netstandard2.0.yaml index 0f91232f8e1..818c04a3834 100644 --- a/bin/configs/csharp-unityWebRequest-netstandard2.0.yaml +++ b/bin/configs/csharp-unityWebRequest-netstandard2.0.yaml @@ -1,6 +1,6 @@ # for .net Unity generatorName: csharp -outputDir: samples/client/petstore/csharp/OpenAPIClient-unityWebRequest +outputDir: samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml templateDir: modules/openapi-generator/src/main/resources/csharp library: unityWebRequest diff --git a/bin/configs/spring-cloud-auth.yaml b/bin/configs/spring-cloud-auth.yaml new file mode 100644 index 00000000000..88c2e399b89 --- /dev/null +++ b/bin/configs/spring-cloud-auth.yaml @@ -0,0 +1,9 @@ +generatorName: spring +outputDir: samples/client/petstore/spring-cloud-auth +library: spring-cloud +inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-auth.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring +additionalProperties: + documentationProvider: none + artifactId: petstore-spring-cloud-auth + hideGenerationTimestamp: "true" diff --git a/bin/utils/test_file_list.yaml b/bin/utils/test_file_list.yaml index 83c86255cda..8b4a7ad2348 100644 --- a/bin/utils/test_file_list.yaml +++ b/bin/utils/test_file_list.yaml @@ -1,10 +1,10 @@ --- # csharp test files and image for upload -- filename: "samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs" +- filename: "samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs" sha256: e323c7e646a0ceb6d1d8f34f287175ac666fdbbe057791b45d138de3d9582666 -- filename: "samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs" +- filename: "samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs" sha256: 7dad88554fe630d25c787cae05305d302d5e34ca810aee4fa23f20055f9188e1 -- filename: "samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png" +- filename: "samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png" sha256: 0a67c32728197e942b13bdda064b73793f12f5c795f1e5cf35a3adf69c973230 # java okhttp gson test files - filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ClientTest.java" diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenSecurity.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenSecurity.java index 671585bc70b..f165639ad18 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenSecurity.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenSecurity.java @@ -43,6 +43,8 @@ public class CodegenSecurity { // Oauth specific public String flow, authorizationUrl, tokenUrl, refreshUrl; public List> scopes; + public Boolean hasScopes; + public Boolean isCode, isPassword, isApplication, isImplicit; // OpenId specific public String openIdConnectUrl; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index edd5663c826..7483a1c6b33 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -2467,6 +2467,14 @@ public class DefaultCodegen implements CodegenConfig { protected String getSingleSchemaType(Schema schema) { Schema unaliasSchema = unaliasSchema(schema); + if (ModelUtils.isRefToSchemaWithProperties(unaliasSchema.get$ref())) { + // ref to schema's properties, e.g. #/components/schemas/Pet/properties/category + Schema refSchema = ModelUtils.getReferencedSchema(openAPI, unaliasSchema); + if (refSchema != null) { + return getSingleSchemaType(refSchema); + } + } + if (StringUtils.isNotBlank(unaliasSchema.get$ref())) { // reference to another definition/schema // get the schema/model name from $ref String schemaName = ModelUtils.getSimpleRef(unaliasSchema.get$ref()); @@ -3357,7 +3365,7 @@ public class DefaultCodegen implements CodegenConfig { String modelName = ModelUtils.getSimpleRef(((Schema) oneOf).get$ref()); CodegenProperty thisCp = discriminatorFound(composedSchemaName, (Schema) oneOf, discPropName, visitedSchemas); if (thisCp == null) { - LOGGER.warn( + once(LOGGER).warn( "'{}' defines discriminator '{}', but the referenced OneOf schema '{}' is missing {}", composedSchemaName, discPropName, modelName, discPropName); } @@ -3366,7 +3374,7 @@ public class DefaultCodegen implements CodegenConfig { continue; } if (cp != thisCp) { - LOGGER.warn( + once(LOGGER).warn( "'{}' defines discriminator '{}', but the OneOf schema '{}' has a different {} definition than the prior OneOf schema's. Make sure the {} type and required values are the same", composedSchemaName, discPropName, modelName, discPropName, discPropName); } @@ -3380,7 +3388,7 @@ public class DefaultCodegen implements CodegenConfig { String modelName = ModelUtils.getSimpleRef(((Schema) anyOf).get$ref()); CodegenProperty thisCp = discriminatorFound(composedSchemaName, (Schema) anyOf, discPropName, visitedSchemas); if (thisCp == null) { - LOGGER.warn( + once(LOGGER).warn( "'{}' defines discriminator '{}', but the referenced AnyOf schema '{}' is missing {}", composedSchemaName, discPropName, modelName, discPropName); } @@ -3389,7 +3397,7 @@ public class DefaultCodegen implements CodegenConfig { continue; } if (cp != thisCp) { - LOGGER.warn( + once(LOGGER).warn( "'{}' defines discriminator '{}', but the AnyOf schema '{}' has a different {} definition than the prior AnyOf schema's. Make sure the {} type and required values are the same", composedSchemaName, discPropName, modelName, discPropName, discPropName); } @@ -3457,7 +3465,7 @@ public class DefaultCodegen implements CodegenConfig { } } if (discriminatorsPropNames.size() > 1) { - LOGGER.warn("The oneOf schemas have conflicting discriminator property names. " + + once(LOGGER).warn("The oneOf schemas have conflicting discriminator property names. " + "oneOf schemas must have the same property name, but found " + String.join(", ", discriminatorsPropNames)); } if (foundDisc != null && (hasDiscriminatorCnt + hasNullTypeCnt) == composedSchema.getOneOf().size() && discriminatorsPropNames.size() == 1) { @@ -3486,7 +3494,7 @@ public class DefaultCodegen implements CodegenConfig { } } if (discriminatorsPropNames.size() > 1) { - LOGGER.warn("The anyOf schemas have conflicting discriminator property names. " + + once(LOGGER).warn("The anyOf schemas have conflicting discriminator property names. " + "anyOf schemas must have the same property name, but found " + String.join(", ", discriminatorsPropNames)); } if (foundDisc != null && (hasDiscriminatorCnt + hasNullTypeCnt) == composedSchema.getAnyOf().size() && discriminatorsPropNames.size() == 1) { @@ -3535,7 +3543,7 @@ public class DefaultCodegen implements CodegenConfig { // schemas also has inline composed schemas // Note: if it is only inline one level, then the inline model resolver will move it into its own // schema and make it a $ref schema in the oneOf/anyOf location - LOGGER.warn( + once(LOGGER).warn( "Invalid inline schema defined in oneOf/anyOf in '{}'. Per the OpenApi spec, for this case when a composed schema defines a discriminator, the oneOf/anyOf schemas must use $ref. Change this inline definition to a $ref definition", composedSchemaName); } @@ -3557,14 +3565,14 @@ public class DefaultCodegen implements CodegenConfig { msgSuffix += spacer + "invalid optional definition of " + discPropName + ", include it in required"; } } - LOGGER.warn("'{}' defines discriminator '{}', but the referenced schema '{}' is incorrect. {}", + once(LOGGER).warn("'{}' defines discriminator '{}', but the referenced schema '{}' is incorrect. {}", composedSchemaName, discPropName, modelName, msgSuffix); } MappedModel mm = new MappedModel(modelName, toModelName(modelName)); descendentSchemas.add(mm); Schema cs = ModelUtils.getSchema(openAPI, modelName); if (cs == null) { // cannot lookup the model based on the name - LOGGER.error("Failed to lookup the schema '{}' when processing oneOf/anyOf. Please check to ensure it's defined properly.", modelName); + once(LOGGER).error("Failed to lookup the schema '{}' when processing oneOf/anyOf. Please check to ensure it's defined properly.", modelName); } else { Map vendorExtensions = cs.getExtensions(); if (vendorExtensions != null && !vendorExtensions.isEmpty() && vendorExtensions.containsKey("x-discriminator-value")) { @@ -3677,7 +3685,7 @@ public class DefaultCodegen implements CodegenConfig { if (e.getValue().indexOf('/') >= 0) { name = ModelUtils.getSimpleRef(e.getValue()); if (ModelUtils.getSchema(openAPI, name) == null) { - LOGGER.error("Failed to lookup the schema '{}' when processing the discriminator mapping of oneOf/anyOf. Please check to ensure it's defined properly.", name); + once(LOGGER).error("Failed to lookup the schema '{}' when processing the discriminator mapping of oneOf/anyOf. Please check to ensure it's defined properly.", name); } } else { name = e.getValue(); @@ -3986,6 +3994,13 @@ public class DefaultCodegen implements CodegenConfig { return cpc; } + // if it's ref to schema's properties, get the actual schema defined in the properties + Schema refToPropertiesSchema = ModelUtils.getSchemaFromRefToSchemaWithProperties(openAPI, p.get$ref()); + if (refToPropertiesSchema != null) { + p = refToPropertiesSchema; + return fromProperty(name, refToPropertiesSchema, required, schemaIsFromAdditionalProperties); + } + Schema original = null; // check if it's allOf (only 1 sub schema) with or without default/nullable/etc set in the top level if (ModelUtils.isAllOf(p) && p.getAllOf().size() == 1) { @@ -6960,6 +6975,7 @@ public class DefaultCodegen implements CodegenConfig { scopes.add(scope); } codegenSecurity.scopes = scopes; + codegenSecurity.hasScopes = true; } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java index 207f34e89f6..99f2d70ee6f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java @@ -929,16 +929,76 @@ public class ModelUtils { * @return schema without '$ref' */ public static Schema getReferencedSchema(OpenAPI openAPI, Schema schema) { - if (schema != null && StringUtils.isNotEmpty(schema.get$ref())) { - String name = getSimpleRef(schema.get$ref()); - Schema referencedSchema = getSchema(openAPI, name); - if (referencedSchema != null) { - return referencedSchema; - } + if (schema == null) { + return null; } + + if (StringUtils.isEmpty(schema.get$ref())) { + return schema; + } + + try { + Schema refSchema = getSchemaFromRefToSchemaWithProperties(openAPI, schema.get$ref()); + if (refSchema != null) { + // it's ref to schema's properties, #/components/schemas/Pet/properties/category for example + return refSchema; + } + } catch (Exception e) { + LOGGER.warn("Failed to parse $ref {}. Please report the issue to openapi-generator GitHub repo.", schema.get$ref()); + } + + // a simple ref, e.g. #/components/schemas/Pet + String name = getSimpleRef(schema.get$ref()); + Schema referencedSchema = getSchema(openAPI, name); + if (referencedSchema != null) { + return referencedSchema; + } + return schema; } + /** + * Get the schema referenced by $ref to schema's properties, e.g. #/components/schemas/Pet/properties/category. + * + * @param openAPI specification being checked + * @param refString schema reference + * @return schema + */ + public static Schema getSchemaFromRefToSchemaWithProperties(OpenAPI openAPI, String refString) { + if (refString == null) { + return null; + } + + String[] parts = refString.split("/"); + // #/components/schemas/Pet/properties/category + if (parts.length == 6 && "properties".equals(parts[4])) { + Schema referencedSchema = getSchema(openAPI, parts[3]); // parts[3] is Pet + return (Schema) referencedSchema.getProperties().get(parts[5]); // parts[5] is category + } else { + return null; + } + } + + /** + * Returns true if $ref to a reference to schema's properties, e.g. #/components/schemas/Pet/properties/category. + * + * @param refString schema reference + * @return true if $ref to a reference to schema's properties + */ + public static boolean isRefToSchemaWithProperties(String refString) { + if (refString == null) { + return false; + } + + String[] parts = refString.split("/"); + // #/components/schemas/Pet/properties/category + if (parts.length == 6 && "properties".equals(parts[4])) { + return true; + } else { + return false; + } + } + public static Schema getSchema(OpenAPI openAPI, String name) { if (name == null) { return null; @@ -1272,7 +1332,9 @@ public class ModelUtils { } Schema ref = allSchemas.get(simpleRef); if (ref == null) { - once(LOGGER).warn("{} is not defined", schema.get$ref()); + if (!isRefToSchemaWithProperties(schema.get$ref())) { + once(LOGGER).warn("{} is not defined", schema.get$ref()); + } return schema; } else if (ref.getEnum() != null && !ref.getEnum().isEmpty()) { // top-level enum class diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache index 85dfdb3c85a..71dbcc85300 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache @@ -112,8 +112,8 @@ ext { dependencies { implementation 'io.swagger:swagger-annotations:1.6.8' implementation "com.google.code.findbugs:jsr305:3.0.2" - implementation 'com.squareup.okhttp3:okhttp:4.10.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0' implementation 'com.google.code.gson:gson:2.9.1' implementation 'io.gsonfire:gson-fire:1.9.0' implementation 'javax.ws.rs:jsr311-api:1.1.1' diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache index 5dfe99f2b9d..05ec20bff2c 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache @@ -10,8 +10,8 @@ lazy val root = (project in file(".")). resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.6.5", - "com.squareup.okhttp3" % "okhttp" % "4.10.0", - "com.squareup.okhttp3" % "logging-interceptor" % "4.10.0", + "com.squareup.okhttp3" % "okhttp" % "4.12.0", + "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0", "com.google.code.gson" % "gson" % "2.9.1", "org.apache.commons" % "commons-lang3" % "3.12.0", "javax.ws.rs" % "jsr311-api" % "1.1.1", diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/clientPropertiesConfiguration.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/clientPropertiesConfiguration.mustache index 2bdc55c15ca..cb855cb5cce 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/clientPropertiesConfiguration.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/clientPropertiesConfiguration.mustache @@ -1,7 +1,6 @@ package {{configPackage}}; -{{#authMethods}} - {{#isOAuth}} + import java.util.Properties; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.ConfigurableEnvironment; @@ -11,31 +10,34 @@ import org.springframework.core.env.PropertiesPropertySource; public class ClientPropertiesConfiguration { public ClientPropertiesConfiguration( final ConfigurableEnvironment configurableEnvironment ) { - final Properties properties = new Properties(); - properties.put("spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.client-id", "set-{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}-client-id" ); - properties.put("{{#scopes}}{{#-first}}spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.scope", "{{/-first}}{{scope}}{{^-last}},{{/-last}}{{/scopes}}" ); +{{#authMethods}} + {{#isOAuth}} + final Properties {{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}} = new Properties(); + {{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.put("spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.client-id", "set-{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}-client-id" ); + {{#hasScopes}} + {{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.put("{{#scopes}}{{#-first}}spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.scope", "{{/-first}}{{scope}}{{^-last}},{{/-last}}{{/scopes}}" ); + {{/hasScopes}} {{#isCode}} - properties.put("spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-grant-type", "authorization_code" ); - properties.put("spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.redirect-uri", "set-{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}-redirect-uri" ); - properties.put("spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.token-uri", "{{{tokenUrl}}}" ); - properties.put("spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-uri", "{{{authorizationUrl}}}" ); + {{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.put("spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-grant-type", "authorization_code" ); + {{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.put("spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.redirect-uri", "set-{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}-redirect-uri" ); + {{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.put("spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.token-uri", "{{{tokenUrl}}}" ); + {{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.put("spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-uri", "{{{authorizationUrl}}}" ); {{/isCode}} {{#isPassword}} - properties.put("spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-grant-type", "password" ); - properties.put("spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.token-uri", "{{{tokenUrl}}}" ); + {{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.put("spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-grant-type", "password" ); + {{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.put("spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.token-uri", "{{{tokenUrl}}}" ); {{/isPassword}} {{#isApplication}} - properties.put("spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-grant-type", "client_credentials" ); - properties.put("spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.token-uri", "{{{tokenUrl}}}" ); + {{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.put("spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-grant-type", "client_credentials" ); + {{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.put("spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.token-uri", "{{{tokenUrl}}}" ); {{/isApplication}} {{#isImplicit}} - properties.put("spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-grant-type", "implicit" ); - properties.put("spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-uri", "{{{authorizationUrl}}}" ); + {{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.put("spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-grant-type", "implicit" ); + {{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.put("spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-uri", "{{{authorizationUrl}}}" ); {{/isImplicit}} - final PropertiesPropertySource propertiesPropertySource = new PropertiesPropertySource("{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}", properties ); - configurableEnvironment.getPropertySources().addLast( propertiesPropertySource ); + configurableEnvironment.getPropertySources().addLast( new PropertiesPropertySource("{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}", {{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}} ) ); + {{/isOAuth}} +{{/authMethods}} } } - {{/isOAuth}} -{{/authMethods}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 5cab4348351..467652c2657 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -57,7 +57,6 @@ import java.util.Map; import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Collectors; - import org.apache.commons.lang3.StringUtils; import org.assertj.core.api.MapAssert; import org.openapitools.codegen.CliOption; @@ -1198,7 +1197,7 @@ public class SpringCodegenTest { output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/3_0/issue_18090.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/3_0/spring/petstore-auth.yaml", null, new ParseOptions()).getOpenAPI(); final SpringCodegen codegen = new SpringCodegen(); codegen.setOpenAPI(openAPI); @@ -1226,9 +1225,23 @@ public class SpringCodegenTest { Path filePath = Paths.get(output.getAbsolutePath(), "src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java"); - String content = new String(Files.readAllBytes(filePath), "UTF-8"); - Assert.assertTrue(content.contains("properties.put(\"spring.security.oauth2.client.provider.oAuth2AccessCode.token-uri\", \"${tokenUrl}\" );")); - Assert.assertTrue(content.contains("properties.put(\"spring.security.oauth2.client.provider.oAuth2AccessCode.authorization-uri\", \"${authorizationUrl}\" );")); + + assertFileContains(filePath, + "oAuth2AccessCode.put(\"spring.security.oauth2.client.registration.oAuth2AccessCode.redirect-uri\", \"set-oAuth2AccessCode-redirect-uri\" );", + "oAuth2AccessCode.put(\"spring.security.oauth2.client.registration.oAuth2AccessCode.authorization-grant-type\", \"authorization_code\" );", + "oAuth2AccessCode.put(\"spring.security.oauth2.client.registration.oAuth2AccessCode.client-id\", \"set-oAuth2AccessCode-client-id\" );", + "oAuth2AccessCode.put(\"spring.security.oauth2.client.registration.oAuth2AccessCode.scope\", \"openid,profile,aud\" );", + "oAuth2AccessCode.put(\"spring.security.oauth2.client.provider.oAuth2AccessCode.token-uri\", \"${tokenUrl}\" );", + "oAuth2AccessCode.put(\"spring.security.oauth2.client.provider.oAuth2AccessCode.authorization-uri\", \"${authorizationUrl}\" );", + + + "oAuth2Application.put(\"spring.security.oauth2.client.registration.oAuth2Application.client-id\", \"set-oAuth2Application-client-id\" );", + "oAuth2Application.put(\"spring.security.oauth2.client.registration.oAuth2Application.authorization-grant-type\", \"client_credentials\" );", + "oAuth2Application.put(\"spring.security.oauth2.client.provider.oAuth2Application.token-uri\", \"/openid-connect/token\" );" + + ); + + assertFileNotContains(filePath,"spring.security.oauth2.client.registration.oAuth2Application.scope"); } @Test diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java index ac6cc875d93..76bd51b43a5 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java @@ -295,6 +295,25 @@ public class ModelUtilsTest { Assert.assertEquals(decoded, "~1 Hallo/Welt"); } + @Test + public void testRefToSchemaProperties() { + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/petstore.yaml"); + + Schema category = ModelUtils.getSchemaFromRefToSchemaWithProperties(openAPI, "#/components/schemas/Pet/properties/category"); + Assert.assertEquals(category.get$ref(), "#/components/schemas/Category"); + + Schema name = ModelUtils.getSchemaFromRefToSchemaWithProperties(openAPI, "#/components/schemas/Pet/properties/name"); + Assert.assertEquals(name.getType(), "string"); + + Schema id = ModelUtils.getSchemaFromRefToSchemaWithProperties(openAPI, "#/components/schemas/Pet/properties/id"); + Assert.assertEquals(id.getType(), "integer"); + Assert.assertEquals(id.getFormat(), "int64"); + + Assert.assertEquals(null, ModelUtils.getSchemaFromRefToSchemaWithProperties(openAPI, "#/components/schemas/Pet/prop/category")); + Assert.assertEquals(null, ModelUtils.getSchemaFromRefToSchemaWithProperties(openAPI, "#/components/schemas/Pet/properties/categoryyyy")); + Assert.assertEquals(null, ModelUtils.getSchemaFromRefToSchemaWithProperties(openAPI, "#/components/schemas/Pet")); + } + // 3.0 spec tests @Test diff --git a/modules/openapi-generator/src/test/resources/3_0/issue_18090.yaml b/modules/openapi-generator/src/test/resources/3_0/issue_18090.yaml deleted file mode 100644 index 6d679214167..00000000000 --- a/modules/openapi-generator/src/test/resources/3_0/issue_18090.yaml +++ /dev/null @@ -1,29 +0,0 @@ -openapi: "3.0.3" -info: - title: Test for OAuth2 provider - version: 1.0.0 - -security: - - OAuth2: - - openid - - profile - -paths: - /some/endpoint: - get: - responses: - "200": - description: OK - -components: - securitySchemes: - OAuth2: - type: oauth2 - x-tokenName: id_token - flows: - authorizationCode: - authorizationUrl: "${authorizationUrl}" - tokenUrl: "${tokenUrl}" - scopes: - openid: Access OpenId Connect info - profile: Profile info diff --git a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml index 44bc0a2788b..9e353005e13 100644 --- a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml @@ -2655,3 +2655,23 @@ components: PetComposition: allOf: - $ref: '#/components/schemas/Pet' + PetRef: + type: object + required: + - name + - photoUrls + properties: + id: + $ref: '#/components/schemas/Pet/properties/id' + category: + $ref: '#/components/schemas/Pet/properties/category' + name: + $ref: '#/components/schemas/Pet/properties/name' + photoUrls: + $ref: '#/components/schemas/Pet/properties/photoUrls' + tags: + $ref: '#/components/schemas/Pet/properties/tags' + status: + $ref: '#/components/schemas/Pet/properties/status' + xml: + name: Pet diff --git a/modules/openapi-generator/src/test/resources/3_0/spring/petstore-auth.yaml b/modules/openapi-generator/src/test/resources/3_0/spring/petstore-auth.yaml new file mode 100644 index 00000000000..f425910a951 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/spring/petstore-auth.yaml @@ -0,0 +1,37 @@ +openapi: "3.0.3" +info: + description: 'This spec is mainly for testing Petstore server and contains fake + endpoints, models. Please do not use this for any other purpose. Special + characters: " \' + version: 1.0.0 + title: OpenAPI Petstore Auth + license: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + +security: + - OAuth2: [openid, profile, aud] + +paths: + /some/endpoint: + get: + responses: + "200": + description: OK + +components: + securitySchemes: + OAuth2: + type: oauth2 + x-tokenName: id_token + flows: + authorizationCode: + authorizationUrl: "${authorizationUrl}" + tokenUrl: "${tokenUrl}" + scopes: + openid: Access OpenId Connect info + profile: Profile info + aud: Audience info + clientCredentials: + tokenUrl: '/openid-connect/token' + scopes: { } diff --git a/samples/client/echo_api/java/okhttp-gson/build.gradle b/samples/client/echo_api/java/okhttp-gson/build.gradle index ea04a997bd8..38a181fc21f 100644 --- a/samples/client/echo_api/java/okhttp-gson/build.gradle +++ b/samples/client/echo_api/java/okhttp-gson/build.gradle @@ -108,8 +108,8 @@ ext { dependencies { implementation 'io.swagger:swagger-annotations:1.6.8' implementation "com.google.code.findbugs:jsr305:3.0.2" - implementation 'com.squareup.okhttp3:okhttp:4.10.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0' implementation 'com.google.code.gson:gson:2.9.1' implementation 'io.gsonfire:gson-fire:1.9.0' implementation 'javax.ws.rs:jsr311-api:1.1.1' diff --git a/samples/client/echo_api/java/okhttp-gson/build.sbt b/samples/client/echo_api/java/okhttp-gson/build.sbt index 8ba4919fe3c..55b2479519f 100644 --- a/samples/client/echo_api/java/okhttp-gson/build.sbt +++ b/samples/client/echo_api/java/okhttp-gson/build.sbt @@ -10,8 +10,8 @@ lazy val root = (project in file(".")). resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.6.5", - "com.squareup.okhttp3" % "okhttp" % "4.10.0", - "com.squareup.okhttp3" % "logging-interceptor" % "4.10.0", + "com.squareup.okhttp3" % "okhttp" % "4.12.0", + "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0", "com.google.code.gson" % "gson" % "2.9.1", "org.apache.commons" % "commons-lang3" % "3.12.0", "javax.ws.rs" % "jsr311-api" % "1.1.1", diff --git a/samples/client/others/java/okhttp-gson-oneOf/build.gradle b/samples/client/others/java/okhttp-gson-oneOf/build.gradle index 0a72788e779..385a98a2074 100644 --- a/samples/client/others/java/okhttp-gson-oneOf/build.gradle +++ b/samples/client/others/java/okhttp-gson-oneOf/build.gradle @@ -108,8 +108,8 @@ ext { dependencies { implementation 'io.swagger:swagger-annotations:1.6.8' implementation "com.google.code.findbugs:jsr305:3.0.2" - implementation 'com.squareup.okhttp3:okhttp:4.10.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0' implementation 'com.google.code.gson:gson:2.9.1' implementation 'io.gsonfire:gson-fire:1.9.0' implementation 'javax.ws.rs:jsr311-api:1.1.1' diff --git a/samples/client/others/java/okhttp-gson-oneOf/build.sbt b/samples/client/others/java/okhttp-gson-oneOf/build.sbt index 3a409fcd9a8..ee12a918d39 100644 --- a/samples/client/others/java/okhttp-gson-oneOf/build.sbt +++ b/samples/client/others/java/okhttp-gson-oneOf/build.sbt @@ -10,8 +10,8 @@ lazy val root = (project in file(".")). resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.6.5", - "com.squareup.okhttp3" % "okhttp" % "4.10.0", - "com.squareup.okhttp3" % "logging-interceptor" % "4.10.0", + "com.squareup.okhttp3" % "okhttp" % "4.12.0", + "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0", "com.google.code.gson" % "gson" % "2.9.1", "org.apache.commons" % "commons-lang3" % "3.12.0", "javax.ws.rs" % "jsr311-api" % "1.1.1", diff --git a/samples/client/others/java/okhttp-gson-streaming/build.gradle b/samples/client/others/java/okhttp-gson-streaming/build.gradle index e607dfa53dd..41d81af4dcc 100644 --- a/samples/client/others/java/okhttp-gson-streaming/build.gradle +++ b/samples/client/others/java/okhttp-gson-streaming/build.gradle @@ -108,8 +108,8 @@ ext { dependencies { implementation 'io.swagger:swagger-annotations:1.6.8' implementation "com.google.code.findbugs:jsr305:3.0.2" - implementation 'com.squareup.okhttp3:okhttp:4.10.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0' implementation 'com.google.code.gson:gson:2.9.1' implementation 'io.gsonfire:gson-fire:1.9.0' implementation 'javax.ws.rs:jsr311-api:1.1.1' diff --git a/samples/client/others/java/okhttp-gson-streaming/build.sbt b/samples/client/others/java/okhttp-gson-streaming/build.sbt index d7080aa288e..2a9184320b6 100644 --- a/samples/client/others/java/okhttp-gson-streaming/build.sbt +++ b/samples/client/others/java/okhttp-gson-streaming/build.sbt @@ -10,8 +10,8 @@ lazy val root = (project in file(".")). resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.6.5", - "com.squareup.okhttp3" % "okhttp" % "4.10.0", - "com.squareup.okhttp3" % "logging-interceptor" % "4.10.0", + "com.squareup.okhttp3" % "okhttp" % "4.12.0", + "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0", "com.google.code.gson" % "gson" % "2.9.1", "org.apache.commons" % "commons-lang3" % "3.12.0", "javax.ws.rs" % "jsr311-api" % "1.1.1", diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/.gitignore b/samples/client/petstore/csharp/generichost/net8/AllOf/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/.gitignore rename to samples/client/petstore/csharp/generichost/net8/AllOf/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/.openapi-generator-ignore b/samples/client/petstore/csharp/generichost/net8/AllOf/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/.openapi-generator-ignore rename to samples/client/petstore/csharp/generichost/net8/AllOf/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/AllOf/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/FILES rename to samples/client/petstore/csharp/generichost/net8/AllOf/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION b/samples/client/petstore/csharp/generichost/net8/AllOf/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION rename to samples/client/petstore/csharp/generichost/net8/AllOf/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/Org.OpenAPITools.sln b/samples/client/petstore/csharp/generichost/net8/AllOf/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/generichost/net8/AllOf/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/README.md b/samples/client/petstore/csharp/generichost/net8/AllOf/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/README.md rename to samples/client/petstore/csharp/generichost/net8/AllOf/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/AllOf/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/api/openapi.yaml rename to samples/client/petstore/csharp/generichost/net8/AllOf/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/appveyor.yml b/samples/client/petstore/csharp/generichost/net8/AllOf/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/appveyor.yml rename to samples/client/petstore/csharp/generichost/net8/AllOf/appveyor.yml diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/apis/DefaultApi.md b/samples/client/petstore/csharp/generichost/net8/AllOf/docs/apis/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/apis/DefaultApi.md rename to samples/client/petstore/csharp/generichost/net8/AllOf/docs/apis/DefaultApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Adult.md b/samples/client/petstore/csharp/generichost/net8/AllOf/docs/models/Adult.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Adult.md rename to samples/client/petstore/csharp/generichost/net8/AllOf/docs/models/Adult.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Child.md b/samples/client/petstore/csharp/generichost/net8/AllOf/docs/models/Child.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Child.md rename to samples/client/petstore/csharp/generichost/net8/AllOf/docs/models/Child.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Person.md b/samples/client/petstore/csharp/generichost/net8/AllOf/docs/models/Person.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Person.md rename to samples/client/petstore/csharp/generichost/net8/AllOf/docs/models/Person.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp/generichost/net8/AllOf/docs/scripts/git_push.ps1 similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/scripts/git_push.ps1 rename to samples/client/petstore/csharp/generichost/net8/AllOf/docs/scripts/git_push.ps1 diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/scripts/git_push.sh b/samples/client/petstore/csharp/generichost/net8/AllOf/docs/scripts/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/scripts/git_push.sh rename to samples/client/petstore/csharp/generichost/net8/AllOf/docs/scripts/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultTests.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Model/AdultTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultTests.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Model/AdultTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/README.md b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/README.md rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Api/IApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/IApi.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Api/IApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/ApiFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiFactory.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/ApiFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/CookieContainer.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/CookieContainer.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/CookieContainer.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/CookieContainer.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/HostConfiguration.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/Option.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/Option.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/Option.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/Option.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/TokenBase.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/TokenContainer`1.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/TokenContainer`1.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Adult.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Adult.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Adult.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Adult.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Child.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Child.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Child.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Child.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Person.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Person.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Person.cs rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Model/Person.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/README.md rename to samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/.gitignore b/samples/client/petstore/csharp/generichost/net8/AnyOf/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/.gitignore rename to samples/client/petstore/csharp/generichost/net8/AnyOf/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/.openapi-generator-ignore b/samples/client/petstore/csharp/generichost/net8/AnyOf/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/.openapi-generator-ignore rename to samples/client/petstore/csharp/generichost/net8/AnyOf/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/AnyOf/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/FILES rename to samples/client/petstore/csharp/generichost/net8/AnyOf/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/.openapi-generator/VERSION b/samples/client/petstore/csharp/generichost/net8/AnyOf/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/.openapi-generator/VERSION rename to samples/client/petstore/csharp/generichost/net8/AnyOf/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/Org.OpenAPITools.sln b/samples/client/petstore/csharp/generichost/net8/AnyOf/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/generichost/net8/AnyOf/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/README.md b/samples/client/petstore/csharp/generichost/net8/AnyOf/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/README.md rename to samples/client/petstore/csharp/generichost/net8/AnyOf/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/AnyOf/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/api/openapi.yaml rename to samples/client/petstore/csharp/generichost/net8/AnyOf/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/appveyor.yml b/samples/client/petstore/csharp/generichost/net8/AnyOf/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/appveyor.yml rename to samples/client/petstore/csharp/generichost/net8/AnyOf/appveyor.yml diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/apis/DefaultApi.md b/samples/client/petstore/csharp/generichost/net8/AnyOf/docs/apis/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/apis/DefaultApi.md rename to samples/client/petstore/csharp/generichost/net8/AnyOf/docs/apis/DefaultApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Apple.md b/samples/client/petstore/csharp/generichost/net8/AnyOf/docs/models/Apple.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Apple.md rename to samples/client/petstore/csharp/generichost/net8/AnyOf/docs/models/Apple.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Banana.md b/samples/client/petstore/csharp/generichost/net8/AnyOf/docs/models/Banana.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Banana.md rename to samples/client/petstore/csharp/generichost/net8/AnyOf/docs/models/Banana.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Fruit.md b/samples/client/petstore/csharp/generichost/net8/AnyOf/docs/models/Fruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Fruit.md rename to samples/client/petstore/csharp/generichost/net8/AnyOf/docs/models/Fruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp/generichost/net8/AnyOf/docs/scripts/git_push.ps1 similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/scripts/git_push.ps1 rename to samples/client/petstore/csharp/generichost/net8/AnyOf/docs/scripts/git_push.ps1 diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/scripts/git_push.sh b/samples/client/petstore/csharp/generichost/net8/AnyOf/docs/scripts/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/scripts/git_push.sh rename to samples/client/petstore/csharp/generichost/net8/AnyOf/docs/scripts/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs 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/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/README.md b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/README.md rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Api/IApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/IApi.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Api/IApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/ApiFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiFactory.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/ApiFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/CookieContainer.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/CookieContainer.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/CookieContainer.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/CookieContainer.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/Option.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/Option.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/Option.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/Option.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/TokenContainer`1.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/TokenContainer`1.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/README.md rename to samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/.gitignore b/samples/client/petstore/csharp/generichost/net8/ManualTests/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/.gitignore rename to samples/client/petstore/csharp/generichost/net8/ManualTests/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/ManualTests.Latest.UseSourceGeneration.csproj b/samples/client/petstore/csharp/generichost/net8/ManualTests/ManualTests.Latest.UseSourceGeneration/ManualTests.Latest.UseSourceGeneration.csproj similarity index 84% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/ManualTests.Latest.UseSourceGeneration.csproj rename to samples/client/petstore/csharp/generichost/net8/ManualTests/ManualTests.Latest.UseSourceGeneration/ManualTests.Latest.UseSourceGeneration.csproj index 9e5f1f956bf..aaafdea5f67 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/ManualTests.Latest.UseSourceGeneration.csproj +++ b/samples/client/petstore/csharp/generichost/net8/ManualTests/ManualTests.Latest.UseSourceGeneration/ManualTests.Latest.UseSourceGeneration.csproj @@ -20,7 +20,7 @@ - + diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/UnitTest1.cs b/samples/client/petstore/csharp/generichost/net8/ManualTests/ManualTests.Latest.UseSourceGeneration/UnitTest1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/UnitTest1.cs rename to samples/client/petstore/csharp/generichost/net8/ManualTests/ManualTests.Latest.UseSourceGeneration/UnitTest1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/Usings.cs b/samples/client/petstore/csharp/generichost/net8/ManualTests/ManualTests.Latest.UseSourceGeneration/Usings.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/Usings.cs rename to samples/client/petstore/csharp/generichost/net8/ManualTests/ManualTests.Latest.UseSourceGeneration/Usings.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests.csproj b/samples/client/petstore/csharp/generichost/net8/ManualTests/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests.csproj similarity index 87% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests.csproj rename to samples/client/petstore/csharp/generichost/net8/ManualTests/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests.csproj index d87af4c4d16..b57653fd3b0 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests.csproj +++ b/samples/client/petstore/csharp/generichost/net8/ManualTests/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests.csproj @@ -21,7 +21,7 @@ - + diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/UnitTest1.cs b/samples/client/petstore/csharp/generichost/net8/ManualTests/OpenAPIClient-generichost-manual-tests/UnitTest1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/UnitTest1.cs rename to samples/client/petstore/csharp/generichost/net8/ManualTests/OpenAPIClient-generichost-manual-tests/UnitTest1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/Usings.cs b/samples/client/petstore/csharp/generichost/net8/ManualTests/OpenAPIClient-generichost-manual-tests/Usings.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/Usings.cs rename to samples/client/petstore/csharp/generichost/net8/ManualTests/OpenAPIClient-generichost-manual-tests/Usings.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/Org.OpenAPITools.sln b/samples/client/petstore/csharp/generichost/net8/ManualTests/Org.OpenAPITools.sln similarity index 69% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/generichost/net8/ManualTests/Org.OpenAPITools.sln index dedb0f176ea..cf27f68b1d1 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/Org.OpenAPITools.sln +++ b/samples/client/petstore/csharp/generichost/net8/ManualTests/Org.OpenAPITools.sln @@ -5,11 +5,11 @@ VisualStudioVersion = 17.5.33502.453 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenAPIClient-generichost-manual-tests", "OpenAPIClient-generichost-manual-tests\OpenAPIClient-generichost-manual-tests.csproj", "{B120BBFD-C287-4235-A7CC-2C5B37601EB1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.OpenAPITools", "..\OpenAPIClient-generichost-net6.0-nrt\src\Org.OpenAPITools\Org.OpenAPITools.csproj", "{C48E5ACD-1ACD-4084-843E-B29DFEE1779C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManualTests.Latest.UseSourceGeneration", "ManualTests.Latest.UseSourceGeneration\ManualTests.Latest.UseSourceGeneration.csproj", "{0CDF58C6-300E-4282-99AF-69A92FD6EAA5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManualTests.Latest.UseSourceGeneration", "ManualTests.Latest.UseSourceGeneration\ManualTests.Latest.UseSourceGeneration.csproj", "{0CDF58C6-300E-4282-99AF-69A92FD6EAA5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.OpenAPITools", "..\NullReferenceTypes\src\Org.OpenAPITools\Org.OpenAPITools.csproj", "{74007D16-25E6-4CF2-9701-64CCDB5290F8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UseSourceGeneration", "..\OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration\src\UseSourceGeneration\UseSourceGeneration.csproj", "{39D8167C-2DF8-42E9-92F5-5DA59E7F281B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UseSourceGeneration", "..\SourceGeneration\src\UseSourceGeneration\UseSourceGeneration.csproj", "{7DFEB146-7822-43C1-8469-BE86CA88E4EC}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -21,18 +21,18 @@ Global {B120BBFD-C287-4235-A7CC-2C5B37601EB1}.Debug|Any CPU.Build.0 = Debug|Any CPU {B120BBFD-C287-4235-A7CC-2C5B37601EB1}.Release|Any CPU.ActiveCfg = Release|Any CPU {B120BBFD-C287-4235-A7CC-2C5B37601EB1}.Release|Any CPU.Build.0 = Release|Any CPU - {C48E5ACD-1ACD-4084-843E-B29DFEE1779C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C48E5ACD-1ACD-4084-843E-B29DFEE1779C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C48E5ACD-1ACD-4084-843E-B29DFEE1779C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C48E5ACD-1ACD-4084-843E-B29DFEE1779C}.Release|Any CPU.Build.0 = Release|Any CPU {0CDF58C6-300E-4282-99AF-69A92FD6EAA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0CDF58C6-300E-4282-99AF-69A92FD6EAA5}.Debug|Any CPU.Build.0 = Debug|Any CPU {0CDF58C6-300E-4282-99AF-69A92FD6EAA5}.Release|Any CPU.ActiveCfg = Release|Any CPU {0CDF58C6-300E-4282-99AF-69A92FD6EAA5}.Release|Any CPU.Build.0 = Release|Any CPU - {39D8167C-2DF8-42E9-92F5-5DA59E7F281B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39D8167C-2DF8-42E9-92F5-5DA59E7F281B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39D8167C-2DF8-42E9-92F5-5DA59E7F281B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39D8167C-2DF8-42E9-92F5-5DA59E7F281B}.Release|Any CPU.Build.0 = Release|Any CPU + {74007D16-25E6-4CF2-9701-64CCDB5290F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {74007D16-25E6-4CF2-9701-64CCDB5290F8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {74007D16-25E6-4CF2-9701-64CCDB5290F8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {74007D16-25E6-4CF2-9701-64CCDB5290F8}.Release|Any CPU.Build.0 = Release|Any CPU + {7DFEB146-7822-43C1-8469-BE86CA88E4EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7DFEB146-7822-43C1-8469-BE86CA88E4EC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7DFEB146-7822-43C1-8469-BE86CA88E4EC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7DFEB146-7822-43C1-8469-BE86CA88E4EC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.gitignore b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.gitignore rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator-ignore b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator-ignore rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/VERSION b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/VERSION rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/Org.OpenAPITools.sln b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/README.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/README.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/api/openapi.yaml rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/appveyor.yml b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/appveyor.yml rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/appveyor.yml diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/AnotherFakeApi.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/AnotherFakeApi.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/DefaultApi.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/DefaultApi.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/DefaultApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/FakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/PetApi.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/PetApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/PetApi.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/PetApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/StoreApi.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/StoreApi.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/StoreApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/UserApi.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/UserApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/UserApi.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/apis/UserApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Activity.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Activity.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Activity.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Activity.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Animal.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Animal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Animal.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Animal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ApiResponse.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ApiResponse.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ApiResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Apple.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Apple.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Apple.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Apple.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/AppleReq.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/AppleReq.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/AppleReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayTest.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayTest.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ArrayTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Banana.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Banana.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Banana.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Banana.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/BananaReq.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/BananaReq.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/BananaReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/BasquePig.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/BasquePig.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/BasquePig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Capitalization.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Capitalization.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Capitalization.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Cat.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Cat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Cat.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Cat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Category.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Category.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Category.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Category.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ChildCat.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ChildCat.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ChildCat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ClassModel.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ClassModel.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ClassModel.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ComplexQuadrilateral.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/DanishPig.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/DanishPig.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/DanishPig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/DateOnlyClass.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/DateOnlyClass.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/DateOnlyClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/DeprecatedObject.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/DeprecatedObject.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/DeprecatedObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Dog.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Dog.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Dog.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Dog.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Drawing.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Drawing.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Drawing.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Drawing.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumArrays.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumArrays.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/EnumArrays.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumClass.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumClass.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/EnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumTest.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumTest.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/EnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/EquilateralTriangle.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/EquilateralTriangle.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/File.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/File.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/File.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/File.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FileSchemaTestClass.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FileSchemaTestClass.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Foo.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Foo.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Foo.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Foo.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FooGetDefaultResponse.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/FormatTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Fruit.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Fruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Fruit.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Fruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FruitReq.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FruitReq.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/FruitReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/GmFruit.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/GmFruit.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/GmFruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/GrandparentAnimal.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/GrandparentAnimal.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/HasOnlyReadOnly.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/HealthCheckResult.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/HealthCheckResult.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/HealthCheckResult.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/IsoscelesTriangle.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/IsoscelesTriangle.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/List.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/List.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/List.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/List.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/LiteralStringClass.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/LiteralStringClass.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/LiteralStringClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Mammal.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Mammal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Mammal.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Mammal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/MapTest.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/MapTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/MapTest.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/MapTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Model200Response.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Model200Response.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Model200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ModelClient.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ModelClient.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ModelClient.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Name.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Name.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Name.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Name.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NotificationtestGetElementsV1ResponseMPayload.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/NotificationtestGetElementsV1ResponseMPayload.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NotificationtestGetElementsV1ResponseMPayload.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/NotificationtestGetElementsV1ResponseMPayload.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableClass.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableClass.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/NullableClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableGuidClass.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableGuidClass.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/NullableGuidClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableShape.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/NullableShape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NumberOnly.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NumberOnly.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/NumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OneOfString.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OneOfString.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/OneOfString.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Order.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Order.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Order.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Order.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterComposite.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterComposite.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/OuterComposite.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnum.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnum.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/OuterEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumInteger.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumInteger.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumTest.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/OuterEnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumTest.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/OuterEnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ParentPet.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ParentPet.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ParentPet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pet.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Pet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pet.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Pet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pig.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Pig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pig.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Pig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/PolymorphicProperty.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/PolymorphicProperty.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Quadrilateral.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Quadrilateral.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Quadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/QuadrilateralInterface.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/QuadrilateralInterface.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ReadOnlyFirst.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ReadOnlyFirst.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/RequiredClass.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/RequiredClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/RequiredClass.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/RequiredClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Return.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Return.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Return.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Return.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/RolesReportsHash.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/RolesReportsHash.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/RolesReportsHash.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/RolesReportsHash.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/RolesReportsHashRole.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/RolesReportsHashRole.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/RolesReportsHashRole.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/RolesReportsHashRole.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ScaleneTriangle.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ScaleneTriangle.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Shape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Shape.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Shape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeInterface.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeInterface.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ShapeInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeOrNull.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ShapeOrNull.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/SimpleQuadrilateral.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/SpecialModelName.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/SpecialModelName.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/SpecialModelName.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Tag.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Tag.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Tag.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Tag.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestInlineFreeformAdditionalPropertiesRequest.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/TestInlineFreeformAdditionalPropertiesRequest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestInlineFreeformAdditionalPropertiesRequest.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/TestInlineFreeformAdditionalPropertiesRequest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Triangle.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Triangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Triangle.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Triangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/TriangleInterface.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/TriangleInterface.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/TriangleInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/User.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/User.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/User.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/User.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Whale.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Whale.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Whale.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Whale.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Zebra.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Zebra.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Zebra.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/Zebra.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ZeroBasedEnum.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ZeroBasedEnum.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/models/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/scripts/git_push.ps1 similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/scripts/git_push.ps1 rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/scripts/git_push.ps1 diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/scripts/git_push.sh b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/scripts/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/scripts/git_push.sh rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/docs/scripts/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/README.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/README.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/IApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/IApi.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/IApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ApiFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiFactory.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ApiFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiKeyToken.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ApiKeyToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiKeyToken.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ApiKeyToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ApiResponse`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponse`1.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ApiResponse`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/BasicToken.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/BasicToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/BasicToken.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/BasicToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/BearerToken.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/BearerToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/BearerToken.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/BearerToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/CookieContainer.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/CookieContainer.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/CookieContainer.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/CookieContainer.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HttpSigningToken.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/HttpSigningToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HttpSigningToken.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/HttpSigningToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/OAuthToken.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/OAuthToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/OAuthToken.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/OAuthToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/Option.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/Option.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/Option.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/Option.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenBase.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/TokenBase.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenBase.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenContainer`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenContainer`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/TokenProvider`1.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenProvider`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumTest.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/RequiredClass.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/RolesReportsHash.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/RolesReportsHash.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/RolesReportsHash.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/RolesReportsHash.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/README.md rename to samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.gitignore b/samples/client/petstore/csharp/generichost/net8/OneOf/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.gitignore rename to samples/client/petstore/csharp/generichost/net8/OneOf/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.openapi-generator-ignore b/samples/client/petstore/csharp/generichost/net8/OneOf/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.openapi-generator-ignore rename to samples/client/petstore/csharp/generichost/net8/OneOf/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/OneOf/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/FILES rename to samples/client/petstore/csharp/generichost/net8/OneOf/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.openapi-generator/VERSION b/samples/client/petstore/csharp/generichost/net8/OneOf/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.openapi-generator/VERSION rename to samples/client/petstore/csharp/generichost/net8/OneOf/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/Org.OpenAPITools.sln b/samples/client/petstore/csharp/generichost/net8/OneOf/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/generichost/net8/OneOf/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/README.md b/samples/client/petstore/csharp/generichost/net8/OneOf/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/README.md rename to samples/client/petstore/csharp/generichost/net8/OneOf/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/OneOf/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/api/openapi.yaml rename to samples/client/petstore/csharp/generichost/net8/OneOf/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/appveyor.yml b/samples/client/petstore/csharp/generichost/net8/OneOf/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/appveyor.yml rename to samples/client/petstore/csharp/generichost/net8/OneOf/appveyor.yml diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/apis/DefaultApi.md b/samples/client/petstore/csharp/generichost/net8/OneOf/docs/apis/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/apis/DefaultApi.md rename to samples/client/petstore/csharp/generichost/net8/OneOf/docs/apis/DefaultApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Apple.md b/samples/client/petstore/csharp/generichost/net8/OneOf/docs/models/Apple.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Apple.md rename to samples/client/petstore/csharp/generichost/net8/OneOf/docs/models/Apple.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Banana.md b/samples/client/petstore/csharp/generichost/net8/OneOf/docs/models/Banana.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Banana.md rename to samples/client/petstore/csharp/generichost/net8/OneOf/docs/models/Banana.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Fruit.md b/samples/client/petstore/csharp/generichost/net8/OneOf/docs/models/Fruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Fruit.md rename to samples/client/petstore/csharp/generichost/net8/OneOf/docs/models/Fruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp/generichost/net8/OneOf/docs/scripts/git_push.ps1 similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/scripts/git_push.ps1 rename to samples/client/petstore/csharp/generichost/net8/OneOf/docs/scripts/git_push.ps1 diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/scripts/git_push.sh b/samples/client/petstore/csharp/generichost/net8/OneOf/docs/scripts/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/scripts/git_push.sh rename to samples/client/petstore/csharp/generichost/net8/OneOf/docs/scripts/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/README.md b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/README.md rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Api/IApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/IApi.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Api/IApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/ApiFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiFactory.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/ApiFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/CookieContainer.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/CookieContainer.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/CookieContainer.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/CookieContainer.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/Option.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/Option.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/Option.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/Option.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/TokenBase.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/README.md rename to samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.gitignore b/samples/client/petstore/csharp/generichost/net8/Petstore/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.gitignore rename to samples/client/petstore/csharp/generichost/net8/Petstore/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.openapi-generator-ignore b/samples/client/petstore/csharp/generichost/net8/Petstore/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.openapi-generator-ignore rename to samples/client/petstore/csharp/generichost/net8/Petstore/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/Petstore/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES rename to samples/client/petstore/csharp/generichost/net8/Petstore/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.openapi-generator/VERSION b/samples/client/petstore/csharp/generichost/net8/Petstore/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.openapi-generator/VERSION rename to samples/client/petstore/csharp/generichost/net8/Petstore/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/Org.OpenAPITools.sln b/samples/client/petstore/csharp/generichost/net8/Petstore/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/generichost/net8/Petstore/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/README.md b/samples/client/petstore/csharp/generichost/net8/Petstore/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/README.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/Petstore/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/api/openapi.yaml rename to samples/client/petstore/csharp/generichost/net8/Petstore/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/appveyor.yml b/samples/client/petstore/csharp/generichost/net8/Petstore/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/appveyor.yml rename to samples/client/petstore/csharp/generichost/net8/Petstore/appveyor.yml diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/AnotherFakeApi.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/AnotherFakeApi.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/DefaultApi.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/DefaultApi.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/DefaultApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/FakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/PetApi.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/PetApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/PetApi.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/PetApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/StoreApi.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/StoreApi.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/StoreApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/UserApi.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/UserApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/UserApi.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/apis/UserApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Activity.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Activity.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Activity.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Activity.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Animal.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Animal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Animal.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Animal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ApiResponse.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ApiResponse.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ApiResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Apple.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Apple.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Apple.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Apple.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/AppleReq.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/AppleReq.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/AppleReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ArrayTest.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ArrayTest.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ArrayTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Banana.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Banana.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Banana.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Banana.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/BananaReq.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/BananaReq.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/BananaReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/BasquePig.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/BasquePig.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/BasquePig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Capitalization.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Capitalization.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Capitalization.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Cat.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Cat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Cat.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Cat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Category.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Category.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Category.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Category.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ChildCat.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ChildCat.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ChildCat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ClassModel.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ClassModel.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ClassModel.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ComplexQuadrilateral.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/DanishPig.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/DanishPig.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/DanishPig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/DateOnlyClass.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/DateOnlyClass.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/DateOnlyClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/DeprecatedObject.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/DeprecatedObject.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/DeprecatedObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Dog.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Dog.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Dog.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Dog.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Drawing.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Drawing.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Drawing.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Drawing.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/EnumArrays.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/EnumArrays.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/EnumArrays.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/EnumClass.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/EnumClass.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/EnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/EnumTest.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/EnumTest.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/EnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/EquilateralTriangle.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/EquilateralTriangle.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/File.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/File.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/File.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/File.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FileSchemaTestClass.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FileSchemaTestClass.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Foo.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Foo.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Foo.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Foo.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FooGetDefaultResponse.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/FormatTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Fruit.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Fruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Fruit.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Fruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FruitReq.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FruitReq.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/FruitReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/GmFruit.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/GmFruit.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/GmFruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/GrandparentAnimal.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/GrandparentAnimal.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/HasOnlyReadOnly.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/HealthCheckResult.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/HealthCheckResult.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/HealthCheckResult.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/IsoscelesTriangle.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/IsoscelesTriangle.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/List.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/List.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/List.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/List.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/LiteralStringClass.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/LiteralStringClass.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/LiteralStringClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Mammal.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Mammal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Mammal.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Mammal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/MapTest.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/MapTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/MapTest.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/MapTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Model200Response.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Model200Response.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Model200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ModelClient.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ModelClient.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ModelClient.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Name.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Name.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Name.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Name.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NotificationtestGetElementsV1ResponseMPayload.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/NotificationtestGetElementsV1ResponseMPayload.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NotificationtestGetElementsV1ResponseMPayload.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/NotificationtestGetElementsV1ResponseMPayload.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableClass.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableClass.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/NullableClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableGuidClass.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableGuidClass.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/NullableGuidClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableShape.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/NullableShape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NumberOnly.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NumberOnly.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/NumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OneOfString.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OneOfString.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/OneOfString.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Order.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Order.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Order.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Order.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterComposite.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterComposite.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/OuterComposite.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterEnum.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterEnum.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/OuterEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumInteger.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumInteger.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumTest.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/OuterEnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumTest.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/OuterEnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ParentPet.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ParentPet.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ParentPet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Pet.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Pet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Pet.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Pet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Pig.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Pig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Pig.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Pig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/PolymorphicProperty.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/PolymorphicProperty.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Quadrilateral.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Quadrilateral.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Quadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/QuadrilateralInterface.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/QuadrilateralInterface.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ReadOnlyFirst.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ReadOnlyFirst.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/RequiredClass.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/RequiredClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/RequiredClass.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/RequiredClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Return.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Return.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Return.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Return.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/RolesReportsHash.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/RolesReportsHash.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/RolesReportsHash.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/RolesReportsHash.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/RolesReportsHashRole.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/RolesReportsHashRole.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/RolesReportsHashRole.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/RolesReportsHashRole.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ScaleneTriangle.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ScaleneTriangle.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Shape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Shape.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Shape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ShapeInterface.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ShapeInterface.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ShapeInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ShapeOrNull.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ShapeOrNull.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/SimpleQuadrilateral.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/SpecialModelName.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/SpecialModelName.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/SpecialModelName.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Tag.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Tag.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Tag.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Tag.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/TestInlineFreeformAdditionalPropertiesRequest.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/TestInlineFreeformAdditionalPropertiesRequest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/TestInlineFreeformAdditionalPropertiesRequest.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/TestInlineFreeformAdditionalPropertiesRequest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Triangle.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Triangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Triangle.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Triangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/TriangleInterface.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/TriangleInterface.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/TriangleInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/User.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/User.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/User.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/User.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Whale.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Whale.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Whale.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Whale.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Zebra.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Zebra.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Zebra.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/Zebra.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ZeroBasedEnum.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ZeroBasedEnum.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/models/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/scripts/git_push.ps1 similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/scripts/git_push.ps1 rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/scripts/git_push.ps1 diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/scripts/git_push.sh b/samples/client/petstore/csharp/generichost/net8/Petstore/docs/scripts/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/scripts/git_push.sh rename to samples/client/petstore/csharp/generichost/net8/Petstore/docs/scripts/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/README.md b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/README.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/IApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/IApi.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/IApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ApiFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiFactory.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ApiFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiKeyToken.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ApiKeyToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiKeyToken.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ApiKeyToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ApiResponse`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ApiResponse`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/BasicToken.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/BasicToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/BasicToken.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/BasicToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/BearerToken.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/BearerToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/BearerToken.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/BearerToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/CookieContainer.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/CookieContainer.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/CookieContainer.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/CookieContainer.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HttpSigningToken.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/HttpSigningToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HttpSigningToken.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/HttpSigningToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/OAuthToken.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/OAuthToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/OAuthToken.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/OAuthToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/Option.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/Option.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/Option.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/Option.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/TokenBase.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/TokenContainer`1.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/TokenContainer`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/TokenContainer`1.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/TokenContainer`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/TokenProvider`1.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumTest.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/RequiredClass.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/RolesReportsHash.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/RolesReportsHash.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/RolesReportsHash.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/RolesReportsHash.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/README.md rename to samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.gitignore b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.gitignore rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator-ignore b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator-ignore rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/.openapi-generator/FILES rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/VERSION b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/VERSION rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/Org.OpenAPITools.sln b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/README.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/README.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/UseSourceGeneration.sln b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/UseSourceGeneration.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/UseSourceGeneration.sln rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/UseSourceGeneration.sln diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/appveyor.yml b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/appveyor.yml rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/appveyor.yml diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/apis/AnotherFakeApi.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/apis/AnotherFakeApi.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/apis/DefaultApi.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/apis/DefaultApi.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/DefaultApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/apis/FakeApi.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/FakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/apis/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/apis/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/apis/PetApi.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/PetApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/apis/PetApi.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/PetApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/apis/StoreApi.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/apis/StoreApi.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/StoreApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/apis/UserApi.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/UserApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/apis/UserApi.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/apis/UserApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Activity.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Activity.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Activity.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Activity.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Animal.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Animal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Animal.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Animal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ApiResponse.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ApiResponse.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ApiResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Apple.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Apple.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Apple.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Apple.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/AppleReq.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/AppleReq.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/AppleReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ArrayTest.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ArrayTest.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ArrayTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Banana.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Banana.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Banana.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Banana.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/BananaReq.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/BananaReq.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/BananaReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/BasquePig.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/BasquePig.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/BasquePig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Capitalization.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Capitalization.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Capitalization.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Cat.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Cat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Cat.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Cat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Category.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Category.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Category.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Category.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ChildCat.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ChildCat.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ChildCat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ClassModel.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ClassModel.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ClassModel.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ComplexQuadrilateral.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/DanishPig.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/DanishPig.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/DanishPig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/DateOnlyClass.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/DateOnlyClass.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/DateOnlyClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/DeprecatedObject.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/DeprecatedObject.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/DeprecatedObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Dog.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Dog.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Dog.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Dog.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Drawing.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Drawing.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Drawing.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Drawing.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/EnumArrays.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/EnumArrays.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/EnumArrays.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/EnumClass.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/EnumClass.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/EnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/EnumTest.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/EnumTest.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/EnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/EquilateralTriangle.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/EquilateralTriangle.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/File.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/File.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/File.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/File.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FileSchemaTestClass.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FileSchemaTestClass.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Foo.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Foo.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Foo.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Foo.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FooGetDefaultResponse.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FormatTest.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FormatTest.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/FormatTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Fruit.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Fruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Fruit.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Fruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FruitReq.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/FruitReq.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/FruitReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/GmFruit.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/GmFruit.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/GmFruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/GrandparentAnimal.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/GrandparentAnimal.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/HasOnlyReadOnly.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/HealthCheckResult.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/HealthCheckResult.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/HealthCheckResult.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/IsoscelesTriangle.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/IsoscelesTriangle.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/List.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/List.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/List.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/List.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/LiteralStringClass.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/LiteralStringClass.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/LiteralStringClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Mammal.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Mammal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Mammal.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Mammal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/MapTest.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/MapTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/MapTest.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/MapTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Model200Response.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Model200Response.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Model200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ModelClient.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ModelClient.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ModelClient.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Name.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Name.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Name.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Name.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/NotificationtestGetElementsV1ResponseMPayload.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/NotificationtestGetElementsV1ResponseMPayload.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/NotificationtestGetElementsV1ResponseMPayload.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/NotificationtestGetElementsV1ResponseMPayload.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/NullableClass.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/NullableClass.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/NullableClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/NullableGuidClass.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/NullableGuidClass.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/NullableGuidClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/NullableShape.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/NullableShape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/NumberOnly.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/NumberOnly.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/NumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/OneOfString.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/OneOfString.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/OneOfString.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Order.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Order.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Order.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Order.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/OuterComposite.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/OuterComposite.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/OuterComposite.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/OuterEnum.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/OuterEnum.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/OuterEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/OuterEnumInteger.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/OuterEnumInteger.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/OuterEnumTest.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/OuterEnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/OuterEnumTest.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/OuterEnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ParentPet.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ParentPet.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ParentPet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Pet.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Pet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Pet.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Pet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Pig.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Pig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Pig.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Pig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/PolymorphicProperty.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/PolymorphicProperty.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Quadrilateral.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Quadrilateral.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Quadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/QuadrilateralInterface.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/QuadrilateralInterface.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ReadOnlyFirst.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ReadOnlyFirst.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/RequiredClass.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/RequiredClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/RequiredClass.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/RequiredClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Return.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Return.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Return.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Return.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/RolesReportsHash.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/RolesReportsHash.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/RolesReportsHash.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/RolesReportsHash.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/RolesReportsHashRole.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/RolesReportsHashRole.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/RolesReportsHashRole.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/RolesReportsHashRole.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ScaleneTriangle.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ScaleneTriangle.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Shape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Shape.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Shape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ShapeInterface.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ShapeInterface.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ShapeInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ShapeOrNull.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ShapeOrNull.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/SimpleQuadrilateral.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/SpecialModelName.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/SpecialModelName.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/SpecialModelName.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Tag.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Tag.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Tag.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Tag.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/TestInlineFreeformAdditionalPropertiesRequest.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/TestInlineFreeformAdditionalPropertiesRequest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/TestInlineFreeformAdditionalPropertiesRequest.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/TestInlineFreeformAdditionalPropertiesRequest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Triangle.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Triangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Triangle.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Triangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/TriangleInterface.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/TriangleInterface.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/TriangleInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/User.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/User.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/User.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/User.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Whale.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Whale.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Whale.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Whale.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Zebra.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Zebra.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/Zebra.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/Zebra.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ZeroBasedEnum.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ZeroBasedEnum.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/docs/models/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/models/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/scripts/git_push.ps1 similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/scripts/git_push.ps1 rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/scripts/git_push.ps1 diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/scripts/git_push.sh b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/scripts/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/scripts/git_push.sh rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/docs/scripts/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Api/ApiTestsBase.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Api/ApiTestsBase.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Api/ApiTestsBase.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Api/DependencyInjectionTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Api/DependencyInjectionTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Api/DependencyInjectionTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/CatTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/DogTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/FileTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/FooTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ListTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/MixedEnumTypeTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/MixedEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/MixedEnumTypeTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/MixedEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/MixedNullableEnumTypeTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/MixedNullableEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/MixedNullableEnumTypeTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/MixedNullableEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/MixedSubIdTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/MixedSubIdTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/MixedSubIdTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/MixedSubIdTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/NameTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumTestTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumTestTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/PetTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/PigTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/RequiredClassTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/RequiredClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/RequiredClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/RequiredClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/RolesReportsHashRoleTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/RolesReportsHashRoleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/RolesReportsHashRoleTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/RolesReportsHashRoleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/RolesReportsHashTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/RolesReportsHashTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/RolesReportsHashTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/RolesReportsHashTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/TagTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/UserTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/README.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/README.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/UseSourceGeneration.Test.csproj b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/UseSourceGeneration.Test.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration.Test/UseSourceGeneration.Test.csproj rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration.Test/UseSourceGeneration.Test.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/DefaultApi.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/FakeApi.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/IApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Api/IApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/IApi.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Api/IApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/PetApi.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Api/PetApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/StoreApi.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Api/UserApi.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Api/UserApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/ApiException.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/ApiException.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/ApiFactory.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/ApiFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/ApiFactory.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/ApiFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/ApiKeyToken.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/ApiKeyToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/ApiKeyToken.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/ApiKeyToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/ApiResponseEventArgs.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/ApiResponseEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/ApiResponseEventArgs.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/ApiResponseEventArgs.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/ApiResponse`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/ApiResponse`1.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/ApiResponse`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/BasicToken.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/BasicToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/BasicToken.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/BasicToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/BearerToken.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/BearerToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/BearerToken.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/BearerToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/ClientUtils.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/CookieContainer.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/CookieContainer.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/CookieContainer.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/CookieContainer.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateOnlyJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/DateOnlyJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateOnlyJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/DateOnlyJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateOnlyNullableJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/DateOnlyNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateOnlyNullableJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/DateOnlyNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/DateTimeJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateTimeJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/DateTimeJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/DateTimeNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/DateTimeNullableJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/DateTimeNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/ExceptionEventArgs.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/ExceptionEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/ExceptionEventArgs.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/ExceptionEventArgs.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/HostConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/HostConfiguration.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/HostConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/HttpSigningToken.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/HttpSigningToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/HttpSigningToken.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/HttpSigningToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/JsonSerializerOptionsProvider.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/JsonSerializerOptionsProvider.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/JsonSerializerOptionsProvider.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/JsonSerializerOptionsProvider.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/OAuthToken.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/OAuthToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/OAuthToken.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/OAuthToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/Option.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/Option.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/Option.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/Option.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/RateLimitProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/RateLimitProvider`1.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/RateLimitProvider`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/TokenBase.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/TokenBase.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/TokenBase.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/TokenContainer`1.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/TokenContainer`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/TokenContainer`1.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/TokenContainer`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/TokenProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Client/TokenProvider`1.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Client/TokenProvider`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Extensions/IHostBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Extensions/IHostBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Extensions/IHostBuilderExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Extensions/IHostBuilderExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Extensions/IHttpClientBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Extensions/IHttpClientBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Extensions/IHttpClientBuilderExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Extensions/IHttpClientBuilderExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Extensions/IServiceCollectionExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Extensions/IServiceCollectionExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Extensions/IServiceCollectionExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Activity.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Activity.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Activity.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Animal.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Animal.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Animal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ApiResponse.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ApiResponse.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Apple.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Apple.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Apple.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/AppleReq.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/AppleReq.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ArrayTest.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ArrayTest.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Banana.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Banana.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Banana.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/BananaReq.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/BananaReq.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/BasquePig.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/BasquePig.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Capitalization.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Capitalization.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Cat.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Cat.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Cat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Category.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Category.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Category.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ChildCat.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ChildCat.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ClassModel.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ClassModel.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/DanishPig.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/DanishPig.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Dog.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Dog.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Dog.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Drawing.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Drawing.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Drawing.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/EnumArrays.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/EnumArrays.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/EnumClass.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/EnumTest.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/File.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/File.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/File.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Foo.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Foo.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Foo.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FormatTest.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FormatTest.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Fruit.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Fruit.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FruitReq.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FruitReq.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/GmFruit.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/GmFruit.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/List.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/List.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/List.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Mammal.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Mammal.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Mammal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/MapTest.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/MapTest.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/MapTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Model200Response.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Model200Response.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ModelClient.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ModelClient.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Name.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Name.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Name.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NotificationtestGetElementsV1ResponseMPayload.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/NotificationtestGetElementsV1ResponseMPayload.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NotificationtestGetElementsV1ResponseMPayload.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/NotificationtestGetElementsV1ResponseMPayload.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NullableClass.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NullableClass.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NullableShape.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NumberOnly.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NumberOnly.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OneOfString.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OneOfString.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Order.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Order.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Order.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterComposite.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterComposite.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnum.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/OuterEnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnumTest.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/OuterEnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ParentPet.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ParentPet.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Pet.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Pet.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Pet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Pig.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Pig.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Pig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Quadrilateral.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/RequiredClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/RequiredClass.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/RequiredClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Return.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Return.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Return.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/RolesReportsHash.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/RolesReportsHash.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/RolesReportsHash.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/RolesReportsHash.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/RolesReportsHashRole.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/RolesReportsHashRole.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/RolesReportsHashRole.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/RolesReportsHashRole.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Shape.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Shape.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Shape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ShapeInterface.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/SpecialModelName.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Tag.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Tag.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Tag.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/TestInlineFreeformAdditionalPropertiesRequest.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/TestInlineFreeformAdditionalPropertiesRequest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/TestInlineFreeformAdditionalPropertiesRequest.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/TestInlineFreeformAdditionalPropertiesRequest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Triangle.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Triangle.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Triangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/TriangleInterface.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/User.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/User.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/User.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Whale.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Whale.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Whale.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Zebra.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/Zebra.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/Zebra.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/README.md b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/README.md rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/UseSourceGeneration.csproj b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/UseSourceGeneration.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/UseSourceGeneration.csproj rename to samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/UseSourceGeneration/UseSourceGeneration.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.gitignore b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.gitignore rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator-ignore b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator-ignore rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/.openapi-generator/FILES rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/VERSION b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/VERSION rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/Org.OpenAPITools.sln b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/README.md b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/README.md rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/api/openapi.yaml rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/appveyor.yml b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/appveyor.yml rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/appveyor.yml diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/apis/DefaultApi.md b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/docs/apis/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/apis/DefaultApi.md rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/docs/apis/DefaultApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/models/NowGet200Response.md b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/docs/models/NowGet200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/docs/models/NowGet200Response.md rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/docs/models/NowGet200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/docs/scripts/git_push.ps1 similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.ps1 rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/docs/scripts/git_push.ps1 diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.sh b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/docs/scripts/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.sh rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/docs/scripts/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Model/NowGet200ResponseTests.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools.Test/Model/NowGet200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Model/NowGet200ResponseTests.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools.Test/Model/NowGet200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/README.md b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools.Test/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/README.md rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools.Test/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Api/IApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/IApi.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Api/IApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/ApiFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiFactory.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/ApiFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponse`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponse`1.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponse`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/CookieContainer.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/CookieContainer.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/CookieContainer.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/CookieContainer.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Option.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/Option.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Option.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/Option.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenBase.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenContainer`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenContainer`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/NowGet200Response.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Model/NowGet200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/NowGet200Response.cs rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Model/NowGet200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate/src/Org.OpenAPITools/README.md rename to samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.gitignore b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.gitignore rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator-ignore b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator-ignore rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/VERSION b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/VERSION rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/Org.OpenAPITools.sln b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/README.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/README.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/api/openapi.yaml b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/api/openapi.yaml rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/appveyor.yml b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/appveyor.yml rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/appveyor.yml diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/AnotherFakeApi.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/AnotherFakeApi.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/DefaultApi.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/DefaultApi.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/DefaultApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/FakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/PetApi.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/PetApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/PetApi.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/PetApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/StoreApi.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/StoreApi.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/StoreApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/UserApi.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/UserApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/UserApi.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/apis/UserApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Activity.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Activity.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Activity.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Activity.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Animal.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Animal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Animal.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Animal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ApiResponse.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ApiResponse.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ApiResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Apple.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Apple.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Apple.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Apple.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/AppleReq.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/AppleReq.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/AppleReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayTest.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayTest.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ArrayTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Banana.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Banana.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Banana.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Banana.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/BananaReq.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/BananaReq.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/BananaReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/BasquePig.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/BasquePig.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/BasquePig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Capitalization.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Capitalization.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Capitalization.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Cat.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Cat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Cat.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Cat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Category.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Category.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Category.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Category.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ChildCat.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ChildCat.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ChildCat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ClassModel.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ClassModel.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ClassModel.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ComplexQuadrilateral.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/DanishPig.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/DanishPig.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/DanishPig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/DateOnlyClass.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/DateOnlyClass.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/DateOnlyClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/DeprecatedObject.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/DeprecatedObject.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/DeprecatedObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Dog.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Dog.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Dog.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Dog.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Drawing.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Drawing.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Drawing.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Drawing.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumArrays.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumArrays.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/EnumArrays.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumClass.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumClass.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/EnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumTest.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumTest.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/EnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/EquilateralTriangle.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/EquilateralTriangle.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/File.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/File.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/File.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/File.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FileSchemaTestClass.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FileSchemaTestClass.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Foo.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Foo.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Foo.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Foo.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FooGetDefaultResponse.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/FormatTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Fruit.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Fruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Fruit.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Fruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FruitReq.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FruitReq.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/FruitReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/GmFruit.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/GmFruit.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/GmFruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/GrandparentAnimal.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/GrandparentAnimal.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/HasOnlyReadOnly.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/HealthCheckResult.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/HealthCheckResult.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/HealthCheckResult.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/IsoscelesTriangle.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/IsoscelesTriangle.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/List.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/List.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/List.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/List.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/LiteralStringClass.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/LiteralStringClass.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/LiteralStringClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Mammal.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Mammal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Mammal.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Mammal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/MapTest.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/MapTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/MapTest.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/MapTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Model200Response.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Model200Response.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Model200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ModelClient.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ModelClient.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ModelClient.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Name.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Name.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Name.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Name.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NotificationtestGetElementsV1ResponseMPayload.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/NotificationtestGetElementsV1ResponseMPayload.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NotificationtestGetElementsV1ResponseMPayload.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/NotificationtestGetElementsV1ResponseMPayload.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableClass.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableClass.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/NullableClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableGuidClass.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableGuidClass.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/NullableGuidClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableShape.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableShape.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/NullableShape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NumberOnly.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NumberOnly.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/NumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OneOfString.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OneOfString.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/OneOfString.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Order.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Order.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Order.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Order.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterComposite.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterComposite.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/OuterComposite.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnum.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnum.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/OuterEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumInteger.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumInteger.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumTest.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/OuterEnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumTest.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/OuterEnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ParentPet.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ParentPet.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ParentPet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Pet.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Pet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Pet.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Pet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Pig.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Pig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Pig.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Pig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/PolymorphicProperty.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/PolymorphicProperty.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Quadrilateral.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Quadrilateral.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Quadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/QuadrilateralInterface.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/QuadrilateralInterface.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ReadOnlyFirst.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ReadOnlyFirst.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/RequiredClass.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/RequiredClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/RequiredClass.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/RequiredClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Return.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Return.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Return.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Return.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/RolesReportsHash.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/RolesReportsHash.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/RolesReportsHash.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/RolesReportsHash.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/RolesReportsHashRole.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/RolesReportsHashRole.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/RolesReportsHashRole.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/RolesReportsHashRole.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ScaleneTriangle.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ScaleneTriangle.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Shape.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Shape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Shape.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Shape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeInterface.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeInterface.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ShapeInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeOrNull.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ShapeOrNull.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/SimpleQuadrilateral.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/SpecialModelName.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/SpecialModelName.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/SpecialModelName.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Tag.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Tag.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Tag.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Tag.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/TestInlineFreeformAdditionalPropertiesRequest.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/TestInlineFreeformAdditionalPropertiesRequest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/TestInlineFreeformAdditionalPropertiesRequest.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/TestInlineFreeformAdditionalPropertiesRequest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Triangle.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Triangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Triangle.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Triangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/TriangleInterface.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/TriangleInterface.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/TriangleInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/User.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/User.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/User.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/User.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Whale.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Whale.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Whale.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Whale.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Zebra.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Zebra.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Zebra.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/Zebra.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ZeroBasedEnum.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ZeroBasedEnum.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/models/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/scripts/git_push.ps1 similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/scripts/git_push.ps1 rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/scripts/git_push.ps1 diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/scripts/git_push.sh b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/scripts/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/scripts/git_push.sh rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/docs/scripts/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/README.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/README.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/IApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/IApi.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/IApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ApiFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiFactory.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ApiFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiKeyToken.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ApiKeyToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiKeyToken.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ApiKeyToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ApiResponse`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ApiResponse`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/BasicToken.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/BasicToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/BasicToken.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/BasicToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/BearerToken.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/BearerToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/BearerToken.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/BearerToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/CookieContainer.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/CookieContainer.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/CookieContainer.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/CookieContainer.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HttpSigningToken.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/HttpSigningToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HttpSigningToken.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/HttpSigningToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/OAuthToken.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/OAuthToken.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/OAuthToken.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/OAuthToken.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/Option.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/Option.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/Option.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/Option.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/TokenBase.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/TokenContainer`1.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/TokenContainer`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/TokenContainer`1.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/TokenContainer`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/TokenProvider`1.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumTest.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/RequiredClass.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/RolesReportsHash.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/RolesReportsHash.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/RolesReportsHash.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/RolesReportsHash.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/README.md rename to samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/.gitignore b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/.gitignore rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/.openapi-generator-ignore b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/.openapi-generator-ignore rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/.openapi-generator/FILES b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/.openapi-generator/FILES rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/VERSION b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/VERSION rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/Org.OpenAPITools.sln b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/README.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/README.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/appveyor.yml b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/appveyor.yml rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/appveyor.yml diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Activity.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Activity.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Activity.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Activity.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Animal.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Animal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Animal.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Animal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/AnotherFakeApi.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ApiResponse.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ApiResponse.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ApiResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Apple.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Apple.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Apple.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Apple.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/AppleReq.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/AppleReq.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/AppleReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ArrayTest.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ArrayTest.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ArrayTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Banana.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Banana.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Banana.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Banana.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/BananaReq.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/BananaReq.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/BananaReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/BasquePig.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/BasquePig.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/BasquePig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Capitalization.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Capitalization.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Capitalization.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Cat.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Cat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Cat.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Cat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/CatAllOf.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/CatAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/CatAllOf.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/CatAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Category.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Category.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Category.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Category.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ChildCat.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ChildCat.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ChildCat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ChildCatAllOf.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ChildCatAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ChildCatAllOf.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ChildCatAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ClassModel.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ClassModel.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ClassModel.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/DanishPig.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/DanishPig.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/DanishPig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/DateOnlyClass.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/DateOnlyClass.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/DateOnlyClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DefaultApi.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DefaultApi.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/DefaultApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/DeprecatedObject.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/DeprecatedObject.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/DeprecatedObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Dog.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Dog.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Dog.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Dog.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DogAllOf.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/DogAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DogAllOf.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/DogAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Drawing.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Drawing.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Drawing.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Drawing.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/EnumArrays.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/EnumArrays.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/EnumArrays.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/EnumClass.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/EnumClass.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/EnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/EnumTest.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/EnumTest.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/EnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/EquilateralTriangle.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/EquilateralTriangle.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FakeApi.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FakeApi.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/FakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/File.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/File.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/File.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/File.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FileSchemaTestClass.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Foo.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Foo.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Foo.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Foo.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FormatTest.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FormatTest.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/FormatTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Fruit.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Fruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Fruit.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Fruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FruitReq.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FruitReq.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/FruitReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/GmFruit.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/GmFruit.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/GmFruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/GrandparentAnimal.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/GrandparentAnimal.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/HealthCheckResult.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/HealthCheckResult.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/HealthCheckResult.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/IsoscelesTriangle.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/List.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/List.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/List.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/List.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/LiteralStringClass.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/LiteralStringClass.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/LiteralStringClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Mammal.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Mammal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Mammal.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Mammal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/MapTest.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/MapTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/MapTest.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/MapTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MixedAnyOf.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/MixedAnyOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MixedAnyOf.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/MixedAnyOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MixedAnyOfContent.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/MixedAnyOfContent.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MixedAnyOfContent.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/MixedAnyOfContent.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MixedEnumType.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/MixedEnumType.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MixedEnumType.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/MixedEnumType.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MixedNullableEnumType.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/MixedNullableEnumType.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MixedNullableEnumType.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/MixedNullableEnumType.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MixedOneOf.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/MixedOneOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MixedOneOf.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/MixedOneOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MixedOneOfContent.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/MixedOneOfContent.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MixedOneOfContent.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/MixedOneOfContent.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MixedSubId.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/MixedSubId.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MixedSubId.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/MixedSubId.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Model200Response.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Model200Response.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Model200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ModelClient.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ModelClient.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ModelClient.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Name.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Name.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Name.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Name.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/NotificationtestGetElementsV1ResponseMPayload.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/NotificationtestGetElementsV1ResponseMPayload.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/NotificationtestGetElementsV1ResponseMPayload.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/NotificationtestGetElementsV1ResponseMPayload.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/NullableClass.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/NullableClass.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/NullableClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/NullableGuidClass.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/NullableGuidClass.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/NullableGuidClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/NullableShape.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/NullableShape.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/NullableShape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/NumberOnly.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/NumberOnly.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/NumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OneOfString.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OneOfString.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/OneOfString.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Order.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Order.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Order.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Order.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterComposite.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterComposite.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/OuterComposite.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterEnum.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterEnum.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/OuterEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterEnumInteger.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterEnumInteger.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterEnumTest.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/OuterEnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterEnumTest.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/OuterEnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ParentPet.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ParentPet.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ParentPet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Pet.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Pet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Pet.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Pet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/PetApi.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/PetApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/PetApi.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/PetApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Pig.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Pig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Pig.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Pig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/PolymorphicProperty.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/PolymorphicProperty.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Quadrilateral.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Quadrilateral.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Quadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/QuadrilateralInterface.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ReadOnlyFirst.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/RequiredClass.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/RequiredClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/RequiredClass.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/RequiredClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Return.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Return.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Return.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Return.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/RolesReportsHash.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/RolesReportsHash.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/RolesReportsHash.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/RolesReportsHash.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/RolesReportsHashRole.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/RolesReportsHashRole.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/RolesReportsHashRole.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/RolesReportsHashRole.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ScaleneTriangle.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ScaleneTriangle.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Shape.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Shape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Shape.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Shape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ShapeInterface.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ShapeInterface.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ShapeInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ShapeOrNull.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ShapeOrNull.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ShapeOrNull.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/SpecialModelName.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/SpecialModelName.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/SpecialModelName.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/StoreApi.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/StoreApi.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/StoreApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Tag.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Tag.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Tag.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Tag.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/TestInlineFreeformAdditionalPropertiesRequest.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/TestInlineFreeformAdditionalPropertiesRequest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/TestInlineFreeformAdditionalPropertiesRequest.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/TestInlineFreeformAdditionalPropertiesRequest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Triangle.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Triangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Triangle.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Triangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/TriangleInterface.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/TriangleInterface.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/TriangleInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/UpdatePet200Response.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/UpdatePet200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/UpdatePet200Response.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/UpdatePet200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/User.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/User.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/User.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/User.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/UserApi.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/UserApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/UserApi.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/UserApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Whale.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Whale.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Whale.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Whale.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Zebra.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Zebra.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Zebra.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/Zebra.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ZeroBasedEnum.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ZeroBasedEnum.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/docs/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/git_push.sh b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/git_push.sh rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTestsV2.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTestsV2.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTestsV2.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTestsV2.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/linux-logo.png b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/linux-logo.png similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/linux-logo.png rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/linux-logo.png diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/FileParameter.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/FileParameter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/FileParameter.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/FileParameter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/CatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/CatAllOf.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/CatAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DogAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DogAllOf.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DogAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedAnyOf.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedAnyOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedAnyOf.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedAnyOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedEnumType.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedEnumType.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedEnumType.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedEnumType.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedOneOf.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedOneOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedOneOf.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedOneOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedOneOfContent.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedOneOfContent.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedOneOfContent.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedOneOfContent.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedSubId.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedSubId.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedSubId.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedSubId.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumTest.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/RequiredClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/RequiredClass.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/RequiredClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/RolesReportsHash.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/RolesReportsHash.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/RolesReportsHash.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/RolesReportsHash.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/UpdatePet200Response.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/UpdatePet200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/UpdatePet200Response.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/UpdatePet200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/httpclient/standard2.0/OpenAPIClient-httpclient/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/.gitignore b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/.gitignore rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/.openapi-generator-ignore b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/.openapi-generator-ignore rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/.openapi-generator/FILES b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/.openapi-generator/FILES rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/.openapi-generator/VERSION b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/.openapi-generator/VERSION rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/Org.OpenAPITools.sln b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/README.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/README.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/api/openapi.yaml rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/appveyor.yml b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/appveyor.yml rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/appveyor.yml diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Activity.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Activity.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Activity.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Activity.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Animal.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Animal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Animal.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Animal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/AnotherFakeApi.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ApiResponse.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ApiResponse.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ApiResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Apple.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Apple.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Apple.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Apple.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/AppleReq.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/AppleReq.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/AppleReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ArrayTest.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ArrayTest.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ArrayTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Banana.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Banana.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Banana.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Banana.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/BananaReq.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/BananaReq.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/BananaReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/BasquePig.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/BasquePig.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/BasquePig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Capitalization.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Capitalization.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Capitalization.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Cat.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Cat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Cat.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Cat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/CatAllOf.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/CatAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/CatAllOf.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/CatAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Category.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Category.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Category.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Category.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ChildCat.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ChildCat.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ChildCat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ChildCatAllOf.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ChildCatAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/ChildCatAllOf.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ChildCatAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ClassModel.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ClassModel.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ClassModel.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DanishPig.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DanishPig.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/DanishPig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DateOnlyClass.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DateOnlyClass.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/DateOnlyClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/DefaultApi.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/DefaultApi.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/DefaultApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DeprecatedObject.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DeprecatedObject.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/DeprecatedObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Dog.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Dog.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Dog.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Dog.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/DogAllOf.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/DogAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/DogAllOf.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/DogAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Drawing.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Drawing.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Drawing.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Drawing.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/EnumArrays.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/EnumArrays.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/EnumArrays.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/EnumClass.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/EnumClass.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/EnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/EnumTest.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/EnumTest.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/EnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/EquilateralTriangle.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/EquilateralTriangle.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FakeApi.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/FakeApi.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/FakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/File.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/File.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/File.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/File.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FileSchemaTestClass.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Foo.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Foo.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Foo.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Foo.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FormatTest.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FormatTest.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/FormatTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Fruit.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Fruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Fruit.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Fruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FruitReq.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FruitReq.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/FruitReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/GmFruit.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/GmFruit.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/GmFruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/GrandparentAnimal.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/GrandparentAnimal.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/HealthCheckResult.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/HealthCheckResult.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/HealthCheckResult.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/IsoscelesTriangle.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/List.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/List.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/List.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/List.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/LiteralStringClass.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/LiteralStringClass.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/LiteralStringClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Mammal.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Mammal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Mammal.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Mammal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MapTest.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/MapTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MapTest.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/MapTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/MixedAnyOf.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/MixedAnyOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/MixedAnyOf.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/MixedAnyOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/MixedAnyOfContent.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/MixedAnyOfContent.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/MixedAnyOfContent.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/MixedAnyOfContent.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/MixedEnumType.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/MixedEnumType.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/MixedEnumType.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/MixedEnumType.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/MixedNullableEnumType.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/MixedNullableEnumType.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/MixedNullableEnumType.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/MixedNullableEnumType.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/MixedOneOf.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/MixedOneOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/MixedOneOf.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/MixedOneOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/MixedOneOfContent.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/MixedOneOfContent.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/MixedOneOfContent.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/MixedOneOfContent.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/MixedSubId.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/MixedSubId.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/MixedSubId.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/MixedSubId.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Model200Response.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Model200Response.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Model200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ModelClient.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ModelClient.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ModelClient.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Name.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Name.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Name.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Name.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/NotificationtestGetElementsV1ResponseMPayload.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/NotificationtestGetElementsV1ResponseMPayload.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/NotificationtestGetElementsV1ResponseMPayload.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/NotificationtestGetElementsV1ResponseMPayload.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/NullableClass.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/NullableClass.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/NullableClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/NullableGuidClass.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/NullableGuidClass.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/NullableGuidClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/NullableShape.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/NullableShape.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/NullableShape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/NumberOnly.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/NumberOnly.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/NumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OneOfString.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OneOfString.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/OneOfString.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Order.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Order.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Order.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Order.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterComposite.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterComposite.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/OuterComposite.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterEnum.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterEnum.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/OuterEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterEnumInteger.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterEnumInteger.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterEnumTest.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/OuterEnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterEnumTest.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/OuterEnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ParentPet.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ParentPet.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ParentPet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Pet.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Pet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Pet.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Pet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/PetApi.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/PetApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/PetApi.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/PetApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Pig.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Pig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Pig.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Pig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/PolymorphicProperty.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/PolymorphicProperty.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Quadrilateral.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Quadrilateral.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Quadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/QuadrilateralInterface.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ReadOnlyFirst.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/RequiredClass.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/RequiredClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/RequiredClass.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/RequiredClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Return.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Return.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Return.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Return.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/RolesReportsHash.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/RolesReportsHash.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/RolesReportsHash.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/RolesReportsHash.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/RolesReportsHashRole.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/RolesReportsHashRole.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/RolesReportsHashRole.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/RolesReportsHashRole.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ScaleneTriangle.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ScaleneTriangle.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Shape.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Shape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Shape.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Shape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ShapeInterface.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ShapeInterface.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ShapeInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ShapeOrNull.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ShapeOrNull.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ShapeOrNull.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/SpecialModelName.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/SpecialModelName.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/SpecialModelName.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/StoreApi.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/StoreApi.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/StoreApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Tag.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Tag.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Tag.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Tag.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/TestInlineFreeformAdditionalPropertiesRequest.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/TestInlineFreeformAdditionalPropertiesRequest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/TestInlineFreeformAdditionalPropertiesRequest.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/TestInlineFreeformAdditionalPropertiesRequest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Triangle.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Triangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Triangle.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Triangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/TriangleInterface.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/TriangleInterface.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/TriangleInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/UpdatePet200Response.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/UpdatePet200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/UpdatePet200Response.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/UpdatePet200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/User.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/User.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/User.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/User.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/UserApi.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/UserApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/UserApi.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/UserApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Whale.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Whale.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Whale.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Whale.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Zebra.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Zebra.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Zebra.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/Zebra.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ZeroBasedEnum.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ZeroBasedEnum.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/docs/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/git_push.sh b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/git_push.sh rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/CatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/CatAllOf.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/CatAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCatAllOf.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCatAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DogAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DogAllOf.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DogAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedAnyOf.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedAnyOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedAnyOf.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedAnyOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedEnumType.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedEnumType.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedEnumType.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedEnumType.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedOneOf.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedOneOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedOneOf.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedOneOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedOneOfContent.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedOneOfContent.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedOneOfContent.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedOneOfContent.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedSubId.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedSubId.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedSubId.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedSubId.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumTest.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/RequiredClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/RequiredClass.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/RequiredClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/RolesReportsHash.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/RolesReportsHash.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/RolesReportsHash.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/RolesReportsHash.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/UpdatePet200Response.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/UpdatePet200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/UpdatePet200Response.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/UpdatePet200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClient-net47/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/.gitignore b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/.gitignore rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/.openapi-generator-ignore b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/.openapi-generator-ignore rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/.openapi-generator/FILES b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/.openapi-generator/FILES rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/.openapi-generator/VERSION b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/.openapi-generator/VERSION rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClient/Org.OpenAPITools.sln b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/README.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/README.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/api/openapi.yaml rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/appveyor.yml b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/appveyor.yml rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/appveyor.yml diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/ApiResponse.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/docs/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/ApiResponse.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/docs/ApiResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/Category.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/docs/Category.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/Category.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/docs/Category.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/Order.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/docs/Order.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/Order.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/docs/Order.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/Pet.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/docs/Pet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/Pet.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/docs/Pet.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/PetApi.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/docs/PetApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/PetApi.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/docs/PetApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/StoreApi.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/docs/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/StoreApi.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/docs/StoreApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/Tag.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/docs/Tag.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/Tag.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/docs/Tag.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/User.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/docs/User.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/User.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/docs/User.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/UserApi.md b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/docs/UserApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/UserApi.md rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/docs/UserApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/git_push.sh b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/git_push.sh rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/restsharp/net4.7/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/.gitignore b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/.gitignore rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/.openapi-generator-ignore b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/.openapi-generator-ignore rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/.openapi-generator/FILES b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/.openapi-generator/FILES rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/.openapi-generator/VERSION b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/.openapi-generator/VERSION rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/Org.OpenAPITools.sln b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/README.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/README.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/api/openapi.yaml rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/appveyor.yml b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/appveyor.yml rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/appveyor.yml diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Activity.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Activity.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Activity.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Activity.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Animal.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Animal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Animal.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Animal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/AnotherFakeApi.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ApiResponse.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/ApiResponse.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ApiResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Apple.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Apple.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Apple.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Apple.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/AppleReq.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/AppleReq.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/AppleReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ArrayTest.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/ArrayTest.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ArrayTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Banana.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Banana.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Banana.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Banana.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/BananaReq.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/BananaReq.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/BananaReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/BasquePig.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/BasquePig.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/BasquePig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Capitalization.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Capitalization.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Capitalization.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Cat.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Cat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Cat.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Cat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/CatAllOf.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/CatAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/CatAllOf.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/CatAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Category.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Category.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Category.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Category.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ChildCat.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/ChildCat.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ChildCat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ChildCatAllOf.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ChildCatAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/ChildCatAllOf.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ChildCatAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ClassModel.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/ClassModel.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ClassModel.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/DanishPig.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/DanishPig.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/DanishPig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/DateOnlyClass.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/DateOnlyClass.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/DateOnlyClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/DefaultApi.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/DefaultApi.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/DefaultApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/DeprecatedObject.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/DeprecatedObject.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/DeprecatedObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Dog.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Dog.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Dog.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Dog.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/DogAllOf.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/DogAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/DogAllOf.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/DogAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Drawing.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Drawing.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Drawing.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Drawing.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/EnumArrays.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/EnumArrays.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/EnumArrays.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/EnumClass.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/EnumClass.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/EnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/EnumTest.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/EnumTest.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/EnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/EquilateralTriangle.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/EquilateralTriangle.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FakeApi.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/FakeApi.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/FakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/File.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/File.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/File.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/File.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/FileSchemaTestClass.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Foo.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Foo.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Foo.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Foo.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FormatTest.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/FormatTest.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/FormatTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Fruit.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Fruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Fruit.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Fruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FruitReq.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/FruitReq.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/FruitReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/GmFruit.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/GmFruit.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/GmFruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/GrandparentAnimal.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/GrandparentAnimal.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/HealthCheckResult.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/HealthCheckResult.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/HealthCheckResult.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/IsoscelesTriangle.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/List.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/List.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/List.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/List.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/LiteralStringClass.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/LiteralStringClass.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/LiteralStringClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Mammal.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Mammal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Mammal.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Mammal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/MapTest.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/MapTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/MapTest.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/MapTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/MixedAnyOf.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/MixedAnyOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/MixedAnyOf.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/MixedAnyOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/MixedAnyOfContent.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/MixedAnyOfContent.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/MixedAnyOfContent.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/MixedAnyOfContent.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/MixedEnumType.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/MixedEnumType.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/MixedEnumType.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/MixedEnumType.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/MixedNullableEnumType.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/MixedNullableEnumType.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/MixedNullableEnumType.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/MixedNullableEnumType.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/MixedOneOf.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/MixedOneOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/MixedOneOf.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/MixedOneOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/MixedOneOfContent.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/MixedOneOfContent.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/MixedOneOfContent.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/MixedOneOfContent.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/MixedSubId.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/MixedSubId.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/MixedSubId.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/MixedSubId.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Model200Response.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Model200Response.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Model200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ModelClient.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/ModelClient.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ModelClient.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Name.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Name.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Name.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Name.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/NotificationtestGetElementsV1ResponseMPayload.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/NotificationtestGetElementsV1ResponseMPayload.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/NotificationtestGetElementsV1ResponseMPayload.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/NotificationtestGetElementsV1ResponseMPayload.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/NullableClass.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/NullableClass.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/NullableClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/NullableGuidClass.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/NullableGuidClass.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/NullableGuidClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/NullableShape.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/NullableShape.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/NullableShape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/NumberOnly.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/NumberOnly.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/NumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/OneOfString.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/OneOfString.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/OneOfString.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Order.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Order.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Order.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Order.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterComposite.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterComposite.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/OuterComposite.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterEnum.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterEnum.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/OuterEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterEnumInteger.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterEnumInteger.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterEnumTest.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/OuterEnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterEnumTest.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/OuterEnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ParentPet.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/ParentPet.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ParentPet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Pet.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Pet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Pet.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Pet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/PetApi.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/PetApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/PetApi.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/PetApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Pig.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Pig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Pig.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Pig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/PolymorphicProperty.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/PolymorphicProperty.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Quadrilateral.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Quadrilateral.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Quadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/QuadrilateralInterface.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/ReadOnlyFirst.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/RequiredClass.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/RequiredClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/RequiredClass.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/RequiredClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Return.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Return.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Return.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Return.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/RolesReportsHash.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/RolesReportsHash.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/RolesReportsHash.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/RolesReportsHash.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/RolesReportsHashRole.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/RolesReportsHashRole.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/RolesReportsHashRole.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/RolesReportsHashRole.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ScaleneTriangle.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/ScaleneTriangle.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Shape.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Shape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Shape.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Shape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ShapeInterface.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/ShapeInterface.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ShapeInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ShapeOrNull.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/ShapeOrNull.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ShapeOrNull.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/SpecialModelName.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/SpecialModelName.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/SpecialModelName.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/StoreApi.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/StoreApi.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/StoreApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Tag.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Tag.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Tag.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Tag.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/TestInlineFreeformAdditionalPropertiesRequest.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/TestInlineFreeformAdditionalPropertiesRequest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/TestInlineFreeformAdditionalPropertiesRequest.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/TestInlineFreeformAdditionalPropertiesRequest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Triangle.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Triangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Triangle.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Triangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/TriangleInterface.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/TriangleInterface.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/TriangleInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/UpdatePet200Response.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/UpdatePet200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/UpdatePet200Response.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/UpdatePet200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/User.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/User.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/User.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/User.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/UserApi.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/UserApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/UserApi.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/UserApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Whale.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Whale.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Whale.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Whale.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Zebra.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Zebra.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/Zebra.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/Zebra.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ZeroBasedEnum.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/ZeroBasedEnum.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/docs/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/docs/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/git_push.sh b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/git_push.sh rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/CatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/CatAllOf.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/CatAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCatAllOf.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCatAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DogAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DogAllOf.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DogAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedAnyOf.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedAnyOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedAnyOf.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedAnyOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedEnumType.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedEnumType.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedEnumType.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedEnumType.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedOneOf.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedOneOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedOneOf.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedOneOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedOneOfContent.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedOneOfContent.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedOneOfContent.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedOneOfContent.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedSubId.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedSubId.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedSubId.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedSubId.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumTest.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/RequiredClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/RequiredClass.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/RequiredClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/RolesReportsHash.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/RolesReportsHash.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/RolesReportsHash.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/RolesReportsHash.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/UpdatePet200Response.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/UpdatePet200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/UpdatePet200Response.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/UpdatePet200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/restsharp/net4.8/OpenAPIClient-net48/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/.gitignore b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/.gitignore rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/.openapi-generator-ignore b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/.openapi-generator-ignore rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/FILES b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/FILES rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/.openapi-generator/VERSION b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/.openapi-generator/VERSION rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/Org.OpenAPITools.sln b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/README.md b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/README.md rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/api/openapi.yaml rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/appveyor.yml b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/appveyor.yml rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/appveyor.yml diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/docs/Env.md b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/docs/Env.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/docs/Env.md rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/docs/Env.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/docs/FakeApi.md b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/docs/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/docs/FakeApi.md rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/docs/FakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/docs/PropertyNameMapping.md b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/docs/PropertyNameMapping.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/docs/PropertyNameMapping.md rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/docs/PropertyNameMapping.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/git_push.sh b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/git_push.sh rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/EnvTests.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/EnvTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/EnvTests.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/EnvTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/PropertyNameMappingTests.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/PropertyNameMappingTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/PropertyNameMappingTests.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/PropertyNameMappingTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/Env.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/Env.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/Env.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/Env.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/PropertyNameMapping.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/PropertyNameMapping.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/PropertyNameMapping.cs rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/PropertyNameMapping.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.gitignore b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.gitignore rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator-ignore b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator-ignore rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/.openapi-generator/FILES b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/.openapi-generator/FILES rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator/VERSION b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator/VERSION rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/Org.OpenAPITools.sln b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/README.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/README.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/api/openapi.yaml rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/appveyor.yml b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/appveyor.yml rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/appveyor.yml diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Activity.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Activity.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Activity.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Activity.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Animal.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Animal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Animal.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Animal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/AnotherFakeApi.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ApiResponse.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/ApiResponse.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ApiResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Apple.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Apple.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Apple.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Apple.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/AppleReq.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/AppleReq.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/AppleReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ArrayTest.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/ArrayTest.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ArrayTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Banana.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Banana.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Banana.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Banana.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/BananaReq.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/BananaReq.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/BananaReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/BasquePig.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/BasquePig.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/BasquePig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Capitalization.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Capitalization.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Capitalization.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Cat.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Cat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Cat.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Cat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/CatAllOf.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/CatAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/CatAllOf.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/CatAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Category.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Category.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Category.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Category.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ChildCat.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/ChildCat.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ChildCat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ChildCatAllOf.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ChildCatAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ChildCatAllOf.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ChildCatAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ClassModel.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/ClassModel.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ClassModel.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/DanishPig.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/DanishPig.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/DanishPig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DateOnlyClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DateOnlyClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/DateOnlyClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/DefaultApi.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/DefaultApi.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/DefaultApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/DeprecatedObject.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/DeprecatedObject.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/DeprecatedObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Dog.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Dog.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Dog.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Dog.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DogAllOf.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/DogAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DogAllOf.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/DogAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Drawing.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Drawing.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Drawing.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Drawing.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/EnumArrays.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/EnumArrays.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/EnumArrays.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/EnumClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/EnumClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/EnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/EnumTest.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/EnumTest.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/EnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/EquilateralTriangle.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/EquilateralTriangle.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FakeApi.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FakeApi.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/FakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/File.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/File.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/File.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/File.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/FileSchemaTestClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Foo.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Foo.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Foo.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Foo.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FormatTest.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FormatTest.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/FormatTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Fruit.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Fruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Fruit.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Fruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FruitReq.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/FruitReq.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/FruitReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/GmFruit.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/GmFruit.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/GmFruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/GrandparentAnimal.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/GrandparentAnimal.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/HealthCheckResult.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/HealthCheckResult.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/HealthCheckResult.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/IsoscelesTriangle.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/List.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/List.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/List.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/List.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/LiteralStringClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/LiteralStringClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/LiteralStringClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Mammal.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Mammal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Mammal.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Mammal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/MapTest.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/MapTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/MapTest.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/MapTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MixedAnyOf.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/MixedAnyOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MixedAnyOf.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/MixedAnyOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MixedAnyOfContent.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/MixedAnyOfContent.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MixedAnyOfContent.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/MixedAnyOfContent.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MixedEnumType.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/MixedEnumType.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MixedEnumType.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/MixedEnumType.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MixedNullableEnumType.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/MixedNullableEnumType.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MixedNullableEnumType.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/MixedNullableEnumType.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MixedOneOf.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/MixedOneOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MixedOneOf.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/MixedOneOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MixedOneOfContent.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/MixedOneOfContent.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MixedOneOfContent.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/MixedOneOfContent.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MixedSubId.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/MixedSubId.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MixedSubId.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/MixedSubId.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Model200Response.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Model200Response.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Model200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ModelClient.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/ModelClient.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ModelClient.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Name.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Name.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Name.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Name.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/NotificationtestGetElementsV1ResponseMPayload.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/NotificationtestGetElementsV1ResponseMPayload.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/NotificationtestGetElementsV1ResponseMPayload.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/NotificationtestGetElementsV1ResponseMPayload.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NullableClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NullableClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/NullableClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/NullableGuidClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/NullableGuidClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/NullableGuidClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/NullableShape.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/NullableShape.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/NullableShape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/NumberOnly.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/NumberOnly.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/NumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/OneOfString.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/OneOfString.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/OneOfString.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Order.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Order.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Order.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Order.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterComposite.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterComposite.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/OuterComposite.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterEnum.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterEnum.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/OuterEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterEnumInteger.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterEnumInteger.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterEnumTest.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/OuterEnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterEnumTest.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/OuterEnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ParentPet.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/ParentPet.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ParentPet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Pet.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Pet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Pet.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Pet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/PetApi.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/PetApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/PetApi.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/PetApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/PetStatusFilter.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/PetStatusFilter.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/PetStatusFilter.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/PetStatusFilter.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Pig.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Pig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Pig.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Pig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/PolymorphicProperty.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/PolymorphicProperty.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Quadrilateral.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Quadrilateral.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Quadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/QuadrilateralInterface.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/ReadOnlyFirst.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/RequiredClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/RequiredClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/RequiredClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/RequiredClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Return.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Return.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Return.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Return.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/RolesReportsHash.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/RolesReportsHash.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/RolesReportsHash.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/RolesReportsHash.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/RolesReportsHashRole.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/RolesReportsHashRole.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/RolesReportsHashRole.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/RolesReportsHashRole.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ScaleneTriangle.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/ScaleneTriangle.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Shape.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Shape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Shape.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Shape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ShapeInterface.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/ShapeInterface.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ShapeInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ShapeOrNull.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/ShapeOrNull.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ShapeOrNull.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/SpecialModelName.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/SpecialModelName.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/SpecialModelName.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/StoreApi.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/StoreApi.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/StoreApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Tag.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Tag.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Tag.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Tag.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/TestInlineFreeformAdditionalPropertiesRequest.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/TestInlineFreeformAdditionalPropertiesRequest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/TestInlineFreeformAdditionalPropertiesRequest.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/TestInlineFreeformAdditionalPropertiesRequest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Triangle.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Triangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Triangle.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Triangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/TriangleInterface.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/TriangleInterface.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/TriangleInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/UpdatePet200Response.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/UpdatePet200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/UpdatePet200Response.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/UpdatePet200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/User.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/User.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/User.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/User.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/UserApi.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/UserApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/UserApi.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/UserApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Whale.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Whale.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Whale.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Whale.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Zebra.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Zebra.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/Zebra.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/Zebra.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ZeroBasedEnum.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/ZeroBasedEnum.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/docs/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/git_push.sh b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/git_push.sh rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PetStatusFilterTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PetStatusFilterTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PetStatusFilterTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PetStatusFilterTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/CatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/CatAllOf.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/CatAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DogAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DogAllOf.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DogAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedAnyOf.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedAnyOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedAnyOf.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedAnyOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedEnumType.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedEnumType.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedEnumType.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedEnumType.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedOneOf.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedOneOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedOneOf.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedOneOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedOneOfContent.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedOneOfContent.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedOneOfContent.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedOneOfContent.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedSubId.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedSubId.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedSubId.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedSubId.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumTest.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/PetStatusFilter.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/PetStatusFilter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/PetStatusFilter.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/PetStatusFilter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/RequiredClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/RequiredClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/RequiredClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/RolesReportsHash.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/RolesReportsHash.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/RolesReportsHash.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/RolesReportsHash.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/UpdatePet200Response.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/UpdatePet200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/UpdatePet200Response.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/UpdatePet200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.gitignore b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.gitignore rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator-ignore b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator-ignore rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator/FILES b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator/FILES rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/VERSION b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/VERSION rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/Org.OpenAPITools.sln b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/README.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/README.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/api/openapi.yaml rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/appveyor.yml b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/appveyor.yml rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/appveyor.yml diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/docs/DefaultApi.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/docs/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/docs/DefaultApi.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/docs/DefaultApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/docs/NowGet200Response.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/docs/NowGet200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/docs/NowGet200Response.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/docs/NowGet200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/git_push.sh b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/git_push.sh rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Model/NowGet200ResponseTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Model/NowGet200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Model/NowGet200ResponseTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Model/NowGet200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/NowGet200Response.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/NowGet200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/NowGet200Response.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Model/NowGet200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClient-net7.0-useDateTimeForDate/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/.gitignore b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/.gitignore rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/.openapi-generator-ignore b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/.openapi-generator-ignore rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/.openapi-generator/FILES b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/.openapi-generator/FILES rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/.travis.yml b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/.travis.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/.travis.yml rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/.travis.yml diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/Org.OpenAPITools.sln b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/README.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/README.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/api/openapi.yaml rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClient/appveyor.yml b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/appveyor.yml rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/appveyor.yml diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/build.bat b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/build.bat similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/build.bat rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/build.bat diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/build.sh b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/build.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/build.sh rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/build.sh diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Activity.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Activity.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Activity.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Activity.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Animal.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Animal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Animal.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Animal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/AnotherFakeApi.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ApiResponse.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ApiResponse.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ApiResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Apple.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Apple.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Apple.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Apple.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/AppleReq.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/AppleReq.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/AppleReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ArrayTest.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ArrayTest.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ArrayTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Banana.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Banana.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Banana.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Banana.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/BananaReq.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/BananaReq.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/BananaReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/BasquePig.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/BasquePig.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/BasquePig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Capitalization.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Capitalization.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Capitalization.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Cat.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Cat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Cat.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Cat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/CatAllOf.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/CatAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/CatAllOf.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/CatAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Category.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Category.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Category.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Category.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ChildCat.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ChildCat.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ChildCat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ChildCatAllOf.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ChildCatAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ChildCatAllOf.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ChildCatAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ClassModel.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ClassModel.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ClassModel.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DanishPig.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DanishPig.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/DanishPig.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/DateOnlyClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/DateOnlyClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/DateOnlyClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DefaultApi.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DefaultApi.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/DefaultApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DeprecatedObject.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DeprecatedObject.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/DeprecatedObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Dog.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Dog.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Dog.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Dog.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DogAllOf.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/DogAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DogAllOf.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/DogAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Drawing.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Drawing.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Drawing.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Drawing.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/EnumArrays.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/EnumArrays.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/EnumArrays.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/EnumClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/EnumClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/EnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/EnumTest.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/EnumTest.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/EnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/EquilateralTriangle.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/EquilateralTriangle.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/FakeApi.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/FakeApi.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/FakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/File.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/File.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/File.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/File.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FileSchemaTestClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Foo.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Foo.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Foo.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Foo.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/FormatTest.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/FormatTest.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/FormatTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Fruit.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Fruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Fruit.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Fruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FruitReq.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FruitReq.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/FruitReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/GmFruit.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/GmFruit.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/GmFruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/GrandparentAnimal.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/GrandparentAnimal.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/HealthCheckResult.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/HealthCheckResult.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/HealthCheckResult.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/IsoscelesTriangle.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/List.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/List.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/List.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/List.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/LiteralStringClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/LiteralStringClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/LiteralStringClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Mammal.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Mammal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Mammal.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Mammal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MapTest.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/MapTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MapTest.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/MapTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MixedAnyOf.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/MixedAnyOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MixedAnyOf.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/MixedAnyOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MixedAnyOfContent.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/MixedAnyOfContent.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MixedAnyOfContent.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/MixedAnyOfContent.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MixedEnumType.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/MixedEnumType.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MixedEnumType.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/MixedEnumType.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MixedNullableEnumType.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/MixedNullableEnumType.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MixedNullableEnumType.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/MixedNullableEnumType.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MixedOneOf.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/MixedOneOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MixedOneOf.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/MixedOneOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MixedOneOfContent.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/MixedOneOfContent.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MixedOneOfContent.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/MixedOneOfContent.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MixedSubId.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/MixedSubId.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MixedSubId.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/MixedSubId.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Model200Response.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Model200Response.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Model200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ModelClient.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ModelClient.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ModelClient.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Name.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Name.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Name.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Name.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NotificationtestGetElementsV1ResponseMPayload.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/NotificationtestGetElementsV1ResponseMPayload.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NotificationtestGetElementsV1ResponseMPayload.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/NotificationtestGetElementsV1ResponseMPayload.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/NullableClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/NullableClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/NullableClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NullableGuidClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NullableGuidClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/NullableGuidClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NullableShape.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NullableShape.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/NullableShape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NumberOnly.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NumberOnly.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/NumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OneOfString.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OneOfString.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/OneOfString.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Order.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Order.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Order.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Order.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterComposite.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterComposite.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/OuterComposite.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterEnum.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterEnum.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/OuterEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterEnumInteger.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterEnumInteger.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterEnumTest.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/OuterEnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterEnumTest.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/OuterEnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ParentPet.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ParentPet.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ParentPet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Pet.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Pet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Pet.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Pet.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/PetApi.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/PetApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/PetApi.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/PetApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Pig.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Pig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Pig.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Pig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/PolymorphicProperty.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/PolymorphicProperty.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Quadrilateral.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Quadrilateral.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Quadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/QuadrilateralInterface.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ReadOnlyFirst.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/RequiredClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/RequiredClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/RequiredClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/RequiredClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Return.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Return.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Return.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Return.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/RolesReportsHash.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/RolesReportsHash.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/RolesReportsHash.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/RolesReportsHash.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/RolesReportsHashRole.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/RolesReportsHashRole.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/RolesReportsHashRole.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/RolesReportsHashRole.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ScaleneTriangle.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ScaleneTriangle.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Shape.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Shape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Shape.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Shape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ShapeInterface.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ShapeInterface.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ShapeInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ShapeOrNull.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ShapeOrNull.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ShapeOrNull.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/SpecialModelName.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/SpecialModelName.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/SpecialModelName.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/StoreApi.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/StoreApi.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/StoreApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Tag.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Tag.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Tag.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Tag.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/TestInlineFreeformAdditionalPropertiesRequest.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/TestInlineFreeformAdditionalPropertiesRequest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/TestInlineFreeformAdditionalPropertiesRequest.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/TestInlineFreeformAdditionalPropertiesRequest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Triangle.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Triangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Triangle.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Triangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/TriangleInterface.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/TriangleInterface.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/TriangleInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/UpdatePet200Response.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/UpdatePet200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/UpdatePet200Response.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/UpdatePet200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/User.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/User.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/User.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/User.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/UserApi.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/UserApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/UserApi.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/UserApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Whale.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Whale.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Whale.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Whale.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Zebra.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Zebra.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Zebra.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/Zebra.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ZeroBasedEnum.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ZeroBasedEnum.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/docs/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/git_push.sh b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/git_push.sh rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/mono_nunit_test.sh b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/mono_nunit_test.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/mono_nunit_test.sh rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/mono_nunit_test.sh diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/linux-logo.png similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools.Test/linux-logo.png diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCatAllOf.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCatAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/DogAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DogAllOf.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/DogAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedAnyOf.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedAnyOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedAnyOf.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedAnyOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedEnumType.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedEnumType.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedEnumType.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedEnumType.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedOneOf.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedOneOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedOneOf.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedOneOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedOneOfContent.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedOneOfContent.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedOneOfContent.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedOneOfContent.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedSubId.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedSubId.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedSubId.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedSubId.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumTest.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/RequiredClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/RequiredClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/RequiredClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/RolesReportsHash.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/RolesReportsHash.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/RolesReportsHash.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/RolesReportsHash.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/UpdatePet200Response.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/UpdatePet200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/UpdatePet200Response.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/UpdatePet200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/restsharp/net7/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient/.gitignore b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/.gitignore rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/.openapi-generator-ignore b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/.openapi-generator-ignore rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/Org.OpenAPITools.sln b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/README.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/README.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/api/openapi.yaml rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/appveyor.yml b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/appveyor.yml rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/appveyor.yml diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Activity.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Activity.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Activity.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Activity.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Animal.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Animal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Animal.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Animal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/AnotherFakeApi.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ApiResponse.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ApiResponse.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ApiResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Apple.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Apple.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Apple.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Apple.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/AppleReq.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/AppleReq.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/AppleReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ArrayTest.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ArrayTest.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ArrayTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Banana.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Banana.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Banana.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Banana.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/BananaReq.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/BananaReq.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/BananaReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/BasquePig.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/BasquePig.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/BasquePig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Capitalization.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Capitalization.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Capitalization.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Cat.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Cat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Cat.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Cat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Category.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Category.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Category.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Category.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ChildCat.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ChildCat.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ChildCat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ClassModel.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ClassModel.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ClassModel.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DanishPig.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DanishPig.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/DanishPig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/DateOnlyClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/DateOnlyClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/DateOnlyClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DefaultApi.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DefaultApi.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/DefaultApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DeprecatedObject.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DeprecatedObject.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/DeprecatedObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Dog.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Dog.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Dog.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Dog.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Drawing.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Drawing.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Drawing.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Drawing.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/EnumArrays.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/EnumArrays.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/EnumArrays.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/EnumClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/EnumClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/EnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/EnumTest.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/EnumTest.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/EnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/EquilateralTriangle.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/EquilateralTriangle.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FakeApi.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FakeApi.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/FakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/File.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/File.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/File.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/File.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FileSchemaTestClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Foo.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Foo.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Foo.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Foo.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FormatTest.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/FormatTest.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/FormatTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Fruit.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Fruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Fruit.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Fruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FruitReq.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FruitReq.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/FruitReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/GmFruit.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/GmFruit.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/GmFruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/GrandparentAnimal.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/GrandparentAnimal.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/HealthCheckResult.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/HealthCheckResult.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/HealthCheckResult.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/IsoscelesTriangle.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/List.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/List.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/List.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/List.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/LiteralStringClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/LiteralStringClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/LiteralStringClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Mammal.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Mammal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Mammal.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Mammal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MapTest.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/MapTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MapTest.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/MapTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Model200Response.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Model200Response.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Model200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ModelClient.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ModelClient.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ModelClient.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Name.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Name.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Name.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Name.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/NotificationtestGetElementsV1ResponseMPayload.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/NotificationtestGetElementsV1ResponseMPayload.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/NotificationtestGetElementsV1ResponseMPayload.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/NotificationtestGetElementsV1ResponseMPayload.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/NullableClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/NullableClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/NullableClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/NullableGuidClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/NullableGuidClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/NullableGuidClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/NullableShape.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/NullableShape.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/NullableShape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/NumberOnly.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/NumberOnly.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/NumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OneOfString.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OneOfString.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/OneOfString.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Order.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Order.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Order.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Order.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterComposite.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterComposite.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/OuterComposite.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterEnum.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterEnum.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/OuterEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterEnumInteger.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterEnumInteger.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterEnumTest.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/OuterEnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterEnumTest.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/OuterEnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ParentPet.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ParentPet.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ParentPet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Pet.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Pet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Pet.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Pet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/PetApi.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/PetApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/PetApi.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/PetApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Pig.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Pig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Pig.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Pig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/PolymorphicProperty.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/PolymorphicProperty.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Quadrilateral.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Quadrilateral.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Quadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/QuadrilateralInterface.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ReadOnlyFirst.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/docs/RequiredClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/RequiredClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/docs/RequiredClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/RequiredClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Return.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Return.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Return.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Return.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/RolesReportsHash.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/RolesReportsHash.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/RolesReportsHash.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/RolesReportsHash.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/RolesReportsHashRole.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/RolesReportsHashRole.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/RolesReportsHashRole.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/RolesReportsHashRole.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ScaleneTriangle.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ScaleneTriangle.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Shape.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Shape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Shape.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Shape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ShapeInterface.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ShapeInterface.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ShapeInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ShapeOrNull.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ShapeOrNull.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ShapeOrNull.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/SpecialModelName.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/SpecialModelName.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/SpecialModelName.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/StoreApi.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/StoreApi.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/StoreApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Tag.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Tag.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Tag.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Tag.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/TestInlineFreeformAdditionalPropertiesRequest.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/TestInlineFreeformAdditionalPropertiesRequest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/TestInlineFreeformAdditionalPropertiesRequest.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/TestInlineFreeformAdditionalPropertiesRequest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Triangle.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Triangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Triangle.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Triangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/TriangleInterface.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/TriangleInterface.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/TriangleInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/User.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/User.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/User.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/User.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/UserApi.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/UserApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/UserApi.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/UserApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Whale.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Whale.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Whale.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Whale.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Zebra.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Zebra.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Zebra.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/Zebra.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ZeroBasedEnum.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ZeroBasedEnum.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/docs/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/git_push.sh b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/git_push.sh rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SerializeBasedOnInitialization.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SerializeBasedOnInitialization.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SerializeBasedOnInitialization.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SerializeBasedOnInitialization.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumTest.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/RequiredClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/RequiredClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/RequiredClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/RolesReportsHash.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/RolesReportsHash.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/RolesReportsHash.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/RolesReportsHash.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/.gitignore b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/.gitignore rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator-ignore b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/.openapi-generator-ignore rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/FILES b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/FILES rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/.openapi-generator/VERSION b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/.openapi-generator/VERSION rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/Org.OpenAPITools.sln b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp/OpenAPIClient/README.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/README.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/api/openapi.yaml rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/appveyor.yml b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/appveyor.yml rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/appveyor.yml diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Activity.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Activity.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Activity.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Activity.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Animal.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Animal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Animal.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Animal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ApiResponse.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/ApiResponse.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ApiResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Apple.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Apple.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Apple.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Apple.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/AppleReq.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/AppleReq.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/AppleReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ArrayTest.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/ArrayTest.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ArrayTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Banana.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Banana.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Banana.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Banana.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/BananaReq.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/BananaReq.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/BananaReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/BasquePig.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/BasquePig.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/BasquePig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Capitalization.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Capitalization.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Capitalization.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Cat.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Cat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Cat.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Cat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/CatAllOf.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/CatAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/CatAllOf.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/CatAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Category.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Category.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Category.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Category.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ChildCat.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/ChildCat.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ChildCat.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ChildCatAllOf.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ChildCatAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/ChildCatAllOf.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ChildCatAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ClassModel.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/ClassModel.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ClassModel.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/DanishPig.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/DanishPig.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/DanishPig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DateOnlyClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DateOnlyClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/DateOnlyClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/DefaultApi.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/DefaultApi.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/DefaultApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/DeprecatedObject.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/DeprecatedObject.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/DeprecatedObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Dog.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Dog.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Dog.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Dog.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/DogAllOf.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/DogAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/DogAllOf.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/DogAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Drawing.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Drawing.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Drawing.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Drawing.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/EnumArrays.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/EnumArrays.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/EnumArrays.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/EnumClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/EnumClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/EnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/EnumTest.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/EnumTest.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/EnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/EquilateralTriangle.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/EquilateralTriangle.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/FakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/File.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/File.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/File.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/File.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/FileSchemaTestClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Foo.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Foo.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Foo.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Foo.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FormatTest.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FormatTest.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/FormatTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Fruit.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Fruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Fruit.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Fruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FruitReq.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/FruitReq.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/FruitReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/GmFruit.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/GmFruit.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/GmFruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/GrandparentAnimal.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/GrandparentAnimal.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/HealthCheckResult.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/HealthCheckResult.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/HealthCheckResult.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/IsoscelesTriangle.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/List.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/List.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/List.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/List.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/LiteralStringClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/LiteralStringClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/LiteralStringClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Mammal.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Mammal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Mammal.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Mammal.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/MapTest.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/MapTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/MapTest.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/MapTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/MixedAnyOf.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/MixedAnyOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/MixedAnyOf.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/MixedAnyOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/MixedAnyOfContent.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/MixedAnyOfContent.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/MixedAnyOfContent.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/MixedAnyOfContent.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/MixedEnumType.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/MixedEnumType.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/MixedEnumType.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/MixedEnumType.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/MixedNullableEnumType.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/MixedNullableEnumType.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/MixedNullableEnumType.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/MixedNullableEnumType.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/MixedOneOf.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/MixedOneOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/MixedOneOf.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/MixedOneOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/MixedOneOfContent.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/MixedOneOfContent.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/MixedOneOfContent.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/MixedOneOfContent.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/MixedSubId.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/MixedSubId.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/MixedSubId.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/MixedSubId.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Model200Response.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Model200Response.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Model200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ModelClient.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/ModelClient.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ModelClient.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Name.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Name.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Name.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Name.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/NotificationtestGetElementsV1ResponseMPayload.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/NotificationtestGetElementsV1ResponseMPayload.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/NotificationtestGetElementsV1ResponseMPayload.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/NotificationtestGetElementsV1ResponseMPayload.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/NullableClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/NullableClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/NullableClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/NullableGuidClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/NullableGuidClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/NullableGuidClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/NullableShape.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/NullableShape.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/NullableShape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/NumberOnly.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/NumberOnly.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/NumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/OneOfString.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/OneOfString.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/OneOfString.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Order.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Order.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Order.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Order.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/OuterComposite.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/OuterComposite.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/OuterComposite.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/OuterEnum.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/OuterEnum.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/OuterEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/OuterEnumInteger.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/OuterEnumInteger.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/OuterEnumTest.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/OuterEnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/OuterEnumTest.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/OuterEnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ParentPet.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/ParentPet.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ParentPet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Pet.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Pet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Pet.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Pet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/PetApi.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/PetApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/PetApi.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/PetApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Pig.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Pig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Pig.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Pig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/PolymorphicProperty.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/PolymorphicProperty.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Quadrilateral.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Quadrilateral.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Quadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/QuadrilateralInterface.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/ReadOnlyFirst.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/RequiredClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/RequiredClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/RequiredClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/RequiredClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Return.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Return.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Return.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Return.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/RolesReportsHash.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/RolesReportsHash.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/RolesReportsHash.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/RolesReportsHash.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/RolesReportsHashRole.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/RolesReportsHashRole.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/RolesReportsHashRole.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/RolesReportsHashRole.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ScaleneTriangle.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/ScaleneTriangle.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Shape.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Shape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Shape.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Shape.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ShapeInterface.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/ShapeInterface.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ShapeInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ShapeOrNull.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/ShapeOrNull.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ShapeOrNull.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/SpecialModelName.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/SpecialModelName.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/SpecialModelName.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/StoreApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Tag.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Tag.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Tag.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Tag.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/TestInlineFreeformAdditionalPropertiesRequest.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/TestInlineFreeformAdditionalPropertiesRequest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/TestInlineFreeformAdditionalPropertiesRequest.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/TestInlineFreeformAdditionalPropertiesRequest.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Triangle.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Triangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Triangle.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Triangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/TriangleInterface.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/TriangleInterface.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/TriangleInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/UpdatePet200Response.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/UpdatePet200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/UpdatePet200Response.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/UpdatePet200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/User.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/User.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/User.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/User.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/UserApi.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/UserApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/UserApi.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/UserApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Whale.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Whale.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Whale.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Whale.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/Zebra.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Zebra.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/Zebra.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/Zebra.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ZeroBasedEnum.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/ZeroBasedEnum.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/docs/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/git_push.sh b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/git_push.sh rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/ApiClientTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/ApiClientTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/ApiClientTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/ApiClientTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/ConfigurationTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/ConfigurationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/ConfigurationTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/ConfigurationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/linux-logo.png b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/linux-logo.png rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/DogAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/DogAllOf.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/DogAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedAnyOf.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/MixedAnyOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedAnyOf.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/MixedAnyOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedEnumType.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/MixedEnumType.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedEnumType.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/MixedEnumType.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedOneOf.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/MixedOneOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedOneOf.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/MixedOneOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedOneOfContent.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/MixedOneOfContent.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedOneOfContent.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/MixedOneOfContent.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedSubId.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/MixedSubId.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedSubId.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/MixedSubId.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumTest.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/RequiredClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/RequiredClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/RequiredClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/RolesReportsHash.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/RolesReportsHash.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/RolesReportsHash.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/RolesReportsHash.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/UpdatePet200Response.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/UpdatePet200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/UpdatePet200Response.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/UpdatePet200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Properties/AssemblyInfo.cs b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Properties/AssemblyInfo.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Properties/AssemblyInfo.cs rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/Properties/AssemblyInfo.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/project.json b/samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/project.json similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/project.json rename to samples/client/petstore/csharp/restsharp/standard2.0/OpenAPIClient/src/Org.OpenAPITools/project.json diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/.gitignore b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/.gitignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/.gitignore rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/.gitignore diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/.openapi-generator-ignore b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/.openapi-generator-ignore rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/.openapi-generator/FILES b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/.openapi-generator/FILES rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/README.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/README.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/README.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/README.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/api/openapi.yaml b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/api/openapi.yaml rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/api/openapi.yaml diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Activity.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Activity.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Activity.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Activity.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Animal.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Animal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Animal.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Animal.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/AnotherFakeApi.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ApiResponse.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/ApiResponse.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ApiResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Apple.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Apple.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Apple.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Apple.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/AppleReq.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/AppleReq.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/AppleReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ArrayTest.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/ArrayTest.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ArrayTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Banana.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Banana.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Banana.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Banana.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/BananaReq.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/BananaReq.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/BananaReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/BasquePig.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/BasquePig.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/BasquePig.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Capitalization.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Capitalization.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Capitalization.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Cat.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Cat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Cat.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Cat.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/CatAllOf.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/CatAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/CatAllOf.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/CatAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Category.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Category.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Category.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Category.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ChildCat.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/ChildCat.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ChildCat.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ChildCatAllOf.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ChildCatAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/ChildCatAllOf.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ChildCatAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ClassModel.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/ClassModel.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ClassModel.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/DanishPig.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/DanishPig.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/DanishPig.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/DateOnlyClass.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/DateOnlyClass.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/DateOnlyClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/DefaultApi.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/DefaultApi.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/DefaultApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/DeprecatedObject.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/DeprecatedObject.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/DeprecatedObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Dog.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Dog.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Dog.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Dog.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/DogAllOf.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/DogAllOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/DogAllOf.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/DogAllOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Drawing.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Drawing.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Drawing.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Drawing.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/EnumArrays.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/EnumArrays.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/EnumArrays.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/EnumClass.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/EnumClass.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/EnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/EnumTest.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/EnumTest.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/EnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/EquilateralTriangle.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/EquilateralTriangle.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FakeApi.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FakeApi.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/FakeApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/File.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/File.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/File.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/File.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/FileSchemaTestClass.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Foo.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Foo.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Foo.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Foo.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FormatTest.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/FormatTest.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/FormatTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Fruit.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Fruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Fruit.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Fruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/FruitReq.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/FruitReq.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/FruitReq.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/GmFruit.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/GmFruit.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/GmFruit.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/GrandparentAnimal.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/GrandparentAnimal.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/HealthCheckResult.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/HealthCheckResult.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/HealthCheckResult.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/IsoscelesTriangle.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/List.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/List.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/List.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/List.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/LiteralStringClass.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/LiteralStringClass.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/LiteralStringClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Mammal.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Mammal.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Mammal.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Mammal.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/MapTest.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/MapTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/MapTest.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/MapTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/MixedAnyOf.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/MixedAnyOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/MixedAnyOf.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/MixedAnyOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/MixedAnyOfContent.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/MixedAnyOfContent.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/MixedAnyOfContent.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/MixedAnyOfContent.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/MixedEnumType.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/MixedEnumType.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/MixedEnumType.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/MixedEnumType.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/MixedNullableEnumType.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/MixedNullableEnumType.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/MixedNullableEnumType.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/MixedNullableEnumType.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/MixedOneOf.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/MixedOneOf.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/MixedOneOf.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/MixedOneOf.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/MixedOneOfContent.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/MixedOneOfContent.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/MixedOneOfContent.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/MixedOneOfContent.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/MixedSubId.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/MixedSubId.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/MixedSubId.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/MixedSubId.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Model200Response.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Model200Response.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Model200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ModelClient.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/ModelClient.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ModelClient.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Name.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Name.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Name.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Name.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/NotificationtestGetElementsV1ResponseMPayload.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/NotificationtestGetElementsV1ResponseMPayload.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/NotificationtestGetElementsV1ResponseMPayload.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/NotificationtestGetElementsV1ResponseMPayload.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/NullableClass.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/NullableClass.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/NullableClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/NullableGuidClass.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/NullableGuidClass.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/NullableGuidClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/NullableShape.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/NullableShape.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/NullableShape.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/NumberOnly.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/NumberOnly.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/NumberOnly.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/OneOfString.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/OneOfString.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/OneOfString.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Order.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Order.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Order.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Order.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterComposite.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterComposite.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/OuterComposite.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterEnum.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterEnum.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/OuterEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterEnumInteger.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterEnumInteger.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterEnumTest.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/OuterEnumTest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterEnumTest.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/OuterEnumTest.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ParentPet.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/ParentPet.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ParentPet.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Pet.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Pet.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Pet.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Pet.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/PetApi.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/PetApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/PetApi.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/PetApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Pig.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Pig.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Pig.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Pig.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/PolymorphicProperty.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/PolymorphicProperty.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Quadrilateral.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Quadrilateral.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Quadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/QuadrilateralInterface.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/ReadOnlyFirst.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/RequiredClass.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/RequiredClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/docs/RequiredClass.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/RequiredClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Return.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Return.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Return.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Return.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/RolesReportsHash.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/RolesReportsHash.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/RolesReportsHash.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/RolesReportsHash.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/RolesReportsHashRole.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/RolesReportsHashRole.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/RolesReportsHashRole.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/RolesReportsHashRole.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ScaleneTriangle.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/ScaleneTriangle.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Shape.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Shape.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Shape.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Shape.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ShapeInterface.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/ShapeInterface.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ShapeInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ShapeOrNull.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/ShapeOrNull.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ShapeOrNull.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/SpecialModelName.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/SpecialModelName.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/SpecialModelName.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/StoreApi.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/StoreApi.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/StoreApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Tag.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Tag.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Tag.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Tag.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/TestInlineFreeformAdditionalPropertiesRequest.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/TestInlineFreeformAdditionalPropertiesRequest.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/TestInlineFreeformAdditionalPropertiesRequest.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/TestInlineFreeformAdditionalPropertiesRequest.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Triangle.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Triangle.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Triangle.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Triangle.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/TriangleInterface.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/TriangleInterface.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/TriangleInterface.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/UpdatePet200Response.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/UpdatePet200Response.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/UpdatePet200Response.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/UpdatePet200Response.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/User.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/User.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/User.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/User.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/UserApi.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/UserApi.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/UserApi.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/UserApi.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Whale.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Whale.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Whale.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Whale.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/Zebra.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Zebra.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/Zebra.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/Zebra.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ZeroBasedEnum.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/ZeroBasedEnum.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/docs/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/docs/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/docs/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/git_push.sh b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/git_push.sh similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/git_push.sh rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/git_push.sh diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedAnyOfContentTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedAnyOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedNullableEnumTypeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedOneOfContentTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedOneOfTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedSubIdTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NotificationtestGetElementsV1ResponseMPayloadTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumTestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/RequiredClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/RolesReportsHashRoleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/RolesReportsHashTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestInlineFreeformAdditionalPropertiesRequestTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/UpdatePet200ResponseTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.asmdef b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.asmdef similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.asmdef rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.asmdef diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ConnectionException.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ConnectionException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ConnectionException.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ConnectionException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/UnexpectedResponseException.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/UnexpectedResponseException.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/UnexpectedResponseException.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/UnexpectedResponseException.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs diff --git a/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/CatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/CatAllOf.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/CatAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCatAllOf.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCatAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DogAllOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DogAllOf.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DogAllOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedAnyOf.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedAnyOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedAnyOf.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedAnyOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedAnyOfContent.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedEnumType.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedEnumType.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedEnumType.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedEnumType.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedNullableEnumType.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedOneOf.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedOneOf.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedOneOf.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedOneOf.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedOneOfContent.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedOneOfContent.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedOneOfContent.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedOneOfContent.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedSubId.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedSubId.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedSubId.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedSubId.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NotificationtestGetElementsV1ResponseMPayload.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumTest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumTest.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumTest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/RequiredClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/RequiredClass.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/RequiredClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/RolesReportsHash.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/RolesReportsHash.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/RolesReportsHash.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/RolesReportsHash.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/RolesReportsHashRole.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestInlineFreeformAdditionalPropertiesRequest.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/UpdatePet200Response.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/UpdatePet200Response.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/UpdatePet200Response.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/UpdatePet200Response.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Org.OpenAPITools.asmdef b/samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Org.OpenAPITools.asmdef similarity index 100% rename from samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Org.OpenAPITools.asmdef rename to samples/client/petstore/csharp/unityWebRequest/standard2.0/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Org.OpenAPITools.asmdef diff --git a/samples/client/petstore/java/okhttp-gson-3.1/build.gradle b/samples/client/petstore/java/okhttp-gson-3.1/build.gradle index 1a8bab77d86..c50f27fa8ae 100644 --- a/samples/client/petstore/java/okhttp-gson-3.1/build.gradle +++ b/samples/client/petstore/java/okhttp-gson-3.1/build.gradle @@ -108,8 +108,8 @@ ext { dependencies { implementation 'io.swagger:swagger-annotations:1.6.8' implementation "com.google.code.findbugs:jsr305:3.0.2" - implementation 'com.squareup.okhttp3:okhttp:4.10.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0' implementation 'com.google.code.gson:gson:2.9.1' implementation 'io.gsonfire:gson-fire:1.9.0' implementation 'javax.ws.rs:jsr311-api:1.1.1' diff --git a/samples/client/petstore/java/okhttp-gson-3.1/build.sbt b/samples/client/petstore/java/okhttp-gson-3.1/build.sbt index 6a364198de5..1cfb07976ed 100644 --- a/samples/client/petstore/java/okhttp-gson-3.1/build.sbt +++ b/samples/client/petstore/java/okhttp-gson-3.1/build.sbt @@ -10,8 +10,8 @@ lazy val root = (project in file(".")). resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.6.5", - "com.squareup.okhttp3" % "okhttp" % "4.10.0", - "com.squareup.okhttp3" % "logging-interceptor" % "4.10.0", + "com.squareup.okhttp3" % "okhttp" % "4.12.0", + "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0", "com.google.code.gson" % "gson" % "2.9.1", "org.apache.commons" % "commons-lang3" % "3.12.0", "javax.ws.rs" % "jsr311-api" % "1.1.1", diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/build.gradle b/samples/client/petstore/java/okhttp-gson-awsv4signature/build.gradle index bc6ac3ee3db..6cad260b145 100644 --- a/samples/client/petstore/java/okhttp-gson-awsv4signature/build.gradle +++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/build.gradle @@ -108,8 +108,8 @@ ext { dependencies { implementation 'io.swagger:swagger-annotations:1.6.8' implementation "com.google.code.findbugs:jsr305:3.0.2" - implementation 'com.squareup.okhttp3:okhttp:4.10.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0' implementation 'com.google.code.gson:gson:2.9.1' implementation 'io.gsonfire:gson-fire:1.9.0' implementation 'javax.ws.rs:jsr311-api:1.1.1' diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/build.sbt b/samples/client/petstore/java/okhttp-gson-awsv4signature/build.sbt index e61ec17d8dd..0f9cf8f3f2a 100644 --- a/samples/client/petstore/java/okhttp-gson-awsv4signature/build.sbt +++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/build.sbt @@ -10,8 +10,8 @@ lazy val root = (project in file(".")). resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.6.5", - "com.squareup.okhttp3" % "okhttp" % "4.10.0", - "com.squareup.okhttp3" % "logging-interceptor" % "4.10.0", + "com.squareup.okhttp3" % "okhttp" % "4.12.0", + "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0", "com.google.code.gson" % "gson" % "2.9.1", "org.apache.commons" % "commons-lang3" % "3.12.0", "javax.ws.rs" % "jsr311-api" % "1.1.1", diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle index 3aebceafc6f..31873abe5dc 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle @@ -108,8 +108,8 @@ ext { dependencies { implementation 'io.swagger:swagger-annotations:1.6.8' implementation "com.google.code.findbugs:jsr305:3.0.2" - implementation 'com.squareup.okhttp3:okhttp:4.10.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0' implementation 'com.google.code.gson:gson:2.9.1' implementation 'io.gsonfire:gson-fire:1.9.0' implementation 'javax.ws.rs:jsr311-api:1.1.1' diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.sbt b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.sbt index 0bb9b8e7bb8..b1ece5e8563 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.sbt +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.sbt @@ -10,8 +10,8 @@ lazy val root = (project in file(".")). resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.6.5", - "com.squareup.okhttp3" % "okhttp" % "4.10.0", - "com.squareup.okhttp3" % "logging-interceptor" % "4.10.0", + "com.squareup.okhttp3" % "okhttp" % "4.12.0", + "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0", "com.google.code.gson" % "gson" % "2.9.1", "org.apache.commons" % "commons-lang3" % "3.12.0", "javax.ws.rs" % "jsr311-api" % "1.1.1", diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/build.gradle b/samples/client/petstore/java/okhttp-gson-group-parameter/build.gradle index 2d46c1a9f7e..4b2531773dd 100644 --- a/samples/client/petstore/java/okhttp-gson-group-parameter/build.gradle +++ b/samples/client/petstore/java/okhttp-gson-group-parameter/build.gradle @@ -108,8 +108,8 @@ ext { dependencies { implementation 'io.swagger:swagger-annotations:1.6.8' implementation "com.google.code.findbugs:jsr305:3.0.2" - implementation 'com.squareup.okhttp3:okhttp:4.10.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0' implementation 'com.google.code.gson:gson:2.9.1' implementation 'io.gsonfire:gson-fire:1.9.0' implementation 'javax.ws.rs:jsr311-api:1.1.1' diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/build.sbt b/samples/client/petstore/java/okhttp-gson-group-parameter/build.sbt index 8c6f95e1384..67c416e48b9 100644 --- a/samples/client/petstore/java/okhttp-gson-group-parameter/build.sbt +++ b/samples/client/petstore/java/okhttp-gson-group-parameter/build.sbt @@ -10,8 +10,8 @@ lazy val root = (project in file(".")). resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.6.5", - "com.squareup.okhttp3" % "okhttp" % "4.10.0", - "com.squareup.okhttp3" % "logging-interceptor" % "4.10.0", + "com.squareup.okhttp3" % "okhttp" % "4.12.0", + "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0", "com.google.code.gson" % "gson" % "2.9.1", "org.apache.commons" % "commons-lang3" % "3.12.0", "javax.ws.rs" % "jsr311-api" % "1.1.1", diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/build.gradle b/samples/client/petstore/java/okhttp-gson-nullable-required/build.gradle index 984b8135b0f..61981aa9d3b 100644 --- a/samples/client/petstore/java/okhttp-gson-nullable-required/build.gradle +++ b/samples/client/petstore/java/okhttp-gson-nullable-required/build.gradle @@ -108,8 +108,8 @@ ext { dependencies { implementation 'io.swagger:swagger-annotations:1.6.8' implementation "com.google.code.findbugs:jsr305:3.0.2" - implementation 'com.squareup.okhttp3:okhttp:4.10.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0' implementation 'com.google.code.gson:gson:2.9.1' implementation 'io.gsonfire:gson-fire:1.9.0' implementation 'javax.ws.rs:jsr311-api:1.1.1' diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/build.sbt b/samples/client/petstore/java/okhttp-gson-nullable-required/build.sbt index 65ec5ab3758..f5180bf8259 100644 --- a/samples/client/petstore/java/okhttp-gson-nullable-required/build.sbt +++ b/samples/client/petstore/java/okhttp-gson-nullable-required/build.sbt @@ -10,8 +10,8 @@ lazy val root = (project in file(".")). resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.6.5", - "com.squareup.okhttp3" % "okhttp" % "4.10.0", - "com.squareup.okhttp3" % "logging-interceptor" % "4.10.0", + "com.squareup.okhttp3" % "okhttp" % "4.12.0", + "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0", "com.google.code.gson" % "gson" % "2.9.1", "org.apache.commons" % "commons-lang3" % "3.12.0", "javax.ws.rs" % "jsr311-api" % "1.1.1", diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle index 9f27b1ebb50..6bc0e6630cc 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle @@ -108,8 +108,8 @@ ext { dependencies { implementation 'io.swagger:swagger-annotations:1.6.8' implementation "com.google.code.findbugs:jsr305:3.0.2" - implementation 'com.squareup.okhttp3:okhttp:4.10.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0' implementation 'com.google.code.gson:gson:2.9.1' implementation 'io.gsonfire:gson-fire:1.9.0' implementation 'javax.ws.rs:jsr311-api:1.1.1' diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt index 0dcbbab8dd2..2e3b8bade6f 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt @@ -10,8 +10,8 @@ lazy val root = (project in file(".")). resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.6.5", - "com.squareup.okhttp3" % "okhttp" % "4.10.0", - "com.squareup.okhttp3" % "logging-interceptor" % "4.10.0", + "com.squareup.okhttp3" % "okhttp" % "4.12.0", + "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0", "com.google.code.gson" % "gson" % "2.9.1", "org.apache.commons" % "commons-lang3" % "3.12.0", "javax.ws.rs" % "jsr311-api" % "1.1.1", diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/build.gradle b/samples/client/petstore/java/okhttp-gson-swagger1/build.gradle index c48a850d197..99b33483c50 100644 --- a/samples/client/petstore/java/okhttp-gson-swagger1/build.gradle +++ b/samples/client/petstore/java/okhttp-gson-swagger1/build.gradle @@ -108,8 +108,8 @@ ext { dependencies { implementation 'io.swagger:swagger-annotations:1.6.8' implementation "com.google.code.findbugs:jsr305:3.0.2" - implementation 'com.squareup.okhttp3:okhttp:4.10.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0' implementation 'com.google.code.gson:gson:2.9.1' implementation 'io.gsonfire:gson-fire:1.9.0' implementation 'javax.ws.rs:jsr311-api:1.1.1' diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/build.sbt b/samples/client/petstore/java/okhttp-gson-swagger1/build.sbt index 66c0359a453..81f278caba4 100644 --- a/samples/client/petstore/java/okhttp-gson-swagger1/build.sbt +++ b/samples/client/petstore/java/okhttp-gson-swagger1/build.sbt @@ -10,8 +10,8 @@ lazy val root = (project in file(".")). resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.6.5", - "com.squareup.okhttp3" % "okhttp" % "4.10.0", - "com.squareup.okhttp3" % "logging-interceptor" % "4.10.0", + "com.squareup.okhttp3" % "okhttp" % "4.12.0", + "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0", "com.google.code.gson" % "gson" % "2.9.1", "org.apache.commons" % "commons-lang3" % "3.12.0", "javax.ws.rs" % "jsr311-api" % "1.1.1", diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/build.gradle b/samples/client/petstore/java/okhttp-gson-swagger2/build.gradle index c48a850d197..99b33483c50 100644 --- a/samples/client/petstore/java/okhttp-gson-swagger2/build.gradle +++ b/samples/client/petstore/java/okhttp-gson-swagger2/build.gradle @@ -108,8 +108,8 @@ ext { dependencies { implementation 'io.swagger:swagger-annotations:1.6.8' implementation "com.google.code.findbugs:jsr305:3.0.2" - implementation 'com.squareup.okhttp3:okhttp:4.10.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0' implementation 'com.google.code.gson:gson:2.9.1' implementation 'io.gsonfire:gson-fire:1.9.0' implementation 'javax.ws.rs:jsr311-api:1.1.1' diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/build.sbt b/samples/client/petstore/java/okhttp-gson-swagger2/build.sbt index 66c0359a453..81f278caba4 100644 --- a/samples/client/petstore/java/okhttp-gson-swagger2/build.sbt +++ b/samples/client/petstore/java/okhttp-gson-swagger2/build.sbt @@ -10,8 +10,8 @@ lazy val root = (project in file(".")). resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.6.5", - "com.squareup.okhttp3" % "okhttp" % "4.10.0", - "com.squareup.okhttp3" % "logging-interceptor" % "4.10.0", + "com.squareup.okhttp3" % "okhttp" % "4.12.0", + "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0", "com.google.code.gson" % "gson" % "2.9.1", "org.apache.commons" % "commons-lang3" % "3.12.0", "javax.ws.rs" % "jsr311-api" % "1.1.1", diff --git a/samples/client/petstore/java/okhttp-gson/.openapi-generator/FILES b/samples/client/petstore/java/okhttp-gson/.openapi-generator/FILES index bebe3898e9e..0eaba6aa617 100644 --- a/samples/client/petstore/java/okhttp-gson/.openapi-generator/FILES +++ b/samples/client/petstore/java/okhttp-gson/.openapi-generator/FILES @@ -79,6 +79,7 @@ docs/ParentPet.md docs/Pet.md docs/PetApi.md docs/PetComposition.md +docs/PetRef.md docs/PetUsingAllOf.md docs/PetWithRequiredTags.md docs/Pig.md @@ -213,6 +214,7 @@ src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java src/main/java/org/openapitools/client/model/ParentPet.java src/main/java/org/openapitools/client/model/Pet.java src/main/java/org/openapitools/client/model/PetComposition.java +src/main/java/org/openapitools/client/model/PetRef.java src/main/java/org/openapitools/client/model/PetUsingAllOf.java src/main/java/org/openapitools/client/model/PetWithRequiredTags.java src/main/java/org/openapitools/client/model/Pig.java diff --git a/samples/client/petstore/java/okhttp-gson/README.md b/samples/client/petstore/java/okhttp-gson/README.md index c88dcf33692..63c167c60e8 100644 --- a/samples/client/petstore/java/okhttp-gson/README.md +++ b/samples/client/petstore/java/okhttp-gson/README.md @@ -235,6 +235,7 @@ Class | Method | HTTP request | Description - [ParentPet](docs/ParentPet.md) - [Pet](docs/Pet.md) - [PetComposition](docs/PetComposition.md) + - [PetRef](docs/PetRef.md) - [PetUsingAllOf](docs/PetUsingAllOf.md) - [PetWithRequiredTags](docs/PetWithRequiredTags.md) - [Pig](docs/Pig.md) diff --git a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml index 0d7cf7f3728..7a956b341e4 100644 --- a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml +++ b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml @@ -2691,6 +2691,26 @@ components: PetComposition: allOf: - $ref: '#/components/schemas/Pet' + PetRef: + properties: + id: + $ref: '#/components/schemas/Pet/properties/id' + category: + $ref: '#/components/schemas/Pet/properties/category' + name: + $ref: '#/components/schemas/Pet/properties/name' + photoUrls: + $ref: '#/components/schemas/Pet/properties/photoUrls' + tags: + $ref: '#/components/schemas/Pet/properties/tags' + status: + $ref: '#/components/schemas/Pet/properties/status' + required: + - name + - photoUrls + type: object + xml: + name: Pet _foo_get_default_response: example: string: diff --git a/samples/client/petstore/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle index c48a850d197..99b33483c50 100644 --- a/samples/client/petstore/java/okhttp-gson/build.gradle +++ b/samples/client/petstore/java/okhttp-gson/build.gradle @@ -108,8 +108,8 @@ ext { dependencies { implementation 'io.swagger:swagger-annotations:1.6.8' implementation "com.google.code.findbugs:jsr305:3.0.2" - implementation 'com.squareup.okhttp3:okhttp:4.10.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0' implementation 'com.google.code.gson:gson:2.9.1' implementation 'io.gsonfire:gson-fire:1.9.0' implementation 'javax.ws.rs:jsr311-api:1.1.1' diff --git a/samples/client/petstore/java/okhttp-gson/build.sbt b/samples/client/petstore/java/okhttp-gson/build.sbt index 66c0359a453..81f278caba4 100644 --- a/samples/client/petstore/java/okhttp-gson/build.sbt +++ b/samples/client/petstore/java/okhttp-gson/build.sbt @@ -10,8 +10,8 @@ lazy val root = (project in file(".")). resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.6.5", - "com.squareup.okhttp3" % "okhttp" % "4.10.0", - "com.squareup.okhttp3" % "logging-interceptor" % "4.10.0", + "com.squareup.okhttp3" % "okhttp" % "4.12.0", + "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0", "com.google.code.gson" % "gson" % "2.9.1", "org.apache.commons" % "commons-lang3" % "3.12.0", "javax.ws.rs" % "jsr311-api" % "1.1.1", diff --git a/samples/client/petstore/java/okhttp-gson/docs/PetRef.md b/samples/client/petstore/java/okhttp-gson/docs/PetRef.md new file mode 100644 index 00000000000..256faf704c4 --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson/docs/PetRef.md @@ -0,0 +1,28 @@ + + +# PetRef + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**id** | **Long** | | [optional] | +|**category** | [**Category**](Category.md) | | [optional] | +|**name** | **String** | | | +|**photoUrls** | **List<String>** | | | +|**tags** | [**List<Tag>**](Tag.md) | | [optional] | +|**status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] | + + + +## Enum: StatusEnum + +| Name | Value | +|---- | -----| +| AVAILABLE | "available" | +| PENDING | "pending" | +| SOLD | "sold" | + + + diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java index 9a6e991cb5a..767d24dc316 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java @@ -298,6 +298,7 @@ public class JSON { gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.ParentPet.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Pet.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.PetComposition.CustomTypeAdapterFactory()); + gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.PetRef.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.PetUsingAllOf.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.PetWithRequiredTags.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Pig.CustomTypeAdapterFactory()); diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetRef.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetRef.java new file mode 100644 index 00000000000..040f77c705d --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetRef.java @@ -0,0 +1,531 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.openapitools.client.model.Category; +import org.openapitools.client.model.Tag; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.google.gson.TypeAdapterFactory; +import com.google.gson.reflect.TypeToken; +import com.google.gson.TypeAdapter; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.openapitools.client.JSON; + +/** + * PetRef + */ +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +public class PetRef { + public static final String SERIALIZED_NAME_ID = "id"; + @SerializedName(SERIALIZED_NAME_ID) + private Long id; + + public static final String SERIALIZED_NAME_CATEGORY = "category"; + @SerializedName(SERIALIZED_NAME_CATEGORY) + private Category category; + + public static final String SERIALIZED_NAME_NAME = "name"; + @SerializedName(SERIALIZED_NAME_NAME) + private String name; + + public static final String SERIALIZED_NAME_PHOTO_URLS = "photoUrls"; + @SerializedName(SERIALIZED_NAME_PHOTO_URLS) + private List photoUrls = new ArrayList<>(); + + public static final String SERIALIZED_NAME_TAGS = "tags"; + @SerializedName(SERIALIZED_NAME_TAGS) + private List tags = new ArrayList<>(); + + /** + * pet status in the store + */ + @JsonAdapter(StatusEnum.Adapter.class) + public enum StatusEnum { + AVAILABLE("available"), + + PENDING("pending"), + + SOLD("sold"); + + private String value; + + StatusEnum(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static StatusEnum fromValue(String value) { + for (StatusEnum b : StatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + public static class Adapter extends TypeAdapter { + @Override + public void write(final JsonWriter jsonWriter, final StatusEnum enumeration) throws IOException { + jsonWriter.value(enumeration.getValue()); + } + + @Override + public StatusEnum read(final JsonReader jsonReader) throws IOException { + String value = jsonReader.nextString(); + return StatusEnum.fromValue(value); + } + } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + StatusEnum.fromValue(value); + } + } + + public static final String SERIALIZED_NAME_STATUS = "status"; + @SerializedName(SERIALIZED_NAME_STATUS) + private StatusEnum status; + + public PetRef() { + } + + public PetRef id(Long id) { + this.id = id; + return this; + } + + /** + * Get id + * @return id + **/ + @javax.annotation.Nullable + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + + public PetRef category(Category category) { + this.category = category; + return this; + } + + /** + * Get category + * @return category + **/ + @javax.annotation.Nullable + public Category getCategory() { + return category; + } + + public void setCategory(Category category) { + this.category = category; + } + + + public PetRef name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + **/ + @javax.annotation.Nonnull + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + + public PetRef photoUrls(List photoUrls) { + this.photoUrls = photoUrls; + return this; + } + + public PetRef addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } + this.photoUrls.add(photoUrlsItem); + return this; + } + + /** + * Get photoUrls + * @return photoUrls + **/ + @javax.annotation.Nonnull + public List getPhotoUrls() { + return photoUrls; + } + + public void setPhotoUrls(List photoUrls) { + this.photoUrls = photoUrls; + } + + + public PetRef tags(List tags) { + this.tags = tags; + return this; + } + + public PetRef addTagsItem(Tag tagsItem) { + if (this.tags == null) { + this.tags = new ArrayList<>(); + } + this.tags.add(tagsItem); + return this; + } + + /** + * Get tags + * @return tags + **/ + @javax.annotation.Nullable + public List getTags() { + return tags; + } + + public void setTags(List tags) { + this.tags = tags; + } + + + public PetRef status(StatusEnum status) { + this.status = status; + return this; + } + + /** + * pet status in the store + * @return status + **/ + @javax.annotation.Nullable + public StatusEnum getStatus() { + return status; + } + + public void setStatus(StatusEnum status) { + this.status = status; + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * + * @param key name of the property + * @param value value of the property + * @return the PetRef instance itself + */ + public PetRef putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + * + * @return a map of objects + */ + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * + * @param key name of the property + * @return an object + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + PetRef petRef = (PetRef) o; + return Objects.equals(this.id, petRef.id) && + Objects.equals(this.category, petRef.category) && + Objects.equals(this.name, petRef.name) && + Objects.equals(this.photoUrls, petRef.photoUrls) && + Objects.equals(this.tags, petRef.tags) && + Objects.equals(this.status, petRef.status)&& + Objects.equals(this.additionalProperties, petRef.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(id, category, name, photoUrls, tags, status, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class PetRef {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" category: ").append(toIndentedString(category)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" photoUrls: ").append(toIndentedString(photoUrls)).append("\n"); + sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); + sb.append(" status: ").append(toIndentedString(status)).append("\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + + public static HashSet openapiFields; + public static HashSet openapiRequiredFields; + + static { + // a set of all properties/fields (JSON key names) + openapiFields = new HashSet(); + openapiFields.add("id"); + openapiFields.add("category"); + openapiFields.add("name"); + openapiFields.add("photoUrls"); + openapiFields.add("tags"); + openapiFields.add("status"); + + // a set of required properties/fields (JSON key names) + openapiRequiredFields = new HashSet(); + openapiRequiredFields.add("name"); + openapiRequiredFields.add("photoUrls"); + } + + /** + * Validates the JSON Element and throws an exception if issues found + * + * @param jsonElement JSON Element + * @throws IOException if the JSON Element is invalid with respect to PetRef + */ + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + if (jsonElement == null) { + if (!PetRef.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null + throw new IllegalArgumentException(String.format("The required field(s) %s in PetRef is not found in the empty JSON string", PetRef.openapiRequiredFields.toString())); + } + } + + // check to make sure all required properties/fields are present in the JSON string + for (String requiredField : PetRef.openapiRequiredFields) { + if (jsonElement.getAsJsonObject().get(requiredField) == null) { + throw new IllegalArgumentException(String.format("The required field `%s` is not found in the JSON string: %s", requiredField, jsonElement.toString())); + } + } + JsonObject jsonObj = jsonElement.getAsJsonObject(); + // validate the optional field `category` + if (jsonObj.get("category") != null && !jsonObj.get("category").isJsonNull()) { + Category.validateJsonElement(jsonObj.get("category")); + } + if (!jsonObj.get("name").isJsonPrimitive()) { + throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); + } + // ensure the required json array is present + if (jsonObj.get("photoUrls") == null) { + throw new IllegalArgumentException("Expected the field `linkedContent` to be an array in the JSON string but got `null`"); + } else if (!jsonObj.get("photoUrls").isJsonArray()) { + throw new IllegalArgumentException(String.format("Expected the field `photoUrls` to be an array in the JSON string but got `%s`", jsonObj.get("photoUrls").toString())); + } + if (jsonObj.get("tags") != null && !jsonObj.get("tags").isJsonNull()) { + JsonArray jsonArraytags = jsonObj.getAsJsonArray("tags"); + if (jsonArraytags != null) { + // ensure the json data is an array + if (!jsonObj.get("tags").isJsonArray()) { + throw new IllegalArgumentException(String.format("Expected the field `tags` to be an array in the JSON string but got `%s`", jsonObj.get("tags").toString())); + } + + // validate the optional field `tags` (array) + for (int i = 0; i < jsonArraytags.size(); i++) { + Tag.validateJsonElement(jsonArraytags.get(i)); + }; + } + } + if ((jsonObj.get("status") != null && !jsonObj.get("status").isJsonNull()) && !jsonObj.get("status").isJsonPrimitive()) { + throw new IllegalArgumentException(String.format("Expected the field `status` to be a primitive type in the JSON string but got `%s`", jsonObj.get("status").toString())); + } + // validate the optional field `status` + if (jsonObj.get("status") != null && !jsonObj.get("status").isJsonNull()) { + StatusEnum.validateJsonElement(jsonObj.get("status")); + } + } + + public static class CustomTypeAdapterFactory implements TypeAdapterFactory { + @SuppressWarnings("unchecked") + @Override + public TypeAdapter create(Gson gson, TypeToken type) { + if (!PetRef.class.isAssignableFrom(type.getRawType())) { + return null; // this class only serializes 'PetRef' and its subtypes + } + final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); + final TypeAdapter thisAdapter + = gson.getDelegateAdapter(this, TypeToken.get(PetRef.class)); + + return (TypeAdapter) new TypeAdapter() { + @Override + public void write(JsonWriter out, PetRef value) throws IOException { + JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); + obj.remove("additionalProperties"); + // serialize additional properties + if (value.getAdditionalProperties() != null) { + for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { + if (entry.getValue() instanceof String) + obj.addProperty(entry.getKey(), (String) entry.getValue()); + else if (entry.getValue() instanceof Number) + obj.addProperty(entry.getKey(), (Number) entry.getValue()); + else if (entry.getValue() instanceof Boolean) + obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); + else if (entry.getValue() instanceof Character) + obj.addProperty(entry.getKey(), (Character) entry.getValue()); + else { + JsonElement jsonElement = gson.toJsonTree(entry.getValue()); + if (jsonElement.isJsonArray()) { + obj.add(entry.getKey(), jsonElement.getAsJsonArray()); + } else { + obj.add(entry.getKey(), jsonElement.getAsJsonObject()); + } + } + } + } + elementAdapter.write(out, obj); + } + + @Override + public PetRef read(JsonReader in) throws IOException { + JsonElement jsonElement = elementAdapter.read(in); + validateJsonElement(jsonElement); + JsonObject jsonObj = jsonElement.getAsJsonObject(); + // store additional fields in the deserialized instance + PetRef instance = thisAdapter.fromJsonTree(jsonObj); + for (Map.Entry entry : jsonObj.entrySet()) { + if (!openapiFields.contains(entry.getKey())) { + if (entry.getValue().isJsonPrimitive()) { // primitive type + if (entry.getValue().getAsJsonPrimitive().isString()) + instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); + else if (entry.getValue().getAsJsonPrimitive().isNumber()) + instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); + else if (entry.getValue().getAsJsonPrimitive().isBoolean()) + instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); + else + throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); + } else if (entry.getValue().isJsonArray()) { + instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); + } else { // JSON object + instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); + } + } + } + return instance; + } + + }.nullSafe(); + } + } + + /** + * Create an instance of PetRef given an JSON string + * + * @param jsonString JSON string + * @return An instance of PetRef + * @throws IOException if the JSON string is invalid with respect to PetRef + */ + public static PetRef fromJson(String jsonString) throws IOException { + return JSON.getGson().fromJson(jsonString, PetRef.class); + } + + /** + * Convert an instance of PetRef to an JSON string + * + * @return JSON string + */ + public String toJson() { + return JSON.getGson().toJson(this); + } +} + diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetRefTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetRefTest.java new file mode 100644 index 00000000000..cbad73a0cde --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetRefTest.java @@ -0,0 +1,48 @@ +/* + * 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 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; +import java.util.Arrays; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for PetRef + */ +public class PetRefTest { + private final PetRef model = new PetRef(); + + /** + * Model tests for PetRef + */ + @Test + public void testPetRef() { + // TODO: test PetRef + } + + /** + * Test the property 'status' + */ + @Test + public void statusTest() { + // TODO: test status + } + +} diff --git a/samples/client/petstore/spring-cloud-auth/.openapi-generator-ignore b/samples/client/petstore/spring-cloud-auth/.openapi-generator-ignore new file mode 100644 index 00000000000..7484ee590a3 --- /dev/null +++ b/samples/client/petstore/spring-cloud-auth/.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/spring-cloud-auth/.openapi-generator/FILES b/samples/client/petstore/spring-cloud-auth/.openapi-generator/FILES new file mode 100644 index 00000000000..a75205774e7 --- /dev/null +++ b/samples/client/petstore/spring-cloud-auth/.openapi-generator/FILES @@ -0,0 +1,7 @@ +README.md +pom.xml +src/main/java/org/openapitools/api/SomeApi.java +src/main/java/org/openapitools/api/SomeApiClient.java +src/main/java/org/openapitools/configuration/ApiKeyRequestInterceptor.java +src/main/java/org/openapitools/configuration/ClientConfiguration.java +src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java diff --git a/samples/client/petstore/spring-cloud-auth/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-auth/.openapi-generator/VERSION new file mode 100644 index 00000000000..08bfd0643b8 --- /dev/null +++ b/samples/client/petstore/spring-cloud-auth/.openapi-generator/VERSION @@ -0,0 +1 @@ +7.5.0-SNAPSHOT diff --git a/samples/client/petstore/spring-cloud-auth/README.md b/samples/client/petstore/spring-cloud-auth/README.md new file mode 100644 index 00000000000..7143b403ce3 --- /dev/null +++ b/samples/client/petstore/spring-cloud-auth/README.md @@ -0,0 +1,53 @@ +# petstore-spring-cloud-auth + +## Requirements + +Building the API client library requires [Maven](https://maven.apache.org/) to be installed. + +## Installation + +To install the API client library to your local Maven repository, simply execute: + +```shell +mvn install +``` + +To deploy it to a remote Maven repository instead, configure the settings of the repository and execute: + +```shell +mvn deploy +``` + +Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information. + +### Maven users + +Add this dependency to your project's POM: + +```xml + + org.openapitools + petstore-spring-cloud-auth + 1.0.0 + compile + +``` + +### Gradle users + +Add this dependency to your project's build file: + +```groovy +compile "org.openapitools:petstore-spring-cloud-auth:1.0.0" +``` + +### Others + +At first generate the JAR by executing: + +mvn package + +Then manually install the following JARs: + +* target/petstore-spring-cloud-auth-1.0.0.jar +* target/lib/*.jar diff --git a/samples/client/petstore/spring-cloud-auth/pom.xml b/samples/client/petstore/spring-cloud-auth/pom.xml new file mode 100644 index 00000000000..e9ecbf6d8a2 --- /dev/null +++ b/samples/client/petstore/spring-cloud-auth/pom.xml @@ -0,0 +1,75 @@ + + 4.0.0 + org.openapitools + petstore-spring-cloud-auth + jar + petstore-spring-cloud-auth + 1.0.0 + + 1.8 + ${java.version} + ${java.version} + UTF-8 + + + org.springframework.boot + spring-boot-starter-parent + 2.7.15 + + + + src/main/java + + + + + + org.springframework.cloud + spring-cloud-starter-parent + 2021.0.5 + pom + import + + + + + + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + org.springframework.security + spring-security-oauth2-client + 5.7.8 + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + org.openapitools + jackson-databind-nullable + 0.2.6 + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.data + spring-data-commons + + + org.springframework.boot + spring-boot-starter-test + test + + + diff --git a/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java new file mode 100644 index 00000000000..a83a31fb6ba --- /dev/null +++ b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java @@ -0,0 +1,41 @@ +/** + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.5.0-SNAPSHOT). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +package org.openapitools.api; + +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.multipart.MultipartFile; + +import javax.validation.Valid; +import javax.validation.constraints.*; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import javax.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@Validated +public interface SomeApi { + + /** + * GET /some/endpoint + * + * @return OK (status code 200) + */ + @RequestMapping( + method = RequestMethod.GET, + value = "/some/endpoint" + ) + + ResponseEntity someEndpointGet( + + ); + +} diff --git a/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApiClient.java b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApiClient.java new file mode 100644 index 00000000000..a02c1ed8c8b --- /dev/null +++ b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApiClient.java @@ -0,0 +1,8 @@ +package org.openapitools.api; + +import org.springframework.cloud.openfeign.FeignClient; +import org.openapitools.configuration.ClientConfiguration; + +@FeignClient(name="${some.name:some}", url="${some.url:http://localhost}", configuration = ClientConfiguration.class) +public interface SomeApiClient extends SomeApi { +} diff --git a/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/configuration/ApiKeyRequestInterceptor.java b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/configuration/ApiKeyRequestInterceptor.java new file mode 100644 index 00000000000..199278dcb53 --- /dev/null +++ b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/configuration/ApiKeyRequestInterceptor.java @@ -0,0 +1,31 @@ +package org.openapitools.configuration; + +import feign.RequestInterceptor; +import feign.RequestTemplate; +import feign.Util; + + +public class ApiKeyRequestInterceptor implements RequestInterceptor { + private final String location; + private final String name; + private String value; + + public ApiKeyRequestInterceptor(String location, String name, String value) { + Util.checkNotNull(location, "location", new Object[0]); + Util.checkNotNull(name, "name", new Object[0]); + Util.checkNotNull(value, "value", new Object[0]); + this.location = location; + this.name = name; + this.value = value; + } + + @Override + public void apply(RequestTemplate requestTemplate) { + if(location.equals("header")) { + requestTemplate.header(name, value); + } else if(location.equals("query")) { + requestTemplate.query(name, value); + } + } + +} diff --git a/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/configuration/ClientConfiguration.java b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/configuration/ClientConfiguration.java new file mode 100644 index 00000000000..205cab40604 --- /dev/null +++ b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/configuration/ClientConfiguration.java @@ -0,0 +1,86 @@ +package org.openapitools.configuration; + +import org.springframework.context.annotation.Bean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.security.authentication.AnonymousAuthenticationToken; +import org.springframework.security.oauth2.client.AuthorizedClientServiceOAuth2AuthorizedClientManager; +import org.springframework.security.oauth2.client.OAuth2AuthorizeRequest; +import org.springframework.security.oauth2.client.OAuth2AuthorizedClient; +import org.springframework.security.oauth2.client.OAuth2AuthorizedClientManager; +import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService; +import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; +import org.springframework.security.oauth2.core.OAuth2AuthenticationException; +import org.springframework.security.oauth2.core.OAuth2AccessToken; +import org.springframework.security.core.authority.AuthorityUtils; +import org.springframework.http.HttpHeaders; + +import feign.RequestInterceptor; +import feign.RequestTemplate; + +import org.springframework.context.annotation.Configuration; + + +public class ClientConfiguration { + + private static final String CLIENT_PRINCIPAL_APPLICATION = "oauth2FeignClient"; + + @Bean + @ConditionalOnProperty( prefix = "spring.security.oauth2.client.registration.oAuth2Application", name = "enabled", havingValue = "true" ) + public OAuth2RequestInterceptor applicationOAuth2RequestInterceptor(final OAuth2AuthorizedClientManager applicationAuthorizedClientManager ) { + return new OAuth2RequestInterceptor(OAuth2AuthorizeRequest.withClientRegistrationId("oAuth2Application") + .principal( new AnonymousAuthenticationToken( CLIENT_PRINCIPAL_APPLICATION, CLIENT_PRINCIPAL_APPLICATION, AuthorityUtils.createAuthorityList( "ROLE_ANONYMOUS" ) ) ) + .build(), applicationAuthorizedClientManager ); + } + + @Bean + @ConditionalOnProperty( prefix = "spring.security.oauth2.client.registration.oAuth2Application", name = "enabled", havingValue = "true" ) + public OAuth2AuthorizedClientManager applicationAuthorizedClientManager(ClientRegistrationRepository clientRegistrationRepository, + OAuth2AuthorizedClientService authorizedClientService ) { + return new AuthorizedClientServiceOAuth2AuthorizedClientManager( clientRegistrationRepository, authorizedClientService ); + } + private static final String CLIENT_PRINCIPAL_ACCESSCODE = "oauth2FeignClient"; + + @Bean + @ConditionalOnProperty( prefix = "spring.security.oauth2.client.registration.oAuth2AccessCode", name = "enabled", havingValue = "true" ) + public OAuth2RequestInterceptor accessCodeOAuth2RequestInterceptor(final OAuth2AuthorizedClientManager accessCodeAuthorizedClientManager ) { + return new OAuth2RequestInterceptor(OAuth2AuthorizeRequest.withClientRegistrationId("oAuth2AccessCode") + .principal( new AnonymousAuthenticationToken( CLIENT_PRINCIPAL_ACCESSCODE, CLIENT_PRINCIPAL_ACCESSCODE, AuthorityUtils.createAuthorityList( "ROLE_ANONYMOUS" ) ) ) + .build(), accessCodeAuthorizedClientManager ); + } + + @Bean + @ConditionalOnProperty( prefix = "spring.security.oauth2.client.registration.oAuth2AccessCode", name = "enabled", havingValue = "true" ) + public OAuth2AuthorizedClientManager accessCodeAuthorizedClientManager(ClientRegistrationRepository clientRegistrationRepository, + OAuth2AuthorizedClientService authorizedClientService ) { + return new AuthorizedClientServiceOAuth2AuthorizedClientManager( clientRegistrationRepository, authorizedClientService ); + } + public static class OAuth2RequestInterceptor implements RequestInterceptor { + + private final OAuth2AuthorizedClientManager oAuth2AuthorizedClientManager; + private final OAuth2AuthorizeRequest oAuth2AuthorizeRequest; + + public OAuth2RequestInterceptor(OAuth2AuthorizeRequest oAuth2AuthorizeRequest,OAuth2AuthorizedClientManager oAuth2AuthorizedClientManager){ + this.oAuth2AuthorizeRequest = oAuth2AuthorizeRequest; + this.oAuth2AuthorizedClientManager = oAuth2AuthorizedClientManager; + } + + @Override + public void apply( final RequestTemplate template ) { + template.header( HttpHeaders.AUTHORIZATION, getBearerToken() ); + } + + public OAuth2AccessToken getAccessToken() { + final OAuth2AuthorizedClient authorizedClient = oAuth2AuthorizedClientManager.authorize(oAuth2AuthorizeRequest); + if (authorizedClient == null) { + throw new OAuth2AuthenticationException( "Client failed to authenticate"); + } + return authorizedClient.getAccessToken(); + } + + public String getBearerToken() { + final OAuth2AccessToken accessToken = getAccessToken(); + return String.format( "%s %s", accessToken.getTokenType().getValue(), accessToken.getTokenValue() ); + } + } + +} diff --git a/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java new file mode 100644 index 00000000000..e5cda646217 --- /dev/null +++ b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java @@ -0,0 +1,28 @@ +package org.openapitools.configuration; + + +import java.util.Properties; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.PropertiesPropertySource; + +@Configuration(value = "org.openapitools.configuration.clientPropertiesConfiguration") +public class ClientPropertiesConfiguration { + + public ClientPropertiesConfiguration( final ConfigurableEnvironment configurableEnvironment ) { + final Properties oAuth2Application = new Properties(); + oAuth2Application.put("spring.security.oauth2.client.registration.oAuth2Application.client-id", "set-oAuth2Application-client-id" ); + oAuth2Application.put("spring.security.oauth2.client.registration.oAuth2Application.authorization-grant-type", "client_credentials" ); + oAuth2Application.put("spring.security.oauth2.client.provider.oAuth2Application.token-uri", "/openid-connect/token" ); + configurableEnvironment.getPropertySources().addLast( new PropertiesPropertySource("oAuth2Application", oAuth2Application ) ); + final Properties oAuth2AccessCode = new Properties(); + oAuth2AccessCode.put("spring.security.oauth2.client.registration.oAuth2AccessCode.client-id", "set-oAuth2AccessCode-client-id" ); + oAuth2AccessCode.put("spring.security.oauth2.client.registration.oAuth2AccessCode.scope", "openid,profile,aud" ); + oAuth2AccessCode.put("spring.security.oauth2.client.registration.oAuth2AccessCode.authorization-grant-type", "authorization_code" ); + oAuth2AccessCode.put("spring.security.oauth2.client.registration.oAuth2AccessCode.redirect-uri", "set-oAuth2AccessCode-redirect-uri" ); + oAuth2AccessCode.put("spring.security.oauth2.client.provider.oAuth2AccessCode.token-uri", "${tokenUrl}" ); + oAuth2AccessCode.put("spring.security.oauth2.client.provider.oAuth2AccessCode.authorization-uri", "${authorizationUrl}" ); + configurableEnvironment.getPropertySources().addLast( new PropertiesPropertySource("oAuth2AccessCode", oAuth2AccessCode ) ); + } + +} diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java index ce9f10507e8..20feed97f25 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java @@ -1,5 +1,6 @@ package org.openapitools.configuration; + import java.util.Properties; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.ConfigurableEnvironment; @@ -9,13 +10,12 @@ import org.springframework.core.env.PropertiesPropertySource; public class ClientPropertiesConfiguration { public ClientPropertiesConfiguration( final ConfigurableEnvironment configurableEnvironment ) { - final Properties properties = new Properties(); - properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" ); - properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" ); - properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" ); - properties.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" ); - final PropertiesPropertySource propertiesPropertySource = new PropertiesPropertySource("petstoreAuthImplicit", properties ); - configurableEnvironment.getPropertySources().addLast( propertiesPropertySource ); + final Properties petstoreAuthImplicit = new Properties(); + petstoreAuthImplicit.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" ); + petstoreAuthImplicit.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" ); + petstoreAuthImplicit.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" ); + petstoreAuthImplicit.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" ); + configurableEnvironment.getPropertySources().addLast( new PropertiesPropertySource("petstoreAuthImplicit", petstoreAuthImplicit ) ); } } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java index ce9f10507e8..20feed97f25 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java @@ -1,5 +1,6 @@ package org.openapitools.configuration; + import java.util.Properties; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.ConfigurableEnvironment; @@ -9,13 +10,12 @@ import org.springframework.core.env.PropertiesPropertySource; public class ClientPropertiesConfiguration { public ClientPropertiesConfiguration( final ConfigurableEnvironment configurableEnvironment ) { - final Properties properties = new Properties(); - properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" ); - properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" ); - properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" ); - properties.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" ); - final PropertiesPropertySource propertiesPropertySource = new PropertiesPropertySource("petstoreAuthImplicit", properties ); - configurableEnvironment.getPropertySources().addLast( propertiesPropertySource ); + final Properties petstoreAuthImplicit = new Properties(); + petstoreAuthImplicit.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" ); + petstoreAuthImplicit.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" ); + petstoreAuthImplicit.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" ); + petstoreAuthImplicit.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" ); + configurableEnvironment.getPropertySources().addLast( new PropertiesPropertySource("petstoreAuthImplicit", petstoreAuthImplicit ) ); } } diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java index ce9f10507e8..20feed97f25 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java @@ -1,5 +1,6 @@ package org.openapitools.configuration; + import java.util.Properties; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.ConfigurableEnvironment; @@ -9,13 +10,12 @@ import org.springframework.core.env.PropertiesPropertySource; public class ClientPropertiesConfiguration { public ClientPropertiesConfiguration( final ConfigurableEnvironment configurableEnvironment ) { - final Properties properties = new Properties(); - properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" ); - properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" ); - properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" ); - properties.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" ); - final PropertiesPropertySource propertiesPropertySource = new PropertiesPropertySource("petstoreAuthImplicit", properties ); - configurableEnvironment.getPropertySources().addLast( propertiesPropertySource ); + final Properties petstoreAuthImplicit = new Properties(); + petstoreAuthImplicit.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" ); + petstoreAuthImplicit.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" ); + petstoreAuthImplicit.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" ); + petstoreAuthImplicit.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" ); + configurableEnvironment.getPropertySources().addLast( new PropertiesPropertySource("petstoreAuthImplicit", petstoreAuthImplicit ) ); } } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java index ce9f10507e8..20feed97f25 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java @@ -1,5 +1,6 @@ package org.openapitools.configuration; + import java.util.Properties; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.ConfigurableEnvironment; @@ -9,13 +10,12 @@ import org.springframework.core.env.PropertiesPropertySource; public class ClientPropertiesConfiguration { public ClientPropertiesConfiguration( final ConfigurableEnvironment configurableEnvironment ) { - final Properties properties = new Properties(); - properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" ); - properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" ); - properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" ); - properties.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" ); - final PropertiesPropertySource propertiesPropertySource = new PropertiesPropertySource("petstoreAuthImplicit", properties ); - configurableEnvironment.getPropertySources().addLast( propertiesPropertySource ); + final Properties petstoreAuthImplicit = new Properties(); + petstoreAuthImplicit.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" ); + petstoreAuthImplicit.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" ); + petstoreAuthImplicit.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" ); + petstoreAuthImplicit.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" ); + configurableEnvironment.getPropertySources().addLast( new PropertiesPropertySource("petstoreAuthImplicit", petstoreAuthImplicit ) ); } } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java index ce9f10507e8..20feed97f25 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java @@ -1,5 +1,6 @@ package org.openapitools.configuration; + import java.util.Properties; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.ConfigurableEnvironment; @@ -9,13 +10,12 @@ import org.springframework.core.env.PropertiesPropertySource; public class ClientPropertiesConfiguration { public ClientPropertiesConfiguration( final ConfigurableEnvironment configurableEnvironment ) { - final Properties properties = new Properties(); - properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" ); - properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" ); - properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" ); - properties.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" ); - final PropertiesPropertySource propertiesPropertySource = new PropertiesPropertySource("petstoreAuthImplicit", properties ); - configurableEnvironment.getPropertySources().addLast( propertiesPropertySource ); + final Properties petstoreAuthImplicit = new Properties(); + petstoreAuthImplicit.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" ); + petstoreAuthImplicit.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" ); + petstoreAuthImplicit.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" ); + petstoreAuthImplicit.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" ); + configurableEnvironment.getPropertySources().addLast( new PropertiesPropertySource("petstoreAuthImplicit", petstoreAuthImplicit ) ); } } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java index ce9f10507e8..20feed97f25 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java @@ -1,5 +1,6 @@ package org.openapitools.configuration; + import java.util.Properties; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.ConfigurableEnvironment; @@ -9,13 +10,12 @@ import org.springframework.core.env.PropertiesPropertySource; public class ClientPropertiesConfiguration { public ClientPropertiesConfiguration( final ConfigurableEnvironment configurableEnvironment ) { - final Properties properties = new Properties(); - properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" ); - properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" ); - properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" ); - properties.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" ); - final PropertiesPropertySource propertiesPropertySource = new PropertiesPropertySource("petstoreAuthImplicit", properties ); - configurableEnvironment.getPropertySources().addLast( propertiesPropertySource ); + final Properties petstoreAuthImplicit = new Properties(); + petstoreAuthImplicit.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" ); + petstoreAuthImplicit.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" ); + petstoreAuthImplicit.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" ); + petstoreAuthImplicit.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" ); + configurableEnvironment.getPropertySources().addLast( new PropertiesPropertySource("petstoreAuthImplicit", petstoreAuthImplicit ) ); } } diff --git a/website/yarn.lock b/website/yarn.lock index dfe35206fa8..5e032805cdb 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -2605,13 +2605,13 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== -body-parser@1.20.1: - version "1.20.1" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" - integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== +body-parser@1.20.2: + version "1.20.2" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" + integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== dependencies: bytes "3.1.2" - content-type "~1.0.4" + content-type "~1.0.5" debug "2.6.9" depd "2.0.0" destroy "1.2.0" @@ -2619,7 +2619,7 @@ body-parser@1.20.1: iconv-lite "0.4.24" on-finished "2.4.1" qs "6.11.0" - raw-body "2.5.1" + raw-body "2.5.2" type-is "~1.6.18" unpipe "1.0.0" @@ -3047,7 +3047,7 @@ content-disposition@0.5.4: dependencies: safe-buffer "5.2.1" -content-type@~1.0.4: +content-type@~1.0.4, content-type@~1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== @@ -3062,10 +3062,10 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== -cookie@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" - integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== +cookie@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" + integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== copy-text-to-clipboard@^3.0.1: version "3.0.1" @@ -3693,16 +3693,16 @@ execa@^5.0.0: strip-final-newline "^2.0.0" express@^4.17.3: - version "4.18.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" - integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== + version "4.19.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465" + integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.20.1" + body-parser "1.20.2" content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.5.0" + cookie "0.6.0" cookie-signature "1.0.6" debug "2.6.9" depd "2.0.0" @@ -5976,10 +5976,10 @@ range-parser@^1.2.1, range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" - integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== +raw-body@2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" + integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== dependencies: bytes "3.1.2" http-errors "2.0.0"