Release 4.8.12

danielpalme · Jul 9, 2021 · 6ce9235 · 6ce9235
1 parent 485d1c9
commit 6ce9235
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 44 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ env:
   solution: 'src\ReportGenerator.sln'
   buildPlatform: Any CPU
   buildConfiguration: Release
-  version: 4.8.11
+  version: 4.8.12
   dotnetSDKVersion: 5.0.301
   nodeVersion: 14
 

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

diff --git a/src/Deployment/nuget/ReportGenerator.Core.nuspec b/src/Deployment/nuget/ReportGenerator.Core.nuspec
@@ -24,6 +24,7 @@ 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" />
@@ -33,6 +34,7 @@ https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage</desc
       </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" />

diff --git a/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj b/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj
@@ -7,8 +7,8 @@
     <AssemblyName>ReportGenerator</AssemblyName>
     <RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
     <StartupObject>Palmmedia.ReportGenerator.Console.NetCore.Program</StartupObject>
-    <AssemblyVersion>4.8.11.0</AssemblyVersion>
-    <FileVersion>4.8.11.0</FileVersion>
+    <AssemblyVersion>4.8.12.0</AssemblyVersion>
+    <FileVersion>4.8.12.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.8.11.0")]
-[assembly: AssemblyFileVersion("4.8.11.0")]
+[assembly: AssemblyVersion("4.8.12.0")]
+[assembly: AssemblyFileVersion("4.8.12.0")]
diff --git a/src/ReportGenerator.Console/ReportGenerator.Console.Net.csproj b/src/ReportGenerator.Console/ReportGenerator.Console.Net.csproj
@@ -26,6 +26,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -93,11 +94,8 @@
     <Content Include="ProgramIcon.ico" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.10.0" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.9.0" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/src/ReportGenerator.Console/app.config b/src/ReportGenerator.Console/app.config
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
   </startup>
   <runtime>
     <gcConcurrent enabled="true"/>
     <gcServer enabled="true"/>
   </runtime>
-</configuration>
+</configuration>
diff --git a/src/ReportGenerator.Core.Test/ReportConfigurationBuilderTest.cs b/src/ReportGenerator.Core.Test/ReportConfigurationBuilderTest.cs
@@ -86,11 +86,11 @@ public void ConfigProvidesMissingArguments()
             Directory.CreateDirectory(dir);
             var config = Config.Build(dir).GetSection(DotNetConfigSettingNames.SectionName);
 
-            config.SetString("reports", ReportPath);
-            config.SetString("targetdir", "C:\\temp");
-            config.SetString("reporttype", "Latex");
-            config.SetString("assemblyfilters", "+Test;-Test");
-            config.SetString("classfilters", "+Test2;-Test2");
+            config = config.SetString("reports", ReportPath);
+            config = config.SetString("targetdir", "C:\\temp");
+            config = config.SetString("reporttype", "Latex");
+            config = config.SetString("assemblyfilters", "+Test;-Test");
+            config = config.SetString("classfilters", "+Test2;-Test2");
             config.SetString("verbosity", VerbosityLevel.Info.ToString());
 
             Directory.SetCurrentDirectory(dir);
@@ -118,24 +118,24 @@ public void ConfigProvidesMultiValuedSettings()
             Directory.CreateDirectory(dir);
             var config = Config.Build(dir).GetSection(DotNetConfigSettingNames.SectionName);
 
-            config.SetString("reports", ReportPath);
+            config = config.SetString("reports", ReportPath);
 
-            config.AddString("reporttype", "Latex");
-            config.AddString("reporttype", "Html");
+            config = config.AddString("reporttype", "Latex");
+            config = config.AddString("reporttype", "Html");
 
-            config.AddString("assemblyfilter", "+Test");
-            config.AddString("assemblyfilter", "-Test");
+            config = config.AddString("assemblyfilter", "+Test");
+            config = config.AddString("assemblyfilter", "-Test");
 
-            config.AddString("classfilter", "+Test2");
-            config.AddString("classfilter", "-Test2");
+            config = config.AddString("classfilter", "+Test2");
+            config = config.AddString("classfilter", "-Test2");
 
-            config.AddString("filefilter", "+cs");
-            config.AddString("filefilter", "-vb");
+            config = config.AddString("filefilter", "+cs");
+            config = config.AddString("filefilter", "-vb");
 
-            config.AddString("sourcedir", "src");
-            config.AddString("sourcedir", "test");
+            config = config.AddString("sourcedir", "src");
+            config = config.AddString("sourcedir", "test");
 
-            config.AddString("plugin", "xunit");
+            config = config.AddString("plugin", "xunit");
             config.AddString("plugin", "moq");
 
             Directory.SetCurrentDirectory(dir);

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>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <RootNamespace>Palmmedia.ReportGenerator.Core.Test</RootNamespace>
-    <AssemblyVersion>4.8.11.0</AssemblyVersion>
-    <FileVersion>4.8.11.0</FileVersion>
+    <AssemblyVersion>4.8.12.0</AssemblyVersion>
+    <FileVersion>4.8.12.0</FileVersion>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 

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.8.11.0</AssemblyVersion>
-    <FileVersion>4.8.11.0</FileVersion>
+    <AssemblyVersion>4.8.12.0</AssemblyVersion>
+    <FileVersion>4.8.12.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj b/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.0;net5.0</TargetFrameworks>
     <RootNamespace>ReportGenerator.DotnetCorePluginLoader</RootNamespace>
-    <AssemblyVersion>4.8.11.0</AssemblyVersion>
-    <FileVersion>4.8.11.0</FileVersion>
+    <AssemblyVersion>4.8.12.0</AssemblyVersion>
+    <FileVersion>4.8.12.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj b/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj
@@ -7,8 +7,8 @@
     <AssemblyName>ReportGenerator</AssemblyName>
     <RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
     <StartupObject>Palmmedia.ReportGenerator.DotnetGlobalTool.Program</StartupObject>
-    <AssemblyVersion>4.8.11.0</AssemblyVersion>
-    <FileVersion>4.8.11.0</FileVersion>
+    <AssemblyVersion>4.8.12.0</AssemblyVersion>
+    <FileVersion>4.8.12.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj b/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj
@@ -5,12 +5,12 @@
     <RootNamespace>Palmmedia.ReportGenerator.MSBuild</RootNamespace>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <AssemblyVersion>4.8.11.0</AssemblyVersion>
-    <FileVersion>4.8.11.0</FileVersion>
+    <AssemblyVersion>4.8.12.0</AssemblyVersion>
+    <FileVersion>4.8.12.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.10.0" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.9.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/build.proj b/src/build.proj
@@ -22,7 +22,7 @@
 
   <!-- Version, adjust before build -->
   <PropertyGroup>
-    <Version>4.8.11</Version>
+    <Version>4.8.12</Version>
   </PropertyGroup>
 
   <!-- Tools -->