FAKE improvements

- paket restore not paket install before calling FAKE
- allow myget feed to specified when calling canary build

Author: Mpdreamz

build.bat

@@ -12,7 +12,7 @@ REM - elasticsearch_versions can be multiple separated with a semi-colon ';'
 if errorlevel 1 (
   exit /b %errorlevel%
 )
-.paket\paket.exe install
+.paket\paket.exe restore
 if errorlevel 1 (
   exit /b %errorlevel%
 )
@@ -23,7 +23,7 @@ SET ESVERSIONS=
 SET DNXVERSION="default"
 SET SKIPTESTS=0
 SET APIKEY=
-
+SET FEED="elasticsearch-net"
 
 IF /I "%1"=="skiptests" (
 	set SKIPTESTS="1"
@@ -51,8 +51,7 @@ IF /I "%1%"=="integrate" (
 
 IF /I "%1%"=="canary" (
 	IF NOT [%2]==[] (set APIKEY="%2")
-	IF /I "%3"=="skiptests" (set SKIPTESTS=1)
-	IF /I "%2"=="skiptests" (set SKIPTESTS=1)
+	IF NOT [%3]==[] (set FEED="%3")
 )
 
-"packages\build\FAKE\tools\Fake.exe" "build\\scripts\\Targets.fsx" "target=%TARGET%" "version=%VERSION%" "esversions=%ESVERSIONS%" "skiptests=%SKIPTESTS%" "apiKey=%APIKEY%"
+"packages\build\FAKE\tools\Fake.exe" "build\\scripts\\Targets.fsx" "target=%TARGET%" "version=%VERSION%" "esversions=%ESVERSIONS%" "skiptests=%SKIPTESTS%" "apiKey=%APIKEY%" "feed=%FEED%"

build/scripts/Releasing.fsx

@@ -102,10 +102,11 @@ type Release() =
             MoveFile Paths.NugetOutput package
         )
 
-    static member PublishCanaryBuild accessKey = 
+    static member PublishCanaryBuild accessKey feed = 
         !! "build/output/_packages/*-ci*.nupkg"
         |> Seq.iter(fun f -> 
-            let success = Tooling.execProcess (Tooling.NugetFile()) ["push"; f; accessKey; "-source"; "https://www.myget.org/F/elasticsearch-net/api/v2/package"] 
+            let source = "https://www.myget.org/F/"+ feed + "/api/v2/package"
+            let success = Tooling.execProcess (Tooling.NugetFile()) ["push"; f; accessKey; "-source"; source] 
             match success with
             | 0 -> traceFAKE "publish to myget succeeded" |> ignore
             | _ -> failwith "publish to myget failed" |> ignore

build/scripts/Targets.fsx

@@ -74,7 +74,8 @@ Target "Release" <| fun _ ->
 Target "Canary" <| fun _ -> 
     trace "Running canary build" 
     let apiKey = (getBuildParam "apikey");
-    if (not (String.IsNullOrWhiteSpace apiKey) || apiKey = "ignore") then Release.PublishCanaryBuild apiKey
+    let feed = (getBuildParamOrDefault "feed" "elasticsearch-net");
+    if (not (String.IsNullOrWhiteSpace apiKey) || apiKey = "ignore") then Release.PublishCanaryBuild apiKey feed
 
 BuildFailureTarget "NotifyTestFailures" <| fun _ -> Tests.Notify() |> ignore