forki · forki · Jul 12, 2016 · May 20, 2016 · May 20, 2016 · May 20, 2016
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,62 @@
+/packages
+/Tools
+/src/*.userprefs
+/src/fsharp/FSStrings.resources
+/src/fsharp/FSharp.Build/*.resx
+/src/fsharp/FSharp.Build-proto/*.resx
+/src/fsharp/FSharp.Build-proto/*.resources
+/src/fsharp/FSharp.Compiler-proto/*.resx
+/src/fsharp/FSharp.Compiler-proto/*.resources
+/src/fsharp/FSharp.Compiler-proto/*.sln
+/src/fsharp/FSharp.Compiler-proto/*.userprefs
+/src/fsharp/fsi/*.resx
+/src/fsharp/FSharp.Compiler.Interactive.Settings/*.resx
+/src/fsharp/FSharp.Compiler.Server.Shared/*.resx
+/src/fsharp/fsi/Fsi.sln
+/src/fsharp/FSharp.Build/*.resources
+/src/fsharp/FSharp.Compiler/*.resx
+/src/fsharp/FSharp.Compiler/*.resources
+/src/fsharp/FSharp.Compiler/*.sln
+/src/fsharp/FSharp.Compiler/*.userprefs
+/src/*.log
+/src/fsharp/FSharp.Compiler/illex.fs
+/src/fsharp/FSharp.Compiler/ilpars.fs
+/src/fsharp/FSharp.Compiler/ilpars.fsi
+/src/fsharp/FSharp.Compiler/lex.fs
+/src/fsharp/FSharp.Compiler/pars.fs
+/src/fsharp/FSharp.Compiler/pars.fsi
+/src/fsharp/FSharp.Compiler/pplex.fs
+/src/fsharp/FSharp.Compiler/pppars.fs
+/src/fsharp/FSharp.Compiler/pppars.fsi
+/src/fsharp/FSharp.Compiler-proto/illex.fs
+/src/fsharp/FSharp.Compiler-proto/ilpars.fs
+/src/fsharp/FSharp.Compiler-proto/ilpars.fsi
+/src/fsharp/FSharp.Compiler-proto/lex.fs
+/src/fsharp/FSharp.Compiler-proto/pars.fs
+/src/fsharp/FSharp.Compiler-proto/pars.fsi
+/src/fsharp/FSharp.Compiler-proto/pplex.fs
+/src/fsharp/FSharp.Compiler-proto/pppars.fs
+/src/fsharp/FSharp.Compiler-proto/pppars.fsi
+/src/fsharp/FSharp.LanguageService.Compiler/illex.*
+/src/fsharp/FSharp.LanguageService.Compiler/ilpars.*
+/src/fsharp/FSharp.LanguageService.Compiler/lex.*
+/src/fsharp/FSharp.LanguageService.Compiler/pars.*
+/src/fsharp/FSharp.LanguageService.Compiler/pplex.fs
+/src/fsharp/FSharp.LanguageService.Compiler/pppars.fs
+/src/fsharp/FSharp.LanguageService.Compiler/pppars.fsi
+/vsintegration/src/unittests/Unittests.fsi
+/tests/*FSharp_Failures.env
+/tests/*FSharp_Failures.lst
+/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
+/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
+/tests/XFSharpQA_Failures.log.*
+/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
+/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ctofiles/
+/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
+/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll
+/tests/fsharpqa/Source/*FSharpQA_Failures.env
+/tests/fsharpqa/Source/*FSharpQA_Failures.lst
+/tests/**/FSharp.Core.dll
 lib/debug
 lib/release
 lib/proto
@@ -7,31 +66,10 @@ lib/bootstrap/4.1/fsharpc
 lib/bootstrap/4.1/fsharpi
 lib/bootstrap/4.1/policy*
 aclocal.m4
-src/*.userprefs
-src/fsharp/FSStrings.resources
-packages
-src/fsharp/FSharp.Build/*.resx
-src/fsharp/FSharp.Build-proto/*.resx
-src/fsharp/FSharp.Build-proto/*.resources
-src/fsharp/FSharp.Compiler-proto/*.resx
-src/fsharp/FSharp.Compiler-proto/*.resources
-src/fsharp/FSharp.Compiler-proto/*.sln
-src/fsharp/FSharp.Compiler-proto/*.userprefs
-src/fsharp/fsi/*.resx
-src/fsharp/FSharp.Compiler.Interactive.Settings/*.resx
-src/fsharp/FSharp.Compiler.Server.Shared/*.resx
-src/fsharp/fsi/Fsi.sln
-src/fsharp/FSharp.Build/*.resources
-src/fsharp/FSharp.Compiler/*.resx
-src/fsharp/FSharp.Compiler/*.resources
-src/fsharp/FSharp.Compiler/*.sln
-src/fsharp/FSharp.Compiler/*.userprefs
-src/*.log
 Debug
 Release
-vsdebug
-vsrelease
 Proto
+sign_temp
 .libs
 Makefile
 configure
@@ -40,50 +78,11 @@ autom4te.cache
 config.log
 config.make
 config.status
-src/fsharp/FSharp.Compiler/illex.fs
-src/fsharp/FSharp.Compiler/ilpars.fs
-src/fsharp/FSharp.Compiler/ilpars.fsi
-src/fsharp/FSharp.Compiler/lex.fs
-src/fsharp/FSharp.Compiler/pars.fs
-src/fsharp/FSharp.Compiler/pars.fsi
-src/fsharp/FSharp.Compiler/pplex.fs
-src/fsharp/FSharp.Compiler/pppars.fs
-src/fsharp/FSharp.Compiler/pppars.fsi
-src/fsharp/FSharp.Compiler-proto/illex.fs
-src/fsharp/FSharp.Compiler-proto/ilpars.fs
-src/fsharp/FSharp.Compiler-proto/ilpars.fsi
-src/fsharp/FSharp.Compiler-proto/lex.fs
-src/fsharp/FSharp.Compiler-proto/pars.fs
-src/fsharp/FSharp.Compiler-proto/pars.fsi
-src/fsharp/FSharp.Compiler-proto/pplex.fs
-src/fsharp/FSharp.Compiler-proto/pppars.fs
-src/fsharp/FSharp.Compiler-proto/pppars.fsi
 *~
-tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.sln
-tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.userprefs
 *.suo
 obj
 extras
 ossreadme*.txt
-src/fsharp/FSharp.LanguageService.Compiler/illex.*
-src/fsharp/FSharp.LanguageService.Compiler/ilpars.*
-src/fsharp/FSharp.LanguageService.Compiler/lex.*
-src/fsharp/FSharp.LanguageService.Compiler/pars.*
-src/fsharp/FSharp.LanguageService.Compiler/pplex.fs
-src/fsharp/FSharp.LanguageService.Compiler/pppars.fs
-src/fsharp/FSharp.LanguageService.Compiler/pppars.fsi
-vsintegration/src/unittests/Unittests.fsi
-tests/*FSharp_Failures.env
-tests/*FSharp_Failures.lst
-tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
-tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
-tests/XFSharpQA_Failures.log.*
-vsintegration/src/vs/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
-vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ctofiles/
-tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
-tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll
-tests/fsharpqa/Source/*FSharpQA_Failures.env
-tests/fsharpqa/Source/*FSharpQA_Failures.lst
 *.csproj.user
 *.sln.DotSettings.user
 *.ide
@@ -94,4 +93,8 @@ tests/fsharpqa/Source/*FSharpQA_Failures.lst
 *.orig
 *.mdf
 *.ldf
-tests/**/FSharp.Core.dll
+*.cto
+*.vstman
+project.lock.json
+Tools/
+Backup/
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
@@ -4,9 +4,13 @@
     <add key="disableSourceControlIntegration" value="true" />
   </solution>
   <packageSources>  
-    <add key="myget.org dotnet-corefx" value="https://www.myget.org/F/dotnet-corefx/" />  
-    <add key="myget.org dotnet-buildtools" value="https://www.myget.org/F/dotnet-buildtools/" />  
-    <add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/" />  
-    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />  
+
+    <!--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="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="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
+
   </packageSources>  
-</configuration>
+</configuration>
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt
@@ -0,0 +1 @@
+1.0.25-prerelease-00517-05
diff --git a/DEVGUIDE.md b/DEVGUIDE.md
@@ -19,24 +19,68 @@ The primary technical documents for the F# compiler code are
 
 **Questions?** If you have questions about the source code, please ask in the issues.
 
-## 0.  A Shortcut to Build and Smoke Test
+## Quick Start: Build, Test, Develop
 
-You can build a subset of functionality (including bootstrapped compiler and library) and run a very 
-small number of 'smoke' tests using the script used by continuous integration on Windows:
+You can build the compiler+tools and run the subset the tests used for continuous integration as follows:
 
-    .\appveyor-build.cmd
+    build.cmd
 
-See the script for what this does.  After you do this, you can do further testing, see  [TESTGUIDE.md](TESTGUIDE.md).
+There are various qualifiers:
 
+    build.cmd release         -- build release (the default)
+    build.cmd debug           -- build debug instead of release
 
-## 1.  Building a Proto Compiler
+    build.cmd proto           -- force the rebuild of the Proto bootstrap compiler in addition to other things
 
-The compiler is compiled as a set of .NET 4.0 components using a bootstrap process. This uses the Last Known Good (LKG) compiler to build.  
-Note that you need the .NET framework 3.5 installed on your machine in order to complete this step.
+    build.cmd coreclr         -- build/tests only the coreclr version compiler (not the Visual F# IDE Tools)
+    build.cmd compiler        -- build/tests only the compiler (not the Visual F# IDE Tools)
+    build.cmd vs              -- build/tests the Visual F# IDE Tools
+    build.cmd pcls            -- build/tests the PCL FSharp.Core libraries
+
+    build.cmd build           -- build, do not test
+    build.cmd ci              -- build, run the same tests as CI 
+    build.cmd all             -- build, run all tests
+    build.cmd notests         -- turn off testing (used in conjunction with other options)
+
+    build.cmd test-smoke      -- build, run smoke tests
+    build.cmd test-coreunit   -- build, run FSharp.Core tests
+    build.cmd test-coreclr    -- build, run CoreCLR tests
+    build.cmd test-pcls       -- build, run PCL tests
+    build.cmd test-fsharp     -- build, run tests\fsharp suite
+    build.cmd test-fsharpqa   -- build, run tests\fsharpqa suite
+    build.cmd test-vs         -- build, run Visual F# IDE Tools unit tests
+
+**Notes**
+To build and test Visual F# IDE Tools, you must 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. 
+Beginning with Visual Studio 2015, Visual Studio 2015 SDK is not available for separate download. Any installation of Visual Studio 2015 and its updates provides Visual Studio SDK as part of the installation of Visual Studio 2015 as feature installation. 
+
+Combinations are also allowed:
+
+    build.cmd debug,compiler,notests   -- build the debug compiler and run smoke tests
+
+After you build the first time you can open and use this solution:
+
+    .\VisualFSharp.sln
+
+or just build it directly:
+
+    msbuild VisualFSharp.sln 
+
+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.
+
+## Step by Step: 
+
+### 1. Building a Proto Compiler
+
+The compiler is compiled as a set of .NET 4.0 components using a bootstrap process. 
+This uses a Last Known Good (LKG) compiler checked into this repository to build.  
 
     msbuild src\fsharp-proto-build.proj
 
-## 2.  Building an F# (Debug) library and compiler
+### 2.  Building an F# (Debug) library and compiler
 
 This uses the proto compiler to build `FSharp.Core.dll`, `FSharp.Compiler.dll`, `fsc.exe`, and `fsi.exe`.
 
@@ -47,17 +91,23 @@ You can now use the updated F# compiler in `debug\net40\bin\fsc.exe` and F# Inte
 
 **Note:** The updated library is not used until you run `update.cmd`, see below.  The updated compiler is not run 'pre-compiled' until you run `update.cmd -ngen`, see below.
 
-## 3. Full Steps Before Running Tests
+### 3. Full Steps Before Running Tests
 
 See [TESTGUIDE.md](TESTGUIDE.md) for full details on how to run tests.
 
-Prior to a **Debug** test run, you need to complete **all** of these steps:
+Prior to a full **Debug** test run, you need to complete **all** of the steps in build.cmd
+
+    build.cmd debug,build
+
+Likewise prior to a **Release** test run:
+
+    build.cmd release,build
+
+For **Debug** this corresponds to these steps, which you can run individually for more incremental builds:
 
     msbuild src/fsharp-library-build.proj
     msbuild src/fsharp-compiler-build.proj
-    msbuild src/fsharp-typeproviders-build.proj
     msbuild src/fsharp-compiler-unittests-build.proj
-    msbuild src/fsharp-library-build.proj /p:TargetFramework=net20
     msbuild src/fsharp-library-build.proj /p:TargetFramework=portable47
     msbuild src/fsharp-library-build.proj /p:TargetFramework=portable7
     msbuild src/fsharp-library-build.proj /p:TargetFramework=portable78
@@ -67,22 +117,21 @@ Prior to a **Debug** test run, you need to complete **all** of these steps:
     msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable7
     msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable78
     msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable259
+    msbuild vsintegration/fsharp-vsintegration-src-build.proj
+    msbuild vsintegration/fsharp-vsintegration-project-templates-build.proj
+    msbuild vsintegration/fsharp-vsintegration-item-templates-build.proj
+    msbuild vsintegration/fsharp-vsintegration-deployment-build.proj
+    msbuild vsintegration/fsharp-vsintegration-unittests-build.proj 
+    msbuild tests/fsharp/FSharp.Tests.fsproj
     src\update.cmd debug -ngen
     tests\BuildTestTools.cmd debug 
 
 
-[Optional] If testing the Visual Studio bits (see below) you will also need:
-
-    msbuild VisualFSharp.sln 
-    msbuild vsintegration\fsharp-vsintegration-unittests-build.proj
-
-Prior to a **Release** test run, you need to do **all** of these:
+For **Release** this corresponds to these steps, which you can run individually for more incremental builds:
 
     msbuild src/fsharp-library-build.proj  /p:Configuration=Release
     msbuild src/fsharp-compiler-build.proj  /p:Configuration=Release
-    msbuild src/fsharp-typeproviders-build.proj  /p:Configuration=Release
     msbuild src/fsharp-compiler-unittests-build.proj  /p:Configuration=Release
-    msbuild src/fsharp-library-build.proj /p:TargetFramework=net20 /p:Configuration=Release
     msbuild src/fsharp-library-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
     msbuild src/fsharp-library-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
     msbuild src/fsharp-library-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
@@ -92,43 +141,44 @@ Prior to a **Release** test run, you need to do **all** of these:
     msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
     msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
     msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
+    msbuild vsintegration/fsharp-vsintegration-src-build.proj /p:Configuration=Release
+    msbuild vsintegration/fsharp-vsintegration-project-templates-build.proj /p:Configuration=Release
+    msbuild vsintegration/fsharp-vsintegration-item-templates-build.proj /p:Configuration=Release
+    msbuild vsintegration/fsharp-vsintegration-deployment-build.proj /p:Configuration=Release
+    msbuild vsintegration/fsharp-vsintegration-unittests-build.proj  /p:Configuration=Release
+    msbuild tests/fsharp/FSharp.Tests.fsproj /p:Configuration=Release
     src\update.cmd release -ngen
     tests\BuildTestTools.cmd release 
 
+### 4. [Optional] Install the Visual F# IDE Tools 
+
+**Note:** This step will install a VSIX extension into Visual Studio 15 that changes the Visual F# IDE Tools 
+components installed into Visual Studio 15.  You can revert this step by disabling or uninstalling the addin.
 
-[Optional] If testing **Release** build of the Visual F# IDE Tools (see below) you will also need:
+For **Debug**:
+
+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``
 
-    msbuild VisualFSharp.sln /p:Configuration=Release
-    msbuild vsintegration\fsharp-vsintegration-unittests-build.proj /p:Configuration=Release
+For **Release**:
 
-## 4. [Optional] Install the Visual F# IDE Tools and Clobber the F# SDK on the machine
+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``
 
-**Note:** Step #2 below will install a VSIX extension into Visual Studio 2015 that changes the Visual F# IDE Tools 
-components installed into Visual Studio 2015.  You can revert this step by disabling or uninstalling the addin.
+Restart Visual Studio, it should now be running your freshly-built Visual F# IDE Tools with updated F# Interactive. 
 
-**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 2015 is currently the 
-only way to revert this step.  
+### 5. [Optional] Clobber the F# SDK on the machine
 
-**Note:** After you complete the install, the FSharp.Core referenced by your projects will not be updated. If you want to make
-a project that references your updated FSharp.Core, you must explicitly change the ``TargetFSharpCoreVersion`` in the .fsproj
-file to ``4.4.0.5099`` (or a corresponding portable version number with suffix ``5099``).
+**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.  
 
 For **Debug**:
 
-1. Ensure that the VSIX package is uninstalled. In VS, select Tools/Extensions and Updates and if the package `VisualStudio.FSharp.EnableOpenSource` is installed, select Uninstall
-1. Run ``debug\net40\bin\EnableOpenSource.vsix``
 1. Run ``vsintegration\update-vsintegration.cmd debug`` (clobbers the installed F# SDK)
 
 For **Release**:
 
-1. Ensure that the VSIX package is uninstalled. In VS, select Tools/Extensions and Updates and if the package `VisualStudio.FSharp.EnableOpenSource` is installed, select Uninstall
-1. Run ``release\net40\bin\EnableOpenSource.vsix``
 1. Run ``vsintegration\update-vsintegration.cmd release`` (clobbers the installed F# SDK)
 
-Restart Visual Studio, it should now be running your freshly-built Visual F# IDE Tools with updated F# Interactive. 
-
-
 ### Notes on the build
 
 1. The `update.cmd` script adds required strong name validation skips, and NGens the compiler and libraries. This requires admin privileges.
@@ -140,7 +190,7 @@ Restart Visual Studio, it should now be running your freshly-built Visual F# IDE
  - 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.
 
-### Further technical resources
+## Resources
 
 The primary technical guide to the core compiler code is [The F# Compiler Technical Guide](http://fsharp.github.io/2015/09/29/fsharp-compiler-guide.html).  Please read and contribute to that guide.
 
diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt
@@ -0,0 +1 @@
+1.0.0-preview2-003121