Skip to content

Commit 4dddf66

Browse files
committed
merge paket and paket.bootstrapper as tools
1 parent b25149c commit 4dddf66

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

build.fsx

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -436,12 +436,17 @@ Target "NuGet" (fun _ ->
436436

437437
Target "MergeDotnetCoreIntoNuget" (fun _ ->
438438

439-
let nupkg = tempDir </> sprintf "Paket.Core.%s.nupkg" (release.NugetVersion) |> Path.GetFullPath
440-
let netcoreNupkg = tempDir </> "dotnetcore" </> sprintf "Paket.Core.%s.nupkg" (release.NugetVersion) |> Path.GetFullPath
441-
442439
let runTool = runCmdIn "tools" dotnetExePath
443440

444-
runTool """mergenupkg --source "%s" --other "%s" --framework netstandard2.0 """ nupkg netcoreNupkg
441+
let mergeNupkg packageName args =
442+
let nupkg = tempDir </> sprintf "%s.%s.nupkg" packageName (release.NugetVersion) |> Path.GetFullPath
443+
let netcoreNupkg = tempDir </> "dotnetcore" </> sprintf "%s.%s.nupkg" packageName (release.NugetVersion) |> Path.GetFullPath
444+
445+
runTool """mergenupkg --source "%s" --other "%s" %s""" nupkg netcoreNupkg args
446+
447+
mergeNupkg "Paket.Core" "--framework netstandard2.0"
448+
mergeNupkg "Paket" "--tools"
449+
mergeNupkg "paket.bootstrapper" "--tools"
445450
)
446451

447452
Target "PublishNuGet" (fun _ ->

0 commit comments

Comments
 (0)