Rename csharp-netcore to csharp (#15903)

* rename csharp-netcore to csharp

* rename file

* renmae modules/openapi-generator/src/main/resources/csharp-netcore

* update samples

* mv dir

* update samples

* rename csharp-netcore to csharp in appveyor.yml

* update doc

.github/workflows/samples-dotnet-standard.yaml

@@ -3,10 +3,10 @@ name: Samples C# .Net Standard
 on:
   push:
     paths:
-      - 'samples/client/petstore/csharp-netcore/**netstandard**/'
+      - 'samples/client/petstore/csharp/**netstandard**/'
   pull_request:
     paths:
-      - 'samples/client/petstore/csharp-netcore/**netstandard**/'
+      - 'samples/client/petstore/csharp/**netstandard**/'
 jobs:
   build:
     name: Build .Net projects
@@ -16,7 +16,7 @@ jobs:
       matrix:
         sample:
           # clients
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-dotnet@v3.2.0

.github/workflows/samples-dotnet.yaml

@@ -3,16 +3,16 @@ name: Samples C# .Net 7
 on:
   push:
     paths:
-      - 'samples/client/petstore/csharp-netcore/**net6.0**/'
-      - 'samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore**/'
+      - 'samples/client/petstore/csharp/**net6.0**/'
+      - 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/'
       - '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-useNewtonsoft/**'
   pull_request:
     paths:
-      - 'samples/client/petstore/csharp-netcore/**net6.0**/'
-      - 'samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore**/'
+      - 'samples/client/petstore/csharp/**net6.0**/'
+      - 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/'
       - 'samples/server/petstore/aspnetcore-6.0/**'
       - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**'
       - 'samples/server/petstore/aspnetcore-6.0-project4Models/**'
@@ -28,11 +28,11 @@ jobs:
       matrix:
         sample:
           # clients
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf
+          - 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/server/petstore/aspnetcore-6.0
           - samples/server/petstore/aspnetcore-6.0-pocoModels
           - samples/server/petstore/aspnetcore-6.0-project4Models

.github/workflows/samples-dotnet6-client.yaml

@@ -4,41 +4,41 @@ on:
   push:
     paths:
       # build C# API client (multiple frameworks)
-      - samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/**
+      - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/**
       # build C# API client (httpclient)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/**
+      - samples/client/petstore/csharp/OpenAPIClient-httpclient/**
       # build C# API client (generichost)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/**
+      - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/**
       # build C# API client (netcore)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient/**
-      - samples/client/petstore/csharp-netcore/OpenAPIClientCore/**
+      - samples/client/petstore/csharp/OpenAPIClient/**
+      - samples/client/petstore/csharp/OpenAPIClientCore/**
       # build C# API client (.net framework 4.7)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-net47/**
+      - samples/client/petstore/csharp/OpenAPIClient-net47/**
       # build C# API client (.net framework 4.8)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-net48/**
+      - samples/client/petstore/csharp/OpenAPIClient-net48/**
       # build C# API client (.net 5.0)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/**
+      - samples/client/petstore/csharp/OpenAPIClient-net5.0/**
       # build C# API client (.net 5.0 with ConditionalSerialization)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/**
+      - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/**
   pull_request:
     paths:
       # build C# API client (multiple frameworks)
-      - samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/**
+      - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/**
       # build C# API client (httpclient)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/**
+      - samples/client/petstore/csharp/OpenAPIClient-httpclient/**
       # build C# API client (generichost)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/**
+      - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/**
       # build C# API client (netcore)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient/**
-      - samples/client/petstore/csharp-netcore/OpenAPIClientCore/**
+      - samples/client/petstore/csharp/OpenAPIClient/**
+      - samples/client/petstore/csharp/OpenAPIClientCore/**
       # build C# API client (.net framework 4.7)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-net47/**
+      - samples/client/petstore/csharp/OpenAPIClient-net47/**
       # build C# API client (.net framework 4.8)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-net48/**
+      - samples/client/petstore/csharp/OpenAPIClient-net48/**
       # build C# API client (.net 5.0)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/**
+      - samples/client/petstore/csharp/OpenAPIClient-net5.0/**
       # build C# API client (.net 5.0 with ConditionalSerialization)
-      - samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/**
+      - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/**
 jobs:
   build:
     name: Build .Net clients
@@ -49,22 +49,22 @@ jobs:
         sample:
           # clients
           # build C# API client (multiple frameworks)
-          - samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/
+          - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/
           # build C# API client (httpclient)
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/
+          - samples/client/petstore/csharp/OpenAPIClient-httpclient/
           # build C# API client (generichost)
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/
+          - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/
           # build C# API client (netcore)
-          - samples/client/petstore/csharp-netcore/OpenAPIClient/
-          - samples/client/petstore/csharp-netcore/OpenAPIClientCore/
+          - samples/client/petstore/csharp/OpenAPIClient/
+          - samples/client/petstore/csharp/OpenAPIClientCore/
           # build C# API client (.net framework 4.7)
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-net47/
+          - samples/client/petstore/csharp/OpenAPIClient-net47/
           # build C# API client (.net framework 4.8)
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-net48/
+          - samples/client/petstore/csharp/OpenAPIClient-net48/
           # build C# API client (.net 5.0)
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/
+          - samples/client/petstore/csharp/OpenAPIClient-net5.0/
           # build C# API client (.net 5.0 with ConditionalSerialization)
-          - samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/
+          - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-dotnet@v3.2.0

appveyor.yml

@@ -25,41 +25,41 @@ build_script:
   ## build C# aspnetcore 2.2 server
   #- dotnet build samples\server\petstore\aspnetcore\Org.OpenAPITools.sln
   ## build C# API client (multiple frameworks)
-  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClientCoreAndNet47\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp\OpenAPIClientCoreAndNet47\Org.OpenAPITools.sln
   ## build C# API client (httpclient)
-  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-httpclient\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-httpclient\Org.OpenAPITools.sln
   ## build C# API client (generichost)
-  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-generichost-netstandard2.0\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-generichost-netstandard2.0\Org.OpenAPITools.sln
   ## build C# API client (netcore)
-  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient\Org.OpenAPITools.sln
-  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClientCore\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp\OpenAPIClientCore\Org.OpenAPITools.sln
   ## build C# API client (.net framework 4.7)
-  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net47\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-net47\Org.OpenAPITools.sln
   ## build C# API client (.net framework 4.8)
-  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net48\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-net48\Org.OpenAPITools.sln
   ## build C# API client (.net 5.0)
-  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net5.0\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-net5.0\Org.OpenAPITools.sln
   ## build C# API client (.net 5.0 with ConditionalSerialization)
-  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-ConditionalSerialization\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp\OpenAPIClient-ConditionalSerialization\Org.OpenAPITools.sln
 
 test_script:
   # test c# API client (multiple frameworks)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClientCoreAndNet47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\OpenAPIClientCoreAndNet47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   # test c# API client (httpclient)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-httpclient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\OpenAPIClient-httpclient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   # test c# API client (generichost)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-generichost-netstandard2.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\OpenAPIClient-generichost-netstandard2.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   # test c# API client (netcore)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  #- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\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-netcore\OpenAPIClient-net47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\OpenAPIClient-net47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   # test C# API client (.net framework 4.8)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-net48\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\OpenAPIClient-net48\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   # test C# API client (.net 5.0)
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-net5.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\OpenAPIClient-net5.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   # test C# API Client using conditional-serialization
-  - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-ConditionalSerialization\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  - dotnet test samples\client\petstore\csharp\OpenAPIClient-ConditionalSerialization\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
 
 ### TODO: Execute all generators via powershell or other
   # generate all petstore clients

bin/configs/csharp-OpenAPIClient-generichost-netcore-latest-allOf.yaml

@@ -1,9 +1,9 @@
-# for csharp-netcore generichost
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf
 inputSpec: modules/openapi-generator/src/test/resources/3_0/allOf.yaml
 library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
+templateDir: modules/openapi-generator/src/main/resources/csharp
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
   useCompareNetObjects: true 

bin/configs/csharp-OpenAPIClient-generichost-netcore-latest-anyOf.yaml

@@ -1,9 +1,9 @@
-# for csharp-netcore generichost
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf
 inputSpec: modules/openapi-generator/src/test/resources/3_0/anyOf.yaml
 library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
+templateDir: modules/openapi-generator/src/main/resources/csharp
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
   useCompareNetObjects: true 

bin/configs/csharp-OpenAPIClient-generichost-netcore-latest-oneOf.yaml

@@ -1,9 +1,9 @@
-# for csharp-netcore generichost
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf
 inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf.yaml
 library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
+templateDir: modules/openapi-generator/src/main/resources/csharp
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
   useCompareNetObjects: true 

bin/configs/csharp-OpenAPIClient-generichost-netcore5.0-nrt.yaml

@@ -1,9 +1,9 @@
-# for csharp-netcore generichost
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt
 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-netcore
+templateDir: modules/openapi-generator/src/main/resources/csharp
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
   useCompareNetObjects: true 

bin/configs/csharp-OpenAPIClient-generichost-netcore5.0.yaml

@@ -1,9 +1,9 @@
-# for csharp-netcore generichost
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0
 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-netcore
+templateDir: modules/openapi-generator/src/main/resources/csharp
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
   useCompareNetObjects: true 

bin/configs/csharp-OpenAPIClient-generichost-netstandard2.0.yaml

@@ -1,9 +1,9 @@
-# for csharp-netcore generichost
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0
 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-netcore
+templateDir: modules/openapi-generator/src/main/resources/csharp
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
   useCompareNetObjects: true 

bin/configs/csharp-OpenAPIClient-httpclient.yaml

@@ -1,8 +1,8 @@
 # for .net standard httpclient
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/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-netcore
+templateDir: modules/openapi-generator/src/main/resources/csharp
 library: httpclient
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'

bin/configs/csharp-OpenAPIClient-net47.yaml

@@ -1,8 +1,8 @@
 # for .net standard
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-net47
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-net47
 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-netcore
+templateDir: modules/openapi-generator/src/main/resources/csharp
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
   useCompareNetObjects: true 

bin/configs/csharp-OpenAPIClient-net48.yaml

@@ -1,8 +1,8 @@
 # for .net standard
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-net48
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-net48
 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-netcore
+templateDir: modules/openapi-generator/src/main/resources/csharp
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
   useCompareNetObjects: true 

bin/configs/csharp-OpenAPIClient-net50.yaml

@@ -1,8 +1,8 @@
 # for .net standard
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient-net5.0
 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-netcore
+templateDir: modules/openapi-generator/src/main/resources/csharp
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
   useCompareNetObjects: true 

bin/configs/csharp-OpenAPIClient-unityWebRequest.yaml

@@ -1,6 +1,6 @@
 # for .net Unity
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/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-netcore
+templateDir: modules/openapi-generator/src/main/resources/csharp
 library: unityWebRequest

bin/configs/csharp-OpenAPIClient.yaml

@@ -1,8 +1,8 @@
 # for .net standard
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClient
 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-netcore
+templateDir: modules/openapi-generator/src/main/resources/csharp
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
   useCompareNetObjects: true 

bin/configs/csharp-OpenAPIClientCore.yaml

@@ -1,7 +1,7 @@
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClientCore
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/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-netcore
+templateDir: modules/openapi-generator/src/main/resources/csharp
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
   targetFramework: net7.0

bin/configs/csharp-OpenAPIClientCoreAndNet47.yaml

@@ -1,7 +1,7 @@
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/OpenAPIClientCoreAndNet47
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
+templateDir: modules/openapi-generator/src/main/resources/csharp
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
   targetFramework: netstandard2.1;net47

bin/configs/csharp-OpenAPIClient_ConditionalSerialization.yaml

@@ -1,8 +1,8 @@
 # for .net standard
-generatorName: csharp-netcore
-outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/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-netcore
+templateDir: modules/openapi-generator/src/main/resources/csharp
 additionalProperties:
   packageGuid: '{fa96c953-af24-457d-8a01-f2fd2a7547a9}'
   useCompareNetObjects: true 

bin/configs/csharp-complex-files.yaml

@@ -1,7 +1,7 @@
-generatorName: csharp-netcore
-outputDir: samples/client/others/csharp-netcore-complex-files
+generatorName: csharp
+outputDir: samples/client/others/csharp-complex-files
 inputSpec: modules/openapi-generator/src/test/resources/3_0/form-multipart-binary-array.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
+templateDir: modules/openapi-generator/src/main/resources/csharp
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
   targetFramework: netstandard2.0

bin/configs/csharp-functions.yaml

@@ -1,7 +1,7 @@
-generatorName: csharp-netcore-functions
-outputDir: samples/client/petstore/csharp-netcore-functions
+generatorName: csharp-functions
+outputDir: samples/client/petstore/csharp-functions
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore-functions
+templateDir: modules/openapi-generator/src/main/resources/csharp-functions
 additionalProperties:
   packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
   userSecretsGuid: "76e9e993-9159-441c-9c5b-fe95e7f4f020"

bin/utils/test_file_list.yaml

@@ -1,10 +1,10 @@
 ---
-# csharp-netcore test files and image for upload
-- filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs"
+# csharp test files and image for upload
+- filename: "samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs"
   sha256: 054adb6efaff70f492e471cb3e4d628d22cda814906808fd3fcce36ce710b7ee
-- filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs"
+- filename: "samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs"
   sha256: 7dad88554fe630d25c787cae05305d302d5e34ca810aee4fa23f20055f9188e1
-- filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png"
+- filename: "samples/client/petstore/csharp/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"

docs/generators.md

@@ -18,7 +18,7 @@ The following generators are available:
 * [cpp-tizen](generators/cpp-tizen.md)  
 * [cpp-ue4 (beta)](generators/cpp-ue4.md)  
 * [crystal (beta)](generators/crystal.md)  
-* [csharp-netcore](generators/csharp-netcore.md)  
+* [csharp](generators/csharp.md)  
 * [dart](generators/dart.md)  
 * [dart-dio](generators/dart-dio.md)  
 * [eiffel](generators/eiffel.md)  
@@ -82,7 +82,7 @@ The following generators are available:
 * [cpp-qt-qhttpengine-server](generators/cpp-qt-qhttpengine-server.md)  
 * [cpp-restbed-server](generators/cpp-restbed-server.md)  
 * [cpp-restbed-server-deprecated](generators/cpp-restbed-server-deprecated.md)  
-* [csharp-netcore-functions](generators/csharp-netcore-functions.md)  
+* [csharp-functions](generators/csharp-functions.md)  
 * [erlang-server](generators/erlang-server.md)  
 * [fsharp-functions (beta)](generators/fsharp-functions.md)  
 * [fsharp-giraffe-server (beta)](generators/fsharp-giraffe-server.md)  

docs/generators/csharp-functions.md

@@ -1,12 +1,12 @@
 ---
-title: Documentation for the csharp-netcore-functions Generator
+title: Documentation for the csharp-functions Generator
 ---
 
 ## METADATA
 
 | Property | Value | Notes |
 | -------- | ----- | ----- |
-| generator name | csharp-netcore-functions | pass this to the generate command after -g |
+| generator name | csharp-functions | pass this to the generate command after -g |
 | generator stability | STABLE | |
 | generator type | SERVER | |
 | generator language | C# | |

docs/generators/csharp.md

@@ -1,12 +1,12 @@
 ---
-title: Documentation for the csharp-netcore Generator
+title: Documentation for the csharp Generator
 ---
 
 ## METADATA
 
 | Property | Value | Notes |
 | -------- | ----- | ----- |
-| generator name | csharp-netcore | pass this to the generate command after -g |
+| generator name | csharp | pass this to the generate command after -g |
 | generator stability | STABLE | |
 | generator type | CLIENT | |
 | generator language | C# | |

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java

@@ -165,7 +165,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
         apiTemplateFiles.put("api.mustache", ".cs");
         modelDocTemplateFiles.put("model_doc.mustache", ".md");
         apiDocTemplateFiles.put("api_doc.mustache", ".md");
-        embeddedTemplateDir = templateDir = "csharp-netcore";
+        embeddedTemplateDir = templateDir = "csharp";
 
         cliOptions.clear();
 
@@ -565,7 +565,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
 
     @Override
     public String getName() {
-        return "csharp-netcore";
+        return "csharp";
     }
 
     public String getNameUsingModelPropertyNaming(String name) {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpFunctionsServerCodegen.java

@@ -108,7 +108,7 @@ public class CSharpFunctionsServerCodegen extends AbstractCSharpCodegen {
         modelTemplateFiles.put("model.mustache", ".cs");
         apiTemplateFiles.put("function.mustache", ".cs");
 
-        embeddedTemplateDir = templateDir = "csharp-netcore-functions";
+        embeddedTemplateDir = templateDir = "csharp-functions";
 
         // contextually reserved words
         // NOTE: C# uses camel cased reserved words, while models are title cased. We don't want lowercase comparisons.
@@ -302,7 +302,7 @@ public class CSharpFunctionsServerCodegen extends AbstractCSharpCodegen {
 
     @Override
     public String getName() {
-        return "csharp-netcore-functions";
+        return "csharp-functions";
     }
 
     @Override