#351: Fixed reading large XML coverage files

danielpalme · Jun 1, 2020 · a2ee606 · a2ee606
2 parents e1213cd + c626cac
commit a2ee606
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 22 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -12,7 +12,7 @@ variables:
   - name: disable.coverage.autogenerate
     value: 'true'
   - name: version
-    value: '4.6.0'
+    value: '4.6.1'
 
 stages:
 - stage: Build

diff --git a/src/AzureDevopsTask/ReportGenerator/task.json b/src/AzureDevopsTask/ReportGenerator/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 4,
         "Minor": 6,
-        "Patch": 0
+        "Patch": 1
     },
     "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.6.0",
+    "version": "4.6.1",
     "publisher": "Palmmedia",
     "public": true,
     "targets": [

diff --git a/src/Readme.txt b/src/Readme.txt
@@ -63,6 +63,10 @@ For further details take a look at LICENSE.txt.
 
 CHANGELOG
 
+4.6.1.0
+
+    * Fix: #351: Fixed reading large XML coverage files
+
 4.6.0.0
 
     * New: #210: Strong named all DLLs. Plugins have to be strong named too.

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.6.0.0</AssemblyVersion>
-    <FileVersion>4.6.0.0</FileVersion>
+    <AssemblyVersion>4.6.1.0</AssemblyVersion>
+    <FileVersion>4.6.1.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.6.0.0")]
-[assembly: AssemblyFileVersion("4.6.0.0")]
+[assembly: AssemblyVersion("4.6.1.0")]
+[assembly: AssemblyFileVersion("4.6.1.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>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <RootNamespace>Palmmedia.ReportGenerator.Core.Test</RootNamespace>
-    <AssemblyVersion>4.6.0.0</AssemblyVersion>
-    <FileVersion>4.6.0.0</FileVersion>
+    <AssemblyVersion>4.6.1.0</AssemblyVersion>
+    <FileVersion>4.6.1.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ReportGenerator.Core/Parser/CoverageReportParser.cs b/src/ReportGenerator.Core/Parser/CoverageReportParser.cs
@@ -186,9 +186,23 @@ private Task CreateProducer(IReadOnlyCollection<string> reportFiles, BlockingCol
                         Logger.DebugFormat(Resources.LoadingReport, reportFile, number, reportFiles.Count);
                         try
                         {
-                            string line1 = File.ReadLines(reportFile).First();
+                            bool isXml = false;
+                            using (var sr = File.OpenText(reportFile))
+                            {
+                                // We need to read first non-space char in the file
+                                var buf = new char[120];
+                                while (sr.Read(buf, 0, buf.Length) > 0)
+                                {
+                                    string block = new string(buf).TrimStart();
+                                    if (block.Length > 0)
+                                    {
+                                        isXml = block.StartsWith("<");
+                                        break;
+                                    }
+                                }
+                            }
 
-                            List<ParserResult> parserResults = line1.Trim().StartsWith("<")
+                            List<ParserResult> parserResults = isXml
                                 ? this.ParseXmlFile(reportFile).ToList()
                                 : this.ParseTextFile(File.ReadAllLines(reportFile)).ToList();
                             foreach (ParserResult parserResult in parserResults)

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.6.0.0</AssemblyVersion>
-    <FileVersion>4.6.0.0</FileVersion>
+    <AssemblyVersion>4.6.1.0</AssemblyVersion>
+    <FileVersion>4.6.1.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.6.0.0</AssemblyVersion>
-    <FileVersion>4.6.0.0</FileVersion>
+    <AssemblyVersion>4.6.1.0</AssemblyVersion>
+    <FileVersion>4.6.1.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.6.0.0</AssemblyVersion>
-    <FileVersion>4.6.0.0</FileVersion>
+    <AssemblyVersion>4.6.1.0</AssemblyVersion>
+    <FileVersion>4.6.1.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.6.0.0</AssemblyVersion>
-    <FileVersion>4.6.0.0</FileVersion>
+    <AssemblyVersion>4.6.1.0</AssemblyVersion>
+    <FileVersion>4.6.1.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.6.0.0</AssemblyVersion>
-    <FileVersion>4.6.0.0</FileVersion>
+    <AssemblyVersion>4.6.1.0</AssemblyVersion>
+    <FileVersion>4.6.1.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.6.0</Version>
+    <Version>4.6.1</Version>
   </PropertyGroup>
 
   <!-- Tools -->