Skip to content

Commit a2ee606

Browse files
danielpalmedanielpalme
committed
#351: Fixed reading large XML coverage files
2 parents e1213cd + c626cac commit a2ee606

File tree

14 files changed

+40
-22
lines changed

14 files changed

+40
-22
lines changed

‎azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ variables:
1212
- name: disable.coverage.autogenerate
1313
value: 'true'
1414
- name: version
15-
value: '4.6.0'
15+
value: '4.6.1'
1616

1717
stages:
1818
- stage: Build

‎src/AzureDevopsTask/ReportGenerator/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"version": {
1414
"Major": 4,
1515
"Minor": 6,
16-
"Patch": 0
16+
"Patch": 1
1717
},
1818
"instanceNameFormat": "ReportGenerator",
1919
"groups": [

‎src/AzureDevopsTask/vss-extension.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"manifestVersion": 1,
33
"id": "reportgenerator",
44
"name": "ReportGenerator",
5-
"version": "4.6.0",
5+
"version": "4.6.1",
66
"publisher": "Palmmedia",
77
"public": true,
88
"targets": [

‎src/Readme.txt

+4
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ For further details take a look at LICENSE.txt.
6363

6464
CHANGELOG
6565

66+
4.6.1.0
67+
68+
* Fix: #351: Fixed reading large XML coverage files
69+
6670
4.6.0.0
6771

6872
* New: #210: Strong named all DLLs. Plugins have to be strong named too.

‎src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<AssemblyName>ReportGenerator</AssemblyName>
88
<RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
99
<StartupObject>Palmmedia.ReportGenerator.Console.NetCore.Program</StartupObject>
10-
<AssemblyVersion>4.6.0.0</AssemblyVersion>
11-
<FileVersion>4.6.0.0</FileVersion>
10+
<AssemblyVersion>4.6.1.0</AssemblyVersion>
11+
<FileVersion>4.6.1.0</FileVersion>
1212
</PropertyGroup>
1313

1414
<ItemGroup>

‎src/ReportGenerator.Console/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("4.6.0.0")]
35-
[assembly: AssemblyFileVersion("4.6.0.0")]
34+
[assembly: AssemblyVersion("4.6.1.0")]
35+
[assembly: AssemblyFileVersion("4.6.1.0")]

‎src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<RootNamespace>Palmmedia.ReportGenerator.Core.Test</RootNamespace>
7-
<AssemblyVersion>4.6.0.0</AssemblyVersion>
8-
<FileVersion>4.6.0.0</FileVersion>
7+
<AssemblyVersion>4.6.1.0</AssemblyVersion>
8+
<FileVersion>4.6.1.0</FileVersion>
99
</PropertyGroup>
1010

1111
<ItemGroup>

‎src/ReportGenerator.Core/Parser/CoverageReportParser.cs

+16-2
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,23 @@ private Task CreateProducer(IReadOnlyCollection<string> reportFiles, BlockingCol
186186
Logger.DebugFormat(Resources.LoadingReport, reportFile, number, reportFiles.Count);
187187
try
188188
{
189-
string line1 = File.ReadLines(reportFile).First();
189+
bool isXml = false;
190+
using (var sr = File.OpenText(reportFile))
191+
{
192+
// We need to read first non-space char in the file
193+
var buf = new char[120];
194+
while (sr.Read(buf, 0, buf.Length) > 0)
195+
{
196+
string block = new string(buf).TrimStart();
197+
if (block.Length > 0)
198+
{
199+
isXml = block.StartsWith("<");
200+
break;
201+
}
202+
}
203+
}
190204

191-
List<ParserResult> parserResults = line1.Trim().StartsWith("<")
205+
List<ParserResult> parserResults = isXml
192206
? this.ParseXmlFile(reportFile).ToList()
193207
: this.ParseTextFile(File.ReadAllLines(reportFile)).ToList();
194208
foreach (ParserResult parserResult in parserResults)

‎src/ReportGenerator.Core/ReportGenerator.Core.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
88
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
99
<AssemblyName>ReportGenerator.Core</AssemblyName>
10-
<AssemblyVersion>4.6.0.0</AssemblyVersion>
11-
<FileVersion>4.6.0.0</FileVersion>
10+
<AssemblyVersion>4.6.1.0</AssemblyVersion>
11+
<FileVersion>4.6.1.0</FileVersion>
1212
</PropertyGroup>
1313

1414
<PropertyGroup>

‎src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<AssemblyName>dotnet-reportgenerator</AssemblyName>
88
<RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
99
<StartupObject>Palmmedia.ReportGenerator.DotnetCliTool.Program</StartupObject>
10-
<AssemblyVersion>4.6.0.0</AssemblyVersion>
11-
<FileVersion>4.6.0.0</FileVersion>
10+
<AssemblyVersion>4.6.1.0</AssemblyVersion>
11+
<FileVersion>4.6.1.0</FileVersion>
1212
</PropertyGroup>
1313

1414
<ItemGroup>

‎src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<PropertyGroup>
33
<TargetFramework>netcoreapp2.0</TargetFramework>
44
<RootNamespace>ReportGenerator.DotnetCorePluginLoader</RootNamespace>
5-
<AssemblyVersion>4.6.0.0</AssemblyVersion>
6-
<FileVersion>4.6.0.0</FileVersion>
5+
<AssemblyVersion>4.6.1.0</AssemblyVersion>
6+
<FileVersion>4.6.1.0</FileVersion>
77
</PropertyGroup>
88

99
<ItemGroup>

‎src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<AssemblyName>ReportGenerator</AssemblyName>
88
<RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
99
<StartupObject>Palmmedia.ReportGenerator.DotnetGlobalTool.Program</StartupObject>
10-
<AssemblyVersion>4.6.0.0</AssemblyVersion>
11-
<FileVersion>4.6.0.0</FileVersion>
10+
<AssemblyVersion>4.6.1.0</AssemblyVersion>
11+
<FileVersion>4.6.1.0</FileVersion>
1212
</PropertyGroup>
1313

1414
<ItemGroup>

‎src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<RootNamespace>Palmmedia.ReportGenerator.MSBuild</RootNamespace>
66
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
77
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
8-
<AssemblyVersion>4.6.0.0</AssemblyVersion>
9-
<FileVersion>4.6.0.0</FileVersion>
8+
<AssemblyVersion>4.6.1.0</AssemblyVersion>
9+
<FileVersion>4.6.1.0</FileVersion>
1010
</PropertyGroup>
1111

1212
<ItemGroup>

‎src/build.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<!-- Version, adjust before build -->
2424
<PropertyGroup>
25-
<Version>4.6.0</Version>
25+
<Version>4.6.1</Version>
2626
</PropertyGroup>
2727

2828
<!-- Tools -->

0 commit comments

Comments
 (0)