Merge remote-tracking branch 'upstream/master' into httplib-server-codegen_4_improvements

Author: rva8kor

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

@@ -11,7 +11,7 @@ on:
       - samples/client/petstore/csharp/generichost/net4.8/**
 jobs:
   build:
-    name: Build .Net projects
+    name: Build .Net Framework projects
     runs-on: windows-latest
     strategy:
       fail-fast: false

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

@@ -15,7 +15,7 @@ on:
       - samples/client/petstore/csharp/unityWebRequest/standard2.0/**
 jobs:
   build:
-    name: Build .Net projects
+    name: Build .Net Standard projects
     runs-on: windows-latest
     strategy:
       fail-fast: false

.github/workflows/samples-dotnet10.yaml

@@ -0,0 +1,59 @@
+name: Samples C# .Net 10 Clients
+
+on:
+  push:
+    paths:
+      - samples/client/petstore/csharp/generichost/latest/**
+      - samples/client/petstore/csharp/generichost/net10/**
+      - samples/client/petstore/csharp/httpclient/net10/**
+      - samples/client/petstore/csharp/restsharp/net10/**
+      - samples/client/petstore/csharp/unityWebRequest/net10/**
+  pull_request:
+    paths:
+      - samples/client/petstore/csharp/generichost/latest/**
+      - samples/client/petstore/csharp/generichost/net10/**
+      - samples/client/petstore/csharp/httpclient/net10/**
+      - samples/client/petstore/csharp/restsharp/net10/**
+      - samples/client/petstore/csharp/unityWebRequest/net10/**
+jobs:
+  build:
+    name: Build .Net 10 projects
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - samples/client/petstore/csharp/generichost/latest/ComposedEnum
+          - samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf
+          - samples/client/petstore/csharp/generichost/latest/Tags
+          - samples/client/petstore/csharp/generichost/latest/HelloWorld
+          - samples/client/petstore/csharp/generichost/latest/OneOfList
+          - samples/client/petstore/csharp/generichost/net10/AllOf
+          - samples/client/petstore/csharp/generichost/net10/AnyOf
+          - samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare
+          - samples/client/petstore/csharp/generichost/net10/FormModels
+          # - samples/client/petstore/csharp/generichost/net10/ManualPetstoreTests
+          # - samples/client/petstore/csharp/generichost/net10/ManualSourceGenerationTests
+          - samples/client/petstore/csharp/generichost/net10/NullReferenceTypes
+          - samples/client/petstore/csharp/generichost/net10/OneOf
+          - samples/client/petstore/csharp/generichost/net10/Petstore
+          - samples/client/petstore/csharp/generichost/net10/SourceGeneration
+          - samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate
+          # restsharp
+          - samples/client/petstore/csharp/restsharp/net10/EnumMappings
+          # httpclient
+          - samples/client/petstore/csharp/httpclient/net10/Petstore
+          - samples/client/petstore/csharp/httpclient/net10/Petstore-nonPublicApi
+          # unity
+          # - samples/client/petstore/csharp/unityWebRequest/net10/Petstore
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-dotnet@v5.0.1
+        with:
+          dotnet-version: '10.x'
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: dotnet build Org.OpenAPITools.sln
+      - name: Test
+        working-directory: ${{ matrix.sample }}
+        run: dotnet test Org.OpenAPITools.sln

.github/workflows/samples-dotnet8.yaml

@@ -15,7 +15,7 @@ on:
       - samples/client/petstore/csharp/unityWebRequest/net8/**
 jobs:
   build:
-    name: Build .Net projects
+    name: Build .Net 8 projects
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

.github/workflows/samples-dotnet9.yaml

@@ -3,31 +3,24 @@ name: Samples C# .Net 9 Clients
 on:
   push:
     paths:
-      - samples/client/petstore/csharp/generichost/latest/**
       - samples/client/petstore/csharp/generichost/net9/**
       - samples/client/petstore/csharp/httpclient/net9/**
       - samples/client/petstore/csharp/restsharp/net9/**
       - samples/client/petstore/csharp/unityWebRequest/net9/**
   pull_request:
     paths:
-      - samples/client/petstore/csharp/generichost/latest/**
       - samples/client/petstore/csharp/generichost/net9/**
       - samples/client/petstore/csharp/httpclient/net9/**
       - samples/client/petstore/csharp/restsharp/net9/**
       - samples/client/petstore/csharp/unityWebRequest/net9/**
 jobs:
   build:
-    name: Build .Net projects
+    name: Build .Net 9 projects
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         sample:
-          - samples/client/petstore/csharp/generichost/latest/ComposedEnum
-          - samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf
-          - samples/client/petstore/csharp/generichost/latest/Tags
-          - samples/client/petstore/csharp/generichost/latest/HelloWorld
-          - samples/client/petstore/csharp/generichost/latest/OneOfList
           - samples/client/petstore/csharp/generichost/net9/AllOf
           - samples/client/petstore/csharp/generichost/net9/AnyOf
           - samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare
@@ -50,7 +43,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-dotnet@v5.0.1
         with:
-          dotnet-version: '9.0.101'
+          dotnet-version: '9.0.x'
       - name: Build
         working-directory: ${{ matrix.sample }}
         run: dotnet build Org.OpenAPITools.sln

README.md

@@ -15,7 +15,7 @@
 
 <div align="center">
 
-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`7.18.0`):
+[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`7.19.0`):
 [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
 [![Bitrise](https://img.shields.io/bitrise/4a2b10a819d12b67/master?label=bitrise%3A%20Swift+4,5&token=859FMDR8QHwabCzwvZK6vQ)](https://app.bitrise.io/app/4a2b10a819d12b67)
 
@@ -148,8 +148,8 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 
 | OpenAPI Generator Version                                                                                                                                 | Release Date | Notes                                             |
 | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- |
-| 7.18.0 (upcoming minor release) [SNAPSHOT](https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-to-test-with-the-latest-master-of-openapi-generator) | 10.12.2025   | Minor release with breaking changes (with fallback) |
-| [7.17.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.17.0) (latest stable release)                                                    | 29.10.2025   | Minor release with breaking changes (with fallback) |
+| 7.19.0 (upcoming minor release) [SNAPSHOT](https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-to-test-with-the-latest-master-of-openapi-generator) | 22.01.2026   | Minor release with breaking changes (with fallback) |
+| [7.18.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.18.0) (latest stable release)                                                    | 22.12.2025   | Minor release with breaking changes (with fallback) |
 | [6.6.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.6.0)                                                    | 11.05.2023   | Minor release with breaking changes (with fallback) |
 | [5.4.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.4.0)                                                    | 31.01.2022   | Minor release with breaking changes (with fallback) |
 | [4.3.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.3.1)                                                    | 06.05.2020   | Patch release (enhancements, bug fixes, etc)                       |
@@ -212,16 +212,16 @@ See the different versions of the [openapi-generator-cli](https://search.maven.o
 <!-- RELEASE_VERSION -->
 If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 11 runtime at a minimum):
 
-JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.17.0/openapi-generator-cli-7.17.0.jar`
+JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.18.0/openapi-generator-cli-7.18.0.jar`
 
 For **Mac/Linux** users:
 ```sh
-wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.17.0/openapi-generator-cli-7.17.0.jar -O openapi-generator-cli.jar
+wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.18.0/openapi-generator-cli-7.18.0.jar -O openapi-generator-cli.jar
 ```
 
 For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g.
 ```
-Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.17.0/openapi-generator-cli-7.17.0.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.18.0/openapi-generator-cli-7.18.0.jar
 ```
 
 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -456,7 +456,7 @@ openapi-generator-cli version
 To use a specific version of "openapi-generator-cli"
 
 ```sh
-openapi-generator-cli version-manager set 7.17.0
+openapi-generator-cli version-manager set 7.18.0
 ```
 
 Or install it as dev-dependency:
@@ -480,7 +480,7 @@ pip install openapi-generator-cli
 
 To install a specific version
 ```
-pip install openapi-generator-cli==7.17.0
+pip install openapi-generator-cli==7.18.0
 ```
 
 You can also install with [jdk4py](https://github.com/activeviam/jdk4py) instead of java binary. (python>=3.10 is required)
@@ -506,7 +506,7 @@ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generat
 (if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g php -o c:\temp\php_api_client`)
 
 <!-- RELEASE_VERSION -->
-You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.17.0/openapi-generator-cli-7.17.0.jar)
+You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.18.0/openapi-generator-cli-7.18.0.jar)
 <!-- /RELEASE_VERSION -->
 
 To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate`

bin/configs/csharp-generichost-net10-allOf.yaml

@@ -0,0 +1,14 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/generichost/net10/AllOf
+inputSpec: modules/openapi-generator/src/test/resources/3_0/allOf.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  nullableReferenceTypes: true
+  equatable: true
+  targetFramework: net10.0
+  modelPropertySorting: alphabetical
+  operationParameterSorting: alphabetical

bin/configs/csharp-generichost-net10-anyOf.yaml

@@ -0,0 +1,14 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/generichost/net10/AnyOf
+inputSpec: modules/openapi-generator/src/test/resources/3_0/anyOf.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  nullableReferenceTypes: true
+  equatable: true
+  targetFramework: net10.0
+  modelPropertySorting: alphabetical
+  operationParameterSorting: alphabetical

bin/configs/csharp-generichost-net10-anyOfNoCompare.yaml

@@ -0,0 +1,14 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare
+inputSpec: modules/openapi-generator/src/test/resources/3_0/anyOf.yaml
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: false
+  disallowAdditionalPropertiesIfNotPresent: false
+  nullableReferenceTypes: true
+  equatable: true
+  targetFramework: net10.0
+  modelPropertySorting: alphabetical
+  operationParameterSorting: alphabetical

bin/configs/csharp-generichost-net10-formModels.yaml

@@ -0,0 +1,17 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/generichost/net10/FormModels
+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
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  useCompareNetObjects: true 
+  disallowAdditionalPropertiesIfNotPresent: false
+  nullableReferenceTypes: false
+  equatable: true
+  targetFramework: net10.0
+  skipFormModel: false
+  modelPropertySorting: alphabetical
+  operationParameterSorting: alphabetical
+inlineSchemaOptions:
+  RESOLVE_INLINE_ENUMS: true