Fix lightweight tool API to expose exitHandler

Fumeaux · May 15, 2023 · a1344e1 · a1344e1
1 parent 832a777
commit a1344e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/source/Nuke.Tooling/Tool.cs b/source/Nuke.Tooling/Tool.cs
@@ -12,12 +12,13 @@ public delegate IReadOnlyCollection<Output> Tool(
 #if NET6_0_OR_GREATER
     ref ArgumentStringHandler arguments,
 #else
-        string arguments = null,
+    string arguments = null,
 #endif
     string workingDirectory = null,
     IReadOnlyDictionary<string, string> environmentVariables = null,
     int? timeout = null,
     bool? logOutput = null,
     bool? logInvocation = null,
-    Action<OutputType, string> customLogger = null,
+    Action<OutputType, string> logger = null,
+    Action<IProcess> exitHandler = null,
     Func<string, string> outputFilter = null);
diff --git a/source/Nuke.Tooling/ToolExecutor.cs b/source/Nuke.Tooling/ToolExecutor.cs
@@ -29,6 +29,7 @@ public IReadOnlyCollection<Output> Execute(
         bool? logOutput = null,
         bool? logInvocation = null,
         Action<OutputType, string> customLogger = null,
+        Action<IProcess> exitHandler = null,
         Func<string, string> outputFilter = null)
     {
         var process = ProcessTasks.StartProcess(
@@ -45,7 +46,7 @@ public IReadOnlyCollection<Output> Execute(
             logInvocation,
             customLogger,
             outputFilter);
-        process.AssertZeroExitCode();
+        (exitHandler ?? (p => ProcessTasks.DefaultExitHandler(toolSettings: null, p))).Invoke(process.AssertWaitForExit());
         return process.Output;
     }
 }