Dropped support for Nuget package 'dotnet-reportgenerator-cli'. Use '…

…dotnet-reportgenerator-globaltool' instead.

README.md

@@ -43,7 +43,6 @@ Use the online [configuration tool](https://danielpalme.github.io/ReportGenerato
 |:----------|:------------|:---------------------|
 |[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]```|
 |[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]```|
-|[dotnet-reportgenerator-cli](https://www.nuget.org/packages/dotnet-reportgenerator-cli)<br/><br/>[![Nuget](https://img.shields.io/nuget/v/dotnet-reportgenerator-cli.svg)![Nuget](https://img.shields.io/nuget/dt/dotnet-reportgenerator-cli.svg)](https://www.nuget.org/packages/dotnet-reportgenerator-cli)|.NET Core 2.0|Use this package if your project is based on *.NET Core 2.x* and you want to use *ReportGenerator* as a 'DotnetCliTool'.<br/><br/>**Warning**<br/>This package is intended for *.NET Core 2.x*. It will not work with .NET Core 3.x.<br/>Consider the [dotnet-reportgenerator-globaltool](https://www.nuget.org/packages/dotnet-reportgenerator-globaltool) for *.NET Core 3.x*.<br/><br/>**Installation**<br/>Add `<DotNetCliToolReference Include="dotnet-reportgenerator-cli" Version="x.y.z" />` to your project file.<br/><br/>**Usage**<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-pipelines.yml

@@ -90,16 +90,6 @@ stages:
         modifyOutputPath: false
         workingDirectory: src/ReportGenerator.Console.NetCore
 
-    - task: DotNetCoreCLI@2
-      displayName: 'dotnet publish ReportGenerator.DotnetCliTool 2.1'
-      inputs:
-        command: publish
-        publishWebProjects: false
-        arguments: '-c $(BuildConfiguration) ReportGenerator.DotnetCliTool.csproj'
-        zipAfterPublish: false
-        modifyOutputPath: false
-        workingDirectory: src/ReportGenerator.DotnetCliTool
-
     - task: DotNetCoreCLI@2
       displayName: 'dotnet publish DotnetGlobalTool 2.1'
       inputs:

docs/usage.html

@@ -229,16 +229,6 @@ <h4>Usage</h4>
                         { tool: '.NET CLI', command: 'dotnet tool install --global dotnet-reportgenerator-globaltool --version x.y.z\r\n\r\ndotnet tool install dotnet-reportgenerator-globaltool --tool-path tools --version x.y.z\r\n\r\ndotnet new tool-manifest\r\ndotnet tool install dotnet-reportgenerator-globaltool --version x.y.z' }
                     ],
                     executables: [{ runtime: '.NET Core', tool: 'reportgenerator' }]
-                },
-                { 
-                    name: 'dotnet-reportgenerator-cli', 
-                    url: 'https://www.nuget.org/packages/dotnet-reportgenerator-cli', 
-                    runtimes: '.NET Core', 
-                    description: 'Use this package if your project is based on .NET Core 2.x and you want to use ReportGenerator as a \'DotnetCliTool\'.\r\n\r\nWarning:\r\nThis package is intended for .NET Core 2.x. It will not work with .NET Core 3.x.\r\nConsider the dotnet-reportgenerator-globaltool for .NET Core 3.x.',
-                    installoptions: [
-                        { tool: 'Manual', hint: 'Add the following element to your project file:', command: '<ItemGroup>\r\n  <DotNetCliToolReference Include="dotnet-reportgenerator-cli" Version="x.y.z" />\r\n</ItemGroup>' }
-                    ],
-                    executables: [{ runtime: '.NET Core', tool: 'dotnet reportgenerator' }]
                 }
             ];
             $scope.verbosities = ['Verbose', 'Info', 'Warning', 'Error', 'Off'];

src/Deployment/nuget/Readme_ReportGenerator.Core.txt

@@ -20,5 +20,4 @@ https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage
 If you want to generate coverage reports use one of the following packages:
 
 https://www.nuget.org/packages/ReportGenerator
-https://www.nuget.org/packages/dotnet-reportgenerator-cli
 https://www.nuget.org/packages/dotnet-reportgenerator-globaltool

src/Readme.txt

@@ -63,6 +63,10 @@ For further details take a look at LICENSE.txt.
 
 CHANGELOG
 
+4.7.0.0
+
+    * New: Dropped support for Nuget package 'dotnet-reportgenerator-cli'. Use 'dotnet-reportgenerator-globaltool' instead.
+
 4.6.7.0
 
     * New: #374: Added support for .netconfig

src/ReportGenerator.sln

@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28803.202
@@ -80,8 +79,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReportGenerator.Console.Net
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportGenerator.Console.Net", "ReportGenerator.Console\ReportGenerator.Console.Net.csproj", "{19A59768-9410-440D-A857-A1B5D44787B8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReportGenerator.DotnetCliTool", "ReportGenerator.DotnetCliTool\ReportGenerator.DotnetCliTool.csproj", "{4C5489D8-077A-49A8-8042-1E6844D48185}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReportGenerator.DotnetGlobalTool", "ReportGenerator.DotnetGlobalTool\ReportGenerator.DotnetGlobalTool.csproj", "{B697EF09-935C-482A-89BB-78D9E8BBB387}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReportGenerator.DotnetCorePluginLoader", "ReportGenerator.DotnetCorePluginLoader\ReportGenerator.DotnetCorePluginLoader.csproj", "{E3CA3149-7810-4E0C-9CF8-97E39DFDD5AF}"
@@ -161,10 +158,6 @@ Global
 		{19A59768-9410-440D-A857-A1B5D44787B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{19A59768-9410-440D-A857-A1B5D44787B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19A59768-9410-440D-A857-A1B5D44787B8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4C5489D8-077A-49A8-8042-1E6844D48185}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C5489D8-077A-49A8-8042-1E6844D48185}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C5489D8-077A-49A8-8042-1E6844D48185}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4C5489D8-077A-49A8-8042-1E6844D48185}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B697EF09-935C-482A-89BB-78D9E8BBB387}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B697EF09-935C-482A-89BB-78D9E8BBB387}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B697EF09-935C-482A-89BB-78D9E8BBB387}.Release|Any CPU.ActiveCfg = Release|Any CPU

src/build.proj

@@ -40,8 +40,6 @@
     <RemoveDir Directories="ReportGenerator.Core\obj" />
     <RemoveDir Directories="ReportGenerator.Core.Test\bin" />
     <RemoveDir Directories="ReportGenerator.Core.Test\obj" />
-    <RemoveDir Directories="ReportGenerator.DotnetCliTool\bin" />
-    <RemoveDir Directories="ReportGenerator.DotnetCliTool\obj" />
     <RemoveDir Directories="ReportGenerator.DotnetCorePluginLoader\bin" />
     <RemoveDir Directories="ReportGenerator.DotnetCorePluginLoader\obj" />
     <RemoveDir Directories="ReportGenerator.DotnetGlobalTool\bin" />
@@ -54,8 +52,6 @@
   <Target Name="Compile">
     <MSBuild Projects="ReportGenerator.sln" Targets="Restore;Build" Properties="Configuration=Release" />
 
-    <Exec Command="dotnet publish -c Release ReportGenerator.DotnetCliTool.csproj" WorkingDirectory="ReportGenerator.DotnetCliTool" />
-
     <Exec Command="dotnet publish -c Release -f netcoreapp2.0 ReportGenerator.Console.NetCore.csproj" WorkingDirectory="ReportGenerator.Console.NetCore" />
     <Exec Command="dotnet publish -c Release -f netcoreapp2.1 ReportGenerator.Console.NetCore.csproj" WorkingDirectory="ReportGenerator.Console.NetCore" />
     <Exec Command="dotnet publish -c Release -f netcoreapp3.0 ReportGenerator.Console.NetCore.csproj" WorkingDirectory="ReportGenerator.Console.NetCore" />
@@ -114,7 +110,6 @@
     <!-- Nuget -->
     <Exec Command="$(NuGetCommandLine) pack Deployment\nuget\ReportGenerator.nuspec -OutputDirectory target\packages -Version $(Version)" />
     <Exec Command="$(NuGetCommandLine) pack Deployment\nuget\ReportGenerator.Core.nuspec -OutputDirectory target\packages -Version $(Version)" />
-    <Exec Command="$(NuGetCommandLine) pack Deployment\nuget\dotnet-reportgenerator-cli.nuspec -OutputDirectory target\packages -Version $(Version)" />
     <Exec Command="$(NuGetCommandLine) pack Deployment\nuget\dotnet-reportgenerator-globaltool.nuspec -OutputDirectory target\packages -Version $(Version)" />
 
     <!-- Chocolatey -->
@@ -125,7 +120,6 @@
     <!-- Nuget -->
     <Exec Command="$(NuGetCommandLine) push .\target\packages\ReportGenerator.$(Version).nupkg -ApiKey $(NugetApiKey) -Source https://www.nuget.org/api/v2/package" />
     <Exec Command="$(NuGetCommandLine) push .\target\packages\ReportGenerator.Core.$(Version).nupkg -ApiKey $(NugetApiKey) -Source https://www.nuget.org/api/v2/package" />
-    <Exec Command="$(NuGetCommandLine) push .\target\packages\dotnet-reportgenerator-cli.$(Version).nupkg -ApiKey $(NugetApiKey) -Source https://www.nuget.org/api/v2/package" />
     <Exec Command="$(NuGetCommandLine) push .\target\packages\dotnet-reportgenerator-globaltool.$(Version).nupkg -ApiKey $(NugetApiKey) -Source https://www.nuget.org/api/v2/package" />
 
     <!-- Chocolatey -->