.NET 5

danielpalme · Nov 10, 2020 · 759d190 · 759d190
1 parent 954d7b3
commit 759d190
Show file tree

Hide file tree

Showing 21 changed files with 101 additions and 51 deletions.
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ 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<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\netcoreapp3.0\ReportGenerator.dll [options]```<br/>```$(UserProfile).nuget\packages\reportgenerator\x.y.z\tools\netcoreapp3.0\ReportGenerator.exe [options]```<br/><br/>```$(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net47\ReportGenerator.exe [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 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|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)|

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -12,7 +12,7 @@ variables:
   - name: disable.coverage.autogenerate
     value: 'true'
   - name: version
-    value: '4.7.1'
+    value: '4.8.0'
 
 stages:
 - stage: Build
@@ -26,10 +26,10 @@ stages:
         custom: '--info'
 
     - task: UseDotNet@2
-      displayName: 'Use .NET Core SDK 3.1.401'
+      displayName: 'Use .NET Core SDK 5.0.100'
       inputs:
         packageType: sdk
-        version: 3.1.401
+        version: 5.0.100
 
     - task: DotNetCoreCLI@2
       displayName: 'dotnet info'
@@ -90,6 +90,16 @@ stages:
         modifyOutputPath: false
         workingDirectory: src/ReportGenerator.Console.NetCore
 
+    - task: DotNetCoreCLI@2
+      displayName: 'dotnet publish Console.NetCore 5.0'
+      inputs:
+        command: publish
+        publishWebProjects: false
+        arguments: '-c $(BuildConfiguration) -f net5.0 ReportGenerator.Console.NetCore.csproj'
+        zipAfterPublish: false
+        modifyOutputPath: false
+        workingDirectory: src/ReportGenerator.Console.NetCore
+
     - task: DotNetCoreCLI@2
       displayName: 'dotnet publish DotnetGlobalTool 2.1'
       inputs:
@@ -110,6 +120,16 @@ stages:
         modifyOutputPath: false
         workingDirectory: src/ReportGenerator.DotnetGlobalTool
 
+    - task: DotNetCoreCLI@2
+      displayName: 'dotnet publish DotnetGlobalTool 5.0'
+      inputs:
+        command: publish
+        publishWebProjects: false
+        arguments: '-c $(BuildConfiguration) -f net5.0 ReportGenerator.DotnetGlobalTool.csproj'
+        zipAfterPublish: false
+        modifyOutputPath: false
+        workingDirectory: src/ReportGenerator.DotnetGlobalTool
+
     # Run tests and create coverage report'
     - task: DotNetCoreCLI@2
       displayName: Test
@@ -210,6 +230,13 @@ stages:
         Contents: '**/*.*'
         TargetFolder: tmpzip/netcoreapp3.0
 
+    - task: CopyFiles@2
+      displayName: 'Prepare ZIP release: NetCore 5.0'
+      inputs:
+        SourceFolder: src/ReportGenerator.Console.NetCore/bin/Release/net5.0/publish
+        Contents: '**/*.*'
+        TargetFolder: tmpzip/net5.0
+
     - task: ArchiveFiles@2
       displayName: 'Pack ZIP release'
       inputs:

diff --git a/docs/usage.html b/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\\netcoreapp3.0\\ReportGenerator.dll' }
+                        { runtime: '.NET Core', tool: 'dotnet $(UserProfile)\\.nuget\\packages\\reportgenerator\\x.y.z\\tools\\net5.0\\ReportGenerator.dll' }
                     ]
                 },
                 { 

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-      "version": "3.1.300",
+      "version": "5.0.100",
       "rollForward": "latestMajor"
     }
 }
diff --git a/src/.gitignore b/src/.gitignore
@@ -11,6 +11,7 @@
 *.suo
 *.user
 *.Cache
+*.binlog
 bin
 obj
 .DS_Store

diff --git a/src/AzureDevopsTask/ReportGenerator/task.json b/src/AzureDevopsTask/ReportGenerator/task.json
@@ -12,8 +12,8 @@
     "author": "Palmmedia",
     "version": {
         "Major": 4,
-        "Minor": 7,
-        "Patch": 1
+        "Minor": 8,
+        "Patch": 0
     },
     "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": "4.7.1",
+    "version": "4.8.0",
     "publisher": "Palmmedia",
     "public": true,
     "targets": [

diff --git a/src/Deployment/chocolatey/reportgenerator.portable.nuspec b/src/Deployment/chocolatey/reportgenerator.portable.nuspec
@@ -32,6 +32,9 @@
 
     <!-- NetCoreApp3.0 ('tools\netcoreapp3.0' directory) -->
     <file src="..\..\ReportGenerator.Console.NetCore\bin\Release\netcoreapp3.0\publish\**\*.*" target="tools\netcoreapp3.0" />
+
+    <!-- Net5.0 ('tools\net5.0' directory) -->
+    <file src="..\..\ReportGenerator.Console.NetCore\bin\Release\net5.0\publish\**\*.*" target="tools\net5.0" />
 
     <!-- .NET 4.7 ('tools\net47' directory) -->
     <file src="..\..\ReportGenerator.Console\bin\Release\appsettings.json" target="tools\net47" />

diff --git a/src/Deployment/nuget/ReportGenerator.Core.nuspec b/src/Deployment/nuget/ReportGenerator.Core.nuspec
@@ -24,22 +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="Microsoft.Extensions.Configuration" version="2.2.0" />
-        <dependency id="Microsoft.Extensions.Configuration.Binder" version="2.2.0" />
-        <dependency id="Microsoft.Extensions.Configuration.CommandLine" version="2.2.0" />
-        <dependency id="Microsoft.Extensions.Configuration.Json" version="2.2.0" />
+        <dependency id="Microsoft.Extensions.Configuration" version="5.0.0-rc.2.20475.5" />
+        <dependency id="Microsoft.Extensions.Configuration.Binder" version="5.0.0-rc.2.20475.5" />
+        <dependency id="Microsoft.Extensions.Configuration.CommandLine" version="5.0.0-rc.2.20475.5" />
+        <dependency id="Microsoft.Extensions.Configuration.Json" version="5.0.0-rc.2.20475.5" />
         <dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0-beta0008" />
         <dependency id="DotNetConfig" version="1.0.0-rc" />
       </group>
 
       <group targetFramework="netcoreapp">
-        <dependency id="Microsoft.Extensions.Configuration" version="2.2.0" />
-        <dependency id="Microsoft.Extensions.Configuration.Binder" version="2.2.0" />
-        <dependency id="Microsoft.Extensions.Configuration.CommandLine" version="2.2.0" />
-        <dependency id="Microsoft.Extensions.Configuration.Json" version="2.2.0" />
+        <dependency id="Microsoft.Extensions.Configuration" version="5.0.0-rc.2.20475.5" />
+        <dependency id="Microsoft.Extensions.Configuration.Binder" version="5.0.0-rc.2.20475.5" />
+        <dependency id="Microsoft.Extensions.Configuration.CommandLine" version="5.0.0-rc.2.20475.5" />
+        <dependency id="Microsoft.Extensions.Configuration.Json" version="5.0.0-rc.2.20475.5" />
         <dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0-beta0008" />
         <dependency id="DotNetConfig" version="1.0.0-rc" />
-        <dependency id="McMaster.NETCore.Plugins" version="0.2.4" />
+        <dependency id="McMaster.NETCore.Plugins" version="1.1.118" />
       </group>
     </dependencies>
   </metadata>
@@ -68,6 +68,14 @@ https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage</desc
     <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.DotnetCorePluginLoader\bin\Release\netcoreapp2.0\ReportGenerator.DotnetCorePluginLoader.pdb" target="lib\netcoreapp3.0\" />
+
+	  <!-- 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\ReportGenerator.Core.pdb" 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\" />
+    <file src="..\..\ReportGenerator.DotnetCorePluginLoader\bin\Release\net5.0\ReportGenerator.DotnetCorePluginLoader.pdb" target="lib\net5.0\" />
   </files>
 </package>
 
diff --git a/src/Deployment/nuget/ReportGenerator.nuspec b/src/Deployment/nuget/ReportGenerator.nuspec
@@ -17,8 +17,8 @@
 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.
 
 Usage:
-dotnet $(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\netcoreapp3.0\ReportGenerator.dll [options]
-$(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\netcoreapp3.0\ReportGenerator.exe [options]
+dotnet $(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net5.0\ReportGenerator.dll [options]
+$(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net5.0\ReportGenerator.exe [options]
 $(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net47\ReportGenerator.exe [options]</description>
     <language>en-US</language>
     <tags>Code Coverage Reporting Testing TDD Utility</tags>
@@ -40,6 +40,9 @@ $(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net47\ReportGenerator
 
     <!-- NetCoreApp3.0 ('tools\netcoreapp3.0' directory) -->
     <file src="..\..\ReportGenerator.Console.NetCore\bin\Release\netcoreapp3.0\publish\**\*.*" target="tools\netcoreapp3.0" />
+
+    <!-- Net5.0 ('tools\net5.0' directory) -->
+    <file src="..\..\ReportGenerator.Console.NetCore\bin\Release\net5.0\publish\**\*.*" target="tools\net5.0" />
 
     <!-- .NET 4.7 ('tools\net47' directory) -->
     <file src="..\..\ReportGenerator.Console\bin\Release\appsettings.json" target="tools\net47" />

diff --git a/src/Deployment/nuget/dotnet-reportgenerator-globaltool.nuspec b/src/Deployment/nuget/dotnet-reportgenerator-globaltool.nuspec
@@ -47,5 +47,9 @@ dotnet reportgenerator [options]</description>
     <!-- NetCoreApp3.0 ('tools\netcoreapp3.0' directory) -->
     <file src="..\..\ReportGenerator.DotnetGlobalTool\bin\Release\netcoreapp3.0\publish\**\*.*" target="tools\netcoreapp3.0\any" />
     <file src="DotnetToolSettings.xml" target="tools\netcoreapp3.0\any" />
+
+    <!-- Net5.0 ('tools\net5.0' directory) -->
+    <file src="..\..\ReportGenerator.DotnetGlobalTool\bin\Release\net5.0\publish\**\*.*" target="tools\net5.0\any" />
+    <file src="DotnetToolSettings.xml" target="tools\net5.0\any" />
   </files>
 </package>
diff --git a/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj b/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;net5.0</TargetFrameworks>
     <ApplicationIcon>ProgramIcon.ico</ApplicationIcon>
     <AssemblyName>ReportGenerator</AssemblyName>
     <RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
     <StartupObject>Palmmedia.ReportGenerator.Console.NetCore.Program</StartupObject>
-    <AssemblyVersion>4.7.1.0</AssemblyVersion>
-    <FileVersion>4.7.1.0</FileVersion>
+    <AssemblyVersion>4.8.0.0</AssemblyVersion>
+    <FileVersion>4.8.0.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ReportGenerator.Console/Properties/AssemblyInfo.cs b/src/ReportGenerator.Console/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.7.1.0")]
-[assembly: AssemblyFileVersion("4.7.1.0")]
+[assembly: AssemblyVersion("4.8.0.0")]
+[assembly: AssemblyFileVersion("4.8.0.0")]
diff --git a/src/ReportGenerator.Console/ReportGenerator.Console.Net.csproj b/src/ReportGenerator.Console/ReportGenerator.Console.Net.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -94,7 +94,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.5.0" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.7.0" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/src/ReportGenerator.Core.Test/ProgramTest.cs b/src/ReportGenerator.Core.Test/ProgramTest.cs
@@ -14,7 +14,7 @@ public class ProgramTest : IEnumerable<object[]>
         [ClassData(typeof(ProgramTest))]
         public void CreateReport(string reportType)
         {
-            string targetdir = $@"..\..\..\..\target\samplereports\{reportType}";
+            string targetdir = $@"..\..\..\target\samplereports\{reportType}";
             string historydir = $@"{targetdir}\history";
 
             if (Directory.Exists(historydir))

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>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <RootNamespace>Palmmedia.ReportGenerator.Core.Test</RootNamespace>
-    <AssemblyVersion>4.7.1.0</AssemblyVersion>
-    <FileVersion>4.7.1.0</FileVersion>
+    <AssemblyVersion>4.8.0.0</AssemblyVersion>
+    <FileVersion>4.8.0.0</FileVersion>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 
@@ -14,10 +14,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="Moq" Version="4.14.5" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201020-06" />
+    <PackageReference Include="Moq" Version="4.14.7" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

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>4.7.1.0</AssemblyVersion>
-    <FileVersion>4.7.1.0</FileVersion>
+    <AssemblyVersion>4.8.0.0</AssemblyVersion>
+    <FileVersion>4.8.0.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -73,10 +73,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.2.4" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
     <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0008" />
     <PackageReference Include="DotNetConfig" Version="1.0.0-rc" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">

diff --git a/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj b/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFrameworks>netcoreapp2.0;net5.0</TargetFrameworks>
     <RootNamespace>ReportGenerator.DotnetCorePluginLoader</RootNamespace>
-    <AssemblyVersion>4.7.1.0</AssemblyVersion>
-    <FileVersion>4.7.1.0</FileVersion>
+    <AssemblyVersion>4.8.0.0</AssemblyVersion>
+    <FileVersion>4.8.0.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="McMaster.NETCore.Plugins" Version="0.2.4" />
+    <PackageReference Include="McMaster.NETCore.Plugins" Version="1.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj b/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.0;net5.0</TargetFrameworks>
     <ApplicationIcon>ProgramIcon.ico</ApplicationIcon>
     <AssemblyName>ReportGenerator</AssemblyName>
     <RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
     <StartupObject>Palmmedia.ReportGenerator.DotnetGlobalTool.Program</StartupObject>
-    <AssemblyVersion>4.7.1.0</AssemblyVersion>
-    <FileVersion>4.7.1.0</FileVersion>
+    <AssemblyVersion>4.8.0.0</AssemblyVersion>
+    <FileVersion>4.8.0.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>