Always quote non-cmd parameters and values

Author: xt0rted

.github/workflows/ci.yml

@@ -140,9 +140,9 @@ jobs:
 
       - run: |
           if [ "${{ matrix.shell }}" == "default" ]; then
-            dotnet r test --verbose
+            dotnet r test --verbose -- --logger "trx;LogFilePrefix=${{ matrix.os }}-integration-tests"
           else
-            dotnet r test --verbose --script-shell "${{ matrix.shell }}"
+            dotnet r test --verbose --script-shell "${{ matrix.shell }}" -- --logger "trx;LogFilePrefix=${{ matrix.os }}-integration-tests"
           fi
         shell: bash
 

src/ArgumentBuilder.cs

@@ -107,13 +107,9 @@ public static string ConcatinateCommandAndArgArrayForDisplay(
 
     private static void EscapeSingleArg(ref ValueStringBuilder sb, ReadOnlySpan<char> arg)
     {
-        var needsQuotes = arg.Length == 0 || ArgumentContainsWhitespace(arg);
-        var isQuoted = needsQuotes || IsSurroundedWithQuotes(arg);
+        var isQuoted = IsSurroundedWithQuotes(arg);
 
-        if (needsQuotes)
-        {
-            sb.Append(Quote);
-        }
+        sb.Append(Quote);
 
         for (var i = 0; i < arg.Length; ++i)
         {
@@ -157,10 +153,7 @@ private static void EscapeSingleArg(ref ValueStringBuilder sb, ReadOnlySpan<char
             }
         }
 
-        if (needsQuotes)
-        {
-            sb.Append(Quote);
-        }
+        sb.Append(Quote);
     }
 
     /// <summary>

test/ArgumentBuilderTests.cs

@@ -8,14 +8,14 @@ public class ArgumentBuilderTests
     [InlineData("cm \"d\"", null, "cm \"d\"")]
     [InlineData("c m d", null, "c m d")]
     [InlineData("c m d", new string[0], "c m d")]
-    [InlineData("c m d", new[] { "one", "two", "three" }, "c m d one two three")]
+    [InlineData("c m d", new[] { "one", "two", "three" }, "c m d \"one\" \"two\" \"three\"")]
     [InlineData("c m d", new[] { "line1\nline2", "word1\tword2" }, "c m d \"line1\nline2\" \"word1\tword2\"")]
     [InlineData("c m d", new[] { "with spaces" }, "c m d \"with spaces\"")]
-    [InlineData("c m d", new[] { @"with\backslash" }, @"c m d with\backslash")]
-    [InlineData("c m d", new[] { @"""quotedwith\backslash""" }, @"c m d \""quotedwith\backslash\""")]
-    [InlineData("c m d", new[] { @"C:\Users\" }, @"c m d C:\Users\")]
-    [InlineData("c m d", new[] { @"C:\Program Files\dotnet\" }, @"c m d ""C:\Program Files\dotnet\\""")]
-    [InlineData("c m d", new[] { @"backslash\""preceedingquote" }, @"c m d backslash\\\""preceedingquote")]
+    [InlineData("c m d", new[] { @"with\backslash" }, @"c m d ""with\backslash""")]
+    [InlineData("c m d", new[] { @"""quotedwith\backslash""" }, @"c m d ""\""quotedwith\backslash\""""")]
+    [InlineData("c m d", new[] { @"C:\Users\" }, @"c m d ""C:\Users\""")]
+    [InlineData("c m d", new[] { @"C:\Program Files\dotnet\" }, @"c m d ""C:\Program Files\dotnet\""")]
+    [InlineData("c m d", new[] { @"backslash\""preceedingquote" }, @"c m d ""backslash\\\""preceedingquote""")]
     [InlineData("c m d", new[] { @""" hello """ }, @"c m d ""\"" hello \""""")]
     public void EscapeAndConcatenateCommandAndArgArrayForProcessStart(string command, string[] args, string expected)
     {