#294: Fixed handling of partial classes for Cobertura coverage files

danielpalme · Nov 5, 2019 · 23a2283 · 23a2283
1 parent 83a7f6f
commit 23a2283
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 20 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.3.5'
+  version: '4.3.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": 3,
-        "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.3.5",
+    "version": "4.3.6",
     "publisher": "Palmmedia",
     "public": true,
     "targets": [

diff --git a/src/Readme.txt b/src/Readme.txt
@@ -61,6 +61,10 @@ For further details take a look at LICENSE.txt.
 
 CHANGELOG
 
+4.3.6.0
+
+    * Fix: Issue #294: Fixed handling of partial classes for Cobertura coverage files
+
 4.3.5.0
 
     * Fix: Issue #292: Improved support for Clover files generated by PhpUnit

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.3.5.0</AssemblyVersion>
-    <FileVersion>4.3.5.0</FileVersion>
+    <AssemblyVersion>4.3.6.0</AssemblyVersion>
+    <FileVersion>4.3.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.3.5.0")]
-[assembly: AssemblyFileVersion("4.3.5.0")]
+[assembly: AssemblyVersion("4.3.6.0")]
+[assembly: AssemblyFileVersion("4.3.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.3.5.0</AssemblyVersion>
-    <FileVersion>4.3.5.0</FileVersion>
+    <AssemblyVersion>4.3.6.0</AssemblyVersion>
+    <FileVersion>4.3.6.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ReportGenerator.Core/Parser/CoberturaParser.cs b/src/ReportGenerator.Core/Parser/CoberturaParser.cs
@@ -174,6 +174,7 @@ private static CodeFile ProcessFile(XElement[] modules, Class @class, string fil
                 .Where(c => c.Attribute("name").Value.Equals(@class.Name)
                             || c.Attribute("name").Value.StartsWith(@class.Name + "$", StringComparison.Ordinal)
                             || c.Attribute("name").Value.StartsWith(@class.Name + "/", StringComparison.Ordinal))
+                .Where(c => c.Attribute("filename").Value.Equals(filePath))
                 .ToArray();
 
             var lines = classes.Elements("lines")

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.3.5.0</AssemblyVersion>
-    <FileVersion>4.3.5.0</FileVersion>
+    <AssemblyVersion>4.3.6.0</AssemblyVersion>
+    <FileVersion>4.3.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.3.5.0</AssemblyVersion>
-    <FileVersion>4.3.5.0</FileVersion>
+    <AssemblyVersion>4.3.6.0</AssemblyVersion>
+    <FileVersion>4.3.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.3.5.0</AssemblyVersion>
-    <FileVersion>4.3.5.0</FileVersion>
+    <AssemblyVersion>4.3.6.0</AssemblyVersion>
+    <FileVersion>4.3.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.3.5.0</AssemblyVersion>
-    <FileVersion>4.3.5.0</FileVersion>
+    <AssemblyVersion>4.3.6.0</AssemblyVersion>
+    <FileVersion>4.3.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.3.5.0</AssemblyVersion>
-    <FileVersion>4.3.5.0</FileVersion>
+    <AssemblyVersion>4.3.6.0</AssemblyVersion>
+    <FileVersion>4.3.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.3.5</Version>
+    <Version>4.3.6</Version>
   </PropertyGroup>
 
   <!-- Tools -->