Fixed bug where CommandLineConfiguration was ignored.

Author: JordanMarr

src/FSharp.SystemCommandLine/CommandBuilders.fs

@@ -124,7 +124,6 @@ type BaseCommandBuilder<'A, 'B, 'C, 'D, 'E, 'F, 'G, 'H, 'Output>() =
             invalidOp "Only 8 inputs are supported."
 
 
-    //member val CommandLineBuilder = CommandLineBuilder().UseDefaults() with get, set
     member val CommandLineConfiguration = new CommandLineConfiguration(new RootCommand()) with get, set
 
     member this.Yield _ =
@@ -397,7 +396,7 @@ type RootCommandBuilder<'A, 'B, 'C, 'D, 'E, 'F, 'G, 'H, 'Output>(args: string ar
             |> this.SetHandlerUnit spec
             |> addGlobalOptionsToCommand spec.GlobalInputs
 
-        CommandLineParser.Parse(rootCommand, args).Invoke()
+        rootCommand.Parse(args, this.CommandLineConfiguration).Invoke()        
 
     /// Executes a Command with a handler that returns int.
     member this.Run (spec: CommandSpec<'Inputs, int>) =
@@ -406,8 +405,8 @@ type RootCommandBuilder<'A, 'B, 'C, 'D, 'E, 'F, 'G, 'H, 'Output>(args: string ar
             |> this.SetGeneralProperties spec
             |> this.SetHandlerInt spec
             |> addGlobalOptionsToCommand spec.GlobalInputs
-        
-        CommandLineParser.Parse(rootCommand, args).Invoke()
+                
+        rootCommand.Parse(args, this.CommandLineConfiguration).Invoke()
 
     /// Executes a Command with a handler that returns a Task<unit> or Task<int>.
     member this.Run (spec: CommandSpec<'Inputs, Task<unit>>) =
@@ -417,7 +416,7 @@ type RootCommandBuilder<'A, 'B, 'C, 'D, 'E, 'F, 'G, 'H, 'Output>(args: string ar
             |> this.SetHandlerTask spec
             |> addGlobalOptionsToCommand spec.GlobalInputs
 
-        CommandLineParser.Parse(rootCommand, args).InvokeAsync()
+        rootCommand.Parse(args, this.CommandLineConfiguration).InvokeAsync()
 
     /// Executes a Command with a handler that returns a Task<unit> or Task<int>.
     member this.Run (spec: CommandSpec<'Inputs, Task<int>>) =
@@ -427,7 +426,7 @@ type RootCommandBuilder<'A, 'B, 'C, 'D, 'E, 'F, 'G, 'H, 'Output>(args: string ar
             |> this.SetHandlerTaskInt spec
             |> addGlobalOptionsToCommand spec.GlobalInputs
 
-        CommandLineParser.Parse(rootCommand, args).InvokeAsync()
+        rootCommand.Parse(args, this.CommandLineConfiguration).InvokeAsync()
 
 
 /// Builds a `System.CommandLine.Command`.

src/Tests/SimpleAppTest.fs

@@ -5,6 +5,7 @@ open Swensen.Unquote
 open FSharp.SystemCommandLine
 open Utils
 open Input
+open System.CommandLine.Parsing
 
 let mutable handlerCalled = false
 [<SetUp>] 
@@ -92,14 +93,13 @@ let ``05 empty array`` () =
     } =! 0
 
 /// In beta5, the action handler is never called if an input starts with "@", even if ResponseFileTokenReplacer is set to null.
-[<Test; Ignore "Ignore failing test">]
+[<Test>]
 let ``06 Token Replacer`` () = 
     testRootCommand "--package @shoelace-style/shoelace" {
         description "Can be called with a leading @ package"
         configure (fun cfg -> 
             // Skip @ processing
-            //cfg.UseTokenReplacer(fun _ _ _ -> false) // Removed in beta5
-            cfg.ResponseFileTokenReplacer <- null // in beta5, you must set ResponseFileTokenReplacer to null to skip @ processing
+            cfg.ResponseFileTokenReplacer <- null
             //cfg.ResponseFileTokenReplacer <- new TryReplaceToken(fun _ _ _ -> false)
         )
         //inputs (Input.Option<string>("package", [ "--package"; "-p" ], "A package with a leading @ name"))