Skip to content

Commit 759d190

Browse files
danielpalmedanielpalme
committed
.NET 5
1 parent 954d7b3 commit 759d190

21 files changed

+101
-51
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Use the online [configuration tool](https://danielpalme.github.io/ReportGenerato
4141

4242
|**Package**|**Platforms**|**Installation/Usage**|
4343
|:----------|:------------|:---------------------|
44-
|[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]```|
44+
|[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]```|
4545
|[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]```|
4646
|[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)|
4747
|[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)|

‎azure-pipelines.yml

+30-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ variables:
1212
- name: disable.coverage.autogenerate
1313
value: 'true'
1414
- name: version
15-
value: '4.7.1'
15+
value: '4.8.0'
1616

1717
stages:
1818
- stage: Build
@@ -26,10 +26,10 @@ stages:
2626
custom: '--info'
2727

2828
- task: UseDotNet@2
29-
displayName: 'Use .NET Core SDK 3.1.401'
29+
displayName: 'Use .NET Core SDK 5.0.100'
3030
inputs:
3131
packageType: sdk
32-
version: 3.1.401
32+
version: 5.0.100
3333

3434
- task: DotNetCoreCLI@2
3535
displayName: 'dotnet info'
@@ -90,6 +90,16 @@ stages:
9090
modifyOutputPath: false
9191
workingDirectory: src/ReportGenerator.Console.NetCore
9292

93+
- task: DotNetCoreCLI@2
94+
displayName: 'dotnet publish Console.NetCore 5.0'
95+
inputs:
96+
command: publish
97+
publishWebProjects: false
98+
arguments: '-c $(BuildConfiguration) -f net5.0 ReportGenerator.Console.NetCore.csproj'
99+
zipAfterPublish: false
100+
modifyOutputPath: false
101+
workingDirectory: src/ReportGenerator.Console.NetCore
102+
93103
- task: DotNetCoreCLI@2
94104
displayName: 'dotnet publish DotnetGlobalTool 2.1'
95105
inputs:
@@ -110,6 +120,16 @@ stages:
110120
modifyOutputPath: false
111121
workingDirectory: src/ReportGenerator.DotnetGlobalTool
112122

123+
- task: DotNetCoreCLI@2
124+
displayName: 'dotnet publish DotnetGlobalTool 5.0'
125+
inputs:
126+
command: publish
127+
publishWebProjects: false
128+
arguments: '-c $(BuildConfiguration) -f net5.0 ReportGenerator.DotnetGlobalTool.csproj'
129+
zipAfterPublish: false
130+
modifyOutputPath: false
131+
workingDirectory: src/ReportGenerator.DotnetGlobalTool
132+
113133
# Run tests and create coverage report'
114134
- task: DotNetCoreCLI@2
115135
displayName: Test
@@ -210,6 +230,13 @@ stages:
210230
Contents: '**/*.*'
211231
TargetFolder: tmpzip/netcoreapp3.0
212232

233+
- task: CopyFiles@2
234+
displayName: 'Prepare ZIP release: NetCore 5.0'
235+
inputs:
236+
SourceFolder: src/ReportGenerator.Console.NetCore/bin/Release/net5.0/publish
237+
Contents: '**/*.*'
238+
TargetFolder: tmpzip/net5.0
239+
213240
- task: ArchiveFiles@2
214241
displayName: 'Pack ZIP release'
215242
inputs:

‎docs/usage.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ <h4>Usage</h4>
217217
],
218218
executables: [
219219
{ runtime: '.NET Framework', tool: '$(UserProfile)\\.nuget\\packages\\reportgenerator\\x.y.z\\tools\\net47\\ReportGenerator.exe' },
220-
{ runtime: '.NET Core', tool: 'dotnet $(UserProfile)\\.nuget\\packages\\reportgenerator\\x.y.z\\tools\\netcoreapp3.0\\ReportGenerator.dll' }
220+
{ runtime: '.NET Core', tool: 'dotnet $(UserProfile)\\.nuget\\packages\\reportgenerator\\x.y.z\\tools\\net5.0\\ReportGenerator.dll' }
221221
]
222222
},
223223
{

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "3.1.300",
3+
"version": "5.0.100",
44
"rollForward": "latestMajor"
55
}
66
}

‎src/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
*.suo
1212
*.user
1313
*.Cache
14+
*.binlog
1415
bin
1516
obj
1617
.DS_Store

‎src/AzureDevopsTask/ReportGenerator/task.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"author": "Palmmedia",
1313
"version": {
1414
"Major": 4,
15-
"Minor": 7,
16-
"Patch": 1
15+
"Minor": 8,
16+
"Patch": 0
1717
},
1818
"instanceNameFormat": "ReportGenerator",
1919
"groups": [

‎src/AzureDevopsTask/vss-extension.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"manifestVersion": 1,
33
"id": "reportgenerator",
44
"name": "ReportGenerator",
5-
"version": "4.7.1",
5+
"version": "4.8.0",
66
"publisher": "Palmmedia",
77
"public": true,
88
"targets": [

‎src/Deployment/chocolatey/reportgenerator.portable.nuspec

+3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232

3333
<!-- NetCoreApp3.0 ('tools\netcoreapp3.0' directory) -->
3434
<file src="..\..\ReportGenerator.Console.NetCore\bin\Release\netcoreapp3.0\publish\**\*.*" target="tools\netcoreapp3.0" />
35+
36+
<!-- Net5.0 ('tools\net5.0' directory) -->
37+
<file src="..\..\ReportGenerator.Console.NetCore\bin\Release\net5.0\publish\**\*.*" target="tools\net5.0" />
3538

3639
<!-- .NET 4.7 ('tools\net47' directory) -->
3740
<file src="..\..\ReportGenerator.Console\bin\Release\appsettings.json" target="tools\net47" />

‎src/Deployment/nuget/ReportGenerator.Core.nuspec

+17-9
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage</desc
2424
<repository type="git" url="https://github.com/danielpalme/ReportGenerator.git" />
2525
<dependencies>
2626
<group targetFramework="netstandard2.0">
27-
<dependency id="Microsoft.Extensions.Configuration" version="2.2.0" />
28-
<dependency id="Microsoft.Extensions.Configuration.Binder" version="2.2.0" />
29-
<dependency id="Microsoft.Extensions.Configuration.CommandLine" version="2.2.0" />
30-
<dependency id="Microsoft.Extensions.Configuration.Json" version="2.2.0" />
27+
<dependency id="Microsoft.Extensions.Configuration" version="5.0.0-rc.2.20475.5" />
28+
<dependency id="Microsoft.Extensions.Configuration.Binder" version="5.0.0-rc.2.20475.5" />
29+
<dependency id="Microsoft.Extensions.Configuration.CommandLine" version="5.0.0-rc.2.20475.5" />
30+
<dependency id="Microsoft.Extensions.Configuration.Json" version="5.0.0-rc.2.20475.5" />
3131
<dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0-beta0008" />
3232
<dependency id="DotNetConfig" version="1.0.0-rc" />
3333
</group>
3434

3535
<group targetFramework="netcoreapp">
36-
<dependency id="Microsoft.Extensions.Configuration" version="2.2.0" />
37-
<dependency id="Microsoft.Extensions.Configuration.Binder" version="2.2.0" />
38-
<dependency id="Microsoft.Extensions.Configuration.CommandLine" version="2.2.0" />
39-
<dependency id="Microsoft.Extensions.Configuration.Json" version="2.2.0" />
36+
<dependency id="Microsoft.Extensions.Configuration" version="5.0.0-rc.2.20475.5" />
37+
<dependency id="Microsoft.Extensions.Configuration.Binder" version="5.0.0-rc.2.20475.5" />
38+
<dependency id="Microsoft.Extensions.Configuration.CommandLine" version="5.0.0-rc.2.20475.5" />
39+
<dependency id="Microsoft.Extensions.Configuration.Json" version="5.0.0-rc.2.20475.5" />
4040
<dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0-beta0008" />
4141
<dependency id="DotNetConfig" version="1.0.0-rc" />
42-
<dependency id="McMaster.NETCore.Plugins" version="0.2.4" />
42+
<dependency id="McMaster.NETCore.Plugins" version="1.1.118" />
4343
</group>
4444
</dependencies>
4545
</metadata>
@@ -68,6 +68,14 @@ https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage</desc
6868
<file src="..\..\ReportGenerator.Core\bin\Release\appsettings.json" target="lib\netcoreapp3.0\" />
6969
<file src="..\..\ReportGenerator.DotnetCorePluginLoader\bin\Release\netcoreapp2.0\ReportGenerator.DotnetCorePluginLoader.dll" target="lib\netcoreapp3.0\" />
7070
<file src="..\..\ReportGenerator.DotnetCorePluginLoader\bin\Release\netcoreapp2.0\ReportGenerator.DotnetCorePluginLoader.pdb" target="lib\netcoreapp3.0\" />
71+
72+
<!-- Execution .NET 5.x (see https://github.com/coverlet-coverage/coverlet/pull/694) -->
73+
<file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.deps.json" target="lib\net5.0\" />
74+
<file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.dll" target="lib\net5.0\" />
75+
<file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.pdb" target="lib\net5.0\" />
76+
<file src="..\..\ReportGenerator.Core\bin\Release\appsettings.json" target="lib\net5.0\" />
77+
<file src="..\..\ReportGenerator.DotnetCorePluginLoader\bin\Release\net5.0\ReportGenerator.DotnetCorePluginLoader.dll" target="lib\net5.0\" />
78+
<file src="..\..\ReportGenerator.DotnetCorePluginLoader\bin\Release\net5.0\ReportGenerator.DotnetCorePluginLoader.pdb" target="lib\net5.0\" />
7179
</files>
7280
</package>
7381

‎src/Deployment/nuget/ReportGenerator.nuspec

+5-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
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.
1818

1919
Usage:
20-
dotnet $(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\netcoreapp3.0\ReportGenerator.dll [options]
21-
$(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\netcoreapp3.0\ReportGenerator.exe [options]
20+
dotnet $(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net5.0\ReportGenerator.dll [options]
21+
$(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net5.0\ReportGenerator.exe [options]
2222
$(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net47\ReportGenerator.exe [options]</description>
2323
<language>en-US</language>
2424
<tags>Code Coverage Reporting Testing TDD Utility</tags>
@@ -40,6 +40,9 @@ $(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net47\ReportGenerator
4040

4141
<!-- NetCoreApp3.0 ('tools\netcoreapp3.0' directory) -->
4242
<file src="..\..\ReportGenerator.Console.NetCore\bin\Release\netcoreapp3.0\publish\**\*.*" target="tools\netcoreapp3.0" />
43+
44+
<!-- Net5.0 ('tools\net5.0' directory) -->
45+
<file src="..\..\ReportGenerator.Console.NetCore\bin\Release\net5.0\publish\**\*.*" target="tools\net5.0" />
4346

4447
<!-- .NET 4.7 ('tools\net47' directory) -->
4548
<file src="..\..\ReportGenerator.Console\bin\Release\appsettings.json" target="tools\net47" />

‎src/Deployment/nuget/dotnet-reportgenerator-globaltool.nuspec

+4
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,9 @@ dotnet reportgenerator [options]</description>
4747
<!-- NetCoreApp3.0 ('tools\netcoreapp3.0' directory) -->
4848
<file src="..\..\ReportGenerator.DotnetGlobalTool\bin\Release\netcoreapp3.0\publish\**\*.*" target="tools\netcoreapp3.0\any" />
4949
<file src="DotnetToolSettings.xml" target="tools\netcoreapp3.0\any" />
50+
51+
<!-- Net5.0 ('tools\net5.0' directory) -->
52+
<file src="..\..\ReportGenerator.DotnetGlobalTool\bin\Release\net5.0\publish\**\*.*" target="tools\net5.0\any" />
53+
<file src="DotnetToolSettings.xml" target="tools\net5.0\any" />
5054
</files>
5155
</package>

‎src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp2.0;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;net5.0</TargetFrameworks>
66
<ApplicationIcon>ProgramIcon.ico</ApplicationIcon>
77
<AssemblyName>ReportGenerator</AssemblyName>
88
<RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
99
<StartupObject>Palmmedia.ReportGenerator.Console.NetCore.Program</StartupObject>
10-
<AssemblyVersion>4.7.1.0</AssemblyVersion>
11-
<FileVersion>4.7.1.0</FileVersion>
10+
<AssemblyVersion>4.8.0.0</AssemblyVersion>
11+
<FileVersion>4.8.0.0</FileVersion>
1212
</PropertyGroup>
1313

1414
<ItemGroup>

‎src/ReportGenerator.Console/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("4.7.1.0")]
35-
[assembly: AssemblyFileVersion("4.7.1.0")]
34+
[assembly: AssemblyVersion("4.8.0.0")]
35+
[assembly: AssemblyFileVersion("4.8.0.0")]

‎src/ReportGenerator.Console/ReportGenerator.Console.Net.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -94,7 +94,7 @@
9494
</ItemGroup>
9595
<ItemGroup>
9696
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
97-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.5.0" />
97+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.7.0" />
9898
</ItemGroup>
9999
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
100100
</Project>

‎src/ReportGenerator.Core.Test/ProgramTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class ProgramTest : IEnumerable<object[]>
1414
[ClassData(typeof(ProgramTest))]
1515
public void CreateReport(string reportType)
1616
{
17-
string targetdir = $@"..\..\..\..\target\samplereports\{reportType}";
17+
string targetdir = $@"..\..\..\target\samplereports\{reportType}";
1818
string historydir = $@"{targetdir}\history";
1919

2020
if (Directory.Exists(historydir))

‎src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<RootNamespace>Palmmedia.ReportGenerator.Core.Test</RootNamespace>
7-
<AssemblyVersion>4.7.1.0</AssemblyVersion>
8-
<FileVersion>4.7.1.0</FileVersion>
7+
<AssemblyVersion>4.8.0.0</AssemblyVersion>
8+
<FileVersion>4.8.0.0</FileVersion>
99
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1010
</PropertyGroup>
1111

@@ -14,10 +14,10 @@
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
18-
<PackageReference Include="Moq" Version="4.14.5" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201020-06" />
18+
<PackageReference Include="Moq" Version="4.14.7" />
1919
<PackageReference Include="xunit" Version="2.4.1" />
20-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
20+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2323
</PackageReference>

‎src/ReportGenerator.Core/ReportGenerator.Core.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
88
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
99
<AssemblyName>ReportGenerator.Core</AssemblyName>
10-
<AssemblyVersion>4.7.1.0</AssemblyVersion>
11-
<FileVersion>4.7.1.0</FileVersion>
10+
<AssemblyVersion>4.8.0.0</AssemblyVersion>
11+
<FileVersion>4.8.0.0</FileVersion>
1212
</PropertyGroup>
1313

1414
<PropertyGroup>
@@ -73,10 +73,10 @@
7373
</ItemGroup>
7474

7575
<ItemGroup>
76-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
77-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.2.4" />
78-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.2.0" />
79-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
76+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
77+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
78+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0" />
79+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
8080
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0008" />
8181
<PackageReference Include="DotNetConfig" Version="1.0.0-rc" />
8282
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">

‎src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.0</TargetFramework>
3+
<TargetFrameworks>netcoreapp2.0;net5.0</TargetFrameworks>
44
<RootNamespace>ReportGenerator.DotnetCorePluginLoader</RootNamespace>
5-
<AssemblyVersion>4.7.1.0</AssemblyVersion>
6-
<FileVersion>4.7.1.0</FileVersion>
5+
<AssemblyVersion>4.8.0.0</AssemblyVersion>
6+
<FileVersion>4.8.0.0</FileVersion>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="McMaster.NETCore.Plugins" Version="0.2.4" />
10+
<PackageReference Include="McMaster.NETCore.Plugins" Version="1.3.1" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp2.1;netcoreapp3.0;net5.0</TargetFrameworks>
66
<ApplicationIcon>ProgramIcon.ico</ApplicationIcon>
77
<AssemblyName>ReportGenerator</AssemblyName>
88
<RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
99
<StartupObject>Palmmedia.ReportGenerator.DotnetGlobalTool.Program</StartupObject>
10-
<AssemblyVersion>4.7.1.0</AssemblyVersion>
11-
<FileVersion>4.7.1.0</FileVersion>
10+
<AssemblyVersion>4.8.0.0</AssemblyVersion>
11+
<FileVersion>4.8.0.0</FileVersion>
1212
</PropertyGroup>
1313

1414
<ItemGroup>

0 commit comments

Comments
 (0)