From b1e7feff9b10790e65807cca563309c13b6c87fa Mon Sep 17 00:00:00 2001 From: Niklas Bergius Date: Fri, 25 Apr 2014 19:57:15 +0200 Subject: [PATCH 1/2] Fixed ProcessHelper.ensureProcessesHaveStopped (#389) --- src/app/FakeLib/ProcessHelper.fs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/FakeLib/ProcessHelper.fs b/src/app/FakeLib/ProcessHelper.fs index e9a43c06881..1af313acf15 100644 --- a/src/app/FakeLib/ProcessHelper.fs +++ b/src/app/FakeLib/ProcessHelper.fs @@ -448,12 +448,12 @@ let killAllCreatedProcesses() = /// ## Parameters /// - `name` - The name of the processes in question. /// - `timeout` - The timespan to time out after. -let ensureProcessesHaveStopped name timeout = +let ensureProcessesHaveStopped name timeout = let endTime = DateTime.Now.Add timeout - while DateTime.Now <= endTime && (getProcessesByName name <> Seq.empty) do + while DateTime.Now <= endTime && not (getProcessesByName name |> Seq.isEmpty) do tracefn "Waiting for %s to stop (Timeout: %A)" name endTime Thread.Sleep 1000 - if getProcessesByName name <> Seq.empty then + if not (getProcessesByName name |> Seq.isEmpty) then failwithf "The process %s has not stopped (check the logs for errors)" name /// Execute an external program and return the exit code. From d63f50ac45c492f66b9e4c5c7eb00d00b50c267b Mon Sep 17 00:00:00 2001 From: Niklas Bergius Date: Fri, 25 Apr 2014 21:42:18 +0200 Subject: [PATCH 2/2] Fixed Fake.Deploy.Web build (#413) --- src/deploy.web/Fake.Deploy.Web/Fake.Deploy.Web.fsproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/deploy.web/Fake.Deploy.Web/Fake.Deploy.Web.fsproj b/src/deploy.web/Fake.Deploy.Web/Fake.Deploy.Web.fsproj index 4417cc3e5f6..bebea6ab21b 100644 --- a/src/deploy.web/Fake.Deploy.Web/Fake.Deploy.Web.fsproj +++ b/src/deploy.web/Fake.Deploy.Web/Fake.Deploy.Web.fsproj @@ -183,6 +183,7 @@ True + ..\..\..\lib\fsi\FSharp.Core.dll ..\..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll