diff --git a/.paket/paket.exe b/.paket/paket.exe
new file mode 100644
index 00000000000..54ddf5ae90b
Binary files /dev/null and b/.paket/paket.exe differ
diff --git a/build.bat b/build.bat
index 8d3057bd66e..58aca39a23d 100644
--- a/build.bat
+++ b/build.bat
@@ -1,30 +1,14 @@
@echo off
-REM we need nuget to install tools locally
-if not exist build\tools\nuget\nuget.exe (
- ECHO Nuget not found.. Downloading..
- mkdir build\tools\nuget
- PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& 'build\download-nuget.ps1'"
-)
-REM we need FAKE to process our build scripts
-if not exist build\tools\FAKE\tools\Fake.exe (
- ECHO FAKE not found.. Installing..
- "build\tools\nuget\nuget.exe" "install" "FAKE" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
+.paket\paket.bootstrapper.exe
+if errorlevel 1 (
+ exit /b %errorlevel%
)
-
-REM we need FSharp.Data so we can use type providers in our build scripts
-if not exist build\tools\FSharp.Data\lib\net40\Fsharp.Data.dll (
- ECHO FSharp.Data not found.. Installing..
- "build\tools\nuget\nuget.exe" "install" "FSharp.Data" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
+.paket\paket.exe install
+if errorlevel 1 (
+ exit /b %errorlevel%
)
-REM we need Microsoft.CodeAnalysis.CSharp so we can use type providers in our build scripts
-if not exist build\tools\FAKE\tools\Microsoft.CodeAnalysis.CSharp (
- ECHO Microsoft.CodeAnalysis.CSharp not found.. Installing..
- "build\tools\nuget\nuget.exe" "install" "Microsoft.CodeAnalysis.CSharp" "-OutputDirectory" "build\tools\FAKE\tools" "-ExcludeVersion" "-Prerelease"
-)
-
-
SET TARGET="build"
SET VERSION=
SET ESVERSIONS=
@@ -42,4 +26,4 @@ IF "%1%"=="integrate" (
shift
shift
-"build\tools\FAKE\tools\Fake.exe" "build\\scripts\\Targets.fsx" "target=%TARGET%" "version=%VERSION%" esversions=%ESVERSIONS%
\ No newline at end of file
+"packages\build\FAKE\tools\Fake.exe" "build\\scripts\\Targets.fsx" "target=%TARGET%" "version=%VERSION%" esversions=%ESVERSIONS%
\ No newline at end of file
diff --git a/build/download-nuget.ps1 b/build/download-nuget.ps1
deleted file mode 100644
index e6251786395..00000000000
--- a/build/download-nuget.ps1
+++ /dev/null
@@ -1,5 +0,0 @@
-$source = "http://nuget.org/nuget.exe"
-$destination = ".\build\tools\nuget\nuget.exe"
-
-$wc = New-Object System.Net.WebClient
-$wc.DownloadFile($source, $destination)
\ No newline at end of file
diff --git a/build/scripts/Building.fsx b/build/scripts/Building.fsx
index 5804940a6f5..cc1a87700a8 100644
--- a/build/scripts/Building.fsx
+++ b/build/scripts/Building.fsx
@@ -1,4 +1,4 @@
-#I @"../tools/FAKE/tools"
+#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
#load @"Paths.fsx"
#load @"Projects.fsx"
diff --git a/build/scripts/Documentation.fsx b/build/scripts/Documentation.fsx
index 64a2e927e4e..8d3b5de0711 100644
--- a/build/scripts/Documentation.fsx
+++ b/build/scripts/Documentation.fsx
@@ -1,4 +1,4 @@
-#I @"../tools/FAKE/tools"
+#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
#load @"Paths.fsx"
open System
diff --git a/build/scripts/InheritDoc.fsx b/build/scripts/InheritDoc.fsx
index 1bf7165b0ac..a1906fbb647 100644
--- a/build/scripts/InheritDoc.fsx
+++ b/build/scripts/InheritDoc.fsx
@@ -1,4 +1,4 @@
-#I @"../tools/FAKE/tools"
+#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
open System.Xml
open System.Xml.XPath
diff --git a/build/scripts/Paths.fsx b/build/scripts/Paths.fsx
index c385feb7d76..2b9b5f1cf41 100644
--- a/build/scripts/Paths.fsx
+++ b/build/scripts/Paths.fsx
@@ -1,4 +1,4 @@
-#I @"../tools/FAKE/tools"
+#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
open Fake
@@ -11,7 +11,7 @@ module Paths =
let BuildFolder = "build"
let BuildOutput = sprintf "%s/output" BuildFolder
- let ToolsFolder = sprintf "%s/tools" BuildFolder
+ let ToolsFolder = "packages/build"
let KeysFolder = sprintf "%s/keys" BuildFolder
let NugetOutput = sprintf "%s/_packages" BuildOutput
let SourceFolder = "src"
@@ -69,23 +69,7 @@ module Tooling =
let private exec = execAt Environment.CurrentDirectory
- let private nuget nugetId location =
- let path = "build/tools/nuget/nuget.exe"
- if doesNotExist path then
- printf "Downloading NuGet..."
- use webClient = new System.Net.WebClient()
- path |> Path.GetDirectoryName |> Directory.CreateDirectory |> ignore
- webClient.DownloadFile("https://nuget.org/nuget.exe", path |> Path.GetFullPath)
- printfn "Done."
- let fullTargetPath = sprintf "%s/%s" Paths.ToolsFolder location
- if doesNotExist fullTargetPath then
- traceFAKE "Tool %s not found installing in %s" nugetId fullTargetPath
- exec path ["install"; nugetId; "-OutputDirectory build/tools"; "-ExcludeVersion"]
-
type NugetTooling(nugetId, path) =
- do
- //bootstrap nuget installation when needed
- nuget nugetId path
member this.Path = sprintf "%s/%s" Paths.ToolsFolder path
member this.Exec arguments =
exec this.Path arguments
diff --git a/build/scripts/Projects.fsx b/build/scripts/Projects.fsx
index 55fb8ccf974..c480cc86d99 100644
--- a/build/scripts/Projects.fsx
+++ b/build/scripts/Projects.fsx
@@ -1,4 +1,4 @@
-#I @"../tools/FAKE/tools"
+#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
open Fake
diff --git a/build/scripts/Releasing.fsx b/build/scripts/Releasing.fsx
index 8d64f267ae1..5d6a7f37f87 100644
--- a/build/scripts/Releasing.fsx
+++ b/build/scripts/Releasing.fsx
@@ -1,4 +1,4 @@
-#I @"../tools/FAKE/tools"
+#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
#load @"Paths.fsx"
#load @"Projects.fsx"
diff --git a/build/scripts/Signing.fsx b/build/scripts/Signing.fsx
index 7c61b75b570..0cb7b540f4d 100644
--- a/build/scripts/Signing.fsx
+++ b/build/scripts/Signing.fsx
@@ -1,4 +1,4 @@
-#I @"../tools/FAKE/tools"
+#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
#load @"Paths.fsx"
#load @"Projects.fsx"
diff --git a/build/scripts/Targets.fsx b/build/scripts/Targets.fsx
index 69f2893799f..60e31278c24 100644
--- a/build/scripts/Targets.fsx
+++ b/build/scripts/Targets.fsx
@@ -1,5 +1,5 @@
// include Fake lib
-#I @"../tools/FAKE/tools"
+#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
open Fake
diff --git a/build/scripts/Testing.fsx b/build/scripts/Testing.fsx
index 839c109f26c..23c2ecb11a9 100644
--- a/build/scripts/Testing.fsx
+++ b/build/scripts/Testing.fsx
@@ -1,4 +1,4 @@
-#I @"../tools/FAKE/tools"
+#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
#r "System.Xml.Linq.dll"
diff --git a/build/scripts/Versioning.fsx b/build/scripts/Versioning.fsx
index c98e8900395..09b307dc758 100644
--- a/build/scripts/Versioning.fsx
+++ b/build/scripts/Versioning.fsx
@@ -1,4 +1,4 @@
-#I @"../tools/FAKE/tools"
+#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
#load @"Projects.fsx"
open System
diff --git a/build/scripts/scripts.fsproj b/build/scripts/scripts.fsproj
index d966eb3028c..d775fe16183 100644
--- a/build/scripts/scripts.fsproj
+++ b/build/scripts/scripts.fsproj
@@ -62,7 +62,6 @@
-
diff --git a/paket.bat b/paket.bat
index c9a4263ce57..1eb3c7c0645 100644
--- a/paket.bat
+++ b/paket.bat
@@ -1,15 +1,8 @@
@echo off
REM we need nuget to install tools locally
-if not exist build\tools\nuget\nuget.exe (
- ECHO Nuget not found.. Downloading..
- mkdir build\tools\nuget
- PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& 'build\download-nuget.ps1'"
+.paket\paket.bootstrapper.exe
+if errorlevel 1 (
+ exit /b %errorlevel%
)
-REM we need paket to call paket doh
-if not exist build\tools\Paket\tools\paket.exe (
- ECHO Paket not found.. Installing..
- "build\tools\nuget\nuget.exe" "install" "Paket" "-OutputDirectory" "build\tools" "-ExcludeVersion" "-Prerelease"
-)
-
-build\tools\Paket\tools\paket.exe %*
+.paket\paket.exe %*
diff --git a/paket.dependencies b/paket.dependencies
index ec2dd892729..2f461efd8eb 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -20,3 +20,13 @@ nuget Rx-Interfaces
nuget Rx-Linq
nuget Rx-Main
nuget Rx-PlatformServices
+
+group build
+
+ source https://www.nuget.org/api/v2
+
+ nuget FAKE
+ nuget FSharp.Data
+ nuget GitLink
+ nuget node.js
+ nuget xunit.runner.console
diff --git a/paket.lock b/paket.lock
index 811a74f8c1c..20ca1643618 100644
--- a/paket.lock
+++ b/paket.lock
@@ -31,21 +31,21 @@ NUGET
Rx-Interfaces (>= 2.2.5)
ShellProgressBar (1.0.0.0)
System.Collections (4.0.10) - framework: dnxcore50
- System.Diagnostics.Debug (>= 4.0.0) - framework: dnxcore50
- System.Resources.ResourceManager (>= 4.0.0) - framework: dnxcore50
+ System.Diagnostics.Debug (>= 4.0.0)
+ System.Resources.ResourceManager (>= 4.0.0)
System.Runtime (>= 4.0.0)
- System.Runtime (>= 4.0.20) - framework: dnxcore50
- System.Runtime.Extensions (>= 4.0.0) - framework: dnxcore50
- System.Threading (>= 4.0.0) - framework: dnxcore50
+ System.Runtime (>= 4.0.20)
+ System.Runtime.Extensions (>= 4.0.0)
+ System.Threading (>= 4.0.0)
System.Collections.Immutable (1.1.37)
- System.Collections (>= 4.0.0) - framework: dnxcore50
- System.Diagnostics.Debug (>= 4.0.0) - framework: dnxcore50
- System.Globalization (>= 4.0.0) - framework: dnxcore50
- System.Linq (>= 4.0.0) - framework: dnxcore50
- System.Resources.ResourceManager (>= 4.0.0) - framework: dnxcore50
- System.Runtime (>= 4.0.0) - framework: dnxcore50
- System.Runtime.Extensions (>= 4.0.0) - framework: dnxcore50
- System.Threading (>= 4.0.0) - framework: dnxcore50
+ System.Collections (>= 4.0.0)
+ System.Diagnostics.Debug (>= 4.0.0)
+ System.Globalization (>= 4.0.0)
+ System.Linq (>= 4.0.0)
+ System.Resources.ResourceManager (>= 4.0.0)
+ System.Runtime (>= 4.0.0)
+ System.Runtime.Extensions (>= 4.0.0)
+ System.Threading (>= 4.0.0)
System.Diagnostics.Contracts (4.0.0) - framework: dnxcore50
System.Runtime (>= 4.0.0)
System.Diagnostics.Debug (4.0.10) - framework: dnxcore50
@@ -53,12 +53,12 @@ NUGET
System.Globalization (4.0.10) - framework: dnxcore50
System.Runtime (>= 4.0.0)
System.IO (4.0.10) - framework: dnxcore50
- System.Globalization (>= 4.0.0) - framework: dnxcore50
+ System.Globalization (>= 4.0.0)
System.Runtime (>= 4.0.20)
System.Text.Encoding (>= 4.0.0)
- System.Text.Encoding (>= 4.0.10) - framework: dnxcore50
- System.Text.Encoding.Extensions (>= 4.0.0) - framework: dnxcore50
- System.Threading (>= 4.0.0) - framework: dnxcore50
+ System.Text.Encoding (>= 4.0.10)
+ System.Text.Encoding.Extensions (>= 4.0.0)
+ System.Threading (>= 4.0.0)
System.Threading.Tasks (>= 4.0.0)
System.Linq (4.0.0) - framework: dnxcore50
System.Collections (>= 4.0.10)
@@ -67,22 +67,22 @@ NUGET
System.Runtime (>= 4.0.20)
System.Runtime.Extensions (>= 4.0.10)
System.Linq.Expressions (4.0.10)
- System.Collections (>= 4.0.0) - framework: dnxcore50
- System.Diagnostics.Debug (>= 4.0.0) - framework: dnxcore50
- System.Globalization (>= 4.0.0) - framework: dnxcore50
- System.IO (>= 4.0.0) - framework: dnxcore50
- System.Linq (>= 4.0.0) - framework: dnxcore50
- System.ObjectModel (>= 4.0.0) - framework: dnxcore50
+ System.Collections (>= 4.0.0)
+ System.Diagnostics.Debug (>= 4.0.0)
+ System.Globalization (>= 4.0.0)
+ System.IO (>= 4.0.0)
+ System.Linq (>= 4.0.0)
+ System.ObjectModel (>= 4.0.0)
System.Reflection (>= 4.0.0)
- System.Reflection.Emit (>= 4.0.0) - framework: dnxcore50
- System.Reflection.Extensions (>= 4.0.0) - framework: dnxcore50
- System.Reflection.Primitives (>= 4.0.0) - framework: dnxcore50
- System.Reflection.TypeExtensions (>= 4.0.0) - framework: dnxcore50
- System.Resources.ResourceManager (>= 4.0.0) - framework: dnxcore50
- System.Runtime (>= 4.0.0)
- System.Runtime (>= 4.0.20) - framework: dnxcore50
- System.Runtime.Extensions (>= 4.0.0) - framework: dnxcore50
- System.Threading (>= 4.0.0) - framework: dnxcore50
+ System.Reflection.Emit (>= 4.0.0)
+ System.Reflection.Extensions (>= 4.0.0)
+ System.Reflection.Primitives (>= 4.0.0)
+ System.Reflection.TypeExtensions (>= 4.0.0)
+ System.Resources.ResourceManager (>= 4.0.0)
+ System.Runtime (>= 4.0.0)
+ System.Runtime (>= 4.0.20)
+ System.Runtime.Extensions (>= 4.0.0)
+ System.Threading (>= 4.0.0)
System.ObjectModel (4.0.10)
System.Collections (>= 4.0.10)
System.Diagnostics.Debug (>= 4.0.10)
@@ -105,52 +105,52 @@ NUGET
System.Reflection.Primitives (>= 4.0.0)
System.Runtime (>= 4.0.0)
System.Reflection.Extensions (4.0.0) - framework: dnxcore50
- System.Diagnostics.Debug (>= 4.0.10) - framework: dnxcore50
+ System.Diagnostics.Debug (>= 4.0.10)
System.Reflection (>= 4.0.0)
- System.Reflection (>= 4.0.10) - framework: dnxcore50
- System.Reflection.Primitives (>= 4.0.0) - framework: dnxcore50
- System.Reflection.TypeExtensions (>= 4.0.0) - framework: dnxcore50
- System.Resources.ResourceManager (>= 4.0.0) - framework: dnxcore50
+ System.Reflection (>= 4.0.10)
+ System.Reflection.Primitives (>= 4.0.0)
+ System.Reflection.TypeExtensions (>= 4.0.0)
+ System.Resources.ResourceManager (>= 4.0.0)
System.Runtime (>= 4.0.0)
- System.Runtime (>= 4.0.20) - framework: dnxcore50
- System.Runtime.Extensions (>= 4.0.10) - framework: dnxcore50
+ System.Runtime (>= 4.0.20)
+ System.Runtime.Extensions (>= 4.0.10)
System.Reflection.Metadata (1.0.22)
- System.Collections (>= 4.0.0) - framework: dnxcore50
- System.Collections.Immutable (>= 1.1.37) - framework: dnxcore50, portable-net45+win80
- System.Diagnostics.Debug (>= 4.0.0) - framework: dnxcore50
- System.IO (>= 4.0.0) - framework: dnxcore50
- System.Reflection (>= 4.0.0) - framework: dnxcore50
- System.Reflection.Extensions (>= 4.0.0) - framework: dnxcore50
- System.Reflection.Primitives (>= 4.0.0) - framework: dnxcore50
- System.Resources.ResourceManager (>= 4.0.0) - framework: dnxcore50
- System.Runtime (>= 4.0.0) - framework: dnxcore50
- System.Runtime.Extensions (>= 4.0.0) - framework: dnxcore50
- System.Runtime.InteropServices (>= 4.0.0) - framework: dnxcore50
- System.Text.Encoding (>= 4.0.0) - framework: dnxcore50
- System.Text.Encoding.Extensions (>= 4.0.0) - framework: dnxcore50
- System.Threading (>= 4.0.0) - framework: dnxcore50
+ System.Collections (>= 4.0.0)
+ System.Collections.Immutable (>= 1.1.37)
+ System.Diagnostics.Debug (>= 4.0.0)
+ System.IO (>= 4.0.0)
+ System.Reflection (>= 4.0.0)
+ System.Reflection.Extensions (>= 4.0.0)
+ System.Reflection.Primitives (>= 4.0.0)
+ System.Resources.ResourceManager (>= 4.0.0)
+ System.Runtime (>= 4.0.0)
+ System.Runtime.Extensions (>= 4.0.0)
+ System.Runtime.InteropServices (>= 4.0.0)
+ System.Text.Encoding (>= 4.0.0)
+ System.Text.Encoding.Extensions (>= 4.0.0)
+ System.Threading (>= 4.0.0)
System.Reflection.Primitives (4.0.0) - framework: dnxcore50
System.Runtime (>= 4.0.0)
- System.Threading (>= 4.0.0) - framework: dnxcore50
+ System.Threading (>= 4.0.0)
System.Reflection.TypeExtensions (4.0.0) - framework: dnxcore50
- System.Diagnostics.Contracts (>= 4.0.0) - framework: dnxcore50
- System.Diagnostics.Debug (>= 4.0.10) - framework: dnxcore50
- System.Linq (>= 4.0.0) - framework: dnxcore50
+ System.Diagnostics.Contracts (>= 4.0.0)
+ System.Diagnostics.Debug (>= 4.0.10)
+ System.Linq (>= 4.0.0)
System.Reflection (>= 4.0.0)
- System.Reflection (>= 4.0.10) - framework: dnxcore50
- System.Reflection.Primitives (>= 4.0.0) - framework: dnxcore50
- System.Resources.ResourceManager (>= 4.0.0) - framework: dnxcore50
+ System.Reflection (>= 4.0.10)
+ System.Reflection.Primitives (>= 4.0.0)
+ System.Resources.ResourceManager (>= 4.0.0)
System.Runtime (>= 4.0.0)
- System.Runtime (>= 4.0.20) - framework: dnxcore50
- System.Runtime.Extensions (>= 4.0.10) - framework: dnxcore50
+ System.Runtime (>= 4.0.20)
+ System.Runtime.Extensions (>= 4.0.10)
System.Resources.ResourceManager (4.0.0) - framework: dnxcore50
System.Globalization (>= 4.0.0)
System.Reflection (>= 4.0.0)
- System.Reflection (>= 4.0.10) - framework: dnxcore50
+ System.Reflection (>= 4.0.10)
System.Runtime (>= 4.0.0)
- System.Runtime (>= 4.0.20) - framework: dnxcore50
+ System.Runtime (>= 4.0.20)
System.Runtime (4.0.20) - framework: dnxcore50
- System.Private.Uri (>= 4.0.0) - framework: dnxcore50
+ System.Private.Uri (>= 4.0.0)
System.Runtime.Extensions (4.0.10) - framework: dnxcore50
System.Runtime (>= 4.0.20)
System.Runtime.Handles (4.0.0) - framework: dnxcore50
@@ -224,3 +224,15 @@ NUGET
System.Threading.Tasks (>= 4.0.0)
xunit.abstractions (>= 2.0.0)
xunit.extensibility.core (2.1.0)
+
+GROUP build
+NUGET
+ remote: https://nuget.org/api/v2
+ specs:
+ FAKE (4.5.6)
+ FSharp.Data (2.2.5)
+ Zlib.Portable (>= 1.10.0)
+ gitlink (2.1.0)
+ Node.js (4.0.0)
+ xunit.runner.console (2.1.0)
+ Zlib.Portable (1.11.0) - framework: portable-net40+sl50+wp80+win80