merge from master

.gitignore

@@ -47,6 +47,7 @@
 /vsintegration/src/unittests/Unittests.fsi
 /tests/*FSharp_Failures.env
 /tests/*FSharp_Failures.lst
+/tests/fsharpqa/testenv/bin/
 /tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
 /tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
 /tests/Xnet40-fsharpqa-suite-failures.log.*
@@ -104,5 +105,5 @@ tests/fsharp/typecheck/sigs/neg94-pre.dll
 times
 /tests/fsharpqa/testenv/bin/System.ValueTuple.dll
 source_link.json
-/.vs
+.vs/
 /VSRelease/net40/bin

.nuget/NuGet.Config

@@ -7,12 +7,13 @@
 
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
-    <add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />  
+    <add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
     <add key="myget.org roslyn-master-nightly" value="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json" />
     <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
-    <add key="myget.org dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />  
-    <add key="myget.org roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />  
+    <add key="myget.org dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
+    <add key="myget.org roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="vctools" value="https://vcppdogfooding.azurewebsites.net/nuget/" />
-  </packageSources>  
+    <add key="artifacts" value="../artifacts" />
+  </packageSources>
 </configuration>

DEVGUIDE.md

@@ -55,7 +55,7 @@ There are various qualifiers:
 
     build.cmd net40           -- build .NET Framework compiler (the default)
     build.cmd coreclr         -- build .NET Core compiler 
-    build.cmd vs              -- build the Visual F# IDE Tools
+    build.cmd vs              -- build the Visual F# IDE Tools (see below)
     build.cmd pcls            -- build the PCL FSharp.Core libraries
     build.cmd all             -- build all 
 
@@ -64,52 +64,86 @@ There are various qualifiers:
     build.cmd test            -- build default targets, run suitable tests
     build.cmd net40 test      -- build net40, run suitable tests
     build.cmd coreclr test    -- build coreclr, run suitable tests
-    build.cmd vs test         -- build Visual F# IDE Tools, run all tests
+    build.cmd vs test         -- build Visual F# IDE Tools, run all tests (see below)
     build.cmd all test        -- build all, run all tests
 
     build.cmd test-smoke      -- build, run smoke tests
     build.cmd test-net40-fsharp     -- build, run tests\fsharp suite for .NET Framework
     build.cmd test-net40-fsharpqa   -- build, run tests\fsharpqa suite for .NET Framework
 
-**Notes**
-To build and test Visual F# IDE Tools, you must use [Visual Studio "vNext" (aka "Dev15")](https://www.visualstudio.com/en-us/downloads/visual-studio-next-downloads-vs.aspx). This is the one after Visual Studio 2015 (aka "Dev 14").  You must also install Visual Studio SDK (also called _Visual Studio Extensibility SDK_ on the Visual Studio installer) before building Visual F# IDE Tools.
-Please ensure that the Visual Studio SDK version is matched with your current Visual Studio to ensure successful builds. For example: Visual Studio 2015 Update 1 requires Visual Studio 2015 SDK Update 1. Any installation of Visual Studio 2015 and later provides Visual Studio SDK as part of the installation of Visual Studio 2015 as feature installation. 
-
 After you build the first time you can open and use this solution:
 
-    .\VisualFSharp.sln
+    .\FSharp.sln
 
 or just build it directly:
 
-    msbuild VisualFSharp.sln 
+    msbuild FSharp.sln 
+
+Building ``FSharp.sln`` builds nearly everything. However building portable profiles of 
+FSharp.Core.dll is not included.  If you are just developing the core compiler and library
+then building the solution will be enough.
+
+### Notes on the .NET Framework build
+
+1. The `update.cmd` script adds required strong name validation skips, and NGens the compiler and libraries. This requires admin privileges.
+1. The compiler binaries produced are "private" and strong-named signed with a test key.
+1. Some additional tools are required to build the compiler, notably `fslex.exe`, `fsyacc.exe`, `FSharp.PowerPack.Build.Tasks.dll`, `FsSrGen.exe`, `FSharp.SRGen.Build.Tasks.dll`, and the other tools found in the `lkg` directory.
+1. The overall bootstrapping process executes as follows
+ - We first need an existing F# compiler. We use the one in the `lkg` directory. Let's assume this compiler has an `FSharp.Core.dll` with version X.
+ - We use this compiler to compile the source in this distribution, to produce a "proto" compiler, dropped to the `proto` directory. When run, this compiler still relies on `FSharp.Core.dll` with version X.
+ - We use the proto compiler to compile the source for `FSharp.Core.dll` in this distribution.
+ - We use the proto compiler to compile the source for `FSharp.Compiler.dll`, `fsc.exe`, `fsi.exe`, and other binaries found in this distribution.
+
+
+
+# The Visual F# IDE Tools (Windows Only)
+
+To build and test Visual F# IDE Tools, you must use [Visual Studio "vNext" (aka "Dev15")](https://www.visualstudio.com/en-us/downloads/visual-studio-next-downloads-vs.aspx). This is the one after Visual Studio 2015 (aka "Dev 14").  You must also install Visual Studio SDK (also called _Visual Studio Extensibility SDK_ on the Visual Studio installer) before building Visual F# IDE Tools.
+Please ensure that the Visual Studio SDK version is matched with your current Visual Studio to ensure successful builds. For example: Visual Studio 2015 Update 1 requires Visual Studio 2015 SDK Update 1. Any installation of Visual Studio 2015 and later provides Visual Studio SDK as part of the installation of Visual Studio 2015 as feature installation. 
+
+    build.cmd vs              -- build the Visual F# IDE Tools (see below)
+    build.cmd vs test         -- build Visual F# IDE Tools, run all tests (see below)
+
+Use ``VisualFSharp.sln`` if you're building the Visual F# IDE Tools.
 
-Building ``VisualFSharp.sln`` builds _nearly_ everything. However building portable profiles of 
-FSharp.Core.dll is not included.  If you are just developing the core compiler, library
-and Visual F# Tools then building the solution will be enough.
 
 ## [Optional] Install the Visual F# IDE Tools  (Windows Only)
 
-At time of writing, the Visual F# IDE Tools can only be installed into Visual Studio "Next" (aka "Dev15") releases.
+At time of writing, the Visual F# IDE Tools can only be installed into Visual Studio "Next" releases.
 The new builds of the Visual F# IDE Tools can no longer be installed into Visual Studio 2015.
 
-You can install VIsual Studio "Next (aka "Dev15") from https://www.visualstudio.com/en-us/downloads/visual-studio-next-downloads-vs.aspx.
+You can install Visual Studio "Next" from https://www.visualstudio.com/en-us/downloads/visual-studio-next-downloads-vs.aspx.
 
-**Note:** This step will install a VSIX extension into Visual Studio "Next" (aka "Dev15") that changes the Visual F# IDE Tools 
+**Note:** This step will install a VSIX extension into Visual Studio "Next" that changes the Visual F# IDE Tools 
 components installed in that VS installation.  You can revert this step by disabling or uninstalling the addin.
 
-For **Debug**:
+For **Debug**, uninstall then reinstall:
 
-1. Ensure that the VSIX package is uninstalled. In VS, select Tools/Extensions and Updates and if the package `Visual F# Tools` is installed, select Uninstall
-1. Run ``debug\net40\bin\VisualFSharpVsix.vsix``
+    VSIXInstaller.exe  /a /u:"VisualFSharp"
+    VSIXInstaller.exe /a  debug\net40\bin\VisualFSharpFull.vsix
 
-For **Release**:
+For **Release**, uninstall then reinstall:
+
+    VSIXInstaller.exe  /a /u:"VisualFSharp"
+    VSIXInstaller.exe /a  release\net40\bin\VisualFSharpFull.vsix
+
+Restart Visual Studio, it should now be running your freshly-built Visual F# IDE Tools with updated F# Interactive.
 
-1. Ensure that the VSIX package is uninstalled. In VS, select Tools/Extensions and Updates and if the package `Visual F# Tools` is installed, select Uninstall
-1. Run ``release\net40\bin\VisualFSharpVsix.vsix``
+### [Optional] F5 testing of local changes
 
-Restart Visual Studio, it should now be running your freshly-built Visual F# IDE Tools with updated F# Interactive. 
+To test your changes locally _without_ overwriting your default installed F# tools, set the `VisualFSharp\Vsix\VisualFSharpOpenSource`
+project as the startup project.  When you hit F5 a new instance of Visual Studio will be started in the `FSharpDev` hive with your
+changes, but the root (default) hive will remain untouched.
 
-### 5. [Optional] Clobber the F# SDK on the machine
+### [Optional] Rapid deployment of incremental changes to Visual F# IDE Tools components
+
+For the brave, you can rapidly deploy incrementally updated versions of Visual F# IDE Tool components such as ``FSHarp.Editor.dll`` by copying them directly into the extension directory in your user AppData folder:
+
+    xcopy /y debug\net40\bin\FSharp.* "%USERPROFILE%\AppData\Local\Microsoft\VisualStudio\15.0_7c5620b7FSharpDev\Extensions\Microsoft.VisualFSharpTools\Visual F# Tools\15.4.1.9055"
+
+This gives a much tighter inner development loop than uninstalling/reinstalling the VSIX, as you do not have to restart VIsual Studio. Caveat emptor.
+
+### [Optional] Clobber the F# SDK on the machine
 
 **Note:** Step #3 below will clobber the machine-wide installed F# SDK on your machine. This replaces the ``fsi.exe``/``fsiAnyCpu.exe`` used by Visual F# Interactive and the ``fsc.exe`` used by ``Microsoft.FSharp.targets``.  Repairing Visual Studio 15 is currently the only way to revert this step.  
 
@@ -121,17 +155,6 @@ For **Release**:
 
 1. Run ``vsintegration\update-vsintegration.cmd release`` (clobbers the installed F# SDK)
 
-### Notes on the .NET Framework build
-
-1. The `update.cmd` script adds required strong name validation skips, and NGens the compiler and libraries. This requires admin privileges.
-1. The compiler binaries produced are "private" and strong-named signed with a test key.
-1. Some additional tools are required to build the compiler, notably `fslex.exe`, `fsyacc.exe`, `FSharp.PowerPack.Build.Tasks.dll`, `FsSrGen.exe`, `FSharp.SRGen.Build.Tasks.dll`, and the other tools found in the `lkg` directory.
-1. The overall bootstrapping process executes as follows
- - We first need an existing F# compiler. We use the one in the `lkg` directory. Let's assume this compiler has an `FSharp.Core.dll` with version X.
- - We use this compiler to compile the source in this distribution, to produce a "proto" compiler, dropped to the `proto` directory. When run, this compiler still relies on `FSharp.Core.dll` with version X.
- - We use the proto compiler to compile the source for `FSharp.Core.dll` in this distribution.
- - We use the proto compiler to compile the source for `FSharp.Compiler.dll`, `fsc.exe`, `fsi.exe`, and other binaries found in this distribution.
-