Merge branch 'master' into feature/javaOneOfDeduction

# Conflicts:
#	modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
#	modules/openapi-generator/src/main/resources/JavaSpring/oneof_interface.mustache

Author: jpfinne

.devcontainer/devcontainer.json

@@ -11,10 +11,9 @@
     },
     "ghcr.io/devcontainers/features/rust:1": {},
     "ghcr.io/snebjorn/devcontainer-feature/chromium:latest": {},
-    "docker-in-docker": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {
       "version": "latest",
-      "moby": true,
-      "dockerDashComposeVersion": "v1"
+      "moby": true
     }
   },
   // Configure tool-specific properties.

.github/CODEOWNERS

@@ -28,3 +28,7 @@ modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @martindelille
 samples/client/petstore/cpp-qt/**/* @martindelille
 modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @muttleyxd
 samples/client/petstore/cpp-qt/**/* @muttleyxd
+
+# cpp-rest-client technical committee
+modules/openapi-generator/src/main/resources/cpp-rest-client/**/* @aminya
+samples/client/petstore/cpp-restsdk/**/* @aminya

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,7 +10,7 @@ assignees: ''
 #### Bug Report Checklist
 
 - [ ] Have you provided a full/minimal spec to reproduce the issue?
-- [ ] Have you validated the input using an OpenAPI validator ([example](https://apitools.dev/swagger-parser/online/))?
+- [ ] Have you validated the input using an OpenAPI validator?
 - [ ] Have you [tested with the latest master](https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-to-test-with-the-latest-master-of-openapi-generator) to confirm the issue still exists?
 - [ ] Have you searched for related issues/PRs?
 - [ ] What's the actual output vs expected output?

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,7 +11,7 @@
   ./bin/generate-samples.sh ./bin/configs/*.yaml || exit
   ./bin/utils/export_docs_generators.sh || exit
   ``` 
-  (For Windows users, please run the script in [Git BASH](https://gitforwindows.org/))
+  (For Windows users, please run the script in [WSL](https://learn.microsoft.com/en-us/windows/wsl/install))
   Commit all changed files. 
   This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit as it would merge with master. 
   These must match the expectations made by your contribution. 

.github/workflows/openapi-generator.yaml

@@ -142,7 +142,9 @@ jobs:
           path: modules/openapi-generator-cli/target
       - name: Delete samples that are entirely generated
         run: |
+          rm -rf samples/client/petstore/csharp/generichost/latest/HelloWorld
           rm -rf samples/client/petstore/csharp/generichost/latest/Tags
+          rm -rf samples/client/petstore/csharp/generichost/latest/OneOfList
 
           rm -rf samples/client/petstore/csharp/generichost/net8/AllOf
           rm -rf samples/client/petstore/csharp/generichost/net8/AnyOf

.github/workflows/samples-aspnet-fastenpoints-server.yaml

@@ -26,7 +26,7 @@ jobs:
           - samples/server/petstore/aspnet/fastendpoints-useValidators
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.0
+      - uses: actions/setup-dotnet@v4.3.1
         with:
           dotnet-version: '8.0.x'
       - name: Build

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

@@ -28,7 +28,7 @@ jobs:
           # - samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.0
+      - uses: actions/setup-dotnet@v4.3.1
         with:
           dotnet-version: 3.1.*
       - name: Build

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

@@ -25,7 +25,7 @@ jobs:
           - samples/server/petstore/aspnetcore-6.0-useSwashBuckle
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.0
+      - uses: actions/setup-dotnet@v4.3.1
         with:
           dotnet-version: '6.0.x'
       - name: Build

.github/workflows/samples-dotnet8-client-echo-api.yaml

@@ -19,7 +19,7 @@ jobs:
           - samples/client/echo_api/csharp/restsharp/net8/EchoApi
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.0
+      - uses: actions/setup-dotnet@v4.3.1
         with:
           dotnet-version: '8.0.x'
       - name: Run echo server

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

@@ -19,7 +19,7 @@ jobs:
           - samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.0
+      - uses: actions/setup-dotnet@v4.3.1
         with:
           dotnet-version: '8.0.x'
       - name: Build