Skip to content

Commit 2f365e4

Browse files
danielpalmedanielpalme
committed
#401: Fixed handling of '=' in command line parameters
1 parent e620614 commit 2f365e4

File tree

16 files changed

+32
-22
lines changed

16 files changed

+32
-22
lines changed

‎azure-pipelines.yml

+1-1
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.8.2'
15+
value: '4.8.3'
1616

1717
stages:
1818
- stage: Build

‎docs/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ <h3>Learn how to use</h3>
116116
You only have to supply the path to your coverage report(s) and a target directory.<br />
117117
If you are using MSBuild, you can also use an MSBuild task.
118118
</p>
119-
<p><a href="https://github.com/danielpalme/ReportGenerator#usage"><i class="fa fa-angle-double-right"></i> Learn more</a></p>
119+
<p><a href="https://github.com/danielpalme/ReportGenerator#getting-started"><i class="fa fa-angle-double-right"></i> Learn more</a></p>
120120
</div>
121121
<div class="col-sm-6 hidden-xs text-center">
122122
<i class="fa fa-info-circle biglogo"></i>

‎src/AzureDevopsTask/ReportGenerator/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"version": {
1414
"Major": 4,
1515
"Minor": 8,
16-
"Patch": 2
16+
"Patch": 3
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.8.2",
5+
"version": "4.8.3",
66
"publisher": "Palmmedia",
77
"public": true,
88
"targets": [

‎src/Readme.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,13 @@ For further details take a look at LICENSE.txt.
6363

6464
CHANGELOG
6565

66+
4.8.3.0
67+
68+
* Fix: #401: Fixed handling of '=' in command line parameters
69+
6670
4.8.2.0
6771

68-
* Fix: #400: Allow suppling all parameters .netconfig
72+
* Fix: #400: Allow suppling all parameters via .netconfig
6973

7074
4.8.1.0
7175

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<AssemblyName>ReportGenerator</AssemblyName>
88
<RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
99
<StartupObject>Palmmedia.ReportGenerator.Console.NetCore.Program</StartupObject>
10-
<AssemblyVersion>4.8.2.0</AssemblyVersion>
11-
<FileVersion>4.8.2.0</FileVersion>
10+
<AssemblyVersion>4.8.3.0</AssemblyVersion>
11+
<FileVersion>4.8.3.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.8.2.0")]
35-
[assembly: AssemblyFileVersion("4.8.2.0")]
34+
[assembly: AssemblyVersion("4.8.3.0")]
35+
[assembly: AssemblyFileVersion("4.8.3.0")]

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<TargetFramework>net5.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<RootNamespace>Palmmedia.ReportGenerator.Core.Test</RootNamespace>
7-
<AssemblyVersion>4.8.2.0</AssemblyVersion>
8-
<FileVersion>4.8.2.0</FileVersion>
7+
<AssemblyVersion>4.8.3.0</AssemblyVersion>
8+
<FileVersion>4.8.3.0</FileVersion>
99
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1010
</PropertyGroup>
1111

‎src/ReportGenerator.Core/CommandLineArgumentNames.cs

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Collections.Generic;
22
using System.Linq;
33
using System.Reflection;
4+
using System.Text.RegularExpressions;
45

56
namespace Palmmedia.ReportGenerator.Core
67
{
@@ -89,6 +90,11 @@ internal static class CommandLineArgumentNames
8990
.Select(x => (string)x.GetRawConstantValue())
9091
.ToList());
9192

93+
/// <summary>
94+
/// Gets the regex to parse command line parameters.
95+
/// </summary>
96+
internal static Regex CommandLineParameterRegex { get; } = new Regex("^-(?<key>[a-zA-Z]{2,}):(?<value>.+)$", RegexOptions.Compiled);
97+
9298
/// <summary>
9399
/// Gets a value indicating whether a command line parameter name is valid.
94100
/// </summary>

‎src/ReportGenerator.Core/Generator.cs

+1
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ private IConfigurationRoot GetConfiguration()
268268
var args = Environment.GetCommandLineArgs()
269269
.Where(a => !a.StartsWith("-property:"))
270270
.Where(a => !a.StartsWith("-p:"))
271+
.Where(a => !CommandLineArgumentNames.CommandLineParameterRegex.IsMatch(a))
271272
.ToArray();
272273

273274
try

‎src/ReportGenerator.Core/ReportConfigurationBuilder.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using System.Text.RegularExpressions;
54
using DotNetConfig;
65
using Palmmedia.ReportGenerator.Core.Logging;
76
using Palmmedia.ReportGenerator.Core.Properties;
@@ -247,7 +246,7 @@ internal ReportConfiguration Create(string[] args)
247246

248247
foreach (var arg in args)
249248
{
250-
var match = Regex.Match(arg, "-(?<key>\\w{2,}):(?<value>.+)");
249+
var match = CommandLineArgumentNames.CommandLineParameterRegex.Match(arg);
251250

252251
if (match.Success)
253252
{

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

+2-2
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.8.2.0</AssemblyVersion>
11-
<FileVersion>4.8.2.0</FileVersion>
10+
<AssemblyVersion>4.8.3.0</AssemblyVersion>
11+
<FileVersion>4.8.3.0</FileVersion>
1212
</PropertyGroup>
1313

1414
<PropertyGroup>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<PropertyGroup>
33
<TargetFrameworks>netcoreapp2.0;net5.0</TargetFrameworks>
44
<RootNamespace>ReportGenerator.DotnetCorePluginLoader</RootNamespace>
5-
<AssemblyVersion>4.8.2.0</AssemblyVersion>
6-
<FileVersion>4.8.2.0</FileVersion>
5+
<AssemblyVersion>4.8.3.0</AssemblyVersion>
6+
<FileVersion>4.8.3.0</FileVersion>
77
</PropertyGroup>
88

99
<ItemGroup>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<AssemblyName>ReportGenerator</AssemblyName>
88
<RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
99
<StartupObject>Palmmedia.ReportGenerator.DotnetGlobalTool.Program</StartupObject>
10-
<AssemblyVersion>4.8.2.0</AssemblyVersion>
11-
<FileVersion>4.8.2.0</FileVersion>
10+
<AssemblyVersion>4.8.3.0</AssemblyVersion>
11+
<FileVersion>4.8.3.0</FileVersion>
1212
</PropertyGroup>
1313

1414
<ItemGroup>

‎src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<RootNamespace>Palmmedia.ReportGenerator.MSBuild</RootNamespace>
66
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
77
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
8-
<AssemblyVersion>4.8.2.0</AssemblyVersion>
9-
<FileVersion>4.8.2.0</FileVersion>
8+
<AssemblyVersion>4.8.3.0</AssemblyVersion>
9+
<FileVersion>4.8.3.0</FileVersion>
1010
</PropertyGroup>
1111

1212
<ItemGroup>

‎src/build.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<!-- Version, adjust before build -->
2424
<PropertyGroup>
25-
<Version>4.8.2</Version>
25+
<Version>4.8.3</Version>
2626
</PropertyGroup>
2727

2828
<!-- Tools -->

0 commit comments

Comments
 (0)