Updated to convert coverage files to sonarqube

Author: LeeGathercole

.github/actions/perform-static-analysis/action.yaml

@@ -44,7 +44,8 @@ runs:
       run: |
         mkdir -p .sonar/scanner
         dotnet tool install dotnet-sonarscanner --tool-path ./.sonar/scanner
-        dotnet tool install dotnet-coverage --tool-path ./.sonar/scanner
+        dotnet tool install dotnet-reportgenerator-globaltool --tool-path ./.sonar/scanner
+
     - name: Build and analyze
       shell: bash
       run: |

.gitignore

@@ -290,3 +290,5 @@ __queuestorage__
 gitleaks-report.json
 
 coverage/
+.sonar/
+.sonarqube/

scripts/tests/coverage.sh

@@ -6,12 +6,19 @@ set -euo pipefail
 : "${SONAR_ORGANISATION_KEY:?SONAR_ORGANISATION_KEY is required}"
 
 SONAR_SCANNER="./.sonar/scanner/dotnet-sonarscanner"
-COVERAGE_FILES=$(find coverage -name '*.coverage.xml' | paste -sd "," -)
+REPORT_GENERATOR="./.sonar/scanner/reportgenerator"
 
-$SONAR_SCANNER begin /k:"$SONAR_PROJECT_KEY" /o:"$SONAR_ORGANISATION_KEY" /d:sonar.token="$SONAR_TOKEN" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths="$COVERAGE_FILES"
+
+
+$SONAR_SCANNER begin /k:"$SONAR_PROJECT_KEY" /o:"$SONAR_ORGANISATION_KEY" /d:sonar.token="$SONAR_TOKEN" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.coverageReportPaths="coverage/converted/SonarQube.xml"
 
 dotnet build src/ServiceLayer.sln
 
-make test-unit
+make test-unit ARGS="--no-build"
+
+$REPORT_GENERATOR \
+  -reports:coverage/**/coverage.cobertura.xml \
+  -targetdir:coverage/converted \
+  -reporttypes:SonarQube
 
 $SONAR_SCANNER end /d:sonar.token="$SONAR_TOKEN"

scripts/tests/unit.sh

@@ -1,6 +1,11 @@
 #!/bin/bash
 set -euo pipefail
 
+BUILD_ARGS=""
+if [[ "${1:-}" == "--no-build" ]]; then
+  BUILD_ARGS="--no-build"
+fi
+
 COVERAGE_DIR="coverage"
 TEST_PROJECTS=$(find tests -name '*.csproj')
 
@@ -11,5 +16,8 @@ for proj in $TEST_PROJECTS; do
   proj_name=$(basename "$proj" .csproj)
   out_file="$COVERAGE_DIR/$proj_name.coverage.xml"
   echo "🧪 Running coverage for $proj -> $out_file"
-  dotnet-coverage collect -f xml -o "$out_file" dotnet test "$proj"
+  dotnet test "$proj" \
+   $BUILD_ARGS \
+  --collect:"XPlat Code Coverage" \
+  --results-directory coverage
 done