resolve conflicts

Author: ranger-ross

.github/workflows/openapi-generator.yaml

@@ -142,6 +142,7 @@ 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/net8/AllOf

.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

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

@@ -26,7 +26,7 @@ jobs:
           - samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management
     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-dotnet8.yaml

@@ -34,7 +34,7 @@ jobs:
           - samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
     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-dotnet9.yaml

@@ -24,6 +24,7 @@ jobs:
       matrix:
         sample:
           - samples/client/petstore/csharp/generichost/latest/Tags
+          - samples/client/petstore/csharp/generichost/latest/HelloWorld
           - samples/client/petstore/csharp/generichost/net9/AllOf
           - samples/client/petstore/csharp/generichost/net9/AnyOf
           - samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare
@@ -43,7 +44,7 @@ jobs:
           #- samples/client/petstore/csharp/unityWebRequest/net9/Petstore
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.3.0
+      - uses: actions/setup-dotnet@v4.3.1
         with:
           dotnet-version: '9.0.101'
       - name: Build

.github/workflows/samples-java-client-jdk11.yaml

@@ -61,6 +61,8 @@ jobs:
           - samples/client/petstore/java/webclient-swagger2
           - samples/client/petstore/java/webclient-useSingleRequestParameter
           - samples/client/petstore/java/vertx
+          - samples/client/petstore/java/vertx-no-nullable
+          - samples/client/petstore/java/vertx-supportVertxFuture
           - samples/client/petstore/java/jersey2-java8-localdatetime
           - samples/client/petstore/java/google-api-client
           - samples/client/petstore/java/rest-assured
@@ -74,6 +76,7 @@ jobs:
           - samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter
           - samples/client/petstore/java/apache-httpclient
           - samples/client/petstore/java/feign
+          - samples/client/petstore/java/feign-hc5
           - samples/client/petstore/java/feign-no-nullable
           - samples/client/petstore/java/okhttp-gson-awsv4signature
           - samples/openapi3/client/petstore/java/jersey2-java8-special-characters