From 35ec0f2a62c334fc32ee6616aa8bb514a91963a4 Mon Sep 17 00:00:00 2001
From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com>
Date: Mon, 14 Sep 2026 11:54:52 +0200
Subject: [PATCH] Update actions in GitHub workflows to latest versions,
 optimize code cleanup

---
 .github/workflows/build-and-stage.yml              |  2 +-
 .github/workflows/scan-vulnerable-dependencies.yml |  4 ++--
 .github/workflows/verify-code-style.yml            | 10 +++++-----
 cleanupcode.ps1                                    |  8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-and-stage.yml b/.github/workflows/build-and-stage.yml
index c3e920c..36d9911 100644
--- a/.github/workflows/build-and-stage.yml
+++ b/.github/workflows/build-and-stage.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Git checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v7
       with:
         persist-credentials: false
 
diff --git a/.github/workflows/scan-vulnerable-dependencies.yml b/.github/workflows/scan-vulnerable-dependencies.yml
index 662d662..02fc8f5 100644
--- a/.github/workflows/scan-vulnerable-dependencies.yml
+++ b/.github/workflows/scan-vulnerable-dependencies.yml
@@ -27,13 +27,13 @@ jobs:
 
     steps:
     - name: Setup .NET
-      uses: actions/setup-dotnet@v5
+      uses: actions/setup-dotnet@v6
       with:
         dotnet-version: |
           10.0.*
 
     - name: Git checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v7
       with:
         persist-credentials: false
 
diff --git a/.github/workflows/verify-code-style.yml b/.github/workflows/verify-code-style.yml
index 3f4f152..a474cb0 100644
--- a/.github/workflows/verify-code-style.yml
+++ b/.github/workflows/verify-code-style.yml
@@ -26,13 +26,13 @@ jobs:
 
     steps:
     - name: Setup .NET
-      uses: actions/setup-dotnet@v5
+      uses: actions/setup-dotnet@v6
       with:
         dotnet-version: |
           10.0.*
 
     - name: Git checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v7
       with:
         persist-credentials: false
         fetch-depth: 2
@@ -44,7 +44,7 @@ jobs:
       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
+      run: dotnet build ${{ env.SOLUTION_FILE }} --no-restore --configuration Release /p:RunAnalyzers=false /p:GeneratePackageOnBuild=false
 
     - name: CleanupCode (on PR diff)
       if: ${{ github.event_name == 'pull_request' }}
@@ -57,7 +57,7 @@ jobs:
 
         Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash in pull request."
         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
+        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;RunAnalyzers=false;NuGetAudit=false;GeneratePackageOnBuild=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 == 'release' || github.event_name == 'workflow_dispatch' }}
@@ -65,4 +65,4 @@ jobs:
       run: |
         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
+        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;RunAnalyzers=false;NuGetAudit=false;GeneratePackageOnBuild=false" --jb --verbosity=WARN --fail-on-diff --print-diff
diff --git a/cleanupcode.ps1 b/cleanupcode.ps1
index d89d6a1..9688976 100644
--- a/cleanupcode.ps1
+++ b/cleanupcode.ps1
@@ -13,7 +13,7 @@ $solutionFile = 'Steeltoe.NetCoreToolService.slnx'
 
 dotnet tool restore
 dotnet restore $solutionFile /p:NuGetAudit=false
-dotnet build $solutionFile --no-restore --configuration Release /p:RunAnalyzers=false
+dotnet build $solutionFile --no-restore --configuration Release /p:RunAnalyzers=false /p:GeneratePackageOnBuild=false
 
 if ($revision) {
     $headCommitHash = git rev-parse HEAD
@@ -22,16 +22,16 @@ if ($revision) {
     if ($baseCommitHash -eq $headCommitHash) {
         Write-Output "Running code cleanup on staged/unstaged files."
         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
+        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;RunAnalyzers=false;NuGetAudit=false;GeneratePackageOnBuild=false" --jb --verbosity=WARN -f staged,modified
     }
     else {
         Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash, including staged/unstaged files."
         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
+        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;RunAnalyzers=false;NuGetAudit=false;GeneratePackageOnBuild=false" --jb --verbosity=WARN -f staged,modified,commits -a $headCommitHash -b $baseCommitHash
     }
 }
 else {
     Write-Output "Running code cleanup on all files."
     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
+    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;RunAnalyzers=false;NuGetAudit=false;GeneratePackageOnBuild=false" --jb --verbosity=WARN
 }