Release 5.1.21

danielpalme · May 21, 2023 · 14c862a · 14c862a
1 parent 5b7823d
commit 14c862a
Show file tree

Hide file tree

Showing 21 changed files with 113 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,8 +6,8 @@ env:
   solution: 'src\ReportGenerator.sln'
   buildPlatform: Any CPU
   buildConfiguration: Release
-  version: 5.1.20
-  dotnetSDKVersion: 7.0.203
+  version: 5.1.21
+  dotnetSDKVersion: 7.0.302
   nodeVersion: 18
 
 jobs:
@@ -41,7 +41,7 @@ jobs:
     - name: 'Show dotnet version'
       run: dotnet --version
 
-    - name: 'Use NuGet 5.x'
+    - name: 'Use NuGet 6.x'
       uses: nuget/setup-nuget@v1
 
     - name: 'NuGet Restore'
@@ -155,7 +155,7 @@ jobs:
       run: nuget pack src/Deployment/nuget/ReportGenerator.nuspec -OutputDirectory src/target/packages -Version ${{ env.Version }}
 
     - name: 'Chocolatey pack reportgenerator.portable'
-      run: .$env:USERPROFILE\.nuget\packages\chocolatey\0.10.14\tools\chocolateyInstall\choco.exe pack src/Deployment/chocolatey/reportgenerator.portable.nuspec --outputdirectory=src/target/packages --version=${{ env.Version }}
+      run: .$env:USERPROFILE\.nuget\packages\chocolatey\1.4.0\tools\chocolateyInstall\choco.exe pack src/Deployment/chocolatey/reportgenerator.portable.nuspec --outputdirectory=src/target/packages --version=${{ env.Version }}
 
     - name: 'Publish Artifact: packages'
       uses: actions/upload-artifact@v3
@@ -184,7 +184,7 @@ jobs:
       run: msbuild .\build.proj /t:Restore
       working-directory: src
 
-    - name: 'Use NuGet 5.x'
+    - name: 'Use NuGet 6.x'
       uses: nuget/setup-nuget@v1
 
     - uses: actions/download-artifact@v3

diff --git a/docs/main.526b20fde383e6c8.js b/docs/main.526b20fde383e6c8.js
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.203",
+    "version": "7.0.302",
     "rollForward": "latestMajor"
   }
 }
diff --git a/src/AzureDevopsTask/ReportGenerator/task.json b/src/AzureDevopsTask/ReportGenerator/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 5,
         "Minor": 1,
-        "Patch": 20
+        "Patch": 21
     },
     "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.20",
+    "version": "5.1.21",
     "publisher": "Palmmedia",
     "public": true,
     "targets": [

diff --git a/src/Deployment/nuget/Readme_ReportGenerator.Core.md b/src/Deployment/nuget/Readme_ReportGenerator.Core.md
@@ -0,0 +1,14 @@
+# ReportGenerator - *ReportGenerator.Core*
+ReportGenerator converts coverage reports generated by coverlet, OpenCover, dotCover, Visual Studio, NCover, Cobertura, JaCoCo, Clover, gcov or lcov into human readable reports in various formats. The reports show the coverage quotas and also visualize which lines of your source code have been covered.
+
+## Available packages
+
+|**Package**|**Platforms**|**Installation/Usage**|
+|:----------|:------------|:---------------------|
+|[ReportGenerator](https://www.nuget.org/packages/ReportGenerator)|.NET Core<br/>.NET Framework 4.7|Use this package if your project is based on *.NET Framework* or *.NET Core* and you want to use *ReportGenerator* via the command line or a build script.|
+|[dotnet-reportgenerator-globaltool](https://www.nuget.org/packages/dotnet-reportgenerator-globaltool)|.NET Core|Use this package if your project is based on *.NET Core* and you want to use *ReportGenerator* as a (global) 'DotnetTool'.|
+|[ReportGenerator.Core](https://www.nuget.org/packages/ReportGenerator.Core)|.NET Standard 2.0|Use this package if you want to write a custom **plugin** for *ReportGenerator* or if you want to call/execute *ReportGenerator* within your code base.|
+
+## Create a plugin
+- [Custom reports](https://github.com/danielpalme/ReportGenerator/wiki/Custom-reports)
+- [Custom history storage](https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage)
diff --git a/src/Deployment/nuget/Readme_ReportGenerator.Core.txt b/src/Deployment/nuget/Readme_ReportGenerator.Core.txt
@@ -11,7 +11,8 @@
 
 DESCRIPTION
 
-This package is only suited to create plugins for ReportGenerator.
+Use this package if you want to write a custom plugin for ReportGenerator
+or if you want to call/execute ReportGenerator within your code base.
 
 https://github.com/danielpalme/ReportGenerator/wiki/Custom-reports
 https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage

diff --git a/src/Deployment/nuget/Readme_ReportGenerator.md b/src/Deployment/nuget/Readme_ReportGenerator.md
@@ -0,0 +1,27 @@
+# ReportGenerator
+ReportGenerator converts coverage reports generated by coverlet, OpenCover, dotCover, Visual Studio, NCover, Cobertura, JaCoCo, Clover, gcov or lcov into human readable reports in various formats. The reports show the coverage quotas and also visualize which lines of your source code have been covered.
+
+## Available packages
+
+|**Package**|**Platforms**|**Installation/Usage**|
+|:----------|:------------|:---------------------|
+|[ReportGenerator](https://www.nuget.org/packages/ReportGenerator)|.NET Core<br/>.NET Framework 4.7|Use this package if your project is based on *.NET Framework* or *.NET Core* and you want to use *ReportGenerator* via the command line or a build script.|
+|[dotnet-reportgenerator-globaltool](https://www.nuget.org/packages/dotnet-reportgenerator-globaltool)|.NET Core|Use this package if your project is based on *.NET Core* and you want to use *ReportGenerator* as a (global) 'DotnetTool'.|
+|[ReportGenerator.Core](https://www.nuget.org/packages/ReportGenerator.Core)|.NET Standard 2.0|Use this package if you want to write a custom **plugin** for *ReportGenerator* or if you want to call/execute *ReportGenerator* within your code base.|
+
+## Usage
+
+### .NET Core
+```
+dotnet $(UserProfile)\.nuget\packages\reportgenerator\5.1.21\tools\net6.0\ReportGenerator.dll [options]
+$(UserProfile)\.nuget\packages\reportgenerator\5.1.21\tools\net6.0\ReportGenerator.exe [options]
+```
+
+### .NET Framework
+```
+$(UserProfile)\.nuget\packages\reportgenerator\5.1.21\tools\net47\ReportGenerator.exe [options]
+```
+
+## Additional information
+- [Get started](https://reportgenerator.io/getstarted)
+- [Command line parameters](https://reportgenerator.io/usage)
diff --git a/src/Deployment/nuget/Readme_dotnet-reportgenerator-globaltool.md b/src/Deployment/nuget/Readme_dotnet-reportgenerator-globaltool.md
@@ -0,0 +1,33 @@
+# ReportGenerator - *dotnet-reportgenerator-globaltool*
+ReportGenerator converts coverage reports generated by coverlet, OpenCover, dotCover, Visual Studio, NCover, Cobertura, JaCoCo, Clover, gcov or lcov into human readable reports in various formats. The reports show the coverage quotas and also visualize which lines of your source code have been covered.
+
+## Available packages
+
+|**Package**|**Platforms**|**Installation/Usage**|
+|:----------|:------------|:---------------------|
+|[ReportGenerator](https://www.nuget.org/packages/ReportGenerator)|.NET Core<br/>.NET Framework 4.7|Use this package if your project is based on *.NET Framework* or *.NET Core* and you want to use *ReportGenerator* via the command line or a build script.|
+|[dotnet-reportgenerator-globaltool](https://www.nuget.org/packages/dotnet-reportgenerator-globaltool)|.NET Core|Use this package if your project is based on *.NET Core* and you want to use *ReportGenerator* as a (global) 'DotnetTool'.|
+|[ReportGenerator.Core](https://www.nuget.org/packages/ReportGenerator.Core)|.NET Standard 2.0|Use this package if you want to write a custom **plugin** for *ReportGenerator* or if you want to call/execute *ReportGenerator* within your code base.|
+
+## Usage
+
+### Installation
+```
+dotnet tool install --global dotnet-reportgenerator-globaltool --version 5.1.21
+
+dotnet tool install dotnet-reportgenerator-globaltool --tool-path tools --version 5.1.21
+
+dotnet new tool-manifest
+dotnet tool install dotnet-reportgenerator-globaltool --version 5.1.21
+```
+
+### Execution
+```
+reportgenerator [options]
+tools\reportgenerator.exe [options]
+dotnet reportgenerator [options]
+```
+
+## Additional information
+- [Get started](https://reportgenerator.io/getstarted)
+- [Command line parameters](https://reportgenerator.io/usage)
diff --git a/src/Deployment/nuget/ReportGenerator.Core.nuspec b/src/Deployment/nuget/ReportGenerator.Core.nuspec
@@ -19,6 +19,7 @@ Use this package if you want to write a custom plugin for ReportGenerator or if
 Plugin development:
 https://github.com/danielpalme/ReportGenerator/wiki/Custom-reports
 https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage</description>
+    <readme>README.md</readme>
     <language>en-US</language>
     <tags>Code Coverage Reporting Testing TDD Utility</tags>
     <repository type="git" url="https://github.com/danielpalme/ReportGenerator.git" />
@@ -47,6 +48,7 @@ https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage</desc
     <file src="..\logo_plugin_64.png" target="icon.png" />
     <file src="..\..\..\LICENSE.txt" target="LICENSE.txt" />
     <file src="Readme_ReportGenerator.Core.txt" target="Readme.txt" />
+    <file src="Readme_ReportGenerator.Core.md" target="Readme.md" />
 
     <!-- Plugin development -->
     <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.deps.json" target="lib\netstandard2.0\" />

diff --git a/src/Deployment/nuget/ReportGenerator.nuspec b/src/Deployment/nuget/ReportGenerator.nuspec
@@ -20,6 +20,7 @@ Usage:
 dotnet $(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net6.0\ReportGenerator.dll [options]
 $(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net6.0\ReportGenerator.exe [options]
 $(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net47\ReportGenerator.exe [options]</description>
+    <readme>README.md</readme>
     <language>en-US</language>
     <tags>Code Coverage Reporting Testing TDD Utility</tags>
     <repository type="git" url="https://github.com/danielpalme/ReportGenerator.git" />
@@ -28,6 +29,7 @@ $(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net47\ReportGenerator
     <file src="..\logo_64.png" target="icon.png" />
     <file src="..\..\..\LICENSE.txt" target="LICENSE.txt" />
     <file src="..\..\Readme.txt" target="Readme.txt" />
+    <file src="Readme_ReportGenerator.md" target="Readme.md" />
 
     <!-- MSBuild *.props file -->
     <file src="ReportGenerator.props" target="build\netstandard2.0" />

diff --git a/src/Deployment/nuget/dotnet-reportgenerator-globaltool.nuspec b/src/Deployment/nuget/dotnet-reportgenerator-globaltool.nuspec
@@ -28,6 +28,7 @@ Usage:
 reportgenerator [options]
 tools\reportgenerator.exe [options]
 dotnet reportgenerator [options]</description>
+    <readme>README.md</readme>
     <language>en-US</language>
     <tags>Code Coverage Reporting Testing TDD Utility</tags>
     <repository type="git" url="https://github.com/danielpalme/ReportGenerator.git" />
@@ -39,6 +40,7 @@ dotnet reportgenerator [options]</description>
     <file src="..\logo_global_64.png" target="icon.png" />
     <file src="..\..\..\LICENSE.txt" target="LICENSE.txt" />
     <file src="..\..\Readme.txt" target="Readme.txt" />
+    <file src="Readme_dotnet-reportgenerator-globaltool.md" target="Readme.md" />
 
     <!-- NetCoreApp3.1 ('tools\netcoreapp3.1' directory) -->
     <file src="..\..\ReportGenerator.DotnetGlobalTool\bin\Release\netcoreapp3.1\publish\**\*.*" target="tools\netcoreapp3.1\any" />

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.20.0</AssemblyVersion>
-    <FileVersion>5.1.20.0</FileVersion>
+    <AssemblyVersion>5.1.21.0</AssemblyVersion>
+    <FileVersion>5.1.21.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ReportGenerator.Console/ReportGenerator.Console.Net.csproj b/src/ReportGenerator.Console/ReportGenerator.Console.Net.csproj
@@ -8,8 +8,8 @@
     <AssemblyTitle>ReportGenerator.Console</AssemblyTitle>
     <Product>ReportGenerator.Console</Product>
     <Copyright>Copyright © 2022</Copyright>
-    <AssemblyVersion>5.1.20.0</AssemblyVersion>
-    <FileVersion>5.1.20.0</FileVersion>
+    <AssemblyVersion>5.1.21.0</AssemblyVersion>
+    <FileVersion>5.1.21.0</FileVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>

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>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <RootNamespace>Palmmedia.ReportGenerator.Core.Test</RootNamespace>
-    <AssemblyVersion>5.1.20.0</AssemblyVersion>
-    <FileVersion>5.1.20.0</FileVersion>
+    <AssemblyVersion>5.1.21.0</AssemblyVersion>
+    <FileVersion>5.1.21.0</FileVersion>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 

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.20.0</AssemblyVersion>
-    <FileVersion>5.1.20.0</FileVersion>
+    <AssemblyVersion>5.1.21.0</AssemblyVersion>
+    <FileVersion>5.1.21.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;net7.0</TargetFrameworks>
     <RootNamespace>ReportGenerator.DotnetCorePluginLoader</RootNamespace>
-    <AssemblyVersion>5.1.20.0</AssemblyVersion>
-    <FileVersion>5.1.20.0</FileVersion>
+    <AssemblyVersion>5.1.21.0</AssemblyVersion>
+    <FileVersion>5.1.21.0</FileVersion>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 

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.20.0</AssemblyVersion>
-    <FileVersion>5.1.20.0</FileVersion>
+    <AssemblyVersion>5.1.21.0</AssemblyVersion>
+    <FileVersion>5.1.21.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.20.0</AssemblyVersion>
-    <FileVersion>5.1.20.0</FileVersion>
+    <AssemblyVersion>5.1.21.0</AssemblyVersion>
+    <FileVersion>5.1.21.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/build.proj b/src/build.proj
@@ -2,13 +2,13 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Deploy">
   <ItemGroup>
     <PackageReference Include="chocolatey">
-      <Version>0.10.14</Version>
+      <Version>1.4.0</Version>
     </PackageReference>
     <PackageReference Include="MSBuildTasks">
       <Version>1.5.0.235</Version>
     </PackageReference>
     <PackageReference Include="NuGet.CommandLine">
-      <Version>5.7.0</Version>
+      <Version>6.5.0</Version>
     </PackageReference>
   </ItemGroup>
 
@@ -22,13 +22,13 @@
 
   <!-- Version, adjust before build -->
   <PropertyGroup>
-    <Version>5.1.20</Version>
+    <Version>5.1.21</Version>
   </PropertyGroup>
 
   <!-- Tools -->
   <PropertyGroup>
-    <NuGetCommandLine>$(UserProfile)\.nuget\packages\nuget.commandline\5.7.0\tools\NuGet.exe</NuGetCommandLine>
-    <ChocolateyCommandLine>$(UserProfile)\.nuget\packages\chocolatey\0.10.14\tools\chocolateyInstall\choco.exe</ChocolateyCommandLine>
+    <NuGetCommandLine>$(UserProfile)\.nuget\packages\nuget.commandline\6.5.0\tools\NuGet.exe</NuGetCommandLine>
+    <ChocolateyCommandLine>$(UserProfile)\.nuget\packages\chocolatey\1.4.0\tools\chocolateyInstall\choco.exe</ChocolateyCommandLine>
   </PropertyGroup>
 
   <Target Name="Clean">

diff --git a/src/update-version.ps1 b/src/update-version.ps1
@@ -9,6 +9,9 @@ Write-Host $To
 ((Get-Content -path ..\.github\workflows\ci.yml -Raw) -replace $From, $To) | Set-Content -Path ..\.github\workflows\ci.yml -NoNewline
 (Get-ChildItem -Recurse -Filter ReportGenerator*.csproj | Select-String $From) | ForEach-Object { ((Get-Content -path $_.Path -Raw) -replace $From, $To) | Out-File $_.Path -Encoding UTF8 -NoNewline }
 ((Get-Content -path AzureDevopsTask\vss-extension.json -Raw) -replace $From, $To) | Set-Content -Path AzureDevopsTask\vss-extension.json -NoNewline
+((Get-Content -path Deployment\nuget\Readme_dotnet-reportgenerator-globaltool.md -Raw) -replace $From, $To) | Set-Content -Path Deployment\nuget\Readme_dotnet-reportgenerator-globaltool.md -NoNewline
+((Get-Content -path Deployment\nuget\Readme_ReportGenerator.Core.md -Raw) -replace $From, $To) | Set-Content -Path Deployment\nuget\Readme_ReportGenerator.Core.md -NoNewline
+((Get-Content -path Deployment\nuget\Readme_ReportGenerator.md -Raw) -replace $From, $To) | Set-Content -Path Deployment\nuget\Readme_ReportGenerator.md -NoNewline
 
 $FromVersions = $From.Split(".")
 $ToVersions = $To.Split(".")