Skip to content

Commit d3a59f3

Browse files
committed
further fixes around dotnet paket
1 parent 51ad610 commit d3a59f3

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

WebSharper.Fake.fsx

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,15 @@ let MakeTargets (args: Args) =
322322
pkg.Name.Contains "WebSharper" || pkg.Name.Contains "Zafir")
323323
if needsUpdate then
324324
attempt 3 <| fun () ->
325-
shell ".paket/paket.exe" "update -g %s %s"
326-
mainGroup.Name.Name
327-
(if Environment.environVarAsBoolOrDefault "PAKET_REDIRECTS" false
328-
then "--redirects"
329-
else "")
325+
let res =
326+
DotNet.exec id "paket"
327+
(sprintf "update -g %s %s"
328+
mainGroup.Name.Name
329+
(if Environment.environVarAsBoolOrDefault "PAKET_REDIRECTS" false
330+
then "--redirects"
331+
else "")
332+
)
333+
if not res.OK then failwith "dotnet paket update failed"
330334

331335
Target.create "WS-Restore" <| fun _ ->
332336
if not (Environment.environVarAsBoolOrDefault "NOT_DOTNET" false) then
@@ -410,6 +414,7 @@ let MakeTargets (args: Args) =
410414
File.WriteAllLines(outName, s)
411415
Paket.pack <| fun p ->
412416
{ p with
417+
ToolType = ToolType.CreateLocalTool()
413418
OutputPath = "build"
414419
Version = version.Value.AsString
415420
}
@@ -434,6 +439,7 @@ let MakeTargets (args: Args) =
434439
Trace.tracefn "[NUGET] Publishing to %s" nugetPublishUrl
435440
Paket.push <| fun p ->
436441
{ p with
442+
ToolType = ToolType.CreateLocalTool()
437443
PublishUrl = nugetPublishUrl
438444
WorkingDir = "build"
439445
}

0 commit comments

Comments
 (0)