From 2f365e4f6851ddd2812e6892eb698e3bcbb322fe Mon Sep 17 00:00:00 2001
From: danielpalme <daniel.palme@gmx.de>
Date: Sat, 26 Dec 2020 12:11:27 +0100
Subject: [PATCH] #401: Fixed handling of '=' in command line parameters

---
 azure-pipelines.yml                                         | 2 +-
 docs/index.html                                             | 2 +-
 src/AzureDevopsTask/ReportGenerator/task.json               | 2 +-
 src/AzureDevopsTask/vss-extension.json                      | 2 +-
 src/Readme.txt                                              | 6 +++++-
 .../ReportGenerator.Console.NetCore.csproj                  | 4 ++--
 src/ReportGenerator.Console/Properties/AssemblyInfo.cs      | 4 ++--
 .../ReportGenerator.Core.Test.csproj                        | 4 ++--
 src/ReportGenerator.Core/CommandLineArgumentNames.cs        | 6 ++++++
 src/ReportGenerator.Core/Generator.cs                       | 1 +
 src/ReportGenerator.Core/ReportConfigurationBuilder.cs      | 3 +--
 src/ReportGenerator.Core/ReportGenerator.Core.csproj        | 4 ++--
 .../ReportGenerator.DotnetCorePluginLoader.csproj           | 4 ++--
 .../ReportGenerator.DotnetGlobalTool.csproj                 | 4 ++--
 src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj  | 4 ++--
 src/build.proj                                              | 2 +-
 16 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f6b8bf93..452964c3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -12,7 +12,7 @@ variables:
   - name: disable.coverage.autogenerate
     value: 'true'
   - name: version
-    value: '4.8.2'
+    value: '4.8.3'
 
 stages:
 - stage: Build
diff --git a/docs/index.html b/docs/index.html
index 7b90a845..68ebfe77 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -116,7 +116,7 @@ <h3>Learn how to use</h3>
                         You only have to supply the path to your coverage report(s) and a target directory.<br />
                         If you are using MSBuild, you can also use an MSBuild task.
                     </p>
-                    <p><a href="https://github.com/danielpalme/ReportGenerator#usage"><i class="fa fa-angle-double-right"></i> Learn more</a></p>
+                    <p><a href="https://github.com/danielpalme/ReportGenerator#getting-started"><i class="fa fa-angle-double-right"></i> Learn more</a></p>
                 </div>
                 <div class="col-sm-6 hidden-xs text-center">
                     <i class="fa fa-info-circle biglogo"></i>
diff --git a/src/AzureDevopsTask/ReportGenerator/task.json b/src/AzureDevopsTask/ReportGenerator/task.json
index f4f52e15..b8fc840b 100644
--- a/src/AzureDevopsTask/ReportGenerator/task.json
+++ b/src/AzureDevopsTask/ReportGenerator/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 4,
         "Minor": 8,
-        "Patch": 2
+        "Patch": 3
     },
     "instanceNameFormat": "ReportGenerator",
     "groups": [
diff --git a/src/AzureDevopsTask/vss-extension.json b/src/AzureDevopsTask/vss-extension.json
index 4d4421aa..5d97fc01 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.8.2",
+    "version": "4.8.3",
     "publisher": "Palmmedia",
     "public": true,
     "targets": [
diff --git a/src/Readme.txt b/src/Readme.txt
index 85ac5ea7..995ffc20 100644
--- a/src/Readme.txt
+++ b/src/Readme.txt
@@ -63,9 +63,13 @@ For further details take a look at LICENSE.txt.
 
 CHANGELOG
 
+4.8.3.0
+
+    * Fix: #401: Fixed handling of '=' in command line parameters
+
 4.8.2.0
 
-    * Fix: #400: Allow suppling all parameters .netconfig
+    * Fix: #400: Allow suppling all parameters via .netconfig
 
 4.8.1.0
 
diff --git a/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj b/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj
index b2be42e6..9df72b27 100644
--- 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.2.0</AssemblyVersion>
-    <FileVersion>4.8.2.0</FileVersion>
+    <AssemblyVersion>4.8.3.0</AssemblyVersion>
+    <FileVersion>4.8.3.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ReportGenerator.Console/Properties/AssemblyInfo.cs b/src/ReportGenerator.Console/Properties/AssemblyInfo.cs
index 37b23f49..b2a43dc2 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.8.2.0")]
-[assembly: AssemblyFileVersion("4.8.2.0")]
+[assembly: AssemblyVersion("4.8.3.0")]
+[assembly: AssemblyFileVersion("4.8.3.0")]
diff --git a/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj b/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj
index 70a9ac0c..96b4f892 100644
--- 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.2.0</AssemblyVersion>
-    <FileVersion>4.8.2.0</FileVersion>
+    <AssemblyVersion>4.8.3.0</AssemblyVersion>
+    <FileVersion>4.8.3.0</FileVersion>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   
diff --git a/src/ReportGenerator.Core/CommandLineArgumentNames.cs b/src/ReportGenerator.Core/CommandLineArgumentNames.cs
index ee9e1e68..4ca9bbbe 100644
--- a/src/ReportGenerator.Core/CommandLineArgumentNames.cs
+++ b/src/ReportGenerator.Core/CommandLineArgumentNames.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Text.RegularExpressions;
 
 namespace Palmmedia.ReportGenerator.Core
 {
@@ -89,6 +90,11 @@ internal static class CommandLineArgumentNames
                 .Select(x => (string)x.GetRawConstantValue())
                 .ToList());
 
+        /// <summary>
+        /// Gets the regex to parse command line parameters.
+        /// </summary>
+        internal static Regex CommandLineParameterRegex { get; } = new Regex("^-(?<key>[a-zA-Z]{2,}):(?<value>.+)$", RegexOptions.Compiled);
+
         /// <summary>
         /// Gets a value indicating whether a command line parameter name is valid.
         /// </summary>
diff --git a/src/ReportGenerator.Core/Generator.cs b/src/ReportGenerator.Core/Generator.cs
index a9c48232..b8512496 100644
--- a/src/ReportGenerator.Core/Generator.cs
+++ b/src/ReportGenerator.Core/Generator.cs
@@ -268,6 +268,7 @@ private IConfigurationRoot GetConfiguration()
             var args = Environment.GetCommandLineArgs()
                 .Where(a => !a.StartsWith("-property:"))
                 .Where(a => !a.StartsWith("-p:"))
+                .Where(a => !CommandLineArgumentNames.CommandLineParameterRegex.IsMatch(a))
                 .ToArray();
 
             try
diff --git a/src/ReportGenerator.Core/ReportConfigurationBuilder.cs b/src/ReportGenerator.Core/ReportConfigurationBuilder.cs
index fd6eac00..393c21a8 100644
--- a/src/ReportGenerator.Core/ReportConfigurationBuilder.cs
+++ b/src/ReportGenerator.Core/ReportConfigurationBuilder.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.RegularExpressions;
 using DotNetConfig;
 using Palmmedia.ReportGenerator.Core.Logging;
 using Palmmedia.ReportGenerator.Core.Properties;
@@ -247,7 +246,7 @@ internal ReportConfiguration Create(string[] args)
 
             foreach (var arg in args)
             {
-                var match = Regex.Match(arg, "-(?<key>\\w{2,}):(?<value>.+)");
+                var match = CommandLineArgumentNames.CommandLineParameterRegex.Match(arg);
 
                 if (match.Success)
                 {
diff --git a/src/ReportGenerator.Core/ReportGenerator.Core.csproj b/src/ReportGenerator.Core/ReportGenerator.Core.csproj
index 8e25c165..d1e83b2f 100644
--- 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.2.0</AssemblyVersion>
-    <FileVersion>4.8.2.0</FileVersion>
+    <AssemblyVersion>4.8.3.0</AssemblyVersion>
+    <FileVersion>4.8.3.0</FileVersion>
   </PropertyGroup>
     
   <PropertyGroup>
diff --git a/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj b/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj
index be98b94d..8ef45128 100644
--- 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.2.0</AssemblyVersion>
-    <FileVersion>4.8.2.0</FileVersion>
+    <AssemblyVersion>4.8.3.0</AssemblyVersion>
+    <FileVersion>4.8.3.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj b/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj
index 4356f361..83b7a7ec 100644
--- 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.2.0</AssemblyVersion>
-    <FileVersion>4.8.2.0</FileVersion>
+    <AssemblyVersion>4.8.3.0</AssemblyVersion>
+    <FileVersion>4.8.3.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj b/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj
index 4cf50ab1..21d1b93d 100644
--- a/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj
+++ b/src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj
@@ -5,8 +5,8 @@
     <RootNamespace>Palmmedia.ReportGenerator.MSBuild</RootNamespace>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <AssemblyVersion>4.8.2.0</AssemblyVersion>
-    <FileVersion>4.8.2.0</FileVersion>
+    <AssemblyVersion>4.8.3.0</AssemblyVersion>
+    <FileVersion>4.8.3.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/build.proj b/src/build.proj
index 0387cf04..67a28b58 100644
--- a/src/build.proj
+++ b/src/build.proj
@@ -22,7 +22,7 @@
 
   <!-- Version, adjust before build -->
   <PropertyGroup>
-    <Version>4.8.2</Version>
+    <Version>4.8.3</Version>
   </PropertyGroup>
   
   <!-- Tools -->