Release 5.1.4

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ env:
   solution: 'src\ReportGenerator.sln'
   buildPlatform: Any CPU
   buildConfiguration: Release
-  version: 5.1.3
+  version: 5.1.4
   dotnetSDKVersion: 6.0.201
   nodeVersion: 16
 
@@ -78,7 +78,7 @@ jobs:
       run: dotnet test src\ReportGenerator.Core.Test\ReportGenerator.Core.Test.csproj --configuration ${{ env.BuildConfiguration }} --no-build /p:CollectCoverage=true /p:DeterministicSourcePaths=true /p:IncludeTestAssembly=true /p:CoverletOutputFormat=opencover%2ccobertura /p:CoverletOutput=../target/reports/coverage/
 
     - name: ReportGenerator
-      uses: danielpalme/ReportGenerator-GitHub-Action@5.0.2
+      uses: danielpalme/ReportGenerator-GitHub-Action@5.1.3
       with:
         reports: 'src\target\reports\coverage\coverage.opencover.xml'
         targetdir: 'src\target\reports\coverage'

src/AzureDevopsTask/ReportGenerator/task.json

@@ -13,7 +13,7 @@
     "version": {
         "Major": 5,
         "Minor": 1,
-        "Patch": 3
+        "Patch": 4
     },
     "instanceNameFormat": "ReportGenerator",
     "groups": [

src/AzureDevopsTask/vss-extension.json

@@ -2,7 +2,7 @@
     "manifestVersion": 1,
     "id": "reportgenerator",
     "name": "ReportGenerator",
-    "version": "5.1.3",
+    "version": "5.1.4",
     "publisher": "Palmmedia",
     "public": true,
     "targets": [

src/Readme.txt

@@ -67,6 +67,10 @@ For further details take a look at LICENSE.txt.
 
 CHANGELOG
 
+5.1.4.0
+
+    * Fix: #408: Improved support for generic classes for 'dotnet-coverage'
+
 5.1.3.0
 
     * Fix: #503: Updated System.Text.Encodings.Web

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.3.0</AssemblyVersion>
-    <FileVersion>5.1.3.0</FileVersion>
+    <AssemblyVersion>5.1.4.0</AssemblyVersion>
+    <FileVersion>5.1.4.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

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.3.0</AssemblyVersion>
-    <FileVersion>5.1.3.0</FileVersion>
+    <AssemblyVersion>5.1.4.0</AssemblyVersion>
+    <FileVersion>5.1.4.0</FileVersion>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 

src/ReportGenerator.Core/Parser/CoberturaParser.cs

@@ -23,6 +23,11 @@ internal class CoberturaParser : ParserBase
         /// </summary>
         private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(CoberturaParser));
 
+        /// <summary>
+        /// Regex to analyze if a class name represents a generic class.
+        /// </summary>
+        private static readonly Regex GenericClassRegex = new Regex("<.*>$", RegexOptions.Compiled);
+
         /// <summary>
         /// Regex to analyze if a method name belongs to a lamda expression.
         /// </summary>
@@ -124,7 +129,8 @@ private Assembly ProcessAssembly(XElement[] modules, string assemblyName)
                     int nestedClassSeparatorIndex = fullname.IndexOf('/');
                     return nestedClassSeparatorIndex > -1 ? fullname.Substring(0, nestedClassSeparatorIndex) : fullname;
                 })
-                .Where(name => !name.Contains("$") && !name.Contains("<"))
+                .Where(name => !name.Contains("$")
+                    && (!name.Contains("<") || GenericClassRegex.IsMatch(name)))
                 .Distinct()
                 .Where(c => this.ClassFilter.IsElementIncludedInReport(c))
                 .OrderBy(name => name)

src/ReportGenerator.Core/ReportGenerator.Core.csproj

@@ -7,8 +7,8 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AssemblyName>ReportGenerator.Core</AssemblyName>
-    <AssemblyVersion>5.1.3.0</AssemblyVersion>
-    <FileVersion>5.1.3.0</FileVersion>
+    <AssemblyVersion>5.1.4.0</AssemblyVersion>
+    <FileVersion>5.1.4.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup>

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.3.0</AssemblyVersion>
-    <FileVersion>5.1.3.0</FileVersion>
+    <AssemblyVersion>5.1.4.0</AssemblyVersion>
+    <FileVersion>5.1.4.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

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.3.0</AssemblyVersion>
-    <FileVersion>5.1.3.0</FileVersion>
+    <AssemblyVersion>5.1.4.0</AssemblyVersion>
+    <FileVersion>5.1.4.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj

@@ -5,8 +5,8 @@
     <RootNamespace>Palmmedia.ReportGenerator.MSBuild</RootNamespace>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <AssemblyVersion>5.1.3.0</AssemblyVersion>
-    <FileVersion>5.1.3.0</FileVersion>
+    <AssemblyVersion>5.1.4.0</AssemblyVersion>
+    <FileVersion>5.1.4.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/build.proj

@@ -22,7 +22,7 @@
 
   <!-- Version, adjust before build -->
   <PropertyGroup>
-    <Version>5.1.3</Version>
+    <Version>5.1.4</Version>
   </PropertyGroup>
 
   <!-- Tools -->