From 23a22836ba046a2fb5745b4ae133a86f24d62fda Mon Sep 17 00:00:00 2001 From: danielpalme Date: Tue, 5 Nov 2019 21:05:53 +0100 Subject: [PATCH] #294: Fixed handling of partial classes for Cobertura coverage files --- azure-pipelines.yml | 2 +- src/AzureDevopsTask/ReportGenerator/task.json | 2 +- src/AzureDevopsTask/vss-extension.json | 2 +- src/Readme.txt | 4 ++++ .../ReportGenerator.Console.NetCore.csproj | 4 ++-- src/ReportGenerator.Console/Properties/AssemblyInfo.cs | 4 ++-- .../ReportGenerator.Core.Test.csproj | 4 ++-- src/ReportGenerator.Core/Parser/CoberturaParser.cs | 1 + src/ReportGenerator.Core/ReportGenerator.Core.csproj | 4 ++-- .../ReportGenerator.DotnetCliTool.csproj | 4 ++-- .../ReportGenerator.DotnetCorePluginLoader.csproj | 4 ++-- .../ReportGenerator.DotnetGlobalTool.csproj | 4 ++-- src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj | 4 ++-- src/build.proj | 2 +- 14 files changed, 25 insertions(+), 20 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d250f813..9db11b4a 100644 --- 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 index c7eac79d..050efaf8 100644 --- 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 index a42f1ced..c274a447 100644 --- 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 index a8447c94..37fd55bd 100644 --- 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 index 46897078..4cb87a74 100644 --- a/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj +++ b/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj @@ -7,8 +7,8 @@ ReportGenerator Palmmedia.ReportGenerator Palmmedia.ReportGenerator.Console.NetCore.Program - 4.3.5.0 - 4.3.5.0 + 4.3.6.0 + 4.3.6.0 diff --git a/src/ReportGenerator.Console/Properties/AssemblyInfo.cs b/src/ReportGenerator.Console/Properties/AssemblyInfo.cs index b1dedf80..0215133b 100644 --- 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 index aa15f1f9..3f9bf3bb 100644 --- a/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj +++ b/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj @@ -4,8 +4,8 @@ netcoreapp2.0 false Palmmedia.ReportGenerator.Core.Test - 4.3.5.0 - 4.3.5.0 + 4.3.6.0 + 4.3.6.0 diff --git a/src/ReportGenerator.Core/Parser/CoberturaParser.cs b/src/ReportGenerator.Core/Parser/CoberturaParser.cs index 706aeeab..6d520927 100644 --- 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 index 588029c2..a37f7c9f 100644 --- a/src/ReportGenerator.Core/ReportGenerator.Core.csproj +++ b/src/ReportGenerator.Core/ReportGenerator.Core.csproj @@ -7,8 +7,8 @@ false true ReportGenerator.Core - 4.3.5.0 - 4.3.5.0 + 4.3.6.0 + 4.3.6.0 diff --git a/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj b/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj index 5e55607b..48936d65 100644 --- a/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj +++ b/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj @@ -7,8 +7,8 @@ dotnet-reportgenerator Palmmedia.ReportGenerator Palmmedia.ReportGenerator.DotnetCliTool.Program - 4.3.5.0 - 4.3.5.0 + 4.3.6.0 + 4.3.6.0 diff --git a/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj b/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj index fbd10209..1447ca12 100644 --- a/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj +++ b/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj @@ -2,8 +2,8 @@ netcoreapp2.0 ReportGenerator.DotnetCorePluginLoader - 4.3.5.0 - 4.3.5.0 + 4.3.6.0 + 4.3.6.0 diff --git a/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj b/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj index 5a5843fc..0d46aabc 100644 --- a/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj +++ b/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj @@ -7,8 +7,8 @@ ReportGenerator Palmmedia.ReportGenerator Palmmedia.ReportGenerator.DotnetGlobalTool.Program - 4.3.5.0 - 4.3.5.0 + 4.3.6.0 + 4.3.6.0 diff --git a/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj b/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj index 26e8e6df..6763c81f 100644 --- a/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj +++ b/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj @@ -5,8 +5,8 @@ Palmmedia.ReportGenerator.MSBuild false true - 4.3.5.0 - 4.3.5.0 + 4.3.6.0 + 4.3.6.0 diff --git a/src/build.proj b/src/build.proj index 3f8cfb28..d881f5aa 100644 --- a/src/build.proj +++ b/src/build.proj @@ -22,7 +22,7 @@ - 4.3.5 + 4.3.6