From 1fbf7220ecd52f0dfbdaee5de2c722d1ff727cd4 Mon Sep 17 00:00:00 2001 From: Anakael Date: Wed, 28 Feb 2024 10:56:48 +0300 Subject: [PATCH] [CS] refactor: update github actions (#17666) * feat: DateOnly for client * fix: generated doc for csharp * doc: fix generators README for csharp * add DateOnly option for aspnet * refactor: update csharp docs * refactor: fix typo * finish * finish * finish * regenerate * rebuild and regenerate * fix build error * finish * revert path * regenerate * remove exceed samples * regenerate * add DateOnly to nullable * remove obsolete file from list * update test files list * remove obsolete sample build * revert manual tests * revert samples to master and regenerate * remove new samples * remove eol * remove eol * add new specs * try fix test * update tests * update files * remove eol * revert * remove eol * regenerate * add net6+ support to aspnetcore * add jobs * update actions * regenerate * delete exceed file * remove rexeg --- .../workflows/samples-dotnet-standard.yaml | 27 +++++++++-- .github/workflows/samples-dotnet.yaml | 42 ++++++---------- .../samples-dotnet6-client-echo-api.yaml | 2 +- .github/workflows/samples-dotnet6-client.yaml | 48 ++++--------------- .github/workflows/samples-dotnet6-server.yaml | 21 ++++---- ...csharp-restsharp-net6.0-name-mappings.yaml | 2 +- .../.gitignore | 0 .../.openapi-generator-ignore | 0 .../.openapi-generator/FILES | 0 .../.openapi-generator/VERSION | 0 .../Org.OpenAPITools.sln | 0 .../README.md | 0 .../api/openapi.yaml | 0 .../appveyor.yml | 0 .../docs/Env.md | 0 .../docs/FakeApi.md | 0 .../docs/PropertyNameMapping.md | 0 .../git_push.sh | 0 .../Org.OpenAPITools.Test/Api/FakeApiTests.cs | 5 +- .../Org.OpenAPITools.Test/Model/EnvTests.cs | 0 .../Model/PropertyNameMappingTests.cs | 0 .../Org.OpenAPITools.Test.csproj | 0 .../src/Org.OpenAPITools/Api/FakeApi.cs | 0 .../src/Org.OpenAPITools/Client/ApiClient.cs | 0 .../Org.OpenAPITools/Client/ApiException.cs | 0 .../Org.OpenAPITools/Client/ApiResponse.cs | 0 .../Org.OpenAPITools/Client/ClientUtils.cs | 0 .../Org.OpenAPITools/Client/Configuration.cs | 0 .../Client/ExceptionFactory.cs | 0 .../Client/GlobalConfiguration.cs | 0 .../src/Org.OpenAPITools/Client/HttpMethod.cs | 0 .../Org.OpenAPITools/Client/IApiAccessor.cs | 0 .../Client/IAsynchronousClient.cs | 0 .../Client/IReadableConfiguration.cs | 0 .../Client/ISynchronousClient.cs | 0 .../src/Org.OpenAPITools/Client/Multimap.cs | 0 .../Client/OpenAPIDateConverter.cs | 0 .../Org.OpenAPITools/Client/RequestOptions.cs | 0 .../Client/RetryConfiguration.cs | 0 .../Model/AbstractOpenAPISchema.cs | 0 .../src/Org.OpenAPITools/Model/Env.cs | 0 .../Model/PropertyNameMapping.cs | 0 .../Org.OpenAPITools/Org.OpenAPITools.csproj | 0 43 files changed, 60 insertions(+), 87 deletions(-) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/.gitignore (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/.openapi-generator-ignore (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/.openapi-generator/FILES (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/.openapi-generator/VERSION (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/Org.OpenAPITools.sln (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/README.md (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/api/openapi.yaml (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/appveyor.yml (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/docs/Env.md (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/docs/FakeApi.md (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/docs/PropertyNameMapping.md (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/git_push.sh (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs (87%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools.Test/Model/EnvTests.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools.Test/Model/PropertyNameMappingTests.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Api/FakeApi.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Client/ApiClient.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Client/ApiException.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Client/ApiResponse.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Client/ClientUtils.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Client/Configuration.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Client/ExceptionFactory.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Client/GlobalConfiguration.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Client/HttpMethod.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Client/IApiAccessor.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Client/IAsynchronousClient.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Client/IReadableConfiguration.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Client/ISynchronousClient.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Client/Multimap.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Client/RequestOptions.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Client/RetryConfiguration.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Model/Env.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Model/PropertyNameMapping.cs (100%) rename samples/client/petstore/{csharp-restsharp-name-parameter-mappings => csharp/OpenAPIClient-restsharp-name-parameter-mappings}/src/Org.OpenAPITools/Org.OpenAPITools.csproj (100%) diff --git a/.github/workflows/samples-dotnet-standard.yaml b/.github/workflows/samples-dotnet-standard.yaml index efa9666bba5..5b6f540102f 100644 --- a/.github/workflows/samples-dotnet-standard.yaml +++ b/.github/workflows/samples-dotnet-standard.yaml @@ -1,12 +1,24 @@ -name: Samples C# .Net Standard +name: Samples C# .Net Standard Client on: push: paths: - - 'samples/client/petstore/csharp/**netstandard**/' + # 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/** pull_request: paths: - - 'samples/client/petstore/csharp/**netstandard**/' + # 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/** jobs: build: name: Build .Net projects @@ -15,8 +27,13 @@ jobs: fail-fast: false matrix: sample: - # clients - - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0 + # 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/ 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 9d2c9b1bc53..ac7ea2fd3a1 100644 --- a/.github/workflows/samples-dotnet.yaml +++ b/.github/workflows/samples-dotnet.yaml @@ -1,27 +1,18 @@ -name: Samples C# .Net 7 +name: Samples C# .Net 8 Clients on: push: paths: - - 'samples/client/petstore/csharp/**net6.0**/' - - 'samples/client/petstore/csharp/**net7.0**/' - - 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/' - - 'samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**' - - 'samples/server/petstore/aspnetcore-6.0/**' - - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**' - - 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**' + - 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*/** pull_request: paths: - - 'samples/client/petstore/csharp/**net6.0**/' - - 'samples/client/petstore/csharp/**net7.0**/' - - 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/' - - 'samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**' - - 'samples/server/petstore/aspnetcore-6.0/**' - - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**' - - 'samples/server/petstore/aspnetcore-6.0-project4Models/**' - - 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**' - - 'samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/**' - - 'samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/**' + - 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*/** jobs: build: name: Build .Net projects @@ -31,20 +22,15 @@ jobs: 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-netcore-latest-allOf - - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf - - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf - - samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests + - samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-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/server/petstore/aspnetcore-6.0 - - samples/server/petstore/aspnetcore-6.0-pocoModels - - samples/server/petstore/aspnetcore-6.0-project4Models - - samples/server/petstore/aspnetcore-6.0-useSwashBuckle - - samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse - - samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes steps: - uses: actions/checkout@v4 - uses: actions/setup-dotnet@v4.0.0 diff --git a/.github/workflows/samples-dotnet6-client-echo-api.yaml b/.github/workflows/samples-dotnet6-client-echo-api.yaml index 0cc3f10bb42..6aefe16aecb 100644 --- a/.github/workflows/samples-dotnet6-client-echo-api.yaml +++ b/.github/workflows/samples-dotnet6-client-echo-api.yaml @@ -1,4 +1,4 @@ -name: Samples C# .Net 6 +name: Samples C# .Net 6 Client Echo API on: push: diff --git a/.github/workflows/samples-dotnet6-client.yaml b/.github/workflows/samples-dotnet6-client.yaml index 2afe3d22e6f..cee008f5085 100644 --- a/.github/workflows/samples-dotnet6-client.yaml +++ b/.github/workflows/samples-dotnet6-client.yaml @@ -1,48 +1,30 @@ -name: Samples C# .Net 6 +name: Samples C# .Net 6 Client on: push: paths: - # build C# API client (multiple frameworks) - - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/** # build C# API client (httpclient) - samples/client/petstore/csharp/OpenAPIClient-httpclient/** - # build C# API client (generichost) - - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/** - # build C# API client (netcore) - - samples/client/petstore/csharp/OpenAPIClient/** - - samples/client/petstore/csharp/OpenAPIClientCore/** # 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 (.net 5.0) - - samples/client/petstore/csharp/OpenAPIClient-net5.0/** - # build C# API client (.net 5.0 with ConditionalSerialization) - - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/** # build C# API client (property, parameter name mappings) - - samples/client/petstore/csharp-restsharp-name-parameter-mappings/** + - samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/** + # build C# API client (multiple frameworks) + - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/** pull_request: paths: - # build C# API client (multiple frameworks) - - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/** # build C# API client (httpclient) - samples/client/petstore/csharp/OpenAPIClient-httpclient/** - # build C# API client (generichost) - - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/** - # build C# API client (netcore) - - samples/client/petstore/csharp/OpenAPIClient/** - - samples/client/petstore/csharp/OpenAPIClientCore/** # 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 (.net 5.0) - - samples/client/petstore/csharp/OpenAPIClient-net5.0/** - # build C# API client (.net 5.0 with ConditionalSerialization) - - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/** # build C# API client (property, parameter name mappings) - - samples/client/petstore/csharp-restsharp-name-parameter-mappings/** + - samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/** + # build C# API client (multiple frameworks) + - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/** jobs: build: name: Build .Net clients @@ -51,26 +33,16 @@ jobs: fail-fast: false matrix: sample: - # clients - # build C# API client (multiple frameworks) - - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/ # build C# API client (httpclient) - samples/client/petstore/csharp/OpenAPIClient-httpclient/ - # build C# API client (generichost) - - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/ - # build C# API client (netcore) - - samples/client/petstore/csharp/OpenAPIClient/ - - samples/client/petstore/csharp/OpenAPIClientCore/ # 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 (.net 5.0) - - samples/client/petstore/csharp/OpenAPIClient-net5.0/ - # build C# API client (.net 5.0 with ConditionalSerialization) - - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/ # build C# API client (property, parameter name mappings) - - samples/client/petstore/csharp-restsharp-name-parameter-mappings + - samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/ + # build C# API client (multiple frameworks) + - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/ steps: - uses: actions/checkout@v4 - uses: actions/setup-dotnet@v4.0.0 diff --git a/.github/workflows/samples-dotnet6-server.yaml b/.github/workflows/samples-dotnet6-server.yaml index 377a48428f5..bfdca34f50e 100644 --- a/.github/workflows/samples-dotnet6-server.yaml +++ b/.github/workflows/samples-dotnet6-server.yaml @@ -1,33 +1,28 @@ -name: Samples C# .Net 6 +name: Samples C# .Net 6 Server on: push: paths: - - 'samples/server/petstore/aspnetcore-6.0/**' - - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**' - - 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**' + - samples/server/petstore/aspnetcore-6.0/** + - samples/server/petstore/aspnetcore-6.0-*/** pull_request: paths: - - 'samples/server/petstore/aspnetcore-6.0/**' - - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**' - - 'samples/server/petstore/aspnetcore-6.0-project4Models/**' - - 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**' - - 'samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/**' - - 'samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/**' + - samples/server/petstore/aspnetcore-6.0/** + - samples/server/petstore/aspnetcore-6.0-*/** jobs: build: - name: Build .Net servers + name: Build .Net 6 servers runs-on: ubuntu-latest strategy: fail-fast: false matrix: sample: - samples/server/petstore/aspnetcore-6.0 + - samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse + - samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes - samples/server/petstore/aspnetcore-6.0-pocoModels - samples/server/petstore/aspnetcore-6.0-project4Models - samples/server/petstore/aspnetcore-6.0-useSwashBuckle - - samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse - - samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes steps: - uses: actions/checkout@v4 - uses: actions/setup-dotnet@v4.0.0 diff --git a/bin/configs/csharp-restsharp-net6.0-name-mappings.yaml b/bin/configs/csharp-restsharp-net6.0-name-mappings.yaml index e58d9e57686..05ead2dc45a 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-restsharp-name-parameter-mappings +outputDir: samples/client/petstore/csharp/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/samples/client/petstore/csharp-restsharp-name-parameter-mappings/.gitignore b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.gitignore similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/.gitignore rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.gitignore diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/.openapi-generator-ignore b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/.openapi-generator-ignore rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/.openapi-generator/FILES rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/.openapi-generator/VERSION rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/Org.OpenAPITools.sln b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/README.md b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/README.md similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/README.md rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/README.md diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/api/openapi.yaml rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/api/openapi.yaml diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/appveyor.yml b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/appveyor.yml rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/appveyor.yml diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/docs/Env.md b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/docs/Env.md similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/docs/Env.md rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/docs/Env.md diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/docs/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/docs/FakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/docs/FakeApi.md diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/docs/PropertyNameMapping.md b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/docs/PropertyNameMapping.md similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/docs/PropertyNameMapping.md rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/docs/PropertyNameMapping.md diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/git_push.sh b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/git_push.sh similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/git_push.sh rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/git_push.sh diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 87% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs index 52fed239f49..955900602c9 100644 --- a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs @@ -18,6 +18,8 @@ using Xunit; using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; +// uncomment below to import models +//using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Test.Api { @@ -63,7 +65,8 @@ namespace Org.OpenAPITools.Test.Api //string type = null; //string TypeWithUnderscore = null; //string httpDebugOption = null; - //instance.GetParameterNameMapping(UnderscoreType, type, TypeWithUnderscore, httpDebugOption); + //var response = instance.GetParameterNameMapping(UnderscoreType, type, TypeWithUnderscore, httpDebugOption); + //Assert.IsType(response); } } } diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/EnvTests.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/EnvTests.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/EnvTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/EnvTests.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/PropertyNameMappingTests.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/PropertyNameMappingTests.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/PropertyNameMappingTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/PropertyNameMappingTests.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/Env.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/Env.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/Env.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/Env.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/PropertyNameMapping.cs b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/PropertyNameMapping.cs similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/PropertyNameMapping.cs rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/PropertyNameMapping.cs diff --git a/samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Org.OpenAPITools.csproj