diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3fd26260..aa4484ef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ env:
solution: 'src\ReportGenerator.sln'
buildPlatform: Any CPU
buildConfiguration: Release
- version: 5.1.8
+ version: 5.1.9
dotnetSDKVersion: 6.0.300
nodeVersion: 16
diff --git a/src/AzureDevopsTask/ReportGenerator/task.json b/src/AzureDevopsTask/ReportGenerator/task.json
index 953001bb..89b0f183 100644
--- a/src/AzureDevopsTask/ReportGenerator/task.json
+++ b/src/AzureDevopsTask/ReportGenerator/task.json
@@ -13,7 +13,7 @@
"version": {
"Major": 5,
"Minor": 1,
- "Patch": 8
+ "Patch": 9
},
"instanceNameFormat": "ReportGenerator",
"groups": [
diff --git a/src/AzureDevopsTask/vss-extension.json b/src/AzureDevopsTask/vss-extension.json
index 3e02c38d..be695186 100644
--- a/src/AzureDevopsTask/vss-extension.json
+++ b/src/AzureDevopsTask/vss-extension.json
@@ -2,7 +2,7 @@
"manifestVersion": 1,
"id": "reportgenerator",
"name": "ReportGenerator",
- "version": "5.1.8",
+ "version": "5.1.9",
"publisher": "Palmmedia",
"public": true,
"targets": [
diff --git a/src/Readme.txt b/src/Readme.txt
index 587d43a4..9a373a05 100644
--- a/src/Readme.txt
+++ b/src/Readme.txt
@@ -67,9 +67,13 @@ For further details take a look at LICENSE.txt.
CHANGELOG
+5.1.9.0
+
+ * Fix: #522: Reverted #516: Improved class name for gcov parser
+
5.1.8.0
- * Fix: #516: Improved class name for gcov parser
+ * Fix: #516: Added setting for custom assembly name
5.1.7.0
diff --git a/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj b/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj
index 0b4f3a08..b12df862 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
- 5.1.8.0
- 5.1.8.0
+ 5.1.9.0
+ 5.1.9.0
diff --git a/src/ReportGenerator.Core.Test/Parser/GCovParserTest.cs b/src/ReportGenerator.Core.Test/Parser/GCovParserTest.cs
index bdd7eadc..a9fac5c7 100644
--- a/src/ReportGenerator.Core.Test/Parser/GCovParserTest.cs
+++ b/src/ReportGenerator.Core.Test/Parser/GCovParserTest.cs
@@ -47,7 +47,7 @@ public void SupportsBranchCoverage()
[Fact]
public void NumberOfLineVisitsTest()
{
- var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "main.cpp", "C:\\temp\\main.cpp");
+ var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "C:\\temp\\main.cpp", "C:\\temp\\main.cpp");
Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 1).LineVisits);
Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 3).LineVisits);
Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 8).LineVisits);
@@ -59,7 +59,7 @@ public void NumberOfLineVisitsTest()
[Fact]
public void LineVisitStatusTest()
{
- var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "main.cpp", "C:\\temp\\main.cpp");
+ var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "C:\\temp\\main.cpp", "C:\\temp\\main.cpp");
var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1);
Assert.Equal(LineVisitStatus.NotCoverable, line.LineVisitStatus);
@@ -86,7 +86,7 @@ public void NumberOfFilesTest()
[Fact]
public void FilesOfClassTest()
{
- Assert.Single(this.parserResult.Assemblies.Single(a => a.Name == "Default").Classes.Single(c => c.Name == "main.cpp").Files);
+ Assert.Single(this.parserResult.Assemblies.Single(a => a.Name == "Default").Classes.Single(c => c.Name == "C:\\temp\\main.cpp").Files);
}
///
@@ -113,7 +113,7 @@ public void AssembliesTest()
[Fact]
public void GetCoverableLinesOfClassTest()
{
- Assert.Equal(11, this.parserResult.Assemblies.Single(a => a.Name == "Default").Classes.Single(c => c.Name == "main.cpp").CoverableLines);
+ Assert.Equal(11, this.parserResult.Assemblies.Single(a => a.Name == "Default").Classes.Single(c => c.Name == "C:\\temp\\main.cpp").CoverableLines);
}
///
@@ -122,7 +122,7 @@ public void GetCoverableLinesOfClassTest()
[Fact]
public void GetCoverageQuotaOfClassTest()
{
- Assert.Equal(81.8m, this.parserResult.Assemblies.Single(a => a.Name == "Default").Classes.Single(c => c.Name == "main.cpp").CoverageQuota);
+ Assert.Equal(81.8m, this.parserResult.Assemblies.Single(a => a.Name == "Default").Classes.Single(c => c.Name == "C:\\temp\\main.cpp").CoverageQuota);
}
///
@@ -131,7 +131,7 @@ public void GetCoverageQuotaOfClassTest()
[Fact]
public void MethodMetricsTest()
{
- Assert.Empty(this.parserResult.Assemblies.Single(a => a.Name == "Default").Classes.Single(c => c.Name == "main.cpp").Files.Single(f => f.Path == "C:\\temp\\main.cpp").MethodMetrics);
+ Assert.Empty(this.parserResult.Assemblies.Single(a => a.Name == "Default").Classes.Single(c => c.Name == "C:\\temp\\main.cpp").Files.Single(f => f.Path == "C:\\temp\\main.cpp").MethodMetrics);
}
///
@@ -140,7 +140,7 @@ public void MethodMetricsTest()
[Fact]
public void CodeElementsTest()
{
- var codeElements = GetFile(this.parserResult.Assemblies, "main.cpp", "C:\\temp\\main.cpp").CodeElements;
+ var codeElements = GetFile(this.parserResult.Assemblies, "C:\\temp\\main.cpp", "C:\\temp\\main.cpp").CodeElements;
Assert.Equal(2, codeElements.Count());
}
diff --git a/src/ReportGenerator.Core.Test/Parser/LCovParserTest.cs b/src/ReportGenerator.Core.Test/Parser/LCovParserTest.cs
index 5cb5f0c6..0d048daf 100644
--- a/src/ReportGenerator.Core.Test/Parser/LCovParserTest.cs
+++ b/src/ReportGenerator.Core.Test/Parser/LCovParserTest.cs
@@ -45,7 +45,7 @@ public void SupportsBranchCoverage()
[Fact]
public void NumberOfLineVisitsTest()
{
- var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "TestClass.cs", "C:\\temp\\TestClass.cs");
+ var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "C:\\temp\\TestClass.cs", "C:\\temp\\TestClass.cs");
Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits);
Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 10).LineVisits);
Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 11).LineVisits);
@@ -54,7 +54,7 @@ public void NumberOfLineVisitsTest()
Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 23).LineVisits);
Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits);
- fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "TestClass2.cs", "C:\\temp\\TestClass2.cs");
+ fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "C:\\temp\\TestClass2.cs", "C:\\temp\\TestClass2.cs");
Assert.Equal(3, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits);
Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits);
Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits);
@@ -64,11 +64,11 @@ public void NumberOfLineVisitsTest()
Assert.Equal(4, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits);
Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits);
- fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "PartialClass.cs", "C:\\temp\\PartialClass.cs");
+ fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "C:\\temp\\PartialClass.cs", "C:\\temp\\PartialClass.cs");
Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits);
Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits);
- fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "PartialClass2.cs", "C:\\temp\\PartialClass2.cs");
+ fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "C:\\temp\\PartialClass2.cs", "C:\\temp\\PartialClass2.cs");
Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits);
Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits);
}
@@ -79,7 +79,7 @@ public void NumberOfLineVisitsTest()
[Fact]
public void LineVisitStatusTest()
{
- var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "TestClass.cs", "C:\\temp\\TestClass.cs");
+ var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "C:\\temp\\TestClass.cs", "C:\\temp\\TestClass.cs");
var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1);
Assert.Equal(LineVisitStatus.NotCoverable, line.LineVisitStatus);
@@ -106,8 +106,8 @@ public void NumberOfFilesTest()
[Fact]
public void FilesOfClassTest()
{
- Assert.Single(this.parserResult.Assemblies.Single(a => a.Name == "Default").Classes.Single(c => c.Name == "TestClass.cs").Files);
- Assert.Single(this.parserResult.Assemblies.Single(a => a.Name == "Default").Classes.Single(c => c.Name == "PartialClass.cs").Files);
+ Assert.Single(this.parserResult.Assemblies.Single(a => a.Name == "Default").Classes.Single(c => c.Name == "C:\\temp\\TestClass.cs").Files);
+ Assert.Single(this.parserResult.Assemblies.Single(a => a.Name == "Default").Classes.Single(c => c.Name == "C:\\temp\\PartialClass.cs").Files);
}
///
@@ -134,7 +134,7 @@ public void AssembliesTest()
[Fact]
public void GetCoverableLinesOfClassTest()
{
- Assert.Equal(20, this.parserResult.Assemblies.Single(a => a.Name == "Default").Classes.Single(c => c.Name == "AbstractClass.cs").CoverableLines);
+ Assert.Equal(20, this.parserResult.Assemblies.Single(a => a.Name == "Default").Classes.Single(c => c.Name == "C:\\temp\\AbstractClass.cs").CoverableLines);
}
///
@@ -143,7 +143,7 @@ public void GetCoverableLinesOfClassTest()
[Fact]
public void GetCoverageQuotaOfClassTest()
{
- Assert.Equal(100m, this.parserResult.Assemblies.Single(a => a.Name == "Default").Classes.Single(c => c.Name == "PartialClassWithAutoProperties.cs").CoverageQuota);
+ Assert.Equal(100m, this.parserResult.Assemblies.Single(a => a.Name == "Default").Classes.Single(c => c.Name == "C:\\temp\\PartialClassWithAutoProperties.cs").CoverageQuota);
}
///
@@ -152,7 +152,7 @@ public void GetCoverageQuotaOfClassTest()
[Fact]
public void MethodMetricsTest()
{
- Assert.Empty(this.parserResult.Assemblies.Single(a => a.Name == "Default").Classes.Single(c => c.Name == "TestClass.cs").Files.Single(f => f.Path == "C:\\temp\\TestClass.cs").MethodMetrics);
+ Assert.Empty(this.parserResult.Assemblies.Single(a => a.Name == "Default").Classes.Single(c => c.Name == "C:\\temp\\TestClass.cs").Files.Single(f => f.Path == "C:\\temp\\TestClass.cs").MethodMetrics);
}
///
@@ -161,16 +161,16 @@ public void MethodMetricsTest()
[Fact]
public void CodeElementsTest()
{
- var codeElements = GetFile(this.parserResult.Assemblies, "TestClass.cs", "C:\\temp\\TestClass.cs").CodeElements;
+ var codeElements = GetFile(this.parserResult.Assemblies, "C:\\temp\\TestClass.cs", "C:\\temp\\TestClass.cs").CodeElements;
Assert.Equal(2, codeElements.Count());
- codeElements = GetFile(this.parserResult.Assemblies, "PartialClass.cs", "C:\\temp\\PartialClass.cs").CodeElements;
+ codeElements = GetFile(this.parserResult.Assemblies, "C:\\temp\\PartialClass.cs", "C:\\temp\\PartialClass.cs").CodeElements;
Assert.Equal(4, codeElements.Count());
- codeElements = GetFile(this.parserResult.Assemblies, "TestClass2.cs", "C:\\temp\\TestClass2.cs").CodeElements;
+ codeElements = GetFile(this.parserResult.Assemblies, "C:\\temp\\TestClass2.cs", "C:\\temp\\TestClass2.cs").CodeElements;
Assert.Equal(12, codeElements.Count());
- codeElements = GetFile(this.parserResult.Assemblies, "AsyncClass.cs", "C:\\temp\\AsyncClass.cs").CodeElements;
+ codeElements = GetFile(this.parserResult.Assemblies, "C:\\temp\\AsyncClass.cs", "C:\\temp\\AsyncClass.cs").CodeElements;
Assert.Single(codeElements);
Assert.Equal("System.Void Test.AsyncClass/d__0::MoveNext()", codeElements.First().Name);
}
diff --git a/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj b/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj
index 2c526b5c..c092b71e 100644
--- a/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj
+++ b/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj
@@ -4,8 +4,8 @@
net6.0
false
Palmmedia.ReportGenerator.Core.Test
- 5.1.8.0
- 5.1.8.0
+ 5.1.9.0
+ 5.1.9.0
false
diff --git a/src/ReportGenerator.Core/Parser/GCovParser.cs b/src/ReportGenerator.Core/Parser/GCovParser.cs
index e9199ccc..5409c17f 100644
--- a/src/ReportGenerator.Core/Parser/GCovParser.cs
+++ b/src/ReportGenerator.Core/Parser/GCovParser.cs
@@ -104,7 +104,7 @@ private void ProcessClass(Assembly assembly, string[] lines)
return;
}
- var @class = new Class(className, assembly);
+ var @class = new Class(fileName, assembly);
this.ProcessCoverage(@class, fileName, lines);
diff --git a/src/ReportGenerator.Core/Parser/LCovParser.cs b/src/ReportGenerator.Core/Parser/LCovParser.cs
index b85a6035..1587d5b3 100644
--- a/src/ReportGenerator.Core/Parser/LCovParser.cs
+++ b/src/ReportGenerator.Core/Parser/LCovParser.cs
@@ -100,7 +100,7 @@ private void ProcessAssembly(Assembly assembly, string[] lines)
continue;
}
- var @class = new Class(className, assembly);
+ var @class = new Class(fileName, assembly);
this.ProcessClass(@class, fileName, lines, ref i);
diff --git a/src/ReportGenerator.Core/ReportGenerator.Core.csproj b/src/ReportGenerator.Core/ReportGenerator.Core.csproj
index ed538745..d9fa832b 100644
--- a/src/ReportGenerator.Core/ReportGenerator.Core.csproj
+++ b/src/ReportGenerator.Core/ReportGenerator.Core.csproj
@@ -7,8 +7,8 @@
false
true
ReportGenerator.Core
- 5.1.8.0
- 5.1.8.0
+ 5.1.9.0
+ 5.1.9.0
diff --git a/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj b/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj
index cb67bf33..a2126e27 100644
--- a/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj
+++ b/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj
@@ -2,8 +2,8 @@
netcoreapp3.1;net5.0;net6.0
ReportGenerator.DotnetCorePluginLoader
- 5.1.8.0
- 5.1.8.0
+ 5.1.9.0
+ 5.1.9.0
diff --git a/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj b/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj
index 1d1c4085..1a543bc7 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
- 5.1.8.0
- 5.1.8.0
+ 5.1.9.0
+ 5.1.9.0
diff --git a/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj b/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj
index 01c3dd34..c440518f 100644
--- a/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj
+++ b/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj
@@ -5,8 +5,8 @@
Palmmedia.ReportGenerator.MSBuild
false
true
- 5.1.8.0
- 5.1.8.0
+ 5.1.9.0
+ 5.1.9.0
diff --git a/src/build.proj b/src/build.proj
index 2033d061..cd72760a 100644
--- a/src/build.proj
+++ b/src/build.proj
@@ -22,7 +22,7 @@
- 5.1.8
+ 5.1.9