Merge branch 'hotfix/7.0.2' into develop

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [vNext]
 
+## [7.0.2] / 2023-05-19
+- Fixed string-based command-line tool tasks to not require interpolated strings
+- Fixed secret filtering
+
 ## [7.0.1] / 2023-05-15
 - Fixed system console colors to fall back to current colors
 - Fixed trimming of `OnlyWhen` conditions
@@ -1255,3 +1259,101 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 [0.3.1]: https://github.com/nuke-build/nuke/compare/0.2.10...0.3.1
 [0.2.10]: https://github.com/nuke-build/nuke/compare/0.2.0...0.2.10
 [0.2.0]: https://github.com/nuke-build/nuke/tree/0.2.0
+
+[vNext]: https://github.com/nuke-build/nuke/compare/7.0.2...HEAD
+[7.0.2]: https://github.com/nuke-build/nuke/compare/7.0.1...7.0.2
+[7.0.1]: https://github.com/nuke-build/nuke/compare/7.0.0...7.0.1
+[7.0.0]: https://github.com/nuke-build/nuke/compare/6.3.0...7.0.0
+[6.3.0]: https://github.com/nuke-build/nuke/compare/6.2.1...6.3.0
+[6.2.1]: https://github.com/nuke-build/nuke/compare/6.2.0...6.2.1
+[6.2.0]: https://github.com/nuke-build/nuke/compare/6.1.2...6.2.0
+[6.1.2]: https://github.com/nuke-build/nuke/compare/6.1.1...6.1.2
+[6.1.1]: https://github.com/nuke-build/nuke/compare/6.1.0...6.1.1
+[6.1.0]: https://github.com/nuke-build/nuke/compare/6.0.3...6.1.0
+[6.0.3]: https://github.com/nuke-build/nuke/compare/6.0.2...6.0.3
+[6.0.2]: https://github.com/nuke-build/nuke/compare/6.0.1...6.0.2
+[6.0.1]: https://github.com/nuke-build/nuke/compare/6.0.0...6.0.1
+[6.0.0]: https://github.com/nuke-build/nuke/compare/5.3.0...6.0.0
+[5.3.0]: https://github.com/nuke-build/nuke/compare/5.2.1...5.3.0
+[5.2.1]: https://github.com/nuke-build/nuke/compare/5.2.0...5.2.1
+[5.2.0]: https://github.com/nuke-build/nuke/compare/5.1.4...5.2.0
+[5.1.4]: https://github.com/nuke-build/nuke/compare/5.1.3...5.1.4
+[5.1.3]: https://github.com/nuke-build/nuke/compare/5.1.2...5.1.3
+[5.1.2]: https://github.com/nuke-build/nuke/compare/5.1.1...5.1.2
+[5.1.1]: https://github.com/nuke-build/nuke/compare/5.1.0...5.1.1
+[5.1.0]: https://github.com/nuke-build/nuke/compare/5.0.2...5.1.0
+[5.0.2]: https://github.com/nuke-build/nuke/compare/5.0.1...5.0.2
+[5.0.1]: https://github.com/nuke-build/nuke/compare/5.0.0...5.0.1
+[5.0.0]: https://github.com/nuke-build/nuke/compare/0.25.0...5.0.0
+[0.25.0]: https://github.com/nuke-build/nuke/compare/0.24.11...0.25.0
+[0.24.11]: https://github.com/nuke-build/nuke/compare/0.24.10...0.24.11
+[0.24.10]: https://github.com/nuke-build/nuke/compare/0.24.9...0.24.10
+[0.24.9]: https://github.com/nuke-build/nuke/compare/0.24.8...0.24.9
+[0.24.8]: https://github.com/nuke-build/nuke/compare/0.24.7...0.24.8
+[0.24.7]: https://github.com/nuke-build/nuke/compare/0.24.6...0.24.7
+[0.24.6]: https://github.com/nuke-build/nuke/compare/0.24.5...0.24.6
+[0.24.5]: https://github.com/nuke-build/nuke/compare/0.24.4...0.24.5
+[0.24.4]: https://github.com/nuke-build/nuke/compare/0.24.2...0.24.4
+[0.24.2]: https://github.com/nuke-build/nuke/compare/0.24.1...0.24.2
+[0.24.1]: https://github.com/nuke-build/nuke/compare/0.24.0...0.24.1
+[0.24.0]: https://github.com/nuke-build/nuke/compare/0.23.7...0.24.0
+[0.23.7]: https://github.com/nuke-build/nuke/compare/0.23.6...0.23.7
+[0.23.6]: https://github.com/nuke-build/nuke/compare/0.23.5...0.23.6
+[0.23.5]: https://github.com/nuke-build/nuke/compare/0.23.4...0.23.5
+[0.23.4]: https://github.com/nuke-build/nuke/compare/0.23.3...0.23.4
+[0.23.3]: https://github.com/nuke-build/nuke/compare/0.23.2...0.23.3
+[0.23.2]: https://github.com/nuke-build/nuke/compare/0.23.1...0.23.2
+[0.23.1]: https://github.com/nuke-build/nuke/compare/0.23.0...0.23.1
+[0.23.0]: https://github.com/nuke-build/nuke/compare/0.22.2...0.23.0
+[0.22.2]: https://github.com/nuke-build/nuke/compare/0.22.1...0.22.2
+[0.22.1]: https://github.com/nuke-build/nuke/compare/0.22.0...0.22.1
+[0.22.0]: https://github.com/nuke-build/nuke/compare/0.21.2...0.22.0
+[0.21.2]: https://github.com/nuke-build/nuke/compare/0.21.1...0.21.2
+[0.21.1]: https://github.com/nuke-build/nuke/compare/0.21.0...0.21.1
+[0.21.0]: https://github.com/nuke-build/nuke/compare/0.20.1...0.21.0
+[0.20.1]: https://github.com/nuke-build/nuke/compare/0.20.0...0.20.1
+[0.20.0]: https://github.com/nuke-build/nuke/compare/0.19.2...0.20.0
+[0.19.2]: https://github.com/nuke-build/nuke/compare/0.19.1...0.19.2
+[0.19.1]: https://github.com/nuke-build/nuke/compare/0.19.0...0.19.1
+[0.19.0]: https://github.com/nuke-build/nuke/compare/0.18.0...0.19.0
+[0.18.0]: https://github.com/nuke-build/nuke/compare/0.17.7...0.18.0
+[0.17.7]: https://github.com/nuke-build/nuke/compare/0.17.6...0.17.7
+[0.17.6]: https://github.com/nuke-build/nuke/compare/0.17.5...0.17.6
+[0.17.5]: https://github.com/nuke-build/nuke/compare/0.17.4...0.17.5
+[0.17.4]: https://github.com/nuke-build/nuke/compare/0.17.3...0.17.4
+[0.17.3]: https://github.com/nuke-build/nuke/compare/0.17.2...0.17.3
+[0.17.2]: https://github.com/nuke-build/nuke/compare/0.17.1...0.17.2
+[0.17.1]: https://github.com/nuke-build/nuke/compare/0.17.0...0.17.1
+[0.17.0]: https://github.com/nuke-build/nuke/compare/0.16.0...0.17.0
+[0.16.0]: https://github.com/nuke-build/nuke/compare/0.15.0...0.16.0
+[0.15.0]: https://github.com/nuke-build/nuke/compare/0.14.1...0.15.0
+[0.14.1]: https://github.com/nuke-build/nuke/compare/0.14.0...0.14.1
+[0.14.0]: https://github.com/nuke-build/nuke/compare/0.13.0...0.14.0
+[0.13.0]: https://github.com/nuke-build/nuke/compare/0.12.4...0.13.0
+[0.12.4]: https://github.com/nuke-build/nuke/compare/0.12.3...0.12.4
+[0.12.3]: https://github.com/nuke-build/nuke/compare/0.12.2...0.12.3
+[0.12.2]: https://github.com/nuke-build/nuke/compare/0.12.1...0.12.2
+[0.12.1]: https://github.com/nuke-build/nuke/compare/0.12.0...0.12.1
+[0.12.0]: https://github.com/nuke-build/nuke/compare/0.11.1...0.12.0
+[0.11.1]: https://github.com/nuke-build/nuke/compare/0.11.0...0.11.1
+[0.11.0]: https://github.com/nuke-build/nuke/compare/0.10.5...0.11.0
+[0.10.5]: https://github.com/nuke-build/nuke/compare/0.10.4...0.10.5
+[0.10.4]: https://github.com/nuke-build/nuke/compare/0.10.3...0.10.4
+[0.10.3]: https://github.com/nuke-build/nuke/compare/0.10.2...0.10.3
+[0.10.2]: https://github.com/nuke-build/nuke/compare/0.10.1...0.10.2
+[0.10.1]: https://github.com/nuke-build/nuke/compare/0.10.0...0.10.1
+[0.10.0]: https://github.com/nuke-build/nuke/compare/0.9.1...0.10.0
+[0.9.1]: https://github.com/nuke-build/nuke/compare/0.9.0...0.9.1
+[0.9.0]: https://github.com/nuke-build/nuke/compare/0.8.0...0.9.0
+[0.8.0]: https://github.com/nuke-build/nuke/compare/0.7.0...0.8.0
+[0.7.0]: https://github.com/nuke-build/nuke/compare/0.6.2...0.7.0
+[0.6.2]: https://github.com/nuke-build/nuke/compare/0.6.1...0.6.2
+[0.6.1]: https://github.com/nuke-build/nuke/compare/0.6.0...0.6.1
+[0.6.0]: https://github.com/nuke-build/nuke/compare/0.5.3...0.6.0
+[0.5.3]: https://github.com/nuke-build/nuke/compare/0.5.2...0.5.3
+[0.5.2]: https://github.com/nuke-build/nuke/compare/0.5.0...0.5.2
+[0.5.0]: https://github.com/nuke-build/nuke/compare/0.4.0...0.5.0
+[0.4.0]: https://github.com/nuke-build/nuke/compare/0.3.1...0.4.0
+[0.3.1]: https://github.com/nuke-build/nuke/compare/0.2.10...0.3.1
+[0.2.10]: https://github.com/nuke-build/nuke/compare/0.2.0...0.2.10
+[0.2.0]: https://github.com/nuke-build/nuke/tree/0.2.0

build/Build.Contributors.cs

@@ -25,7 +25,7 @@ partial class Build
             var repositoryDirectories = new[] { RootDirectory / ".git" }
                 .Concat(ExternalRepositoriesDirectory.GlobDirectories("*/.git"));
             var contributors = repositoryDirectories
-                .SelectMany(x => Git(@$"log --pretty=""%an|%ae%n%cn|%ce""", workingDirectory: x, logOutput: false))
+                .SelectMany(x => Git(@"log --pretty=""%an|%ae%n%cn|%ce""", workingDirectory: x, logOutput: false))
                 .Select(x => x.Text)
                 .Distinct().ToList()
                 .Select(x => x.Split('|'))

build/Build.GitFlow.cs

@@ -104,11 +104,11 @@ void Checkout(string branch, string start)
         var hasCleanWorkingCopy = GitHasCleanWorkingCopy();
 
         if (!hasCleanWorkingCopy && AutoStash)
-            Git($"stash");
+            Git("stash");
 
         Git($"checkout -b {branch} {start}");
 
         if (!hasCleanWorkingCopy && AutoStash)
-            Git($"stash apply");
+            Git("stash apply");
     }
 }

build/_build.csproj.DotSettings

@@ -3,7 +3,6 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VariableHidesOuterVariable/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeMadeStatic_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-    <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InterpolatedStringExpressionIsNotIFormattable/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Implicit</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_PRIVATE_MODIFIER/@EntryValue">Implicit</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>

source/Nuke.Build/Execution/ToolRequirementService.cs

@@ -89,7 +89,7 @@ private static void InstallNpmPackages(IReadOnlyCollection<NpmPackageRequirement
 
         packageJsonFile.WriteAllText(content);
         var npm = ToolResolver.GetEnvironmentOrPathTool("npm");
-        npm.Invoke($"install", workingDirectory: packageJsonFile.Parent, logInvocation: false, logOutput: false);
+        npm.Invoke("install", workingDirectory: packageJsonFile.Parent, logInvocation: false, logOutput: false);
     }
 
     private static void InstallAptGetPackages(IReadOnlyCollection<AptGetPackageRequirement> requirements, AbsolutePath directory)

source/Nuke.Common/Tools/AzureSignTool/AzureSignTool.Generated.cs

@@ -40,9 +40,9 @@ public partial class AzureSignToolTasks
     ///   <p>Azure Sign Tool is similar to <c>signtool</c> in the Windows SDK, with the major difference being that it uses Azure Key Vault for performing the signing process. The usage is like <c>signtool</c>, except with a limited set of options for signing and options for authenticating to Azure Key Vault.</p>
     ///   <p>For more details, visit the <a href="https://github.com/vcsjones/AzureSignTool">official website</a>.</p>
     /// </summary>
-    public static IReadOnlyCollection<Output> AzureSignTool(ref ArgumentStringHandler arguments, string workingDirectory = null, IReadOnlyDictionary<string, string> environmentVariables = null, int? timeout = null, bool? logOutput = null, bool? logInvocation = null, Action<OutputType, string> logger = null, Action<IProcess> exitHandler = null)
+    public static IReadOnlyCollection<Output> AzureSignTool(ArgumentStringHandler arguments, string workingDirectory = null, IReadOnlyDictionary<string, string> environmentVariables = null, int? timeout = null, bool? logOutput = null, bool? logInvocation = null, Action<OutputType, string> logger = null, Action<IProcess> exitHandler = null)
     {
-        using var process = ProcessTasks.StartProcess(AzureSignToolPath, ref arguments, workingDirectory, environmentVariables, timeout, logOutput, logInvocation, logger ?? AzureSignToolLogger);
+        using var process = ProcessTasks.StartProcess(AzureSignToolPath, arguments, workingDirectory, environmentVariables, timeout, logOutput, logInvocation, logger ?? AzureSignToolLogger);
         (exitHandler ?? (p => AzureSignToolExitHandler.Invoke(null, p))).Invoke(process.AssertWaitForExit());
         return process.Output;
     }

source/Nuke.Common/Tools/BenchmarkDotNet/BenchmarkDotNet.Generated.cs

@@ -40,9 +40,9 @@ public partial class BenchmarkDotNetTasks
     ///   <p>Powerful .NET library for benchmarking</p>
     ///   <p>For more details, visit the <a href="https://benchmarkdotnet.org/">official website</a>.</p>
     /// </summary>
-    public static IReadOnlyCollection<Output> BenchmarkDotNet(ref ArgumentStringHandler arguments, string workingDirectory = null, IReadOnlyDictionary<string, string> environmentVariables = null, int? timeout = null, bool? logOutput = null, bool? logInvocation = null, Action<OutputType, string> logger = null, Action<IProcess> exitHandler = null)
+    public static IReadOnlyCollection<Output> BenchmarkDotNet(ArgumentStringHandler arguments, string workingDirectory = null, IReadOnlyDictionary<string, string> environmentVariables = null, int? timeout = null, bool? logOutput = null, bool? logInvocation = null, Action<OutputType, string> logger = null, Action<IProcess> exitHandler = null)
     {
-        using var process = ProcessTasks.StartProcess(BenchmarkDotNetPath, ref arguments, workingDirectory, environmentVariables, timeout, logOutput, logInvocation, logger ?? BenchmarkDotNetLogger);
+        using var process = ProcessTasks.StartProcess(BenchmarkDotNetPath, arguments, workingDirectory, environmentVariables, timeout, logOutput, logInvocation, logger ?? BenchmarkDotNetLogger);
         (exitHandler ?? (p => BenchmarkDotNetExitHandler.Invoke(null, p))).Invoke(process.AssertWaitForExit());
         return process.Output;
     }

source/Nuke.Common/Tools/Boots/Boots.Generated.cs

@@ -40,9 +40,9 @@ public partial class BootsTasks
     ///   <p>boots is a .NET global tool for <c>bootstrapping</c> <c>vsix</c> and <c>pkg</c> files.</p>
     ///   <p>For more details, visit the <a href="https://github.com/jonathanpeppers/boots">official website</a>.</p>
     /// </summary>
-    public static IReadOnlyCollection<Output> Boots(ref ArgumentStringHandler arguments, string workingDirectory = null, IReadOnlyDictionary<string, string> environmentVariables = null, int? timeout = null, bool? logOutput = null, bool? logInvocation = null, Action<OutputType, string> logger = null, Action<IProcess> exitHandler = null)
+    public static IReadOnlyCollection<Output> Boots(ArgumentStringHandler arguments, string workingDirectory = null, IReadOnlyDictionary<string, string> environmentVariables = null, int? timeout = null, bool? logOutput = null, bool? logInvocation = null, Action<OutputType, string> logger = null, Action<IProcess> exitHandler = null)
     {
-        using var process = ProcessTasks.StartProcess(BootsPath, ref arguments, workingDirectory, environmentVariables, timeout, logOutput, logInvocation, logger ?? BootsLogger);
+        using var process = ProcessTasks.StartProcess(BootsPath, arguments, workingDirectory, environmentVariables, timeout, logOutput, logInvocation, logger ?? BootsLogger);
         (exitHandler ?? (p => BootsExitHandler.Invoke(null, p))).Invoke(process.AssertWaitForExit());
         return process.Output;
     }

source/Nuke.Common/Tools/Chocolatey/Chocolatey.Generated.cs

@@ -40,9 +40,9 @@ public partial class ChocolateyTasks
     ///   <p>Chocolatey has the largest online registry of Windows packages. Chocolatey packages encapsulate everything required to manage a particular piece of software into one deployment artifact by wrapping installers, executables, zips, and/or scripts into a compiled package file.</p>
     ///   <p>For more details, visit the <a href="https://chocolatey.org/">official website</a>.</p>
     /// </summary>
-    public static IReadOnlyCollection<Output> Chocolatey(ref ArgumentStringHandler arguments, string workingDirectory = null, IReadOnlyDictionary<string, string> environmentVariables = null, int? timeout = null, bool? logOutput = null, bool? logInvocation = null, Action<OutputType, string> logger = null, Action<IProcess> exitHandler = null)
+    public static IReadOnlyCollection<Output> Chocolatey(ArgumentStringHandler arguments, string workingDirectory = null, IReadOnlyDictionary<string, string> environmentVariables = null, int? timeout = null, bool? logOutput = null, bool? logInvocation = null, Action<OutputType, string> logger = null, Action<IProcess> exitHandler = null)
     {
-        using var process = ProcessTasks.StartProcess(ChocolateyPath, ref arguments, workingDirectory, environmentVariables, timeout, logOutput, logInvocation, logger ?? ChocolateyLogger);
+        using var process = ProcessTasks.StartProcess(ChocolateyPath, arguments, workingDirectory, environmentVariables, timeout, logOutput, logInvocation, logger ?? ChocolateyLogger);
         (exitHandler ?? (p => ChocolateyExitHandler.Invoke(null, p))).Invoke(process.AssertWaitForExit());
         return process.Output;
     }

source/Nuke.Common/Tools/CloudFoundry/CloudFoundry.Generated.cs

@@ -37,9 +37,9 @@ public partial class CloudFoundryTasks
     ///   <p>Cloud Foundry CLI is the official command line client for Cloud Foundry</p>
     ///   <p>For more details, visit the <a href="https://docs.cloudfoundry.org/cf-cli/cf-help.html">official website</a>.</p>
     /// </summary>
-    public static IReadOnlyCollection<Output> CloudFoundry(ref ArgumentStringHandler arguments, string workingDirectory = null, IReadOnlyDictionary<string, string> environmentVariables = null, int? timeout = null, bool? logOutput = null, bool? logInvocation = null, Action<OutputType, string> logger = null, Action<IProcess> exitHandler = null)
+    public static IReadOnlyCollection<Output> CloudFoundry(ArgumentStringHandler arguments, string workingDirectory = null, IReadOnlyDictionary<string, string> environmentVariables = null, int? timeout = null, bool? logOutput = null, bool? logInvocation = null, Action<OutputType, string> logger = null, Action<IProcess> exitHandler = null)
     {
-        using var process = ProcessTasks.StartProcess(CloudFoundryPath, ref arguments, workingDirectory, environmentVariables, timeout, logOutput, logInvocation, logger ?? CloudFoundryLogger);
+        using var process = ProcessTasks.StartProcess(CloudFoundryPath, arguments, workingDirectory, environmentVariables, timeout, logOutput, logInvocation, logger ?? CloudFoundryLogger);
         (exitHandler ?? (p => CloudFoundryExitHandler.Invoke(null, p))).Invoke(process.AssertWaitForExit());
         return process.Output;
     }

source/Nuke.Common/Tools/CodeMetrics/CodeMetrics.Generated.cs

@@ -40,9 +40,9 @@ public partial class CodeMetricsTasks
     ///   <p>Code metrics is a set of software measures that provide developers better insight into the code they are developing. By taking advantage of code metrics, developers can understand which types and/or methods should be reworked or more thoroughly tested. Development teams can identify potential risks, understand the current state of a project, and track progress during software development.</p>
     ///   <p>For more details, visit the <a href="https://docs.microsoft.com/en-us/visualstudio/code-quality/code-metrics-values">official website</a>.</p>
     /// </summary>
-    public static IReadOnlyCollection<Output> CodeMetrics(ref ArgumentStringHandler arguments, string workingDirectory = null, IReadOnlyDictionary<string, string> environmentVariables = null, int? timeout = null, bool? logOutput = null, bool? logInvocation = null, Action<OutputType, string> logger = null, Action<IProcess> exitHandler = null)
+    public static IReadOnlyCollection<Output> CodeMetrics(ArgumentStringHandler arguments, string workingDirectory = null, IReadOnlyDictionary<string, string> environmentVariables = null, int? timeout = null, bool? logOutput = null, bool? logInvocation = null, Action<OutputType, string> logger = null, Action<IProcess> exitHandler = null)
     {
-        using var process = ProcessTasks.StartProcess(CodeMetricsPath, ref arguments, workingDirectory, environmentVariables, timeout, logOutput, logInvocation, logger ?? CodeMetricsLogger);
+        using var process = ProcessTasks.StartProcess(CodeMetricsPath, arguments, workingDirectory, environmentVariables, timeout, logOutput, logInvocation, logger ?? CodeMetricsLogger);
         (exitHandler ?? (p => CodeMetricsExitHandler.Invoke(null, p))).Invoke(process.AssertWaitForExit());
         return process.Output;
     }