Merge pull request #463 from danielpalme/net6

.NET 6

.github/workflows/ci.yml

@@ -6,8 +6,8 @@ env:
   solution: 'src\ReportGenerator.sln'
   buildPlatform: Any CPU
   buildConfiguration: Release
-  version: 4.8.13
-  dotnetSDKVersion: 5.0.301
+  version: 4.9.0
+  dotnetSDKVersion: 6.0.100
   nodeVersion: 14
 
 jobs:
@@ -50,34 +50,30 @@ jobs:
     - name: 'Compile Solution'
       run: msbuild '${{ env.solution }}' /p:configuration='${{ env.buildConfiguration }}' /p:platform='${{ env.buildPlatform }}'
 
-    - name: dotnet publish Console.NetCore 2.0
-      run: dotnet publish -c ${{ env.BuildConfiguration }} -f netcoreapp2.0 ReportGenerator.Console.NetCore.csproj
-      working-directory: src/ReportGenerator.Console.NetCore
-
-    - name: dotnet publish Console.NetCore 2.1
-      run: dotnet publish -c ${{ env.BuildConfiguration }} -f netcoreapp2.1 ReportGenerator.Console.NetCore.csproj
-      working-directory: src/ReportGenerator.Console.NetCore
-
-    - name: dotnet publish Console.NetCore 3.0
-      run: dotnet publish -c ${{ env.BuildConfiguration }} -f netcoreapp3.0 ReportGenerator.Console.NetCore.csproj
+    - name: dotnet publish Console.NetCore 3.1
+      run: dotnet publish -c ${{ env.BuildConfiguration }} -f netcoreapp3.1 ReportGenerator.Console.NetCore.csproj
       working-directory: src/ReportGenerator.Console.NetCore
 
     - name: dotnet publish Console.NetCore 5.0
       run: dotnet publish -c ${{ env.BuildConfiguration }} -f net5.0 ReportGenerator.Console.NetCore.csproj
       working-directory: src/ReportGenerator.Console.NetCore
 
-    - name: dotnet publish DotnetGlobalTool 2.1
-      run: dotnet publish -c ${{ env.BuildConfiguration }} -f netcoreapp2.1 ReportGenerator.DotnetGlobalTool.csproj
-      working-directory: src/ReportGenerator.DotnetGlobalTool
+    - name: dotnet publish Console.NetCore 6.0
+      run: dotnet publish -c ${{ env.BuildConfiguration }} -f net6.0 ReportGenerator.Console.NetCore.csproj
+      working-directory: src/ReportGenerator.Console.NetCore
 
-    - name: dotnet publish DotnetGlobalTool 3.0
-      run: dotnet publish -c ${{ env.BuildConfiguration }} -f netcoreapp3.0 ReportGenerator.DotnetGlobalTool.csproj
+    - name: dotnet publish DotnetGlobalTool 3.1
+      run: dotnet publish -c ${{ env.BuildConfiguration }} -f netcoreapp3.1 ReportGenerator.DotnetGlobalTool.csproj
       working-directory: src/ReportGenerator.DotnetGlobalTool
 
     - name: dotnet publish DotnetGlobalTool 5.0
       run: dotnet publish -c ${{ env.BuildConfiguration }} -f net5.0 ReportGenerator.DotnetGlobalTool.csproj
       working-directory: src/ReportGenerator.DotnetGlobalTool
 
+    - name: dotnet publish DotnetGlobalTool 6.0
+      run: dotnet publish -c ${{ env.BuildConfiguration }} -f net6.0 ReportGenerator.DotnetGlobalTool.csproj
+      working-directory: src/ReportGenerator.DotnetGlobalTool
+
     - name: Test
       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/
 
@@ -97,8 +93,8 @@ jobs:
 
     - name: 'Prepare VSIX release: NetCore'
       run: |
-        mkdir src/AzureDevopsTask/ReportGenerator/tools/netcoreapp2.1
-        xcopy 'src\ReportGenerator.Console.NetCore\bin\Release\netcoreapp2.1\publish' 'src\AzureDevopsTask\ReportGenerator\tools\netcoreapp2.1' /s
+        mkdir src/AzureDevopsTask/ReportGenerator/tools/netcoreapp3.1
+        xcopy 'src\ReportGenerator.Console.NetCore\bin\Release\netcoreapp3.1\publish' 'src\AzureDevopsTask\ReportGenerator\tools\netcoreapp3.1' /s
 
     - name: 'Prepare VSIX release: Install TFS Cross Platform Command Line Interface (tfx-cli)'
       run: npm install -g tfx-cli
@@ -119,10 +115,9 @@ jobs:
       run: |
         mkdir tmpzip
         mkdir tmpzip\net47
-        mkdir tmpzip\netcoreapp2.0
-        mkdir tmpzip\netcoreapp2.1
-        mkdir tmpzip\netcoreapp3.0
+        mkdir tmpzip\netcoreapp3.1
         mkdir tmpzip\net5.0
+        mkdir tmpzip\net6.0
 
     - name: 'Prepare ZIP release'
       run: |
@@ -132,10 +127,9 @@ jobs:
         xcopy "src\ReportGenerator.Console\bin\Release\*.dll" "tmpzip\net47"
         xcopy "src\ReportGenerator.Console\bin\Release\ReportGenerator.exe" "tmpzip\net47"
         xcopy "src\ReportGenerator.Console\bin\Release\ReportGenerator.exe.config" "tmpzip\net47"
-        xcopy 'src\ReportGenerator.Console.NetCore\bin\Release\netcoreapp2.0\publish\*' 'tmpzip\netcoreapp2.0' /s
-        xcopy 'src\ReportGenerator.Console.NetCore\bin\Release\netcoreapp2.1\publish\*' 'tmpzip\netcoreapp2.1' /s
-        xcopy 'src\ReportGenerator.Console.NetCore\bin\Release\netcoreapp3.0\publish\*' 'tmpzip\netcoreapp3.0' /s
+        xcopy 'src\ReportGenerator.Console.NetCore\bin\Release\netcoreapp3.1\publish\*' 'tmpzip\netcoreapp3.1' /s
         xcopy 'src\ReportGenerator.Console.NetCore\bin\Release\net5.0\publish\*' 'tmpzip\net5.0' /s
+        xcopy 'src\ReportGenerator.Console.NetCore\bin\Release\net6.0\publish\*' 'tmpzip\net6.0' /s
 
     - name: 'Pack ZIP release'
       run: Compress-Archive -Path tmpzip/* -DestinationPath src/target/packages/ReportGenerator_${{ env.Version }}.zip

README.md

@@ -40,11 +40,11 @@ Use the online [configuration tool](https://danielpalme.github.io/ReportGenerato
 
 |**Package**|**Platforms**|**Installation/Usage**|
 |:----------|:------------|:---------------------|
-|[ReportGenerator](https://www.nuget.org/packages/ReportGenerator)<br/><br/>[![Nuget](https://img.shields.io/nuget/v/ReportGenerator.svg)![Nuget](https://img.shields.io/nuget/dt/ReportGenerator.svg)](https://www.nuget.org/packages/ReportGenerator)|.NET Core 2.x, 3.x, 5.x<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.<br/><br/>**Usage**<br/>```dotnet $(UserProfile).nuget\packages\reportgenerator\x.y.z\tools\net5.0\ReportGenerator.dll [options]```<br/>```$(UserProfile).nuget\packages\reportgenerator\x.y.z\tools\net5.0\ReportGenerator.exe [options]```<br/><br/>```$(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net47\ReportGenerator.exe [options]```|
-|[dotnet-reportgenerator-globaltool](https://www.nuget.org/packages/dotnet-reportgenerator-globaltool)<br/><br/>[![Nuget](https://img.shields.io/nuget/v/dotnet-reportgenerator-globaltool.svg)![Nuget](https://img.shields.io/nuget/dt/dotnet-reportgenerator-globaltool.svg)](https://www.nuget.org/packages/dotnet-reportgenerator-globaltool)|.NET Core 2.1, 3.x, 5.x |Use this package if your project is based on *.NET Core* and you want to use *ReportGenerator* as a (global) 'DotnetTool'.<br/><br/>**Installation**<br/>```dotnet tool install -g dotnet-reportgenerator-globaltool```<br/><br/>```dotnet tool install dotnet-reportgenerator-globaltool --tool-path tools```<br/><br/>```dotnet new tool-manifest```<br/>```dotnet tool install dotnet-reportgenerator-globaltool```<br/><br/>**Usage**<br/>```reportgenerator [options]```<br/>```tools\reportgenerator.exe [options]```<br/>```dotnet reportgenerator [options]```|
+|[ReportGenerator](https://www.nuget.org/packages/ReportGenerator)<br/><br/>[![Nuget](https://img.shields.io/nuget/v/ReportGenerator.svg)![Nuget](https://img.shields.io/nuget/dt/ReportGenerator.svg)](https://www.nuget.org/packages/ReportGenerator)|.NET Core >=3.1<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.<br/><br/>**Usage**<br/>```dotnet $(UserProfile).nuget\packages\reportgenerator\x.y.z\tools\net6.0\ReportGenerator.dll [options]```<br/>```$(UserProfile).nuget\packages\reportgenerator\x.y.z\tools\net6.0\ReportGenerator.exe [options]```<br/><br/>```$(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net47\ReportGenerator.exe [options]```|
+|[dotnet-reportgenerator-globaltool](https://www.nuget.org/packages/dotnet-reportgenerator-globaltool)<br/><br/>[![Nuget](https://img.shields.io/nuget/v/dotnet-reportgenerator-globaltool.svg)![Nuget](https://img.shields.io/nuget/dt/dotnet-reportgenerator-globaltool.svg)](https://www.nuget.org/packages/dotnet-reportgenerator-globaltool)|.NET Core >=3.1 |Use this package if your project is based on *.NET Core* and you want to use *ReportGenerator* as a (global) 'DotnetTool'.<br/><br/>**Installation**<br/>```dotnet tool install -g dotnet-reportgenerator-globaltool```<br/><br/>```dotnet tool install dotnet-reportgenerator-globaltool --tool-path tools```<br/><br/>```dotnet new tool-manifest```<br/>```dotnet tool install dotnet-reportgenerator-globaltool```<br/><br/>**Usage**<br/>```reportgenerator [options]```<br/>```tools\reportgenerator.exe [options]```<br/>```dotnet reportgenerator [options]```|
 |[ReportGenerator.Core](https://www.nuget.org/packages/ReportGenerator.Core)<br/><br/>[![Nuget](https://img.shields.io/nuget/v/ReportGenerator.Core.svg)![Nuget](https://img.shields.io/nuget/dt/ReportGenerator.Core.svg)](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.<br/><br/>**Plugin development**<br/>[Custom reports](https://github.com/danielpalme/ReportGenerator/wiki/Custom-reports)<br/>[Custom history storage](https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage)|
-|[Azure DevOps extension](https://marketplace.visualstudio.com/items?itemName=Palmmedia.reportgenerator)<br/><br/>[![Visual Studio Marketplace Version](https://img.shields.io/visual-studio-marketplace/v/Palmmedia.reportgenerator.svg)![Visual Studio Marketplace Installs - Azure DevOps Extension](https://img.shields.io/visual-studio-marketplace/azure-devops/installs/total/Palmmedia.reportgenerator.svg)](https://marketplace.visualstudio.com/items?itemName=Palmmedia.reportgenerator)|.NET Core >=2.1| Add the Azure DevOps extension to your build pipeline.<br />[Learn more](https://github.com/danielpalme/ReportGenerator/wiki/Integration#azure-devops-extension)|
-|[GitHub Actions](https://github.com/marketplace/actions/reportgenerator)|.NET Core >=2.1| Add the GitHub Action to your build pipeline.<br />[Learn more](https://github.com/danielpalme/ReportGenerator/wiki/Integration#github-actions)|
+|[Azure DevOps extension](https://marketplace.visualstudio.com/items?itemName=Palmmedia.reportgenerator)<br/><br/>[![Visual Studio Marketplace Version](https://img.shields.io/visual-studio-marketplace/v/Palmmedia.reportgenerator.svg)![Visual Studio Marketplace Installs - Azure DevOps Extension](https://img.shields.io/visual-studio-marketplace/azure-devops/installs/total/Palmmedia.reportgenerator.svg)](https://marketplace.visualstudio.com/items?itemName=Palmmedia.reportgenerator)|.NET Core >=3.1| Add the Azure DevOps extension to your build pipeline.<br />[Learn more](https://github.com/danielpalme/ReportGenerator/wiki/Integration#azure-devops-extension)|
+|[GitHub Actions](https://github.com/marketplace/actions/reportgenerator)|.NET Core >=3.1| Add the GitHub Action to your build pipeline.<br />[Learn more](https://github.com/danielpalme/ReportGenerator/wiki/Integration#github-actions)|
 
 ### Usage / Command line parameters
 ```

docs/usage.html

@@ -217,7 +217,7 @@ <h4>Usage</h4>
                     ],
                     executables: [
                         { runtime: '.NET Framework', tool: '$(UserProfile)\\.nuget\\packages\\reportgenerator\\x.y.z\\tools\\net47\\ReportGenerator.exe' },
-                        { runtime: '.NET Core', tool: 'dotnet $(UserProfile)\\.nuget\\packages\\reportgenerator\\x.y.z\\tools\\net5.0\\ReportGenerator.dll' }
+                        { runtime: '.NET Core', tool: 'dotnet $(UserProfile)\\.nuget\\packages\\reportgenerator\\x.y.z\\tools\\net6.0\\ReportGenerator.dll' }
                     ]
                 },
                 { 

global.json

@@ -1,6 +1,6 @@
 {
-    "sdk": {
-      "version": "5.0.301",
-      "rollForward": "latestMajor"
-    }
+  "sdk": {
+    "version": "6.0.100",
+    "rollForward": "latestMajor"
+  }
 }

src/AzureDevopsTask/ReportGenerator/reportgenerator.ts

@@ -3,7 +3,7 @@ import tl = require('azure-pipelines-task-lib/task');
 
 async function executeReportGenerator(): Promise<number> {
     var tool = tl.tool('dotnet')
-    .arg(path.join(__dirname, 'tools/netcoreapp2.1/ReportGenerator.dll'))
+    .arg(path.join(__dirname, 'tools/netcoreapp3.1/ReportGenerator.dll'))
     .arg('-reports:' + (tl.getInput('reports') || ''))
     .arg('-targetdir:' + (tl.getInput('targetdir') || ''))
     .arg('-reporttypes:' + (tl.getInput('reporttypes') || ''))

src/Deployment/chocolatey/reportgenerator.portable.nuspec

@@ -24,17 +24,14 @@
     <file src="..\..\Readme.txt" target="Readme.txt" />
     <file src="VERIFICATION.txt" target="tools\VERIFICATION.txt" />
 
-    <!-- NetCoreApp2.0 ('tools\netcoreapp2.0' directory) -->
-    <file src="..\..\ReportGenerator.Console.NetCore\bin\Release\netcoreapp2.0\publish\**\*.*" target="tools\netcoreapp2.0" />
-
-    <!-- NetCoreApp2.1 ('tools\netcoreapp2.1' directory) -->
-    <file src="..\..\ReportGenerator.Console.NetCore\bin\Release\netcoreapp2.1\publish\**\*.*" target="tools\netcoreapp2.1" />
-
-    <!-- NetCoreApp3.0 ('tools\netcoreapp3.0' directory) -->
-    <file src="..\..\ReportGenerator.Console.NetCore\bin\Release\netcoreapp3.0\publish\**\*.*" target="tools\netcoreapp3.0" />
+    <!-- NetCoreApp3.1 ('tools\netcoreapp3.1' directory) -->
+    <file src="..\..\ReportGenerator.Console.NetCore\bin\Release\netcoreapp3.1\publish\**\*.*" target="tools\netcoreapp3.1" />
 
     <!-- Net5.0 ('tools\net5.0' directory) -->
     <file src="..\..\ReportGenerator.Console.NetCore\bin\Release\net5.0\publish\**\*.*" target="tools\net5.0" />
+
+    <!-- Net6.0 ('tools\net6.0' directory) -->
+    <file src="..\..\ReportGenerator.Console.NetCore\bin\Release\net6.0\publish\**\*.*" target="tools\net6.0" />
 
     <!-- .NET 4.7 ('tools\net47' directory) -->
     <file src="..\..\ReportGenerator.Console\bin\Release\appsettings.json" target="tools\net47" />

src/Deployment/nuget/ReportGenerator.Core.nuspec

@@ -24,24 +24,22 @@ https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage</desc
     <repository type="git" url="https://github.com/danielpalme/ReportGenerator.git" />
     <dependencies>
       <group targetFramework="netstandard2.0">
-        <dependency id="System.Text.Encodings.Web" version="5.0.1" /><!-- System.Text.Encodings.Web 5.0.1+ for  CVE-2021-26701  - see https://github.com/dotnet/runtime/issues/49377 -->
-        <dependency id="Microsoft.Extensions.Configuration" version="5.0.0" />
-        <dependency id="Microsoft.Extensions.Configuration.Binder" version="5.0.0" />
-        <dependency id="Microsoft.Extensions.Configuration.CommandLine" version="5.0.0" />
-        <dependency id="Microsoft.Extensions.Configuration.Json" version="5.0.0" />
+        <dependency id="Microsoft.Extensions.Configuration" version="6.0.0" />
+        <dependency id="Microsoft.Extensions.Configuration.Binder" version="6.0.0" />
+        <dependency id="Microsoft.Extensions.Configuration.CommandLine" version="6.0.0" />
+        <dependency id="Microsoft.Extensions.Configuration.Json" version="6.0.0" />
         <dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0-beta13" />
         <dependency id="DotNetConfig" version="1.0.6" />
       </group>
 
       <group targetFramework="netcoreapp">
-        <dependency id="System.Text.Encodings.Web" version="5.0.1" /><!-- System.Text.Encodings.Web 5.0.1+ for  CVE-2021-26701  - see https://github.com/dotnet/runtime/issues/49377 -->
-        <dependency id="Microsoft.Extensions.Configuration" version="5.0.0" />
-        <dependency id="Microsoft.Extensions.Configuration.Binder" version="5.0.0" />
-        <dependency id="Microsoft.Extensions.Configuration.CommandLine" version="5.0.0" />
-        <dependency id="Microsoft.Extensions.Configuration.Json" version="5.0.0" />
+        <dependency id="Microsoft.Extensions.Configuration" version="6.0.0" />
+        <dependency id="Microsoft.Extensions.Configuration.Binder" version="6.0.0" />
+        <dependency id="Microsoft.Extensions.Configuration.CommandLine" version="6.0.0" />
+        <dependency id="Microsoft.Extensions.Configuration.Json" version="6.0.0" />
         <dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0-beta13" />
         <dependency id="DotNetConfig" version="1.0.6" />
-        <dependency id="McMaster.NETCore.Plugins" version="1.3.1" />
+        <dependency id="McMaster.NETCore.Plugins" version="1.4.0" />
       </group>
     </dependencies>
   </metadata>
@@ -54,23 +52,23 @@ https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage</desc
     <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.deps.json" target="lib\netstandard2.0\" />
     <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.dll" target="lib\netstandard2.0\" />
 
-	  <!-- Execution .NET Core 2.x (see #253) -->
-    <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.deps.json" target="lib\netcoreapp\" />
-    <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.dll" target="lib\netcoreapp\" />
-    <file src="..\..\ReportGenerator.Core\bin\Release\appsettings.json" target="lib\netcoreapp\" />
-    <file src="..\..\ReportGenerator.DotnetCorePluginLoader\bin\Release\netcoreapp2.0\ReportGenerator.DotnetCorePluginLoader.dll" target="lib\netcoreapp\" />
-
 	  <!-- Execution .NET Core 3.x (see https://github.com/coverlet-coverage/coverlet/pull/694) -->
-    <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.deps.json" target="lib\netcoreapp3.0\" />
-    <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.dll" target="lib\netcoreapp3.0\" />
-    <file src="..\..\ReportGenerator.Core\bin\Release\appsettings.json" target="lib\netcoreapp3.0\" />
-    <file src="..\..\ReportGenerator.DotnetCorePluginLoader\bin\Release\netcoreapp2.0\ReportGenerator.DotnetCorePluginLoader.dll" target="lib\netcoreapp3.0\" />
+    <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.deps.json" target="lib\netcoreapp3.1\" />
+    <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.dll" target="lib\netcoreapp3.1\" />
+    <file src="..\..\ReportGenerator.Core\bin\Release\appsettings.json" target="lib\netcoreapp3.1\" />
+    <file src="..\..\ReportGenerator.DotnetCorePluginLoader\bin\Release\netcoreapp3.1\ReportGenerator.DotnetCorePluginLoader.dll" target="lib\netcoreapp3.1\" />
 
 	  <!-- Execution .NET 5.x (see https://github.com/coverlet-coverage/coverlet/pull/694) -->
     <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.deps.json" target="lib\net5.0\" />
     <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.dll" target="lib\net5.0\" />
     <file src="..\..\ReportGenerator.Core\bin\Release\appsettings.json" target="lib\net5.0\" />
     <file src="..\..\ReportGenerator.DotnetCorePluginLoader\bin\Release\net5.0\ReportGenerator.DotnetCorePluginLoader.dll" target="lib\net5.0\" />
+
+	  <!-- Execution .NET 6.x (see https://github.com/coverlet-coverage/coverlet/pull/694) -->
+    <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.deps.json" target="lib\net6.0\" />
+    <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.dll" target="lib\net6.0\" />
+    <file src="..\..\ReportGenerator.Core\bin\Release\appsettings.json" target="lib\net6.0\" />
+    <file src="..\..\ReportGenerator.DotnetCorePluginLoader\bin\Release\net6.0\ReportGenerator.DotnetCorePluginLoader.dll" target="lib\net6.0\" />
   </files>
 </package>