Prepare for updating tests, small fixes

.config/dotnet-tools.json

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

.github/workflows/Steeltoe.All.yml

@@ -38,7 +38,7 @@ jobs:
         - os: windows-latest
           skipFilter: Category!=Integration
         - os: macos-latest
-          skipFilter: Category!=Integration&Category!=SkipOnMacOS
+          skipFilter: Category!=Integration
     runs-on: ${{ matrix.os }}
     continue-on-error: true
 
@@ -74,12 +74,12 @@ 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 SkipOnPlatformFact/Theory.
       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
 
@@ -115,7 +115,7 @@ jobs:
 
     - name: Upload crash/hang dumps (on failure)
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: FailedTestOutput-${{ matrix.os }}
         path: |

.github/workflows/component-configuration.yml

@@ -25,4 +25,4 @@ jobs:
     with:
       component: Configuration
       OS: ubuntu
-      runConfigServer: true
+      runDockerContainers: true

.github/workflows/component-management.yml

@@ -31,7 +31,6 @@ jobs:
     with:
       component: Management
       OS: macos
-      skipFilter: Category!=SkipOnMacOS
 
   windows:
     uses: ./.github/workflows/component-shared-workflow.yml

.github/workflows/component-shared-workflow.yml

@@ -12,7 +12,7 @@ on:
       skipFilter:
         required: false
         type: string
-      runConfigServer:
+      runDockerContainers:
         required: false
         type: boolean
         default: false
@@ -24,14 +24,10 @@ permissions:
 env:
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   DOTNET_NOLOGO: true
-  SOLUTION_FILE: src/Steeltoe.${{ inputs.component }}.slnf
+  SOLUTION_FILE: 'src/Steeltoe.${{ inputs.component }}.slnf'
   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
-  SKIP_FILTER_NO_MEMORY_DUMPS: >-
-    ${{ inputs.skipFilter && format('--filter "{0}&Category!=MemoryDumps"', inputs.skipFilter) || '--filter "Category!=MemoryDumps"' }}
-  SKIP_FILTER_WITH_MEMORY_DUMPS: >-
-    ${{ inputs.skipFilter && format('--filter "{0}&Category=MemoryDumps"', inputs.skipFilter) || '--filter "Category=MemoryDumps"' }}
 
 jobs:
   build:
@@ -41,11 +37,11 @@ jobs:
 
     services:
       eurekaServer:
-        image: ${{ inputs.runConfigServer && 'steeltoe.azurecr.io/eureka-server' || null }}
+        image: ${{ inputs.runDockerContainers && 'steeltoe.azurecr.io/eureka-server' || null }}
         ports:
         - 8761:8761
       configServer:
-        image: ${{ inputs.runConfigServer && 'steeltoe.azurecr.io/config-server' || null }}
+        image: ${{ inputs.runDockerContainers && 'steeltoe.azurecr.io/config-server' || null }}
         env:
           eureka.client.enabled: true
           eureka.client.serviceUrl.defaultZone: http://eurekaServer:8761/eureka
@@ -71,12 +67,12 @@ 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 SkipOnPlatformFact/Theory.
       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
 
@@ -86,33 +82,38 @@ jobs:
     - name: Build solution
       run: dotnet build ${{ env.SOLUTION_FILE }} --no-restore --configuration Release --verbosity minimal
 
+    - name: Set skip filters for tests
+      shell: bash
+      run: |
+        echo SKIP_FILTER_NO_MEMORY_DUMPS="${{ inputs.skipFilter && format('{0}&Category!=MemoryDumps', inputs.skipFilter) || 'Category!=MemoryDumps' }}" >> $GITHUB_ENV
+        echo SKIP_FILTER_WITH_MEMORY_DUMPS="${{ inputs.skipFilter && format('{0}&Category=MemoryDumps', inputs.skipFilter) || 'Category=MemoryDumps' }}" >> $GITHUB_ENV
+
     - name: Test (net10.0)
-      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net10.0 ${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
+      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net10.0 --filter "${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }}" ${{ env.COMMON_TEST_ARGS }}
 
     - name: Test (net10.0) (memory dumps)
       if: ${{ inputs.component == 'Management' }}
-      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net10.0 ${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
+      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net10.0 --filter "${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }}" ${{ env.COMMON_TEST_ARGS }}
 
     - name: Test (net9.0)
-      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net9.0 ${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
+      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net9.0 --filter "${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }}" ${{ env.COMMON_TEST_ARGS }}
 
     - name: Test (net9.0) (memory dumps)
       if: ${{ inputs.component == 'Management' }}
-      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net9.0 ${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
+      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net9.0 --filter "${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }}" ${{ env.COMMON_TEST_ARGS }}
 
     - name: Test (net8.0)
-      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net8.0 ${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
+      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net8.0 --filter "${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }}" ${{ env.COMMON_TEST_ARGS }}
 
     - name: Test (net8.0) (memory dumps)
       if: ${{ inputs.component == 'Management' }}
-      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net8.0 ${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
-
+      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net8.0 --filter "${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }}" ${{ env.COMMON_TEST_ARGS }}
 
     - name: Upload crash/hang dumps (on failure)
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
-        name: FailedTestOutput-${{ inputs.OS }}
+        name: FailedTestOutput-${{ inputs.OS }}-latest
         path: |
           ${{ github.workspace }}/dumps/**/*.dmp
           ${{ github.workspace }}/dumps/**/Sequence_*.xml
@@ -122,7 +123,7 @@ jobs:
       if: ${{ !cancelled() }}
       uses: dorny/test-reporter@v2
       with:
-        name: ${{ inputs.OS }} test results
+        name: ${{ inputs.OS }}-latest test results
         reporter: dotnet-trx
         path: '**/*.trx'
         fail-on-empty: 'true'

.github/workflows/package.yml

@@ -40,7 +40,7 @@ jobs:
           10.0.*
 
     - name: Git checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         persist-credentials: false
 
@@ -123,7 +123,7 @@ jobs:
       run: dotnet pack ${{ env.SOLUTION_FILE }} --no-build --configuration Release --output ${{ github.workspace }}/packages /p:VersionSuffix=${{ env.PACKAGE_VERSION_SUFFIX }}
 
     - name: Upload unsigned packages
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         if-no-files-found: error
         name: unsigned-packages
@@ -174,7 +174,7 @@ jobs:
         --description-url 'https://steeltoe.io/'
 
     - name: Upload signed packages
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         if-no-files-found: error
         name: signed-packages
@@ -263,7 +263,7 @@ jobs:
 
     steps:
     - name: Git checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         persist-credentials: true
 

.github/workflows/scan-vulnerable-dependencies.yml

@@ -36,7 +36,7 @@ jobs:
           10.0.*
 
     - name: Git checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         persist-credentials: false
 

.github/workflows/sonarcube.yml

@@ -59,7 +59,7 @@ jobs:
       run: dotnet tool install --global dotnet-sonarscanner
 
     - name: Git checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         persist-credentials: false
         # Sonar: Shallow clones should be disabled for a better relevancy of analysis.

.github/workflows/verify-code-style.yml

@@ -24,6 +24,7 @@ jobs:
   verify:
     name: Verify Code Style
     runs-on: ubuntu-latest
+    timeout-minutes: 90
 
     steps:
     - name: Setup .NET
@@ -35,7 +36,7 @@ jobs:
           10.0.*
 
     - name: Git checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         persist-credentials: false
         fetch-depth: 2
@@ -44,7 +45,10 @@ jobs:
       run: dotnet tool restore --verbosity minimal
 
     - name: Restore packages
-      run: dotnet restore ${{ env.SOLUTION_FILE }} /p:Configuration=Release --verbosity minimal
+      run: dotnet restore ${{ env.SOLUTION_FILE }} /p:Configuration=Release /p:NuGetAudit=false --verbosity minimal
+
+    - name: Build
+      run: dotnet build ${{ env.SOLUTION_FILE }} --no-restore --configuration Release /p:RunAnalyzers=false
 
     - name: CleanupCode (on PR diff)
       if: ${{ github.event_name == 'pull_request' }}
@@ -56,11 +60,13 @@ jobs:
         $baseCommitHash = git rev-parse HEAD~1
 
         Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash in pull request."
-        dotnet regitlint -s ${{ env.SOLUTION_FILE }} --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash --fail-on-diff --print-diff
+        dotnet jb cleanupcode --version
+        dotnet regitlint -s $env:SOLUTION_FILE --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash --fail-on-diff --print-diff
 
     - name: CleanupCode (on branch)
-      if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' }}
+      if: ${{ github.event_name == 'push' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' }}
       shell: pwsh
       run: |
-        Write-Output "Running code cleanup on all files."
-        dotnet regitlint -s ${{ env.SOLUTION_FILE }} --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --verbosity=WARN --fail-on-diff --print-diff
+        Write-Output 'Running code cleanup on all files.'
+        dotnet jb cleanupcode --version
+        dotnet regitlint -s $env:SOLUTION_FILE --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --verbosity=WARN --fail-on-diff --print-diff

cleanupcode.ps1

@@ -1,4 +1,4 @@
-#Requires -Version 7.0
+#Requires -Version 7.4
 
 # This script reformats (part of) the codebase to make it compliant with our coding guidelines.
 
@@ -7,38 +7,31 @@ param(
     [string] $revision
 )
 
-function VerifySuccessExitCode {
-    if ($LastExitCode -ne 0) {
-        throw "Command failed with exit code $LastExitCode."
-    }
-}
+$ErrorActionPreference = "Stop"
+$PSNativeCommandUseErrorActionPreference = $true
+$solutionFile = 'src/Steeltoe.All.sln'
 
 dotnet tool restore
-VerifySuccessExitCode
-
-dotnet restore src
-VerifySuccessExitCode
+dotnet restore $solutionFile /p:NuGetAudit=false
+dotnet build $solutionFile --no-restore --configuration Release /p:RunAnalyzers=false
 
 if ($revision) {
     $headCommitHash = git rev-parse HEAD
-    VerifySuccessExitCode
-
     $baseCommitHash = git rev-parse $revision
-    VerifySuccessExitCode
 
     if ($baseCommitHash -eq $headCommitHash) {
         Write-Output "Running code cleanup on staged/unstaged files."
-        dotnet regitlint -s src/Steeltoe.All.sln --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --properties:Configuration=Release --jb --properties:NuGetAudit=false --jb --verbosity=WARN -f staged,modified
-        VerifySuccessExitCode
+        dotnet jb cleanupcode --version
+        dotnet regitlint -s $solutionFile --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --verbosity=WARN -f staged,modified
     }
     else {
         Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash, including staged/unstaged files."
-        dotnet regitlint -s src/Steeltoe.All.sln --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --properties:Configuration=Release --jb --properties:NuGetAudit=false --jb --verbosity=WARN -f staged,modified,commits -a $headCommitHash -b $baseCommitHash
-        VerifySuccessExitCode
+        dotnet jb cleanupcode --version
+        dotnet regitlint -s $solutionFile --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --verbosity=WARN -f staged,modified,commits -a $headCommitHash -b $baseCommitHash
     }
 }
 else {
     Write-Output "Running code cleanup on all files."
-    dotnet regitlint -s src/Steeltoe.All.sln --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --properties:Configuration=Release --jb --properties:NuGetAudit=false --jb --verbosity=WARN
-    VerifySuccessExitCode
+    dotnet jb cleanupcode --version
+    dotnet regitlint -s $solutionFile --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --verbosity=WARN
 }

shared-project.props

@@ -4,5 +4,6 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <Import Condition="$(MSBuildProjectName.EndsWith('.Test'))" Project="$(MSBuildThisFileDirectory)\shared-test.props" />
+  <Import Condition="$(MSBuildProjectName.EndsWith('.Test')) Or $(MSBuildProjectName.EndsWith('.Tests'))"
+    Project="$(MSBuildThisFileDirectory)\shared-test.props" />
 </Project>

shared-test.props

@@ -11,7 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(MSBuildThisFileDirectory)\src\Common\test\TestResources\Steeltoe.Common.TestResources.csproj" />
+    <ProjectReference Condition="'$(MSBuildProjectName)' != 'ConfigurationSchemaGenerator.Tests'"
+      Include="$(MSBuildThisFileDirectory)\src\Common\test\TestResources\Steeltoe.Common.TestResources.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/Common/test/Certificates.Test/ConfigureCertificateOptionsTest.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information.
 
+using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text.Json;
@@ -50,10 +51,9 @@ public void ConfigureCertificateOptions_BadPath_NoCertificate(string certificate
         options.Certificate.Should().BeNull();
     }
 
-    [Theory]
+    [SkipOnPlatformTheory(nameof(OSPlatform.OSX))]
     [InlineData("")]
     [InlineData(CertificateName)]
-    [Trait("Category", "SkipOnMacOS")]
     public void ConfigureCertificateOptions_ThrowsOnEmptyFile(string certificateName)
     {
         var appSettings = new Dictionary<string, string?>

src/Common/test/TestResources/SkipOnPlatformFactAttribute.cs

@@ -0,0 +1,29 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.InteropServices;
+using Xunit;
+using Xunit.v3;
+
+namespace Steeltoe.Common.TestResources;
+
+/// <summary>
+/// Skips running the decorated test on the specified platforms.
+/// </summary>
+/// <remarks>
+/// A common reason for skipping tests on macOS is because the ASP.NET dev certificate is not trusted. See
+/// https://github.com/dotnet/aspnetcore/issues/42273.
+/// </remarks>
+[XunitTestCaseDiscoverer(typeof(FactDiscoverer))]
+[AttributeUsage(AttributeTargets.Method)]
+public sealed class SkipOnPlatformFactAttribute : FactAttribute
+{
+    public SkipOnPlatformFactAttribute(params string[] platformNames)
+    {
+        foreach (OSPlatform platform in platformNames.Select(OSPlatform.Create))
+        {
+            Assert.SkipWhen(RuntimeInformation.IsOSPlatform(platform), $"Skipping test on platform {platform}.");
+        }
+    }
+}