Run Pickles with Framework #1894

fsprojects · May 1, 2018 · 795d0e4 · 795d0e4
1 parent e567c2e
commit 795d0e4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/help/markdown/fake-tools-pickles.md b/help/markdown/fake-tools-pickles.md
@@ -8,11 +8,13 @@
 #r "paket:
 nuget Fake.Core.Target
 nuget Fake.IO.FileSystem
-nuget Fake.Tools.Pickles //"
+nuget Fake.Tools.Pickles
+nuget Pickles.CommandLine storage: packages
+//"
 
 open Fake.Core
-open Fake.Core.TargetOperators
 open Fake.IO.FileSystemOperators
+open Fake.IO.Globbing
 open Fake.Tools
 open System.IO
 
@@ -22,7 +24,8 @@ Target.create "BuildDoc" (fun _ ->
     Pickles.convert (fun p ->
         { p with FeatureDirectory = currentDirectory </> "Specs"
                  OutputDirectory = currentDirectory </> "SpecDocs"
-                 OutputFileFormat = Pickles.DocumentationFormat.DHTML })
+                 OutputFileFormat = Pickles.DocumentationFormat.DHTML
+                 ToolPath = Tools.findToolInSubPath "pickles.exe" "~/.fake/build.fsx/packages" })
 )
 
 Target.runOrDefault "BuildDoc"

diff --git a/src/app/Fake.Tools.Pickles/Pickles.fs b/src/app/Fake.Tools.Pickles/Pickles.fs
@@ -217,8 +217,9 @@ let convert setParams =
     let makeProcessStartInfo info =
         { info with FileName = parameters.ToolPath
                     WorkingDirectory = "."
-                    Arguments = parameters |> buildPicklesArgs } 
+                    Arguments = parameters |> buildPicklesArgs }
+        |> Process.withFramework
 
-    let result = Process.execSimple makeProcessStartInfo  parameters.TimeOut
+    let result = Process.execSimple makeProcessStartInfo parameters.TimeOut
 
     ResultHandling.failBuildIfPicklesReportedError parameters.ErrorLevel result