Merge branch 'OpenAPITools:master' into csharp-type-declaration-for-deep-inline-aliases

Author: Mattias-Sehlstedt

.github/workflows/linux.yaml

@@ -92,7 +92,7 @@ jobs:
           java-version: 11
           maven-version: 3.8.8
       - name: Download build artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: artifact
       - name: Run Ensures Script

.github/workflows/openapi-generator.yaml

@@ -97,7 +97,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target
@@ -136,7 +136,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target

.github/workflows/samples-cpp-oatpp-client.yaml

@@ -0,0 +1,30 @@
+name: Samples cpp oat++ client
+
+on:
+  push:
+    branches:
+      - "samples/client/petstore/cpp-oatpp/**"
+  pull_request:
+    paths:
+      - "samples/client/petstore/cpp-oatpp/**"
+
+env:
+  GRADLE_VERSION: 6.9
+
+jobs:
+  build:
+    name: Build cpp oat++ client
+    strategy:
+      matrix:
+        sample:
+          - samples/client/petstore/cpp-oatpp
+        os:
+          - ubuntu-latest
+          - macOS-latest
+          - windows-latest
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: cmake -B build && cmake --build build --verbose

.github/workflows/samples-cpp-oatpp-server.yaml

@@ -13,7 +13,7 @@ env:
 
 jobs:
   build:
-    name: Build cpp qt client
+    name: Build cpp oat++ server
     strategy:
       matrix:
         sample:

.github/workflows/samples-dotnet9.yaml

@@ -23,6 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         sample:
+          - samples/client/petstore/csharp/generichost/latest/ComposedEnum
           - samples/client/petstore/csharp/generichost/latest/Tags
           - samples/client/petstore/csharp/generichost/latest/HelloWorld
           - samples/client/petstore/csharp/generichost/latest/OneOfList

.gitignore

@@ -92,6 +92,12 @@ samples/client/petstore/cpp-restsdk/client/cmake_install.cmake
 samples/client/petstore/cpp-restsdk/client/CppRestPetstoreClientConfig.cmake
 samples/client/petstore/cpp-restsdk/client/CMakeCache.txt
 
+# cpp-oatpp
+samples/client/petstore/cpp-oatpp/build
+samples/client/petstore/cpp-oatpp/external
+samples/server/petstore/cpp-oatpp/build
+samples/server/petstore/cpp-oatpp/external
+
 #Java/Android
 **/.gradle
 samples/client/petstore/java/hello.txt

README.md

@@ -1025,6 +1025,7 @@ Here is a list of template creators:
    * Apex: @asnelling
    * Bash: @bkryza
    * C: @PowerOfCreation @zhemant [:heart:](https://www.patreon.com/zhemant)
+   * C++ Oat++: @Kraust
    * C++ REST: @Danielku15
    * C++ Tiny: @AndersSpringborg @kaareHH @michelealbano @mkakbas
    * C++ UE4: @Kahncode

appveyor.yml

@@ -43,6 +43,7 @@ build_script:
   #- dotnet build samples\client\petstore\csharp\OpenAPIClient-ConditionalSerialization\Org.OpenAPITools.sln
 
 test_script:
+  - dotnet test samples\client\petstore\csharp\generichost\latest\ComposedEnum\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   - dotnet test samples\client\petstore\csharp\generichost\latest\Tags\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   - dotnet test samples\client\petstore\csharp\generichost\latest\HelloWorld\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   - dotnet test samples\client\petstore\csharp\generichost\latest\OneOfList\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj

bin/configs/cpp-oatpp-client.yaml

@@ -0,0 +1,6 @@
+generatorName: cpp-oatpp-client
+outputDir: samples/client/petstore/cpp-oatpp
+inputSpec: modules/openapi-generator/src/test/resources/3_0/cpp-oatpp-client/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/cpp-oatpp-client
+additionalProperties:
+  addExternalLibs: "true"

bin/configs/csharp-generichost-latest-composedEnum.yaml

@@ -0,0 +1,10 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/generichost/latest/ComposedEnum
+inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/composed-enum.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  modelPropertySorting: alphabetical
+  operationParameterSorting: alphabetical
+validateSpec: false