Merge pull request #1716 from SteeltoeOSS/merge-tag-420-into-4x

Merge tag 4.2.0 into 4.x (retry)

Author: bart-vmware

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2025.2.0",
+      "version": "2026.1.2",
       "commands": [
         "jb"
       ],

.editorconfig

@@ -159,6 +159,3 @@ dotnet_diagnostic.IDE0270.severity = silent
 
 # JSON002: Probable JSON string detected
 dotnet_diagnostic.JSON002.severity = silent
-
-# CA1848: Use the LoggerMessage delegates (depends on https://github.com/SteeltoeOSS/Steeltoe/issues/969)
-dotnet_diagnostic.CA1848.severity = silent

.github/ISSUE_TEMPLATE/question.md

@@ -1,6 +1,6 @@
 ---
 name: Question
-about: Select if you have a question or feedback - Also check out slack.steeltoe.io for assistance.
+about: Select if you have a question or feedback - Also check out https://github.com/SteeltoeOSS/Steeltoe/discussions for assistance.
 title: "[QUESTION] "
 labels: Type/question
 assignees: ''

.github/workflows/Steeltoe.All.yml

@@ -17,17 +17,18 @@ permissions:
   pull-requests: write
 
 env:
+  STEELTOE_MACOS_DIAGNOSE_HOSTNAME_LOOKUP: true
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   DOTNET_NOLOGO: true
-  SOLUTION_FILE: 'src/Steeltoe.All.sln'
+  SOLUTION_FILE: 'src/Steeltoe.All.slnx'
   COMMON_TEST_ARGS: >-
-    --no-build --configuration Release --collect "XPlat Code Coverage" --logger trx --results-directory ${{ github.workspace }}/dumps
-    --settings coverlet.runsettings --blame-crash --blame-hang-timeout 3m
+    --no-build --configuration Release --collect "XPlat Code Coverage" --logger trx --results-directory ${{ github.workspace }}/TestOutput
+    --settings coverlet.runsettings --blame-crash --blame-hang-timeout 1m
 
 jobs:
-  analyze:
+  build:
     name: Build and Test
-    timeout-minutes: 30
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
@@ -36,11 +37,10 @@ jobs:
         - os: ubuntu-latest
           runDockerContainers: true
         - os: windows-latest
-          skipFilter: Category!=Integration
+          skipIntegrationTests: true
         - os: macos-latest
-          skipFilter: Category!=Integration&Category!=SkipOnMacOS
+          skipIntegrationTests: true
     runs-on: ${{ matrix.os }}
-    continue-on-error: true
 
     services:
       eurekaServer:
@@ -54,16 +54,24 @@ jobs:
           eureka.client.serviceUrl.defaultZone: http://eurekaServer:8761/eureka
           eureka.instance.hostname: localhost
           eureka.instance.instanceId: localhost:configServer:8888
+          encrypt.keyStore.location: file:///workspace/server.jks
+          encrypt.keyStore.password: letmein
+          encrypt.keyStore.alias: mytestkey
+          encrypt.rsa.algorithm: OAEP
+          encrypt.rsa.salt: deadbeef
+          encrypt.rsa.strong: "false"
+        options: --name steeltoe-config
         ports:
         - 8888:8888
 
     steps:
     - name: Setup .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
         dotnet-version: |
           8.0.*
           9.0.*
+          10.0.*
 
     - name: Turn off dev certificate (macOS only)
       if: ${{ matrix.os == 'macos-latest' }}
@@ -73,52 +81,51 @@ jobs:
       #   When that happens, select 'Always Allow' to grant 'dotnet' access to the certificate key in the future.
       # and the test run fails, but without indicating which test caused it. By setting this, the causing test fails with the next message:
       #   Unable to configure HTTPS endpoint. No server certificate was specified, and the default developer certificate could not be found or is out of date.
-      # To prevent the causing test from failing the test run, disable it on macOS by adding [Trait("Category", "SkipOnMacOS")].
+      # To prevent the causing test from failing the test run, disable it on macOS using FactSkippedOnPlatform/TheorySkippedOnPlatform.
       shell: bash
       run: echo "DOTNET_GENERATE_ASPNET_CERTIFICATE=false" >> $GITHUB_ENV
 
     - name: Git checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         persist-credentials: false
 
-    - name: Restore packages
-      run: dotnet restore ${{ env.SOLUTION_FILE }} /p:Configuration=Release --verbosity minimal
-
-    - name: Build solution
-      run: dotnet build ${{ env.SOLUTION_FILE }} --no-restore --configuration Release --verbosity minimal
-
-    - name: Set skip filters for tests
+    - name: Provide jks file for Config Server container
+      if: ${{ matrix.runDockerContainers }}
+      # The Config Server container starts before checkout, when server.jks is not yet available.
+      # Copy it into the container now and restart so Config Server can pick up the keystore.
       shell: bash
       run: |
-        echo SKIP_FILTER_NO_MEMORY_DUMPS="${{ matrix.skipFilter && format('{0}&Category!=MemoryDumps', matrix.skipFilter) || 'Category!=MemoryDumps' }}" >> $GITHUB_ENV
-        echo SKIP_FILTER_WITH_MEMORY_DUMPS="${{ matrix.skipFilter && format('{0}&Category=MemoryDumps', matrix.skipFilter) || 'Category=MemoryDumps' }}" >> $GITHUB_ENV
+        docker cp src/Configuration/test/Encryption.Test/Cryptography/server.jks steeltoe-config:/workspace/server.jks
+        docker restart steeltoe-config
 
-    - name: Test (net8.0)
-      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net8.0 --filter "${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }}" ${{ env.COMMON_TEST_ARGS }}
+    - name: Restore packages
+      run: dotnet restore ${{ env.SOLUTION_FILE }} /p:Configuration=Release /p:NuGetAudit=false --verbosity minimal
 
-    - name: Test (net8.0) (memory dumps)
-      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net8.0 --filter "${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }}" ${{ env.COMMON_TEST_ARGS }}
+    - name: Build solution
+      run: dotnet build ${{ env.SOLUTION_FILE }} --no-restore --configuration Release --verbosity minimal
 
-    - name: Test (net9.0)
-      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net9.0 --filter "${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }}" ${{ env.COMMON_TEST_ARGS }}
+    - name: Test
+      id: test
+      run: dotnet test ${{ env.SOLUTION_FILE }} --filter "${{ matrix.skipIntegrationTests == true && 'Category!=MemoryDumps&Category!=Integration' || 'Category!=MemoryDumps' }}" ${{ env.COMMON_TEST_ARGS }}
 
-    - name: Test (net9.0) (memory dumps)
-      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net9.0 --filter "${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }}" ${{ env.COMMON_TEST_ARGS }}
+    - name: Test (memory dumps)
+      id: test-memory-dumps
+      run: dotnet test src/Management/test/Endpoint.Test --filter "Category=MemoryDumps" ${{ env.COMMON_TEST_ARGS }}
 
     - name: Upload crash/hang dumps (on failure)
-      if: ${{ failure() }}
-      uses: actions/upload-artifact@v4
+      if: ${{ !cancelled() && (steps.test.outcome == 'failure' || steps.test-memory-dumps.outcome == 'failure') }}
+      uses: actions/upload-artifact@v7
       with:
         name: FailedTestOutput-${{ matrix.os }}
         path: |
-          ${{ github.workspace }}/dumps/**/*.dmp
-          ${{ github.workspace }}/dumps/**/Sequence_*.xml
+          ${{ github.workspace }}/TestOutput/**/*.dmp
+          ${{ github.workspace }}/TestOutput/**/Sequence_*.xml
         if-no-files-found: ignore
 
     - name: Report test results
-      if: ${{ !cancelled() }}
-      uses: dorny/test-reporter@v2
+      if: ${{ !cancelled() && (steps.test.outcome != 'skipped' || steps.test-memory-dumps.outcome != 'skipped') }}
+      uses: dorny/test-reporter@v3
       with:
         name: ${{ matrix.os }} test results
         reporter: dotnet-trx

.github/workflows/component-common.yml

@@ -8,6 +8,7 @@ on:
     - stylecop.json
     - '*.props'
     - '*.ruleset'
+    - nuget.config
     - .config/dotnet-tools.json
     - .github/workflows/component-shared-workflow.yml
     - .github/workflows/component-common.yml

.github/workflows/component-configuration.yml

@@ -8,6 +8,7 @@ on:
     - stylecop.json
     - '*.props'
     - '*.ruleset'
+    - nuget.config
     - .config/dotnet-tools.json
     - .github/workflows/component-shared-workflow.yml
     - .github/workflows/component-configuration.yml
@@ -24,4 +25,4 @@ jobs:
     with:
       component: Configuration
       OS: ubuntu
-      runConfigServer: true
+      runDockerContainers: true

.github/workflows/component-connectors.yml

@@ -8,6 +8,7 @@ on:
     - stylecop.json
     - '*.props'
     - '*.ruleset'
+    - nuget.config
     - .config/dotnet-tools.json
     - .github/workflows/component-shared-workflow.yml
     - .github/workflows/component-connectors.yml

.github/workflows/component-discovery.yml

@@ -8,6 +8,7 @@ on:
     - stylecop.json
     - '*.props'
     - '*.ruleset'
+    - nuget.config
     - .config/dotnet-tools.json
     - .github/workflows/component-shared-workflow.yml
     - .github/workflows/component-discovery.yml

.github/workflows/component-logging.yml

@@ -8,6 +8,7 @@ on:
     - stylecop.json
     - '*.props'
     - '*.ruleset'
+    - nuget.config
     - .config/dotnet-tools.json
     - .github/workflows/component-shared-workflow.yml
     - .github/workflows/component-logging.yml

.github/workflows/component-management.yml

@@ -8,6 +8,7 @@ on:
     - stylecop.json
     - '*.props'
     - '*.ruleset'
+    - nuget.config
     - .config/dotnet-tools.json
     - .github/workflows/component-shared-workflow.yml
     - .github/workflows/component-management.yml
@@ -30,7 +31,6 @@ jobs:
     with:
       component: Management
       OS: macos
-      skipFilter: Category!=SkipOnMacOS
 
   windows:
     uses: ./.github/workflows/component-shared-workflow.yml