Fix argument formatting for boolean values.

nuke-build · Mar 4, 2018 · 26442ee · 26442ee
1 parent 2684e44
commit 26442ee
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/source/Nuke.Common.Tests/SettingsTest.cs b/source/Nuke.Common.Tests/SettingsTest.cs
@@ -36,14 +36,17 @@ public void TestMSBuild()
                     .SetProjectFile(projectFile)
                     .SetTargetPlatform(MSBuildTargetPlatform.MSIL)
                     .SetConfiguration("Release")
+                    .DisableNodeReuse()
                     .EnableNoLogo(),
-                $"{projectFile} /nologo /p:Platform=AnyCPU /p:Configuration=Release");
+                $"{projectFile} /nodeReuse:False /nologo /p:Platform=AnyCPU /p:Configuration=Release");
 
             Assert<MSBuildSettings>(x => x
                     .SetProjectFile(solutionFile)
                     .SetTargetPlatform(MSBuildTargetPlatform.MSIL)
+                    .EnableNodeReuse()
+                    .DisableNoLogo()
                     .ToggleRunCodeAnalysis(),
-                $"{solutionFile} /p:Platform=\"Any CPU\" /p:RunCodeAnalysis=True");
+                $"{solutionFile} /nodeReuse:True /p:Platform=\"Any CPU\" /p:RunCodeAnalysis=True");
         }
 
         [Fact]

diff --git a/source/Nuke.Core/Tooling/Arguments.cs b/source/Nuke.Core/Tooling/Arguments.cs
@@ -18,6 +18,7 @@ public interface IArguments
         string RenderForOutput();
     }
 
+    // TODO: extract {value} and {key} into constants
     public sealed class Arguments : IArguments
     {
         private const string c_hiddenString = "[hidden]";
@@ -26,15 +27,17 @@ public sealed class Arguments : IArguments
         private readonly List<string> _secrets = new List<string>();
         private readonly LookupTable<string, string> _arguments = new LookupTable<string, string>(StringComparer.OrdinalIgnoreCase);
 
-        public Arguments Add(string argument, bool? condition = true)
+        public Arguments Add(string argumentFormat, bool? condition = true)
         {
-            return Add(argument, condition.HasValue && condition.Value ? new object() : null);
+            return condition.HasValue && (condition.Value || argumentFormat.Contains("{value}"))  
+                ? Add(argumentFormat, (object) condition.Value) 
+                : this;
         }
 
         public Arguments Add<T>(string argumentFormat, T? value, char? disallowed = null, bool secret = false)
             where T : struct
         {
-            return Add(argumentFormat, value.HasValue ? (object) value.Value : null, disallowed, secret);
+            return value.HasValue ? Add(argumentFormat, value.Value, disallowed, secret) : this;
         }
 
         public Arguments Add(string argumentFormat, [CanBeNull] object value, char? disallowed = null, bool secret = false)