Release 5.1.9

danielpalme · May 18, 2022 · ca2e34f · ca2e34f
1 parent ed44a48
commit ca2e34f
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 40 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -7,8 +7,8 @@
     <AssemblyName>ReportGenerator</AssemblyName>
     <RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
     <StartupObject>Palmmedia.ReportGenerator.Console.NetCore.Program</StartupObject>
-    <AssemblyVersion>5.1.8.0</AssemblyVersion>
-    <FileVersion>5.1.8.0</FileVersion>
+    <AssemblyVersion>5.1.9.0</AssemblyVersion>
+    <FileVersion>5.1.9.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git 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);
         }
 
         /// <summary>
@@ -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);
         }
 
         /// <summary>
@@ -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);
         }
 
         /// <summary>
@@ -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);
         }
 
         /// <summary>
@@ -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
@@ -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);
         }
 
         /// <summary>
@@ -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);
         }
 
         /// <summary>
@@ -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);
         }
 
         /// <summary>
@@ -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);
         }
 
         /// <summary>
@@ -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/<SendAsync>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
@@ -4,8 +4,8 @@
     <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <RootNamespace>Palmmedia.ReportGenerator.Core.Test</RootNamespace>
-    <AssemblyVersion>5.1.8.0</AssemblyVersion>
-    <FileVersion>5.1.8.0</FileVersion>
+    <AssemblyVersion>5.1.9.0</AssemblyVersion>
+    <FileVersion>5.1.9.0</FileVersion>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 

diff --git 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
@@ -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
@@ -7,8 +7,8 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AssemblyName>ReportGenerator.Core</AssemblyName>
-    <AssemblyVersion>5.1.8.0</AssemblyVersion>
-    <FileVersion>5.1.8.0</FileVersion>
+    <AssemblyVersion>5.1.9.0</AssemblyVersion>
+    <FileVersion>5.1.9.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj b/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <RootNamespace>ReportGenerator.DotnetCorePluginLoader</RootNamespace>
-    <AssemblyVersion>5.1.8.0</AssemblyVersion>
-    <FileVersion>5.1.8.0</FileVersion>
+    <AssemblyVersion>5.1.9.0</AssemblyVersion>
+    <FileVersion>5.1.9.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>5.1.8.0</AssemblyVersion>
-    <FileVersion>5.1.8.0</FileVersion>
+    <AssemblyVersion>5.1.9.0</AssemblyVersion>
+    <FileVersion>5.1.9.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>5.1.8.0</AssemblyVersion>
-    <FileVersion>5.1.8.0</FileVersion>
+    <AssemblyVersion>5.1.9.0</AssemblyVersion>
+    <FileVersion>5.1.9.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/build.proj b/src/build.proj
@@ -22,7 +22,7 @@
 
   <!-- Version, adjust before build -->
   <PropertyGroup>
-    <Version>5.1.8</Version>
+    <Version>5.1.9</Version>
   </PropertyGroup>
 
   <!-- Tools -->