From 942c5d5131bc30a68ff3e83f0de218f12d78a905 Mon Sep 17 00:00:00 2001 From: danielpalme Date: Mon, 20 Jan 2020 22:18:43 +0100 Subject: [PATCH] Upgraded ReportGenerator.Core package for usage with .NET Core 3.x --- azure-pipelines.yml | 2 +- src/AzureDevopsTask/ReportGenerator/task.json | 2 +- src/AzureDevopsTask/vss-extension.json | 2 +- src/Readme.txt | 4 ++++ .../ReportGenerator.Console.NetCore.csproj | 4 ++-- src/ReportGenerator.Console/Properties/AssemblyInfo.cs | 4 ++-- .../ReportGenerator.Core.Test.csproj | 4 ++-- src/ReportGenerator.Core/Generator.cs | 2 +- src/ReportGenerator.Core/ReportGenerator.Core.csproj | 4 ++-- .../ReportGenerator.DotnetCliTool.csproj | 4 ++-- .../ReportGenerator.DotnetCorePluginLoader.csproj | 4 ++-- .../ReportGenerator.DotnetGlobalTool.csproj | 4 ++-- src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj | 4 ++-- src/build.proj | 2 +- 14 files changed, 25 insertions(+), 21 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6c0dd037..1e2560a4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,7 +11,7 @@ variables: buildPlatform: 'Any CPU' buildConfiguration: 'Release' disable.coverage.autogenerate: 'true' - version: '4.4.4' + version: '4.4.5' # Prepare steps: diff --git a/src/AzureDevopsTask/ReportGenerator/task.json b/src/AzureDevopsTask/ReportGenerator/task.json index 1e6b811a..c7e8b356 100644 --- a/src/AzureDevopsTask/ReportGenerator/task.json +++ b/src/AzureDevopsTask/ReportGenerator/task.json @@ -13,7 +13,7 @@ "version": { "Major": 4, "Minor": 4, - "Patch": 4 + "Patch": 5 }, "instanceNameFormat": "ReportGenerator", "groups": [ diff --git a/src/AzureDevopsTask/vss-extension.json b/src/AzureDevopsTask/vss-extension.json index a58106ba..69bd3db5 100644 --- a/src/AzureDevopsTask/vss-extension.json +++ b/src/AzureDevopsTask/vss-extension.json @@ -2,7 +2,7 @@ "manifestVersion": 1, "id": "reportgenerator", "name": "ReportGenerator", - "version": "4.4.4", + "version": "4.4.5", "publisher": "Palmmedia", "public": true, "targets": [ diff --git a/src/Readme.txt b/src/Readme.txt index 369217a9..8d44de08 100644 --- a/src/Readme.txt +++ b/src/Readme.txt @@ -62,6 +62,10 @@ For further details take a look at LICENSE.txt. CHANGELOG +4.4.5.0 + + * Fix: Upgraded ReportGenerator.Core package for usage with .NET Core 3.x + 4.4.4.0 * Fix: Upgraded ReportGenerator.Core package for usage with .NET Core 3.x diff --git a/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj b/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj index 156ccdf8..f059b060 100644 --- a/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj +++ b/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj @@ -7,8 +7,8 @@ ReportGenerator Palmmedia.ReportGenerator Palmmedia.ReportGenerator.Console.NetCore.Program - 4.4.4.0 - 4.4.4.0 + 4.4.5.0 + 4.4.5.0 diff --git a/src/ReportGenerator.Console/Properties/AssemblyInfo.cs b/src/ReportGenerator.Console/Properties/AssemblyInfo.cs index 012483b8..01acbeb5 100644 --- 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.4.4.0")] -[assembly: AssemblyFileVersion("4.4.4.0")] +[assembly: AssemblyVersion("4.4.5.0")] +[assembly: AssemblyFileVersion("4.4.5.0")] diff --git a/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj b/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj index 173db091..a56f6f14 100644 --- a/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj +++ b/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj @@ -4,8 +4,8 @@ netcoreapp2.0 false Palmmedia.ReportGenerator.Core.Test - 4.4.4.0 - 4.4.4.0 + 4.4.5.0 + 4.4.5.0 diff --git a/src/ReportGenerator.Core/Generator.cs b/src/ReportGenerator.Core/Generator.cs index f731f21b..b97bf233 100644 --- a/src/ReportGenerator.Core/Generator.cs +++ b/src/ReportGenerator.Core/Generator.cs @@ -277,7 +277,7 @@ private IConfigurationRoot GetConfiguration() return builder.Build(); } - catch (FileLoadException) + catch (IOException) { // This can happen when excuted within MSBuild (dotnet msbuild): JSON configuration gets ignored var builder = new ConfigurationBuilder() diff --git a/src/ReportGenerator.Core/ReportGenerator.Core.csproj b/src/ReportGenerator.Core/ReportGenerator.Core.csproj index 89cf8d90..827e388d 100644 --- a/src/ReportGenerator.Core/ReportGenerator.Core.csproj +++ b/src/ReportGenerator.Core/ReportGenerator.Core.csproj @@ -7,8 +7,8 @@ false true ReportGenerator.Core - 4.4.4.0 - 4.4.4.0 + 4.4.5.0 + 4.4.5.0 diff --git a/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj b/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj index 360bbbf0..caf69224 100644 --- a/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj +++ b/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj @@ -7,8 +7,8 @@ dotnet-reportgenerator Palmmedia.ReportGenerator Palmmedia.ReportGenerator.DotnetCliTool.Program - 4.4.4.0 - 4.4.4.0 + 4.4.5.0 + 4.4.5.0 diff --git a/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj b/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj index 893615db..ed502644 100644 --- a/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj +++ b/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj @@ -2,8 +2,8 @@ netcoreapp2.0 ReportGenerator.DotnetCorePluginLoader - 4.4.4.0 - 4.4.4.0 + 4.4.5.0 + 4.4.5.0 diff --git a/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj b/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj index c0ff3901..94b85c0d 100644 --- a/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj +++ b/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj @@ -7,8 +7,8 @@ ReportGenerator Palmmedia.ReportGenerator Palmmedia.ReportGenerator.DotnetGlobalTool.Program - 4.4.4.0 - 4.4.4.0 + 4.4.5.0 + 4.4.5.0 diff --git a/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj b/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj index fd34c317..174296ef 100644 --- a/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj +++ b/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj @@ -5,8 +5,8 @@ Palmmedia.ReportGenerator.MSBuild false true - 4.4.4.0 - 4.4.4.0 + 4.4.5.0 + 4.4.5.0 diff --git a/src/build.proj b/src/build.proj index b266110e..f766a80b 100644 --- a/src/build.proj +++ b/src/build.proj @@ -22,7 +22,7 @@ - 4.4.4 + 4.4.5