Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ internal Dictionary<string, string> GetProperties(ICakeEnvironment environment,
if (AdditionalCodeCoverageFiles != null && AdditionalCodeCoverageFiles.Any())
{
properties.Add("additionalcodecoveragefiles",
string.Join(",",
string.Join(',',
AdditionalCodeCoverageFiles
.Select(filePath =>
filePath
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ internal Dictionary<string, string> GetProperties(ICakeEnvironment environment)
if (TestResultsFiles != null && TestResultsFiles.Any())
{
properties.Add("resultFiles",
string.Join(",",
string.Join(',',
TestResultsFiles.Select(filePath =>
filePath
.MakeAbsolute(environment)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ internal void WriteCommand(string command, string message = null)

internal void WriteCommand(string command, Dictionary<string, string> parameters, string message)
{
var parameterString = parameters?.Count > 0 ? string.Concat(" ", string.Join(",", parameters.Select(pair => $"{pair.Key}={EscapeCommandParameter(pair.Value)}"))) : string.Empty;
var parameterString = parameters?.Count > 0 ? string.Concat(" ", string.Join(',', parameters.Select(pair => $"{pair.Key}={EscapeCommandParameter(pair.Value)}"))) : string.Empty;

_writer.Write("::{0}{1}::{2}", command, parameterString, EscapeCommandMessage(message));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ private static string ToString(bool value)
private static string ToCommaSeparatedString(ICollection<string> values)
{
return values != null && values.Count != 0
? string.Join(",", values)
? string.Join(',', values)
: null;
}

Expand All @@ -199,7 +199,7 @@ private static string ToMultiLineString(ICollection<string> values)
private static string ToSpaceSeparatedString(ICollection<string> values)
{
return values != null && values.Count != 0
? string.Join(" ", values.Select(x => x.Replace(" ", "-")))
? string.Join(' ', values.Select(x => x.Replace(" ", "-")))
: null;
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/Cake.Common/Tools/DotCover/DotCoverCoverageTool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -81,28 +81,28 @@ protected ProcessArgumentBuilder GetCoverageArguments(DotCoverCoverageSettings s
// Scope
if (settings.Scope.Count > 0)
{
var scope = string.Join(";", settings.Scope);
var scope = string.Join(';', settings.Scope);
builder.AppendSwitch("/Scope", "=", scope.Quote());
}

// Filters
if (settings.Filters.Count > 0)
{
var filters = string.Join(";", settings.Filters);
var filters = string.Join(';', settings.Filters);
builder.AppendSwitch("/Filters", "=", filters.Quote());
}

// AttributeFilters
if (settings.AttributeFilters.Count > 0)
{
var attributeFilters = string.Join(";", settings.AttributeFilters);
var attributeFilters = string.Join(';', settings.AttributeFilters);
builder.AppendSwitch("/AttributeFilters", "=", attributeFilters.Quote());
}

// Filters
if (settings.ProcessFilters.Count > 0)
{
var processFilters = string.Join(";", settings.ProcessFilters);
var processFilters = string.Join(';', settings.ProcessFilters);
builder.AppendSwitch("/ProcessFilters", "=", processFilters.Quote());
}

Expand Down
2 changes: 1 addition & 1 deletion src/Cake.Common/Tools/DotCover/Merge/DotCoverMerger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private ProcessArgumentBuilder GetArguments(
GetConfigurationFileArgument(settings).CopyTo(builder);

// Set the Source files.
var source = string.Join(";", sourceFiles.Select(s => s.MakeAbsolute(_environment).FullPath));
var source = string.Join(';', sourceFiles.Select(s => s.MakeAbsolute(_environment).FullPath));
builder.AppendSwitch("/Source", "=", source.Quote());

// Set the Output file.
Expand Down
6 changes: 3 additions & 3 deletions src/Cake.Common/Tools/DotNet/Format/DotNetFormatter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private ProcessArgumentBuilder GetArguments(string root, string subcommand, DotN
// Diagnostics
if (settings.Diagnostics != null && settings.Diagnostics.Any())
{
builder.AppendSwitch("--diagnostics", string.Join(" ", settings.Diagnostics));
builder.AppendSwitch("--diagnostics", string.Join(' ', settings.Diagnostics));
}

// Severity
Expand All @@ -100,13 +100,13 @@ private ProcessArgumentBuilder GetArguments(string root, string subcommand, DotN
// Include
if (settings.Include != null && settings.Include.Any())
{
builder.AppendSwitch("--include", string.Join(" ", settings.Include));
builder.AppendSwitch("--include", string.Join(' ', settings.Include));
}

// Exclude
if (settings.Exclude != null && settings.Exclude.Any())
{
builder.AppendSwitch("--exclude", string.Join(" ", settings.Exclude));
builder.AppendSwitch("--exclude", string.Join(' ', settings.Exclude));
}

// Include Generated
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,7 @@ private string GetPropertyValueOrDefault(string propertyName, string @default =
return @default;
}

var propertyValue = string.Join(";", propertyValues);
return propertyValue;
return string.Join(';', propertyValues);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static void AppendMSBuildSettings(this ProcessArgumentBuilder builder, Do
throw new ArgumentException("Specify the name of the target", nameof(settings.Targets));
}

msBuilder.AppendMSBuildSwitch("target", string.Join(";", settings.Targets));
msBuilder.AppendMSBuildSwitch("target", string.Join(';', settings.Targets));
}

// Got any properties?
Expand Down Expand Up @@ -202,7 +202,7 @@ public static void AppendMSBuildSettings(this ProcessArgumentBuilder builder, Do
// set project file extensions to ignore when searching for project file
if (settings.IgnoreProjectExtensions.Any())
{
msBuilder.AppendMSBuildSwitch("ignoreprojectextensions", string.Join(",", settings.IgnoreProjectExtensions));
msBuilder.AppendMSBuildSwitch("ignoreprojectextensions", string.Join(',', settings.IgnoreProjectExtensions));
}

// detailed summary?
Expand Down Expand Up @@ -343,7 +343,7 @@ private static string GetLoggerSettings(MSBuildFileLoggerSettings loggerSettings
settings.Add($"Encoding={loggerSettings.FileEncoding}");
}

return string.Join(";", settings);
return string.Join(';', settings);
}

private static string GetLoggerSettings(MSBuildLoggerSettings loggerSettings)
Expand Down Expand Up @@ -418,13 +418,13 @@ private static string GetLoggerSettings(MSBuildLoggerSettings loggerSettings)
settings.Add($"Verbosity={loggerSettings.Verbosity}");
}

return string.Join(";", settings);
return string.Join(';', settings);
}

private static string GetWarningCodes(bool shouldApplyToAllWarnings, IList<string> warningCodes)
=> shouldApplyToAllWarnings
? null
: string.Join(";", warningCodes);
: string.Join(';', warningCodes);

private static void AppendMSBuildSwitch(this ProcessArgumentBuilder builder, string @switch)
=> builder.Append($"/{@switch}");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public DotNetPackageList List(string project, DotNetPackageListSettings settings
var output = string.Empty;
Run(settings, GetArguments(project, settings), new ProcessSettings { RedirectStandardOutput = true }, process =>
{
output = string.Join("\n", process.GetStandardOutput());
output = string.Join('\n', process.GetStandardOutput());
});

return JsonSerializer.Deserialize<DotNetPackageList>(output, new JsonSerializerOptions
Expand Down
2 changes: 1 addition & 1 deletion src/Cake.Common/Tools/DotNet/VSTest/DotNetVSTester.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private ProcessArgumentBuilder GetArguments(IEnumerable<FilePath> testFiles, Dot
// Tests to run
if (settings.TestsToRun.Any())
{
builder.AppendSwitch("--Tests", ":", string.Join(",", settings.TestsToRun));
builder.AppendSwitch("--Tests", ":", string.Join(',', settings.TestsToRun));
}

// Path to custom test adapter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private ProcessArgumentBuilder GetArguments(IEnumerable<string> workloadIds, Dot

if (workloadIds != null && workloadIds.Any())
{
builder.Append(string.Join(" ", workloadIds));
builder.Append(string.Join(' ', workloadIds));
}

// Config File
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private ProcessArgumentBuilder GetArguments(IEnumerable<string> workloadIds, Dot

if (workloadIds != null && workloadIds.Any())
{
builder.Append(string.Join(" ", workloadIds));
builder.Append(string.Join(' ', workloadIds));
}

return builder;
Expand Down
2 changes: 1 addition & 1 deletion src/Cake.Common/Tools/GitVersion/GitVersionRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public GitVersion Run(GitVersionSettings settings)
var output = string.Empty;
Run(settings, GetArguments(settings), new ProcessSettings { RedirectStandardOutput = true }, process =>
{
output = string.Join("\n", process.GetStandardOutput());
output = string.Join('\n', process.GetStandardOutput());
if (_log.Verbosity < Verbosity.Diagnostic)
{
var errors = Regex.Matches(output, @"( *ERROR:? [^\n]*)\n([^\n]*)").Cast<Match>()
Expand Down
2 changes: 1 addition & 1 deletion src/Cake.Common/Tools/ILMerge/ILMergeRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ private static string GetTargetPlatformParameter(ILMergeSettings settings)
{
result.Add(settings.TargetPlatform.Path.FullPath.Quote());
}
return string.Concat("/targetPlatform:", string.Join(",", result));
return string.Concat("/targetPlatform:", string.Join(',', result));
}

private static string GetTargetPlatformString(TargetPlatformVersion version)
Expand Down
2 changes: 1 addition & 1 deletion src/Cake.Common/Tools/MSBuild/MSBuildFileLogger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public string GetParameters(ICakeEnvironment environment)
parameters.Add(ShowEventId ? "ShowEventId" : null);
parameters.Add(Verbosity != null ? $"Verbosity={Verbosity.Value.GetMSBuildVerbosityName()}" : null);

return string.Join(";", parameters.Where(p => p != null));
return string.Join(';', parameters.Where(p => p != null));
}
}
}
8 changes: 4 additions & 4 deletions src/Cake.Common/Tools/MSBuild/MSBuildRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ private ProcessArgumentBuilder GetArguments(FilePath projectFile, MSBuildSetting
// Got any targets?
if (settings.Targets.Count > 0)
{
var targets = string.Join(";", settings.Targets);
var targets = string.Join(';', settings.Targets);
builder.Append(string.Concat("/target:", targets));
}
else
Expand Down Expand Up @@ -227,7 +227,7 @@ private ProcessArgumentBuilder GetArguments(FilePath projectFile, MSBuildSetting
// Treat errors as warnings?
if (settings.WarningsAsErrorCodes.Any())
{
var codes = string.Join(";", settings.WarningsAsErrorCodes);
var codes = string.Join(';', settings.WarningsAsErrorCodes);
builder.Append($"/warnaserror:{codes.Quote()}");
}
else if (settings.WarningsAsError)
Expand All @@ -238,7 +238,7 @@ private ProcessArgumentBuilder GetArguments(FilePath projectFile, MSBuildSetting
// Any warnings to NOT treat as errors?
if (settings.WarningsAsMessageCodes.Any())
{
var codes = string.Join(";", settings.WarningsAsMessageCodes);
var codes = string.Join(';', settings.WarningsAsMessageCodes);
builder.Append($"/warnasmessage:{codes.Quote()}");
}

Expand All @@ -257,7 +257,7 @@ private ProcessArgumentBuilder GetArguments(FilePath projectFile, MSBuildSetting
// Got any console logger parameters?
if (settings.ConsoleLoggerParameters.Count > 0)
{
var argument = "/clp:" + string.Join(";", settings.ConsoleLoggerParameters);
var argument = "/clp:" + string.Join(';', settings.ConsoleLoggerParameters);
builder.Append(argument);
}

Expand Down
4 changes: 2 additions & 2 deletions src/Cake.Common/Tools/MSBuild/MSBuildSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public sealed class MSBuildSettings : ToolSettings
/// <value>The MSBuild target.</value>
public string Target
{
get => string.Join(";", Targets);
get => string.Join(';', Targets);
set
{
Targets.Clear();
Expand Down Expand Up @@ -341,7 +341,7 @@ private string GetPropertyValueOrDefault(string propertyName, string @default =
return @default;
}

var propertyValue = string.Join(";", propertyValues);
var propertyValue = string.Join(';', propertyValues);
return propertyValue;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Cake.Common/Tools/NuGet/Install/NuGetInstaller.cs
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,14 @@ private ProcessArgumentBuilder GetArguments(string packageId, NuGetInstallSettin
if (settings.Source != null && settings.Source.Count > 0)
{
builder.Append("-Source");
builder.AppendQuoted(string.Join(";", settings.Source));
builder.AppendQuoted(string.Join(';', settings.Source));
}

// List of package fallback sources.
if (settings.FallbackSource != null && settings.FallbackSource.Count > 0)
{
builder.Append("-FallbackSource");
builder.AppendQuoted(string.Join(";", settings.FallbackSource));
builder.AppendQuoted(string.Join(';', settings.FallbackSource));
}

// No Cache?
Expand Down
2 changes: 1 addition & 1 deletion src/Cake.Common/Tools/NuGet/List/NuGetList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ private ProcessArgumentBuilder GetHasArguments(string packageId, NuGetListSettin
if (settings.Source != null && settings.Source.Count > 0)
{
builder.Append("-Source");
builder.AppendQuoted(string.Join(";", settings.Source));
builder.AppendQuoted(string.Join(';', settings.Source));
}

if (settings.ConfigFile != null)
Expand Down
2 changes: 1 addition & 1 deletion src/Cake.Common/Tools/NuGet/Pack/NuGetPacker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ private ProcessArgumentBuilder GetArguments(FilePath filePath, NuGetPackSettings
throw new CakeException("Properties keys can not be null or empty.");
}
builder.Append("-Properties");
builder.AppendQuoted(string.Join(";",
builder.AppendQuoted(string.Join(';',
settings.Properties.Select(property => string.Concat(property.Key, "=", property.Value))));
}

Expand Down
4 changes: 2 additions & 2 deletions src/Cake.Common/Tools/NuGet/Pack/NuspecTransformer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ private static string ToString(bool? value)
private static string ToCommaSeparatedString(ICollection<string> values)
{
return values != null && values.Count != 0
? string.Join(",", values)
? string.Join(',', values)
: null;
}

Expand All @@ -410,7 +410,7 @@ private static string ToMultiLineString(ICollection<string> values)
private static string ToSpaceSeparatedString(ICollection<string> values)
{
return values != null && values.Count != 0
? string.Join(" ", values.Select(x => x.Replace(" ", "-")))
? string.Join(' ', values.Select(x => x.Replace(" ", "-")))
: null;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Cake.Common/Tools/NuGet/Restore/NuGetRestorer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ private ProcessArgumentBuilder GetArguments(FilePath targetFilePath, NuGetRestor
if (settings.Source != null && settings.Source.Count > 0)
{
builder.Append("-Source");
builder.AppendQuoted(string.Join(";", settings.Source));
builder.AppendQuoted(string.Join(';', settings.Source));
}

// List of package fallback sources.
if (settings.FallbackSource != null && settings.FallbackSource.Count > 0)
{
builder.Append("-FallbackSource");
builder.AppendQuoted(string.Join(";", settings.FallbackSource));
builder.AppendQuoted(string.Join(';', settings.FallbackSource));
}

// No Cache?
Expand Down
4 changes: 2 additions & 2 deletions src/Cake.Common/Tools/NuGet/Update/NuGetUpdater.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ private ProcessArgumentBuilder GetArguments(FilePath targetFile, NuGetUpdateSett
if (settings.Id != null && settings.Id.Count > 0)
{
builder.Append("-Id");
builder.AppendQuoted(string.Join(";", settings.Id));
builder.AppendQuoted(string.Join(';', settings.Id));
}

// List of package sources
if (settings.Source != null && settings.Source.Count > 0)
{
builder.Append("-Source");
builder.AppendQuoted(string.Join(";", settings.Source));
builder.AppendQuoted(string.Join(';', settings.Source));
}

// Verbosity?
Expand Down
Loading
Loading