Skip to content

Commit 8fb89ae

Browse files
jpfinnejpfinne
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # pom.xml
2 parents b3ea3d8 + 1586c69 commit 8fb89ae

9,660 files changed

Lines changed: 548169 additions & 27176 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.

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"ghcr.io/devcontainers/features/node:1": {
1010
"version": "lts"
1111
},
12+
"ghcr.io/devcontainers/features/rust:1": {},
1213
"ghcr.io/snebjorn/devcontainer-feature/chromium:latest": {},
1314
"docker-in-docker": {
1415
"version": "latest",

‎.github/workflows/linux.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
${{ runner.os }}-gradle-
4646
4747
- name: Setup Maven
48-
uses: s4u/setup-maven-action@v1.11.0
48+
uses: s4u/setup-maven-action@v1.12.0
4949
with:
5050
java-version: ${{ matrix.java }}
5151
maven-version: 3.8.8
@@ -87,7 +87,7 @@ jobs:
8787
- name: Check out code
8888
uses: actions/checkout@v4
8989
- name: Setup Maven
90-
uses: s4u/setup-maven-action@v1.11.0
90+
uses: s4u/setup-maven-action@v1.12.0
9191
with:
9292
java-version: 11
9393
maven-version: 3.8.8

‎.github/workflows/samples-c-libcurl-client.yaml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,31 @@ on:
44
push:
55
paths:
66
- 'samples/client/petstore/c/**'
7+
- 'samples/client/petstore/c-useJsonUnformatted/**'
78
pull_request:
89
paths:
910
- 'samples/client/petstore/c/**'
11+
- 'samples/client/petstore/c-useJsonUnformatted/**'
1012

1113
jobs:
1214
build:
1315
name: Build c libcurl client
1416
runs-on: ubuntu-latest
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
sample:
21+
- 'samples/client/petstore/c/'
22+
- 'samples/client/petstore/c-useJsonUnformatted/'
23+
1524
steps:
1625
- uses: actions/checkout@v4
1726
- name: Prepare
1827
run: |
1928
sudo apt-get update
2029
sudo apt-get install -y libssl-dev libcurl4-openssl-dev
2130
- name: Build
22-
working-directory: "samples/client/petstore/c"
31+
working-directory: ${{ matrix.sample }}
2332
run: |
2433
mkdir build
2534
cd build

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

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
1-
name: Samples C# .Net Standard
1+
name: Samples C# .Net Standard Client
22

33
on:
44
push:
55
paths:
6-
- 'samples/client/petstore/csharp/**netstandard**/'
6+
# build C# API client (netstandard)
7+
- samples/client/petstore/csharp/OpenAPIClient/**
8+
- samples/client/petstore/csharp/*netstandard*/**
9+
# build C# API client (netstandard with ConditionalSerialization)
10+
- samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/**
11+
# build C# API client (netstandard httpclient)
12+
- samples/client/petstore/csharp/OpenAPIClient-httpclient/**
713
pull_request:
814
paths:
9-
- 'samples/client/petstore/csharp/**netstandard**/'
15+
# build C# API client (netstandard)
16+
- samples/client/petstore/csharp/OpenAPIClient/**
17+
- samples/client/petstore/csharp/*netstandard*/**
18+
# build C# API client (netstandard with ConditionalSerialization)
19+
- samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/**
20+
# build C# API client (netstandard httpclient)
21+
- samples/client/petstore/csharp/OpenAPIClient-httpclient/**
1022
jobs:
1123
build:
1224
name: Build .Net projects
@@ -15,8 +27,13 @@ jobs:
1527
fail-fast: false
1628
matrix:
1729
sample:
18-
# clients
19-
- samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0
30+
# build C# API client (netstandard)
31+
- samples/client/petstore/csharp/OpenAPIClient/
32+
- samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/
33+
# build C# API client (netstandard with ConditionalSerialization)
34+
- samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/
35+
# build C# API client (netstandard httpclient)
36+
- samples/client/petstore/csharp/OpenAPIClient-httpclient/
2037
steps:
2138
- uses: actions/checkout@v4
2239
- uses: actions/setup-dotnet@v4.0.0
@@ -25,6 +42,8 @@ jobs:
2542
- name: Build
2643
working-directory: ${{ matrix.sample }}
2744
run: dotnet build Org.OpenAPITools.sln
28-
- name: Test
29-
working-directory: ${{ matrix.sample }}
30-
run: dotnet test Org.OpenAPITools.sln
45+
# skip tests as petstore server it not running
46+
# these tests are run in appveyor instead
47+
#- name: Test
48+
# working-directory: ${{ matrix.sample }}
49+
# run: dotnet test Org.OpenAPITools.sln

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

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,18 @@
1-
name: Samples C# .Net 7
1+
name: Samples C# .Net 8 Clients
22

33
on:
44
push:
55
paths:
6-
- 'samples/client/petstore/csharp/**net6.0**/'
7-
- 'samples/client/petstore/csharp/**net7.0**/'
8-
- 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/'
9-
- 'samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**'
10-
- 'samples/server/petstore/aspnetcore-6.0/**'
11-
- 'samples/server/petstore/aspnetcore-6.0-pocoModels/**'
12-
- 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**'
6+
- samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**
7+
- samples/client/petstore/csharp/*net6.0*/**
8+
- samples/client/petstore/csharp/*net7.0*/**
9+
- samples/client/petstore/csharp/OpenAPIClient-*latest*/**
1310
pull_request:
1411
paths:
15-
- 'samples/client/petstore/csharp/**net6.0**/'
16-
- 'samples/client/petstore/csharp/**net7.0**/'
17-
- 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/'
18-
- 'samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**'
19-
- 'samples/server/petstore/aspnetcore-6.0/**'
20-
- 'samples/server/petstore/aspnetcore-6.0-pocoModels/**'
21-
- 'samples/server/petstore/aspnetcore-6.0-project4Models/**'
22-
- 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**'
23-
- 'samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/**'
24-
- 'samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/**'
12+
- samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**
13+
- samples/client/petstore/csharp/*net6.0*/**
14+
- samples/client/petstore/csharp/*net7.0*/**
15+
- samples/client/petstore/csharp/OpenAPIClient-*latest*/**
2516
jobs:
2617
build:
2718
name: Build .Net projects
@@ -31,20 +22,15 @@ jobs:
3122
matrix:
3223
sample:
3324
# clients
25+
- samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests
3426
- samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0
3527
- samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt
28+
- samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration
29+
- samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate
3630
- samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf
37-
- samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf
3831
- samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf
39-
- samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests
40-
- samples/client/petstore/csharp/OpenAPIClient-generichost-net7.0-useDateTimeForDate
32+
- samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf
4133
- samples/client/petstore/csharp/OpenAPIClient-net7.0-useDateTimeForDate
42-
- samples/server/petstore/aspnetcore-6.0
43-
- samples/server/petstore/aspnetcore-6.0-pocoModels
44-
- samples/server/petstore/aspnetcore-6.0-project4Models
45-
- samples/server/petstore/aspnetcore-6.0-useSwashBuckle
46-
- samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse
47-
- samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes
4834
steps:
4935
- uses: actions/checkout@v4
5036
- uses: actions/setup-dotnet@v4.0.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Samples C# .Net 6
1+
name: Samples C# .Net 6 Client Echo API
22

33
on:
44
push:

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

Lines changed: 10 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,30 @@
1-
name: Samples C# .Net 6
1+
name: Samples C# .Net 6 Client
22

33
on:
44
push:
55
paths:
6-
# build C# API client (multiple frameworks)
7-
- samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/**
86
# build C# API client (httpclient)
97
- samples/client/petstore/csharp/OpenAPIClient-httpclient/**
10-
# build C# API client (generichost)
11-
- samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/**
12-
# build C# API client (netcore)
13-
- samples/client/petstore/csharp/OpenAPIClient/**
14-
- samples/client/petstore/csharp/OpenAPIClientCore/**
158
# build C# API client (.net framework 4.7)
169
- samples/client/petstore/csharp/OpenAPIClient-net47/**
1710
# build C# API client (.net framework 4.8)
1811
- samples/client/petstore/csharp/OpenAPIClient-net48/**
19-
# build C# API client (.net 5.0)
20-
- samples/client/petstore/csharp/OpenAPIClient-net5.0/**
21-
# build C# API client (.net 5.0 with ConditionalSerialization)
22-
- samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/**
2312
# build C# API client (property, parameter name mappings)
24-
- samples/client/petstore/csharp-restsharp-name-parameter-mappings/**
25-
pull_request:
26-
paths:
13+
- samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/**
2714
# build C# API client (multiple frameworks)
2815
- samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/**
16+
pull_request:
17+
paths:
2918
# build C# API client (httpclient)
3019
- samples/client/petstore/csharp/OpenAPIClient-httpclient/**
31-
# build C# API client (generichost)
32-
- samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/**
33-
# build C# API client (netcore)
34-
- samples/client/petstore/csharp/OpenAPIClient/**
35-
- samples/client/petstore/csharp/OpenAPIClientCore/**
3620
# build C# API client (.net framework 4.7)
3721
- samples/client/petstore/csharp/OpenAPIClient-net47/**
3822
# build C# API client (.net framework 4.8)
3923
- samples/client/petstore/csharp/OpenAPIClient-net48/**
40-
# build C# API client (.net 5.0)
41-
- samples/client/petstore/csharp/OpenAPIClient-net5.0/**
42-
# build C# API client (.net 5.0 with ConditionalSerialization)
43-
- samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/**
4424
# build C# API client (property, parameter name mappings)
45-
- samples/client/petstore/csharp-restsharp-name-parameter-mappings/**
25+
- samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/**
26+
# build C# API client (multiple frameworks)
27+
- samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/**
4628
jobs:
4729
build:
4830
name: Build .Net clients
@@ -51,26 +33,16 @@ jobs:
5133
fail-fast: false
5234
matrix:
5335
sample:
54-
# clients
55-
# build C# API client (multiple frameworks)
56-
- samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/
5736
# build C# API client (httpclient)
5837
- samples/client/petstore/csharp/OpenAPIClient-httpclient/
59-
# build C# API client (generichost)
60-
- samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/
61-
# build C# API client (netcore)
62-
- samples/client/petstore/csharp/OpenAPIClient/
63-
- samples/client/petstore/csharp/OpenAPIClientCore/
6438
# build C# API client (.net framework 4.7)
6539
- samples/client/petstore/csharp/OpenAPIClient-net47/
6640
# build C# API client (.net framework 4.8)
6741
- samples/client/petstore/csharp/OpenAPIClient-net48/
68-
# build C# API client (.net 5.0)
69-
- samples/client/petstore/csharp/OpenAPIClient-net5.0/
70-
# build C# API client (.net 5.0 with ConditionalSerialization)
71-
- samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/
7242
# build C# API client (property, parameter name mappings)
73-
- samples/client/petstore/csharp-restsharp-name-parameter-mappings
43+
- samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/
44+
# build C# API client (multiple frameworks)
45+
- samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/
7446
steps:
7547
- uses: actions/checkout@v4
7648
- uses: actions/setup-dotnet@v4.0.0

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

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,28 @@
1-
name: Samples C# .Net 6
1+
name: Samples C# .Net 6 Server
22

33
on:
44
push:
55
paths:
6-
- 'samples/server/petstore/aspnetcore-6.0/**'
7-
- 'samples/server/petstore/aspnetcore-6.0-pocoModels/**'
8-
- 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**'
6+
- samples/server/petstore/aspnetcore-6.0/**
7+
- samples/server/petstore/aspnetcore-6.0-*/**
98
pull_request:
109
paths:
11-
- 'samples/server/petstore/aspnetcore-6.0/**'
12-
- 'samples/server/petstore/aspnetcore-6.0-pocoModels/**'
13-
- 'samples/server/petstore/aspnetcore-6.0-project4Models/**'
14-
- 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**'
15-
- 'samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/**'
16-
- 'samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/**'
10+
- samples/server/petstore/aspnetcore-6.0/**
11+
- samples/server/petstore/aspnetcore-6.0-*/**
1712
jobs:
1813
build:
19-
name: Build .Net servers
14+
name: Build .Net 6 servers
2015
runs-on: ubuntu-latest
2116
strategy:
2217
fail-fast: false
2318
matrix:
2419
sample:
2520
- samples/server/petstore/aspnetcore-6.0
21+
- samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse
22+
- samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes
2623
- samples/server/petstore/aspnetcore-6.0-pocoModels
2724
- samples/server/petstore/aspnetcore-6.0-project4Models
2825
- samples/server/petstore/aspnetcore-6.0-useSwashBuckle
29-
- samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse
30-
- samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes
3126
steps:
3227
- uses: actions/checkout@v4
3328
- uses: actions/setup-dotnet@v4.0.0

‎.github/workflows/samples-go-gin.yaml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Samples Go
2+
3+
on:
4+
push:
5+
paths:
6+
- 'samples/server/petstore/go-gin-api-server/**'
7+
- 'samples/server/petstore/go-gin-api-server-interface-only/**'
8+
pull_request:
9+
paths:
10+
- 'samples/server/petstore/go-gin-api-server/**'
11+
- 'samples/server/petstore/go-gin-api-server-interface-only/**'
12+
13+
jobs:
14+
build:
15+
name: Build Go
16+
runs-on: ubuntu-latest
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
sample:
21+
- samples/server/petstore/go-gin-api-server/
22+
- samples/server/petstore/go-gin-api-server-interface-only/
23+
steps:
24+
- uses: actions/checkout@v4
25+
- uses: actions/setup-go@v5
26+
with:
27+
go-version: "stable"
28+
- run: go version
29+
- name: Run test
30+
working-directory: ${{ matrix.sample }}
31+
run: go test -mod=mod -v

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
~/.gradle
3636
key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
3737
- name: Install Gradle wrapper
38-
uses: eskatos/gradle-command-action@v2
38+
uses: eskatos/gradle-command-action@v3
3939
with:
4040
gradle-version: ${{ env.GRADLE_VERSION }}
4141
build-root-directory: ${{ matrix.sample }}

0 commit comments

Comments
 (0)