Fix ToolPath on DotnetToolUpdateOptions (#583)

Author: thomhurst

src/ModularPipelines.Build/ReleaseNotes.md

@@ -0,0 +1 @@
+- Fix ToolPath on DotnetToolUpdateOptions

src/ModularPipelines.DotNet/Options/DotNetToolInstallOptions.cs

@@ -15,7 +15,7 @@ string path
 
         PackageName = packageName;
 
-        Path = path;
+        ToolPath = path;
     }
 
     public DotNetToolInstallOptions(
@@ -70,10 +70,7 @@ string packageName
     public string? VersionNumber { get; set; }
 
     [BooleanCommandSwitch("--tool-path")]
-    public bool? ToolPath { get; set; }
-
-    [PositionalArgument(PlaceholderName = "<PATH>")]
-    public string? Path { get; set; }
+    public string? ToolPath { get; set; }
 
     [BooleanCommandSwitch("--local")]
     public bool? Local { get; set; }

src/ModularPipelines.DotNet/Options/DotNetToolUninstallOptions.cs

@@ -15,7 +15,7 @@ string path
 
         PackageName = packageName;
 
-        Path = path;
+        ToolPath = path;
     }
 
     public DotNetToolUninstallOptions(
@@ -34,10 +34,7 @@ string packageName
     public bool? Global { get; set; }
 
     [BooleanCommandSwitch("--tool-path")]
-    public bool? ToolPath { get; set; }
-
-    [PositionalArgument(PlaceholderName = "<PATH>")]
-    public string? Path { get; set; }
+    public string? ToolPath { get; set; }
 
     [CommandSwitch("--tool-manifest")]
     public string? ToolManifest { get; set; }

src/ModularPipelines.DotNet/Options/DotNetToolUpdateOptions.cs

@@ -8,14 +8,13 @@ public record DotNetToolUpdateOptions : DotNetOptions
 {
     public DotNetToolUpdateOptions(
         string packageId,
-        string path
+        string toolPath
     )
     {
         CommandParts = ["tool", "update", "<PACKAGE_ID>"];
 
         PackageId = packageId;
-
-        Path = path;
+        ToolPath = toolPath;
     }
 
     public DotNetToolUpdateOptions(
@@ -64,10 +63,7 @@ string packageId
     public string? Version { get; set; }
 
     [BooleanCommandSwitch("--tool-path")]
-    public bool? ToolPath { get; set; }
-
-    [PositionalArgument(PlaceholderName = "<PATH>")]
-    public string? Path { get; set; }
+    public string? ToolPath { get; set; }
 
     [BooleanCommandSwitch("--local")]
     public bool? Local { get; set; }

src/ModularPipelines/Context/Command.cs

@@ -47,7 +47,7 @@ public async Task<CommandResult> ExecuteCommandLineTool(CommandLineToolOptions o
             tool = options.Tool;
         }
 
-        var command = Cli.Wrap(tool).WithArguments(parsedArgs);
+        var command = Cli.Wrap(tool).WithArguments(SantiseArguments(parsedArgs));
 
         if (options.WorkingDirectory != null)
         {
@@ -76,6 +76,13 @@ public async Task<CommandResult> ExecuteCommandLineTool(CommandLineToolOptions o
         return await Of(command, options, cancellationToken);
     }
 
+    private List<string> SantiseArguments(List<string> parsedArgs)
+    {
+        parsedArgs.RemoveAll(x => x.StartsWith("<"));
+        
+        return parsedArgs;
+    }
+
     private static List<string> GetPrecedingArguments(object optionsObject)
     {
         if (optionsObject is CommandLineToolOptions { CommandParts: not null } commandLineToolOptions)

src/ModularPipelines/Helpers/CommandOptionsObjectArgumentParser.cs

@@ -61,12 +61,17 @@ private static void AddPlaceholderArguments(List<string> precedingArguments, obj
                 throw new ArgumentException($"No value provided for property {positionalPlaceholderArgument.Name}");
             }
 
-            if (string.IsNullOrWhiteSpace(value))
+            if (string.IsNullOrWhiteSpace(value) && indexOfMatchingPrecedingArgumentPlaceholder >= 0)
             {
                 precedingArguments.RemoveAt(indexOfMatchingPrecedingArgumentPlaceholder);
                 return;
             }
 
+            if (string.IsNullOrWhiteSpace(value))
+            {
+                return;
+            }
+            
             precedingArguments[indexOfMatchingPrecedingArgumentPlaceholder] = value;
         }
     }