Merge pull request #4537 from antonysmith-mandogroup/feature/GH-4286

GH4286: Update DotNetToolRunner to append command using quotes

Author: devlead

src/Cake.Common.Tests/Unit/Tools/DotNet/Tool/DotNetToolTests.cs

@@ -96,6 +96,22 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code()
                 // Then
                 AssertEx.IsCakeException(result, ".NET CLI: Process returned an error (exit code 1).");
             }
+
+            [Fact]
+            public void Should_Wrap_Command_In_Quotes()
+            {
+                // Given
+                var fixture = new DotNetToolFixture();
+                fixture.ProjectPath = "./tests/Cake.Common.Tests/";
+                fixture.Command = "C:\\example\\path with\\spaces";
+                fixture.Settings = new DotNetToolSettings();
+
+                // When
+                var result = fixture.Run();
+
+                // Then
+                Assert.Equal("\"C:\\example\\path with\\spaces\"", result.Args);
+            }
         }
     }
 }

src/Cake.Common/Tools/DotNet/Tool/DotNetToolRunner.cs

@@ -60,7 +60,9 @@ private ProcessArgumentBuilder GetArguments(string command, ProcessArgumentBuild
         {
             var builder = CreateArgumentBuilder(settings);
 
-            builder.Append(command);
+            // Appending quoted to cater for scenarios where the command passed is not a .NET CLI command,
+            // but the path of an application to run that contains whitespace
+            builder.AppendQuoted(command);
 
             // Arguments
             if (!arguments.IsNullOrEmpty())