Skip to content

Commit

Permalink
#721 Added support for comma-separated arguments in addition to semic…
Browse files Browse the repository at this point in the history 
…olon
  • Loading branch information
@danielpalme
danielpalme committed Jan 22, 2025
1 parent 609ec95 commit f778630
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 28 deletions.
4 changes: 4 additions & 0 deletions src/Readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ For further details take a look at LICENSE.txt.

CHANGELOG

5.4.4.0

* New: #721 Added support for comma-separated arguments in addition to semicolon

5.4.3.0

* New: #717 Added new new coverage type "Full method coverage" (percentage of methods that are fully covered)
Expand Down
43 changes: 24 additions & 19 deletions src/ReportGenerator.Core/ReportConfigurationBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ public class ReportConfigurationBuilder
/// </summary>
private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(ReportConfigurationBuilder));

/// <summary>
/// The argument separators.
/// </summary>
private static readonly char[] ArgumentSeparators = new[] { ';', ',' };

/// <summary>
/// Initializes a new instance of the <see cref="ReportConfiguration"/> class.
/// </summary>
Expand Down Expand Up @@ -48,11 +53,11 @@ public ReportConfiguration Create(Dictionary<string, string> cliArguments)

if (namedArguments.TryGetValue(CommandLineArgumentNames.Reports, out value))
{
reportFilePatterns = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
reportFilePatterns = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else if (config.TryGetString(DotNetConfigSettingNames.Reports, out value))
{
reportFilePatterns = value.Split(new[] { ';', ',' }, StringSplitOptions.RemoveEmptyEntries);
reportFilePatterns = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else
{
Expand All @@ -74,11 +79,11 @@ public ReportConfiguration Create(Dictionary<string, string> cliArguments)

if (namedArguments.TryGetValue(CommandLineArgumentNames.SourceDirectories, out value))
{
sourceDirectories = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
sourceDirectories = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else if (config.TryGetString(DotNetConfigSettingNames.SourceDirectories, out value))
{
sourceDirectories = value.Split(new[] { ';', ',' }, StringSplitOptions.RemoveEmptyEntries);
sourceDirectories = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else
{
Expand All @@ -100,15 +105,15 @@ public ReportConfiguration Create(Dictionary<string, string> cliArguments)

if (namedArguments.TryGetValue(CommandLineArgumentNames.ReportTypes, out value))
{
reportTypes = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
reportTypes = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else if (namedArguments.TryGetValue(CommandLineArgumentNames.ReportType, out value))
{
reportTypes = new[] { value };
}
else if (config.TryGetString(DotNetConfigSettingNames.ReportTypes, out value))
{
reportTypes = value.Split(new[] { ';', ',' }, StringSplitOptions.RemoveEmptyEntries);
reportTypes = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else
{
Expand All @@ -121,11 +126,11 @@ public ReportConfiguration Create(Dictionary<string, string> cliArguments)

if (namedArguments.TryGetValue(CommandLineArgumentNames.Plugins, out value))
{
plugins = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
plugins = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else if (config.TryGetString(DotNetConfigSettingNames.Plugins, out value))
{
plugins = value.Split(new[] { ';', ',' }, StringSplitOptions.RemoveEmptyEntries);
plugins = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else
{
Expand All @@ -138,15 +143,15 @@ public ReportConfiguration Create(Dictionary<string, string> cliArguments)

if (namedArguments.TryGetValue(CommandLineArgumentNames.AssemblyFilters, out value))
{
assemblyFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
assemblyFilters = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else if (namedArguments.TryGetValue(CommandLineArgumentNames.Filters, out value))
{
assemblyFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
assemblyFilters = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else if (config.TryGetString(DotNetConfigSettingNames.AssemblyFilters, out value))
{
assemblyFilters = value.Split(new[] { ';', ',' }, StringSplitOptions.RemoveEmptyEntries);
assemblyFilters = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else
{
Expand All @@ -159,11 +164,11 @@ public ReportConfiguration Create(Dictionary<string, string> cliArguments)

if (namedArguments.TryGetValue(CommandLineArgumentNames.ClassFilters, out value))
{
classFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
classFilters = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else if (config.TryGetString(DotNetConfigSettingNames.ClassFilters, out value))
{
classFilters = value.Split(new[] { ';', ',' }, StringSplitOptions.RemoveEmptyEntries);
classFilters = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else
{
Expand All @@ -176,11 +181,11 @@ public ReportConfiguration Create(Dictionary<string, string> cliArguments)

if (namedArguments.TryGetValue(CommandLineArgumentNames.FileFilters, out value))
{
fileFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
fileFilters = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else if (config.TryGetString(DotNetConfigSettingNames.FileFilters, out value))
{
fileFilters = value.Split(new[] { ';', ',' }, StringSplitOptions.RemoveEmptyEntries);
fileFilters = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else
{
Expand All @@ -193,11 +198,11 @@ public ReportConfiguration Create(Dictionary<string, string> cliArguments)

if (namedArguments.TryGetValue(CommandLineArgumentNames.RiskHotspotAssemblyFilters, out value))
{
riskHotspotAssemblyFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
riskHotspotAssemblyFilters = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else if (config.TryGetString(DotNetConfigSettingNames.RiskHotspotAssemblyFilters, out value))
{
riskHotspotAssemblyFilters = value.Split(new[] { ';', ',' }, StringSplitOptions.RemoveEmptyEntries);
riskHotspotAssemblyFilters = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else
{
Expand All @@ -210,11 +215,11 @@ public ReportConfiguration Create(Dictionary<string, string> cliArguments)

if (namedArguments.TryGetValue(CommandLineArgumentNames.RiskHotspotClassFilters, out value))
{
riskHotspotClassFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
riskHotspotClassFilters = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else if (config.TryGetString(DotNetConfigSettingNames.RiskHotspotClassFilters, out value))
{
riskHotspotClassFilters = value.Split(new[] { ';', ',' }, StringSplitOptions.RemoveEmptyEntries);
riskHotspotClassFilters = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else
{
Expand Down
23 changes: 14 additions & 9 deletions src/ReportGenerator.MSBuild/ReportGenerator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ namespace Palmmedia.ReportGenerator.MSBuild
/// </example>
public class ReportGenerator : Task, ITask
{
/// <summary>
/// The argument separators.
/// </summary>
private static readonly char[] ArgumentSeparators = new[] { ';', ',' };

/// <summary>
/// Gets or sets the project directory where the tool is being run, for loading
/// the relevant .netconfig.
Expand Down Expand Up @@ -185,7 +190,7 @@ public override bool Execute()
}
else if (config.TryGetString(DotNetConfigSettingNames.Reports, out value))
{
reportFilePatterns = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
reportFilePatterns = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else
{
Expand Down Expand Up @@ -220,7 +225,7 @@ public override bool Execute()
}
else if (config.TryGetString(DotNetConfigSettingNames.SourceDirectories, out value))
{
sourceDirectories = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
sourceDirectories = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else
{
Expand All @@ -243,7 +248,7 @@ public override bool Execute()
}
else if (config.TryGetString(DotNetConfigSettingNames.ReportTypes, out value))
{
reportTypes = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
reportTypes = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else
{
Expand All @@ -260,7 +265,7 @@ public override bool Execute()
}
else if (config.TryGetString(DotNetConfigSettingNames.Plugins, out value))
{
plugins = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
plugins = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else
{
Expand All @@ -281,7 +286,7 @@ public override bool Execute()
}
else if (config.TryGetString(DotNetConfigSettingNames.AssemblyFilters, out value))
{
assemblyFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
assemblyFilters = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else
{
Expand All @@ -298,7 +303,7 @@ public override bool Execute()
}
else if (config.TryGetString(DotNetConfigSettingNames.ClassFilters, out value))
{
classFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
classFilters = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else
{
Expand All @@ -315,7 +320,7 @@ public override bool Execute()
}
else if (config.TryGetString(DotNetConfigSettingNames.FileFilters, out value))
{
fileFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
fileFilters = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else
{
Expand All @@ -332,7 +337,7 @@ public override bool Execute()
}
else if (config.TryGetString(DotNetConfigSettingNames.RiskHotspotAssemblyFilters, out value))
{
riskHotspotAssemblyFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
riskHotspotAssemblyFilters = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else
{
Expand All @@ -349,7 +354,7 @@ public override bool Execute()
}
else if (config.TryGetString(DotNetConfigSettingNames.RiskHotspotClassFilters, out value))
{
riskHotspotClassFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
riskHotspotClassFilters = value.Split(ArgumentSeparators, StringSplitOptions.RemoveEmptyEntries);
}
else
{
Expand Down

0 comments on commit f778630

Please sign in to comment.