#202: Attribute 'branch' is no longer required in Cobertura files

danielpalme · danielpalme · commit ff4b6b7b603b · 2019-01-23T19:33:22.000+01:00
diff --git a/src/AzureDevopsTask/ReportGenerator/task.json b/src/AzureDevopsTask/ReportGenerator/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 17
+        "Patch": 18
     },
     "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": "1.0.17",
+    "version": "1.0.18",
     "publisher": "Palmmedia",
     "public": true,
     "targets": [
diff --git a/src/Readme.txt b/src/Readme.txt
@@ -58,6 +58,10 @@ For further details take a look at LICENSE.txt.
 
 CHANGELOG
 
+4.0.9.0
+
+    * Fix: Issue #202: Attribute 'branch' is no longer required in Cobertura files
+
 4.0.8.0
 
     * Fix: Issue #199: Handling of negative NPath complexity values (integer overflow)
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.0.8.0</AssemblyVersion>
-    <FileVersion>4.0.8.0</FileVersion>
+    <AssemblyVersion>4.0.9.0</AssemblyVersion>
+    <FileVersion>4.0.9.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
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.0.8.0")]
-[assembly: AssemblyFileVersion("4.0.8.0")]
+[assembly: AssemblyVersion("4.0.9.0")]
+[assembly: AssemblyFileVersion("4.0.9.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.0.8.0</AssemblyVersion>
-    <FileVersion>4.0.8.0</FileVersion>
+    <AssemblyVersion>4.0.9.0</AssemblyVersion>
+    <FileVersion>4.0.9.0</FileVersion>
   </PropertyGroup>
 
 
diff --git a/src/ReportGenerator.Core/Parser/CoberturaParser.cs b/src/ReportGenerator.Core/Parser/CoberturaParser.cs
@@ -375,7 +375,7 @@ private static Dictionary<int, ICollection<Branch>> GetBranches(IEnumerable<XEle
 
             foreach (var line in lines)
             {
-                if (!line.Attribute("branch").Value.Equals("true", StringComparison.OrdinalIgnoreCase))
+                if (line.Attribute("branch") == null || !line.Attribute("branch").Value.Equals("true", StringComparison.OrdinalIgnoreCase))
                 {
                     continue;
                 }
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.0.8.0</AssemblyVersion>
-    <FileVersion>4.0.8.0</FileVersion>
+    <AssemblyVersion>4.0.9.0</AssemblyVersion>
+    <FileVersion>4.0.9.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
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.0.8.0</AssemblyVersion>
-    <FileVersion>4.0.8.0</FileVersion>
+    <AssemblyVersion>4.0.9.0</AssemblyVersion>
+    <FileVersion>4.0.9.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
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.0.8.0</AssemblyVersion>
-    <FileVersion>4.0.8.0</FileVersion>
+    <AssemblyVersion>4.0.9.0</AssemblyVersion>
+    <FileVersion>4.0.9.0</FileVersion>
   </PropertyGroup>
   
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
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.0.8.0</AssemblyVersion>
-    <FileVersion>4.0.8.0</FileVersion>
+    <AssemblyVersion>4.0.9.0</AssemblyVersion>
+    <FileVersion>4.0.9.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/src/build.proj b/src/build.proj
@@ -22,8 +22,8 @@
 
   <!-- Version, adjust before build -->
   <PropertyGroup>
-    <Version>4.0.8.0</Version>
-    <VersionShort>4.0.8</VersionShort>
+    <Version>4.0.9.0</Version>
+    <VersionShort>4.0.9</VersionShort>
   </PropertyGroup>
   
   <!-- Tools -->

Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ private static Dictionary<int, ICollection<Branch>> GetBranches(IEnumerable<XEle`
`375`	`375`
`376`	`376`	`foreach (var line in lines)`
`377`	`377`	`{`
`378`		`- if (!line.Attribute("branch").Value.Equals("true", StringComparison.OrdinalIgnoreCase))`
	`378`	`+ if (line.Attribute("branch") == null \|\| !line.Attribute("branch").Value.Equals("true", StringComparison.OrdinalIgnoreCase))`
`379`	`379`	`{`
`380`	`380`	`continue;`
`381`	`381`	`}`