Skip to content

Commit 7c67f73

Browse files
wing328wing328
authored
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
1 parent af048ec commit 7c67f73

4,017 files changed

Lines changed: 140 additions & 149 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: Samples C# .Net Standard
33
on:
44
push:
55
paths:
6-
- 'samples/client/petstore/csharp-netcore/**netstandard**/'
6+
- 'samples/client/petstore/csharp/**netstandard**/'
77
pull_request:
88
paths:
9-
- 'samples/client/petstore/csharp-netcore/**netstandard**/'
9+
- 'samples/client/petstore/csharp/**netstandard**/'
1010
jobs:
1111
build:
1212
name: Build .Net projects
@@ -16,7 +16,7 @@ jobs:
1616
matrix:
1717
sample:
1818
# clients
19-
- samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0
19+
- samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0
2020
steps:
2121
- uses: actions/checkout@v3
2222
- uses: actions/setup-dotnet@v3.2.0

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ name: Samples C# .Net 7
33
on:
44
push:
55
paths:
6-
- 'samples/client/petstore/csharp-netcore/**net6.0**/'
7-
- 'samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore**/'
6+
- 'samples/client/petstore/csharp/**net6.0**/'
7+
- 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/'
88
- 'samples/server/petstore/aspnetcore-6.0/**'
99
- 'samples/server/petstore/aspnetcore-6.0-pocoModels/**'
1010
- 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**'
1111
- 'samples/server/petstore/aspnetcore-6.0-useNewtonsoft/**'
1212
pull_request:
1313
paths:
14-
- 'samples/client/petstore/csharp-netcore/**net6.0**/'
15-
- 'samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore**/'
14+
- 'samples/client/petstore/csharp/**net6.0**/'
15+
- 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/'
1616
- 'samples/server/petstore/aspnetcore-6.0/**'
1717
- 'samples/server/petstore/aspnetcore-6.0-pocoModels/**'
1818
- 'samples/server/petstore/aspnetcore-6.0-project4Models/**'
@@ -28,11 +28,11 @@ jobs:
2828
matrix:
2929
sample:
3030
# clients
31-
- samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0
32-
- samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt
33-
- samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf
34-
- samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf
35-
- samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf
31+
- samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0
32+
- samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt
33+
- samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf
34+
- samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf
35+
- samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf
3636
- samples/server/petstore/aspnetcore-6.0
3737
- samples/server/petstore/aspnetcore-6.0-pocoModels
3838
- samples/server/petstore/aspnetcore-6.0-project4Models

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,41 @@ on:
44
push:
55
paths:
66
# build C# API client (multiple frameworks)
7-
- samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/**
7+
- samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/**
88
# build C# API client (httpclient)
9-
- samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/**
9+
- samples/client/petstore/csharp/OpenAPIClient-httpclient/**
1010
# build C# API client (generichost)
11-
- samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/**
11+
- samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/**
1212
# build C# API client (netcore)
13-
- samples/client/petstore/csharp-netcore/OpenAPIClient/**
14-
- samples/client/petstore/csharp-netcore/OpenAPIClientCore/**
13+
- samples/client/petstore/csharp/OpenAPIClient/**
14+
- samples/client/petstore/csharp/OpenAPIClientCore/**
1515
# build C# API client (.net framework 4.7)
16-
- samples/client/petstore/csharp-netcore/OpenAPIClient-net47/**
16+
- samples/client/petstore/csharp/OpenAPIClient-net47/**
1717
# build C# API client (.net framework 4.8)
18-
- samples/client/petstore/csharp-netcore/OpenAPIClient-net48/**
18+
- samples/client/petstore/csharp/OpenAPIClient-net48/**
1919
# build C# API client (.net 5.0)
20-
- samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/**
20+
- samples/client/petstore/csharp/OpenAPIClient-net5.0/**
2121
# build C# API client (.net 5.0 with ConditionalSerialization)
22-
- samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/**
22+
- samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/**
2323
pull_request:
2424
paths:
2525
# build C# API client (multiple frameworks)
26-
- samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/**
26+
- samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/**
2727
# build C# API client (httpclient)
28-
- samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/**
28+
- samples/client/petstore/csharp/OpenAPIClient-httpclient/**
2929
# build C# API client (generichost)
30-
- samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/**
30+
- samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/**
3131
# build C# API client (netcore)
32-
- samples/client/petstore/csharp-netcore/OpenAPIClient/**
33-
- samples/client/petstore/csharp-netcore/OpenAPIClientCore/**
32+
- samples/client/petstore/csharp/OpenAPIClient/**
33+
- samples/client/petstore/csharp/OpenAPIClientCore/**
3434
# build C# API client (.net framework 4.7)
35-
- samples/client/petstore/csharp-netcore/OpenAPIClient-net47/**
35+
- samples/client/petstore/csharp/OpenAPIClient-net47/**
3636
# build C# API client (.net framework 4.8)
37-
- samples/client/petstore/csharp-netcore/OpenAPIClient-net48/**
37+
- samples/client/petstore/csharp/OpenAPIClient-net48/**
3838
# build C# API client (.net 5.0)
39-
- samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/**
39+
- samples/client/petstore/csharp/OpenAPIClient-net5.0/**
4040
# build C# API client (.net 5.0 with ConditionalSerialization)
41-
- samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/**
41+
- samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/**
4242
jobs:
4343
build:
4444
name: Build .Net clients
@@ -49,22 +49,22 @@ jobs:
4949
sample:
5050
# clients
5151
# build C# API client (multiple frameworks)
52-
- samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/
52+
- samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/
5353
# build C# API client (httpclient)
54-
- samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/
54+
- samples/client/petstore/csharp/OpenAPIClient-httpclient/
5555
# build C# API client (generichost)
56-
- samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/
56+
- samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/
5757
# build C# API client (netcore)
58-
- samples/client/petstore/csharp-netcore/OpenAPIClient/
59-
- samples/client/petstore/csharp-netcore/OpenAPIClientCore/
58+
- samples/client/petstore/csharp/OpenAPIClient/
59+
- samples/client/petstore/csharp/OpenAPIClientCore/
6060
# build C# API client (.net framework 4.7)
61-
- samples/client/petstore/csharp-netcore/OpenAPIClient-net47/
61+
- samples/client/petstore/csharp/OpenAPIClient-net47/
6262
# build C# API client (.net framework 4.8)
63-
- samples/client/petstore/csharp-netcore/OpenAPIClient-net48/
63+
- samples/client/petstore/csharp/OpenAPIClient-net48/
6464
# build C# API client (.net 5.0)
65-
- samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/
65+
- samples/client/petstore/csharp/OpenAPIClient-net5.0/
6666
# build C# API client (.net 5.0 with ConditionalSerialization)
67-
- samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/
67+
- samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/
6868
steps:
6969
- uses: actions/checkout@v3
7070
- uses: actions/setup-dotnet@v3.2.0

‎appveyor.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,41 +25,41 @@ build_script:
2525
## build C# aspnetcore 2.2 server
2626
#- dotnet build samples\server\petstore\aspnetcore\Org.OpenAPITools.sln
2727
## build C# API client (multiple frameworks)
28-
#- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClientCoreAndNet47\Org.OpenAPITools.sln
28+
#- dotnet build samples\client\petstore\csharp\OpenAPIClientCoreAndNet47\Org.OpenAPITools.sln
2929
## build C# API client (httpclient)
30-
#- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-httpclient\Org.OpenAPITools.sln
30+
#- dotnet build samples\client\petstore\csharp\OpenAPIClient-httpclient\Org.OpenAPITools.sln
3131
## build C# API client (generichost)
32-
#- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-generichost-netstandard2.0\Org.OpenAPITools.sln
32+
#- dotnet build samples\client\petstore\csharp\OpenAPIClient-generichost-netstandard2.0\Org.OpenAPITools.sln
3333
## build C# API client (netcore)
34-
#- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient\Org.OpenAPITools.sln
35-
#- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClientCore\Org.OpenAPITools.sln
34+
#- dotnet build samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln
35+
#- dotnet build samples\client\petstore\csharp\OpenAPIClientCore\Org.OpenAPITools.sln
3636
## build C# API client (.net framework 4.7)
37-
#- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net47\Org.OpenAPITools.sln
37+
#- dotnet build samples\client\petstore\csharp\OpenAPIClient-net47\Org.OpenAPITools.sln
3838
## build C# API client (.net framework 4.8)
39-
#- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net48\Org.OpenAPITools.sln
39+
#- dotnet build samples\client\petstore\csharp\OpenAPIClient-net48\Org.OpenAPITools.sln
4040
## build C# API client (.net 5.0)
41-
#- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net5.0\Org.OpenAPITools.sln
41+
#- dotnet build samples\client\petstore\csharp\OpenAPIClient-net5.0\Org.OpenAPITools.sln
4242
## build C# API client (.net 5.0 with ConditionalSerialization)
43-
#- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-ConditionalSerialization\Org.OpenAPITools.sln
43+
#- dotnet build samples\client\petstore\csharp\OpenAPIClient-ConditionalSerialization\Org.OpenAPITools.sln
4444

4545
test_script:
4646
# test c# API client (multiple frameworks)
47-
- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClientCoreAndNet47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
47+
- dotnet test samples\client\petstore\csharp\OpenAPIClientCoreAndNet47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
4848
# test c# API client (httpclient)
49-
- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-httpclient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
49+
- dotnet test samples\client\petstore\csharp\OpenAPIClient-httpclient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
5050
# test c# API client (generichost)
51-
- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-generichost-netstandard2.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
51+
- dotnet test samples\client\petstore\csharp\OpenAPIClient-generichost-netstandard2.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
5252
# test c# API client (netcore)
53-
- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
54-
#- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
53+
- dotnet test samples\client\petstore\csharp\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
54+
#- dotnet test samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
5555
# test C# API client (.net framework 4.7)
56-
- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-net47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
56+
- dotnet test samples\client\petstore\csharp\OpenAPIClient-net47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
5757
# test C# API client (.net framework 4.8)
58-
- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-net48\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
58+
- dotnet test samples\client\petstore\csharp\OpenAPIClient-net48\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
5959
# test C# API client (.net 5.0)
60-
- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-net5.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
60+
- dotnet test samples\client\petstore\csharp\OpenAPIClient-net5.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
6161
# test C# API Client using conditional-serialization
62-
- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-ConditionalSerialization\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
62+
- dotnet test samples\client\petstore\csharp\OpenAPIClient-ConditionalSerialization\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
6363

6464
### TODO: Execute all generators via powershell or other
6565
# generate all petstore clients

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# for csharp-netcore generichost
2-
generatorName: csharp-netcore
3-
outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf
1+
# for csharp generichost
2+
generatorName: csharp
3+
outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf
44
inputSpec: modules/openapi-generator/src/test/resources/3_0/allOf.yaml
55
library: generichost
6-
templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
6+
templateDir: modules/openapi-generator/src/main/resources/csharp
77
additionalProperties:
88
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
99
useCompareNetObjects: true

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# for csharp-netcore generichost
2-
generatorName: csharp-netcore
3-
outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf
1+
# for csharp generichost
2+
generatorName: csharp
3+
outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf
44
inputSpec: modules/openapi-generator/src/test/resources/3_0/anyOf.yaml
55
library: generichost
6-
templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
6+
templateDir: modules/openapi-generator/src/main/resources/csharp
77
additionalProperties:
88
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
99
useCompareNetObjects: true

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# for csharp-netcore generichost
2-
generatorName: csharp-netcore
3-
outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf
1+
# for csharp generichost
2+
generatorName: csharp
3+
outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf
44
inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf.yaml
55
library: generichost
6-
templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
6+
templateDir: modules/openapi-generator/src/main/resources/csharp
77
additionalProperties:
88
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
99
useCompareNetObjects: true

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# for csharp-netcore generichost
2-
generatorName: csharp-netcore
3-
outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt
1+
# for csharp generichost
2+
generatorName: csharp
3+
outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt
44
inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
55
library: generichost
6-
templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
6+
templateDir: modules/openapi-generator/src/main/resources/csharp
77
additionalProperties:
88
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
99
useCompareNetObjects: true

bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore5.0.yaml renamed to bin/configs/csharp-OpenAPIClient-generichost-netcore5.0.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# for csharp-netcore generichost
2-
generatorName: csharp-netcore
3-
outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0
1+
# for csharp generichost
2+
generatorName: csharp
3+
outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0
44
inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
55
library: generichost
6-
templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
6+
templateDir: modules/openapi-generator/src/main/resources/csharp
77
additionalProperties:
88
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
99
useCompareNetObjects: true

bin/configs/csharp-netcore-OpenAPIClient-generichost-netstandard2.0.yaml renamed to bin/configs/csharp-OpenAPIClient-generichost-netstandard2.0.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# for csharp-netcore generichost
2-
generatorName: csharp-netcore
3-
outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0
1+
# for csharp generichost
2+
generatorName: csharp
3+
outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0
44
inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
55
library: generichost
6-
templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
6+
templateDir: modules/openapi-generator/src/main/resources/csharp
77
additionalProperties:
88
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
99
useCompareNetObjects: true

0 commit comments

Comments
 (0)