Merge pull request #33 from ionide/paket3

Use Paket3 Git Dependencies

Author: Krzysztof-Cieslak

.gitignore

@@ -1,3 +1,5 @@
+release/bin
+
 # Logs
 logs
 *.log
@@ -31,6 +33,7 @@ Test/
 Test/obj/
 Test/bin/
 .paket/paket.exe
+paket-files
 packages
 Test/Script.fsx
 Test/Script.fsx

build.cmd

@@ -1,4 +1,14 @@
 @echo off
 cls
 
+.paket\paket.bootstrapper.exe prerelease
+if errorlevel 1 (
+  exit /b %errorlevel%
+)
+
+.paket\paket.exe restore
+if errorlevel 1 (
+  exit /b %errorlevel%
+)
+
 packages\FAKE\tools\FAKE.exe build.fsx %* --nocache

build.fsx

@@ -88,6 +88,19 @@ Target "RunScript" (fun () ->
     Ionide.VSCode.Generator.translateModules typeof<Ionide.VSCode.FSharp> (".." </> "release" </> "fsharp.js")
 )
 
+
+let releaseBin  = "release/bin"
+let fsacBin     = "paket-files/github.com/ionide/FsAutoComplete/bin/release"
+
+Target "CopyFSAC" (fun _ ->
+    ensureDirectory releaseBin
+    CleanDir releaseBin
+
+    !! (fsacBin + "/*")
+    |> CopyFiles  releaseBin 
+)
+
+
 Target "InstallVSCE" ( fun _ ->
     killProcess "npm"
     run npmTool "install -g vsce" ""
@@ -166,6 +179,7 @@ Target "Release" DoNothing
 
 "Clean"
     ==> "RunScript"
+    ==> "CopyFSAC"
     ==> "Default"
 
 "Default"

ionide-fsharp-vscode.sln

@@ -1,13 +1,16 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40418.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Ionide.FSharp", "src\Ionide.FSharp.fsproj", "{D1081029-2369-4DAA-9F33-2353C5C9ED02}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{67EDE4A4-AC6E-407A-987D-A4B6334C29F2}"
 	ProjectSection(SolutionItems) = preProject
+		.gitignore = .gitignore
+		build.cmd = build.cmd
 		build.fsx = build.fsx
+		build.sh = build.sh
 		release\package.json = release\package.json
 		paket.dependencies = paket.dependencies
 		paket.lock = paket.lock

lib/FunScript.TypeScript.Binding.lib.dll

@@ -1,5 +1,9 @@
 source https://nuget.org/api/v2
 
+git [email protected]:ionide/ionide-vscode-helpers.git master build:"build.cmd"
+git [email protected]:ionide/FsAutoComplete.git master build:"build.cmd LocalRelease"
+
+
 nuget FAKE
 nuget FunScript
 nuget Npm.js

lib/FunScript.TypeScript.Binding.node.dll

@@ -1,21 +1,33 @@
 NUGET
-  remote: https://nuget.org/api/v2
+  remote: https://www.nuget.org/api/v2
   specs:
-    FAKE (4.9.3)
+    FAKE (4.20.0)
     FunScript (1.1.94)
     Microsoft.Bcl (1.1.10)
       Microsoft.Bcl.Build (>= 1.0.14)
     Microsoft.Bcl.Build (1.0.21) - import_targets: false
     Microsoft.Net.Http (2.2.29)
       Microsoft.Bcl (>= 1.1.10)
       Microsoft.Bcl.Build (>= 1.0.14)
-    Node.js (4.0.0)
+    Node.js (5.3.0)
     Npm.js (2.13.1)
       Node.js (>= 0.12.7)
-    Octokit (0.16.0)
+    Octokit (0.18.0)
       Microsoft.Net.Http
+GIT
+  remote: [email protected]:ionide/ionide-vscode-helpers.git
+  specs:
+     (b81a80ede2179222a5639cf866423d9bc6c2f0b4)
+      build: build.cmd
+  remote: [email protected]:ionide/ionide-fsgrammar.git
+  specs:
+     (7672ca5d35651c899fa9c095db5e94d45cb9f0ba)
+  remote: [email protected]:ionide/FsAutoComplete.git
+  specs:
+     (43364293eb5da2eb8599aa2d70324324b3b1adbb)
+      build: build.cmd LocalRelease
 GITHUB
   remote: fsharp/FAKE
   specs:
-    modules/Octokit/Octokit.fsx (752592c55d7f9e2b7a10f1782cb4128703d7a7d3)
+    modules/Octokit/Octokit.fsx (43c4800c5f132d2c2d6832a3a59232a64d83d4c0)
       Octokit