From ae59e4597175caf53705b573e83f4d9d11663c67 Mon Sep 17 00:00:00 2001 From: Ilja Nosik Date: Tue, 21 Jul 2015 20:08:34 +0200 Subject: [PATCH 1/3] Ignore .DS_Store --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e95c112ebe7..5faae9b128d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ #ignore thumbnails created by windows Thumbs.db +.DS_Store #Ignore files build by Visual Studio docs/ docsBuild/ From 6baed528e693cda13b4f9c2c3c59841468bf9f2b Mon Sep 17 00:00:00 2001 From: Ilja Nosik Date: Tue, 21 Jul 2015 20:06:01 +0200 Subject: [PATCH 2/3] Add LockDependencies-Parameter to Paket.PackParameters --- src/app/FakeLib/PaketHelper.fs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/FakeLib/PaketHelper.fs b/src/app/FakeLib/PaketHelper.fs index 67457a0c274..7b68fb51254 100644 --- a/src/app/FakeLib/PaketHelper.fs +++ b/src/app/FakeLib/PaketHelper.fs @@ -11,6 +11,7 @@ type PaketPackParams = { ToolPath : string TimeOut : TimeSpan Version : string + LockDependencies : bool ReleaseNotes : string BuildConfig : string TemplateFile : string @@ -22,6 +23,7 @@ let PaketPackDefaults() : PaketPackParams = { ToolPath = (findToolFolderInSubPath "paket.exe" (currentDirectory @@ ".paket")) @@ "paket.exe" TimeOut = TimeSpan.FromMinutes 5. Version = null + LockDependencies = false ReleaseNotes = null BuildConfig = null TemplateFile = null @@ -64,12 +66,13 @@ let Pack setParams = let releaseNotes = if String.IsNullOrWhiteSpace parameters.ReleaseNotes then "" else " releaseNotes " + toParam (xmlEncode parameters.ReleaseNotes) let buildConfig = if String.IsNullOrWhiteSpace parameters.BuildConfig then "" else " buildconfig " + toParam parameters.BuildConfig let templateFile = if String.IsNullOrWhiteSpace parameters.TemplateFile then "" else " templatefile " + toParam parameters.TemplateFile - + let lockDependencies = if parameters.LockDependencies then " lock-dependencies" else "" + let packResult = ExecProcess (fun info -> info.FileName <- parameters.ToolPath - info.Arguments <- sprintf "pack output %s%s%s%s%s" parameters.OutputPath version releaseNotes buildConfig templateFile) parameters.TimeOut + info.Arguments <- sprintf "pack output %s%s%s%s%s%s" parameters.OutputPath version releaseNotes buildConfig templateFile lockDependencies) parameters.TimeOut if packResult <> 0 then failwithf "Error during packing %s." parameters.WorkingDir traceEndTask "PaketPack" parameters.WorkingDir From 4ef327e6b4d2eb8db7fe9a8b2c2b092a552e6aa8 Mon Sep 17 00:00:00 2001 From: Ilja Nosik Date: Wed, 22 Jul 2015 19:19:47 +0200 Subject: [PATCH 3/3] Refactor command line parameter composition --- src/app/FakeLib/PaketHelper.fs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/FakeLib/PaketHelper.fs b/src/app/FakeLib/PaketHelper.fs index 7b68fb51254..46f95daa59f 100644 --- a/src/app/FakeLib/PaketHelper.fs +++ b/src/app/FakeLib/PaketHelper.fs @@ -69,10 +69,11 @@ let Pack setParams = let lockDependencies = if parameters.LockDependencies then " lock-dependencies" else "" let packResult = + let cmdArgs = sprintf "%s%s%s%s%s" version releaseNotes buildConfig templateFile lockDependencies ExecProcess (fun info -> info.FileName <- parameters.ToolPath - info.Arguments <- sprintf "pack output %s%s%s%s%s%s" parameters.OutputPath version releaseNotes buildConfig templateFile lockDependencies) parameters.TimeOut + info.Arguments <- sprintf "pack output %s %s" parameters.OutputPath cmdArgs) parameters.TimeOut if packResult <> 0 then failwithf "Error during packing %s." parameters.WorkingDir traceEndTask "PaketPack" parameters.WorkingDir