Merge changes

Author: Krzysztof-Cieslak

README.md

@@ -40,7 +40,7 @@ This can be obtained by installing Visual Studio 2013 / 2015 or downloading:
 More details how to obtain and install F# on different platforms can be found on http://fsharp.org/
 
 ## WebPreview
-`WebView` allows the user to override the default conventions used to run and preview web applications. To do so You need to create an `.ionide` file in the root folder of Your project opened by Atom. The configuration file uses the [TOML](https://github.com/toml-lang/toml) language.
+`WebView` allows the user to override the default conventions used to run and preview web applications. To do so You need to create an `.ionide` file in the root folder of Your project opened by VSCode. The configuration file uses the [TOML](https://github.com/toml-lang/toml) language.
 
 Here is the default configuration values used if the `.ionide` file doesn't exist or some entry is missing:
 

RELEASE_NOTES.md

@@ -1,3 +1,6 @@
+### 1.6.10 - 19.05.2016
+* Update FSAC
+
 ### 1.6.8 - 28.04.2016
 * Fix typo
 

paket.lock

@@ -1,6 +1,6 @@
 NUGET
   remote: https://www.nuget.org/api/v2
-    FAKE (4.25.5)
+    FAKE (4.26)
     FunScript (1.1.94)
     Microsoft.Bcl (1.1.10) - framework: net10, net11, net20, net30, net35, net40, net40-full
       Microsoft.Bcl.Build (>= 1.0.14)
@@ -21,7 +21,7 @@ GIT
      (8b996684032cebe1ba052696fb30081fab023b1f)
       build: build.cmd
   remote: https://github.com/ionide/FsAutoComplete.git
-     (40248ae40c8b30921565fb573091e3917ff2a3cf)
+     (e291884b2b52da09f24924a899e8ac84be42c9bc)
       build: build.cmd LocalRelease
   remote: https://github.com/fsprojects/Forge.git
      (0ce0281d45e8f7368f447fc33bf22406b4992801)
@@ -30,5 +30,5 @@ GIT
      (8061b5296321522633b16d7df66af8cf5fcd3784)
 GITHUB
   remote: fsharp/FAKE
-    modules/Octokit/Octokit.fsx (26ea4dbb3d60352b88162bb32577015af2e7c44e)
+    modules/Octokit/Octokit.fsx (32e262c11174b196dc8af16a577c8c3aa0ab0b2b)
       Octokit

release/README.md

@@ -40,7 +40,7 @@ This can be obtained by installing Visual Studio 2013 / 2015 or downloading:
 More details how to obtain and install F# on different platforms can be found on http://fsharp.org/
 
 ## WebPreview
-`WebView` allows the user to override the default conventions used to run and preview web applications. To do so You need to create an `.ionide` file in the root folder of Your project opened by Atom. The configuration file uses the [TOML](https://github.com/toml-lang/toml) language.
+`WebView` allows the user to override the default conventions used to run and preview web applications. To do so You need to create an `.ionide` file in the root folder of Your project opened by VSCode. The configuration file uses the [TOML](https://github.com/toml-lang/toml) language.
 
 Here is the default configuration values used if the `.ionide` file doesn't exist or some entry is missing:
 

release/RELEASE_NOTES.md

@@ -1,3 +1,6 @@
+### 1.6.10 - 19.05.2016
+* Update FSAC
+
 ### 1.6.8 - 28.04.2016
 * Fix typo
 

release/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "Ionide-fsharp",
-	"version": "1.6.8",
+	"version": "1.6.10",
 	"publisher": "Ionide",
 	"description": "F# Language Support",
 	"categories":[

src/main.fs

@@ -76,7 +76,8 @@ let translateModules (typ : System.Type) fileName =
         yield "var _funcs = wrappedFunScript();"
         yield "var _self = _funcs[0]();"
         yield ""
-        yield "exports.activate = _funcs[1](_self);" ]
+        yield "exports.activate = _funcs[1](_self);"
+        yield "exports.deactivate = _funcs[2](_self);" ]
       |> String.concat "\n"
     System.IO.File.WriteAllText(System.IO.Path.Combine(root, fileName), moduleJS)