Added cobertura code coverage summary output format

eng/.vsts.yml

@@ -16,6 +16,7 @@ stages:
           manifests: true       
       enablePublishUsingPipelines: true
       enablePublishTestResults: true
+      enablePublishCodeCoverageResults: true
 
       jobs:
 

eng/templates/job.yml

@@ -19,6 +19,7 @@ parameters:
   enablePublishBuildArtifacts: false
   enablePublishBuildAssets: false
   enablePublishTestResults: false
+  enablePublishCodeCoverageResults: false
   enablePublishUsingPipelines: false
   useBuildManifest: false
   mergeTestResults: false
@@ -181,6 +182,16 @@ jobs:
         mergeTestResults: ${{ parameters.mergeTestResults }}
       continueOnError: true
       condition: always()
+
+  - ${{ if eq(parameters.enablePublishCodeCoverageResults, 'true') }}:
+    - task: PublishCodeCoverageResults@1
+      displayName: Publish Code Coverage Results
+      inputs:
+        codeCoverageTool: 'cobertura'
+        summaryFileLocation: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Reports/Summary/Cobertura.xml'
+      continueOnError: true
+      condition: always()
+
 
   - ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - task: CopyFiles@2

global.json

@@ -6,6 +6,6 @@
     "dotnet": "6.0.101"
   },
   "msbuild-sdks": {
-    "MsBullet.Sdk": "0.5.0-beta.1"
+    "MsBullet.Sdk": "0.6.0"
   }
 }

src/MsBullet.Sdk.IntegrationTests/MultipleProjectsWithTestsTests.cs

@@ -20,26 +20,37 @@ public MultipleProjectsWithTestsTests(ITestOutputHelper output, TestProjectFixtu
         }
 
         [Theory]
-        [InlineData("Debug", "index.html")]
-        [InlineData("Release", "index.html")]
-        [InlineData("Debug", "Summary.tex")]
-        [InlineData("Release", "Summary.tex")]
-        public void MinimalRepoRunTestsShoudGenerateCoverageReportSummary(string configuration, string fileName)
+        [InlineData("Debug", "", "index.html", "Summary.tex", "Cobertura.xml")]
+        [InlineData("Release", "", "index.html", "Summary.tex", "Cobertura.xml")]
+        [InlineData("Debug", "Html", "index.html", "Cobertura.xml")]
+        [InlineData("Release", "Html", "index.html", "Cobertura.xml")]
+        public void MinimalRepoRunTestsShoudGenerateCoverageReportSummary(string configuration, string reportTypes, params string[] reports)
         {
             // Given
             TestApp app = this.fixture.ProvideTestApp("MultipleProjectsWithTests").Create(this.output);
             var outDir = Path.Combine(app.WorkingDirectory, "artifacts", "TestResults", configuration, "Reports", "Summary");
+            var args = new[]
+            {
+                "-test",
+                $"-configuration {configuration}"
+            };
+            if (!string.IsNullOrWhiteSpace(reportTypes))
+            {
+                args = args.Append($"/p:ReportTypes=\"{reportTypes}\"").ToArray();
+            }
 
             // When
-            int exitCode = app.ExecuteBuild(
-                this.output,
-                "-test",
-                $"-configuration {configuration}");
+            int exitCode = app.ExecuteBuild(this.output, args);
 
             // Then
             Assert.Equal(0, exitCode);
             Assert.True(Directory.Exists(outDir));
-            Assert.Contains(fileName, Directory.EnumerateFiles(outDir).Select(path => Path.GetFileName(path)));
+
+            var outDirPahts = Directory.EnumerateFiles(outDir).Select(path => Path.GetFileName(path));
+            foreach (var report in reports)
+            {
+                Assert.Contains(report, outDirPahts);
+            }
         }
     }
 }

src/MsBullet.Sdk/tools/ReportGenerator/ReportGenerator.targets

@@ -26,9 +26,14 @@
   <Target Name="_GenerateCoverageReportSummary" DependsOnTargets="_GenerateCoverageReport" >
     <ItemGroup>
       <CoverageFiles Include="$(ArtifactsCoverageDir)\*.xml" />
+      <_InnerSummaryReportTypes Include="$(ReportTypes);Cobertura" />
     </ItemGroup>
 
-    <ReportGenerator ProjectDirectory="$(RepositoryEngineeringDir)" ReportFiles="@(CoverageFiles)" TargetDirectory="$(ArtifactsTestResultsDir)\Reports\Summary" ReportTypes="$(ReportTypes)" VerbosityLevel="$(VerbosityLevel)" />
+    <PropertyGroup>
+      <_SummaryReportTypes>@(_InnerSummaryReportTypes->Distinct())</_SummaryReportTypes>
+    </PropertyGroup>
+
+    <ReportGenerator ProjectDirectory="$(RepositoryEngineeringDir)" ReportFiles="@(CoverageFiles)" TargetDirectory="$(ArtifactsTestResultsDir)\Reports\Summary" ReportTypes="$(_SummaryReportTypes)" VerbosityLevel="$(VerbosityLevel)" />
   </Target>
 
 </Project>