Try to get branch coverage in Sonar

Author: bart-vmware

.github/workflows/Steeltoe.All.yml

@@ -23,7 +23,7 @@ env:
   SOLUTION_FILE: 'src/Steeltoe.All.sln'
   TEST_OUTPUT_DIRECTORY: '${{ github.workspace }}/TestOutput'
   COMMON_TEST_ARGS: >-
-    --no-build --no-progress --configuration Release --results-directory ${{ github.workspace }}/TestOutput
+    --no-build --no-progress --configuration Release --results-directory '${{ github.workspace }}/TestOutput'
     --report-trx --coverage --coverage-settings coverage.config --crashdump --hangdump --hangdump-timeout 1m
 
 jobs:

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

@@ -25,8 +25,8 @@ env:
   SOLUTION_FILE: 'src/Steeltoe.${{ inputs.component }}.slnf'
   TEST_OUTPUT_DIRECTORY: '${{ github.workspace }}/TestOutput'
   COMMON_TEST_ARGS: >-
-    --no-build --no-progress --configuration Release --results-directory ${{ github.workspace }}/TestOutput
-     --report-trx --coverage --coverage-settings coverage.config --crashdump --hangdump --hangdump-timeout 1m
+    --no-build --no-progress --configuration Release --results-directory '${{ github.workspace }}/TestOutput'
+    --report-trx --coverage --coverage-settings coverage.config --crashdump --hangdump --hangdump-timeout 1m
 
 jobs:
   build:

.github/workflows/sonarcube.yml

@@ -24,8 +24,8 @@ env:
   SOLUTION_FILE: 'src/Steeltoe.All.sln'
   TEST_OUTPUT_DIRECTORY: '${{ github.workspace }}/TestOutput'
   SONAR_TEST_ARGS: >-
-    --no-build --no-progress --configuration Release --results-directory ${{ github.workspace }}/TestOutput
-    --report-trx --coverage --coverage-settings coverage.sonar.config
+    --no-build --no-progress --configuration Release --results-directory '${{ github.workspace }}/TestOutput'
+    --report-trx --coverage --coverage-settings coverage.config
 
 jobs:
   analyze:
@@ -78,7 +78,7 @@ jobs:
         # TODO: Revert to OpenCover, see https://github.com/microsoft/testfx/issues/7104
         # /d:sonar.cs.opencover.reportsPaths=**/coverage.opencover.xml
         dotnet sonarscanner begin /k:"SteeltoeOSS_steeltoe" /o:"steeltoeoss" /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
-        /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths="${{ env.TEST_OUTPUT_DIRECTORY }}/*.xml"
+        /d:sonar.host.url="https://sonarcloud.io" /d:sonar.coverageReportPaths=TestOutput/SonarQube.xml
 
     - name: Build solution
       run: dotnet build ${{ env.SOLUTION_FILE }} --no-restore --configuration Release --verbosity minimal
@@ -89,6 +89,20 @@ jobs:
     - name: Test (memory dumps)
       run: dotnet test --project src/Management/test/Endpoint.Test/Steeltoe.Management.Endpoint.Test.csproj --filter-trait "Category=MemoryDumps" ${{ env.SONAR_TEST_ARGS }}
 
+    - name: 'TEMP: List files before coverage conversion'
+      run: find ${{ env.TEST_OUTPUT_DIRECTORY }}
+
+    - name: Convert Cobertura to Sonar format using ReportGenerator
+      uses: danielpalme/[email protected]
+      with:
+        reports: '${{ env.TEST_OUTPUT_DIRECTORY }}/*cobertura.xml'
+        targetdir: '${{ env.TEST_OUTPUT_DIRECTORY }}'
+        reporttypes: 'SonarQube'
+        filefilters: '-*.g.cs'
+
+    - name: 'TEMP: List files after coverage conversion'
+      run: find ${{ env.TEST_OUTPUT_DIRECTORY }}
+
     - name: End Sonar .NET scanner
       if: ${{ !cancelled() && steps.sonar_begin.outcome == 'success' }}
       env: