Added support for Clover files with namespace declaration (coverage f…

…iles generated by https://github.com/jsargiot/visual-coverage)
danielpalme · Jul 9, 2019 · c77267f · c77267f
1 parent d468ee1
commit c77267f
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 22 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -11,7 +11,7 @@ variables:
   buildPlatform: 'Any CPU'
   buildConfiguration: 'Release'
   disable.coverage.autogenerate: 'true'
-  version: '4.2.5'
+  version: '4.2.6'
 
 # Prepare
 steps:

diff --git a/src/AzureDevopsTask/ReportGenerator/task.json b/src/AzureDevopsTask/ReportGenerator/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 4,
         "Minor": 2,
-        "Patch": 5
+        "Patch": 6
     },
     "instanceNameFormat": "ReportGenerator",
     "groups": [

diff --git a/src/AzureDevopsTask/vss-extension.json b/src/AzureDevopsTask/vss-extension.json
@@ -2,7 +2,7 @@
     "manifestVersion": 1,
     "id": "reportgenerator",
     "name": "ReportGenerator",
-    "version": "4.2.5",
+    "version": "4.2.6",
     "publisher": "Palmmedia",
     "public": true,
     "targets": [

diff --git a/src/Readme.txt b/src/Readme.txt
@@ -60,6 +60,10 @@ For further details take a look at LICENSE.txt.
 
 CHANGELOG
 
+4.2.6.0
+
+    * Fix: Added support for Clover files with namespace declaration (coverage files generated by https://github.com/jsargiot/visual-coverage)
+
 4.2.5.0
 
     * Fix: Issue #260: Added tag to comparision selection

diff --git a/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj b/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj
@@ -7,8 +7,8 @@
     <AssemblyName>ReportGenerator</AssemblyName>
     <RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
     <StartupObject>Palmmedia.ReportGenerator.Console.NetCore.Program</StartupObject>
-    <AssemblyVersion>4.2.5.0</AssemblyVersion>
-    <FileVersion>4.2.5.0</FileVersion>
+    <AssemblyVersion>4.2.6.0</AssemblyVersion>
+    <FileVersion>4.2.6.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ReportGenerator.Console/Properties/AssemblyInfo.cs b/src/ReportGenerator.Console/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.2.5.0")]
-[assembly: AssemblyFileVersion("4.2.5.0")]
+[assembly: AssemblyVersion("4.2.6.0")]
+[assembly: AssemblyFileVersion("4.2.6.0")]
diff --git a/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj b/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj
@@ -4,8 +4,8 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <RootNamespace>Palmmedia.ReportGenerator.Core.Test</RootNamespace>
-    <AssemblyVersion>4.2.5.0</AssemblyVersion>
-    <FileVersion>4.2.5.0</FileVersion>
+    <AssemblyVersion>4.2.6.0</AssemblyVersion>
+    <FileVersion>4.2.6.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ReportGenerator.Core/Parser/CoverageReportParser.cs b/src/ReportGenerator.Core/Parser/CoverageReportParser.cs
@@ -142,7 +142,7 @@ public ParserResult ParseFiles(IReadOnlyCollection<string> reportFiles)
         /// </summary>
         /// <param name="report">The report file to parse.</param>
         /// <returns>The parser result.</returns>
-        private IEnumerable<ParserResult> ParseXmlFile(XContainer report)
+        private IEnumerable<ParserResult> ParseXmlFile(XDocument report)
         {
             if (report.Descendants("PartCoverReport").Any())
             {
@@ -204,7 +204,8 @@ private IEnumerable<ParserResult> ParseXmlFile(XContainer report)
                 yield break;
             }
 
-            elements = report.Descendants("coverage").ToArray();
+            var ns = report.Root.GetDefaultNamespace();
+            elements = report.Descendants(ns + "coverage").ToArray();
 
             if (elements.Length > 0)
             {

diff --git a/src/ReportGenerator.Core/Parser/Preprocessing/CloverReportPreprocessor.cs b/src/ReportGenerator.Core/Parser/Preprocessing/CloverReportPreprocessor.cs
@@ -43,6 +43,17 @@ internal CloverReportPreprocessor(IEnumerable<string> sourceDirectories)
         /// <param name="report">The report.</param>
         internal void Execute(XContainer report)
         {
+            // Remove namespace declaration if it exists (required to support coverage files generated by https://github.com/jsargiot/visual-coverage
+            report.Descendants()
+               .Attributes()
+               .Where(x => x.IsNamespaceDeclaration)
+               .Remove();
+
+            foreach (var elem in report.Descendants())
+            {
+                elem.Name = elem.Name.LocalName;
+            }
+
             var files = report.Descendants("package").Elements("file").ToArray();
 
             if (this.sourceDirectories.Count == 0)

diff --git a/src/ReportGenerator.Core/ReportGenerator.Core.csproj b/src/ReportGenerator.Core/ReportGenerator.Core.csproj
@@ -7,8 +7,8 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AssemblyName>ReportGenerator.Core</AssemblyName>
-    <AssemblyVersion>4.2.5.0</AssemblyVersion>
-    <FileVersion>4.2.5.0</FileVersion>
+    <AssemblyVersion>4.2.6.0</AssemblyVersion>
+    <FileVersion>4.2.6.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj b/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj
@@ -7,8 +7,8 @@
     <AssemblyName>dotnet-reportgenerator</AssemblyName>
     <RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
     <StartupObject>Palmmedia.ReportGenerator.DotnetCliTool.Program</StartupObject>
-    <AssemblyVersion>4.2.5.0</AssemblyVersion>
-    <FileVersion>4.2.5.0</FileVersion>
+    <AssemblyVersion>4.2.6.0</AssemblyVersion>
+    <FileVersion>4.2.6.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj b/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <RootNamespace>ReportGenerator.DotnetCorePluginLoader</RootNamespace>
-    <AssemblyVersion>4.2.5.0</AssemblyVersion>
-    <FileVersion>4.2.5.0</FileVersion>
+    <AssemblyVersion>4.2.6.0</AssemblyVersion>
+    <FileVersion>4.2.6.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj b/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj
@@ -7,8 +7,8 @@
     <AssemblyName>ReportGenerator</AssemblyName>
     <RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
     <StartupObject>Palmmedia.ReportGenerator.DotnetGlobalTool.Program</StartupObject>
-    <AssemblyVersion>4.2.5.0</AssemblyVersion>
-    <FileVersion>4.2.5.0</FileVersion>
+    <AssemblyVersion>4.2.6.0</AssemblyVersion>
+    <FileVersion>4.2.6.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj b/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj
@@ -5,8 +5,8 @@
     <RootNamespace>Palmmedia.ReportGenerator.MSBuild</RootNamespace>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <AssemblyVersion>4.2.5.0</AssemblyVersion>
-    <FileVersion>4.2.5.0</FileVersion>
+    <AssemblyVersion>4.2.6.0</AssemblyVersion>
+    <FileVersion>4.2.6.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/build.proj b/src/build.proj
@@ -22,7 +22,7 @@
 
   <!-- Version, adjust before build -->
   <PropertyGroup>
-    <Version>4.2.5</Version>
+    <Version>4.2.6</Version>
   </PropertyGroup>
 
   <!-- Tools -->