dotnet · dsyme · Nov 25, 2014 · Dec 1, 2014 · Dec 1, 2014 · Dec 1, 2014
diff --git a/.gitignore b/.gitignore
@@ -30,6 +30,8 @@ src/fsharp/FSharp.Compiler/*.userprefs
 src/*.log
 Debug
 Release
+vsdebug
+vsrelease
 Proto
 .libs
 Makefile
@@ -94,4 +96,10 @@ tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
 tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll
 
 *.csproj.user
+
+*.ide
+*.log
+*.jrs
+*.chk
+*.bak
 *.orig
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/DEVGUIDE.md b/DEVGUIDE.md
@@ -10,7 +10,7 @@ To get a free F# environment, go to [fsharp.org](http://fsharp.org/use/windows).
 > Contributions made to this repo are subject to terms and conditions of the Apache License, Version 2.0. A copy of the license can be found in the [License.txt](License.txt) file at the root of this distribution.
 > By using this source code in any fashion, you are agreeing to be bound by the terms of the Apache License, Version 2.0. You must not remove this notice, or any other, from this software.
 
-**Questions?** If you have questions about the source code, please ask in the issues and discussion forums.
+**Questions?** If you have questions about the source code, please ask in the issues.
 
 ## 0.  A Shortcut to Build and Smoke Test
 
@@ -33,10 +33,8 @@ Note that you need the .NET framework 3.5 installed on your machine in order to
 
 This uses the proto compiler to build `FSharp.Core.dll`, `FSharp.Compiler.dll`, `fsc.exe`, and `fsi.exe`.
 
-```
-msbuild src/fsharp-library-build.proj 
-msbuild src/fsharp-compiler-build.proj 
-```
+    msbuild src/fsharp-library-build.proj 
+    msbuild src/fsharp-compiler-build.proj 
 
 You can now use the updated F# compiler in `debug\net40\bin\fsc.exe` and F# Interactive in `debug\net40\bin\fsi.exe` to develop and test basic language and tool features.
 
@@ -48,73 +46,81 @@ 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:
 
-```
-msbuild src/fsharp-library-build.proj
-msbuild src/fsharp-compiler-build.proj
-msbuild src/fsharp-typeproviders-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
-msbuild src/fsharp-library-build.proj /p:TargetFramework=portable259
-msbuild src/fsharp-library-unittests-build.proj
-msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable47
-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
-src\update.cmd debug -ngen
-tests\BuildTestTools.cmd debug 
-```
+    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
+    msbuild src/fsharp-library-build.proj /p:TargetFramework=portable259
+    msbuild src/fsharp-library-unittests-build.proj
+    msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable47
+    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
+    src\update.cmd debug -ngen
+    tests\BuildTestTools.cmd debug 
+
 
 [Optional] If testing the Visual Studio bits (see below) you will also need:
 
-```
-msbuild vsintegration\fsharp-vsintegration-build.proj
-msbuild vsintegration\fsharp-vsintegration-unittests-build.proj
-```    
+    msbuild vsintegration\fsharp-vsintegration-build.proj
+    msbuild vsintegration\fsharp-vsintegration-unittests-build.proj
 
 Prior to a **Release** test run, you need to do **all** of these:
 
-```
-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-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
-msbuild src/fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
-msbuild src/fsharp-library-unittests-build.proj  /p:Configuration=Release
-msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
-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
-src\update.cmd release -ngen
-tests\BuildTestTools.cmd release 
-```
-
-[Optional] If testing the Visual F# IDE Tools (see below) you will also need:
-
-```
-msbuild vsintegration\fsharp-vsintegration-build.proj /p:Configuration=Release
-msbuild vsintegration\fsharp-vsintegration-unittests-build.proj /p:Configuration=Release
-```
-
-## 4. [Optional] Build and Install the Visual F# IDE Tools
-
-To build the VS components:
-
-```
-msbuild vsintegration\fsharp-vsintegration-build.proj
-```
-
-To install the VS components:
-
-1. Ensure that the VSIX package is uninstalled.
- - In VS, select Tools/Extensions and Updates
- - If the package `VisualStudio.FSharp.EnableOpenSource` is installed, select Uninstall
-1. Run ```debug\net40\bin\EnableOpenSource.vsix```
-1. Restart Visual Studio, it should now be running your freshly-built Visual F# IDE Tools.
+    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
+    msbuild src/fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
+    msbuild src/fsharp-library-unittests-build.proj  /p:Configuration=Release
+    msbuild src/fsharp-library-unittests-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
+    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
+    src\update.cmd release -ngen
+    tests\BuildTestTools.cmd release 
+
+
+[Optional] If testing **Release** build of the Visual F# IDE Tools (see below) you will also need:
+
+    msbuild vsintegration\fsharp-vsintegration-build.proj /p:Configuration=Release
+    msbuild vsintegration\fsharp-vsintegration-unittests-build.proj /p:Configuration=Release
+
+## 4. [Optional] Install the Visual F# IDE Tools and Clobber the F# 4.0 SDK on the machine
+
+**Note:** Step #3 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.
+
+**Note:** Step #4 will clobber the machine-wide installed F# 4.0 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.  
+
+**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``).
+
+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# 4.0 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# 4.0 SDK)
+
+Restart Visual Studio, it should now be running your freshly-built Visual F# IDE Tools with updated F# Interactive. 
+
 
 ### Notes on the build
 

diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 [![Issue Stats](http://issuestats.com/github/Microsoft/visualfsharp/badge/pr)](http://issuestats.com/github/microsoft/visualfsharp)
 [![Issue Stats](http://issuestats.com/github/Microsoft/visualfsharp/badge/issue)](http://issuestats.com/github/microsoft/visualfsharp)
-[![Build status](https://img.shields.io/appveyor/ci/KevinRansom/visualfsharp-radou/master.svg)](https://ci.appveyor.com/project/KevinRansom/visualfsharp-radou/branch/master)
+[![Build status](https://img.shields.io/appveyor/ci/KevinRansom/visualfsharp-radou/fsharp4.svg)](https://ci.appveyor.com/project/KevinRansom/visualfsharp-radou/branch/fsharp4)
+
+[![Join the chat at https://gitter.im/Microsoft/visualfsharp](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Microsoft/visualfsharp?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 #Visual F# Tools
 
@@ -41,3 +43,4 @@ Although the primary focus of this repo is F# for Windows and the Visual Studio
 ###Get In Touch
 
 Keep up with the Visual F# Team and the development of the Visual F# Tools by following us [@VisualFSharp](https://twitter.com/VisualFSharp) or subscribing to our [team blog](http://blogs.msdn.com/b/fsharpteam/).
+
diff --git a/TESTGUIDE.md b/TESTGUIDE.md
@@ -11,8 +11,8 @@ The test cases for this suite reside under `tests\fsharp`. This suite dates back
 The test cases for this suite reside under `tests\fsharpqa\source`.
 This suite was first created when F# 2.0 was being added to Visual Studio 2010.  Tests for this suite are driven by the "RunAll" framework, implemented in Perl.  This suite is rather large and has broad and deep coverage of a variety of compiler, runtime, and syntax scenarios.
 
-### Compiler and Library Core Unit Test Suite
-The test cases for this suite reside next to the F# core library code, at `src\fsharp\FSharp.Core.Unittests`. This suite is a set of standard NUnit test cases, implemented in F#.  This suite focuses on validation of the core F# types and the public surface area of `FSharp.Core.dll`.
+### Compiler and Library Core Unit Test Suites
+The test cases for these suites reside next to the F# core library code, at `src\fsharp\FSharp.Core.Unittests` and `src\fsharp\FSharp.Compiler.Unittests`. These suites are standard NUnit test cases, implemented in F#.  The FSharp.Core.Unittests suite focuses on validation of the core F# types and the public surface area of `FSharp.Core.dll`, and the FSharp.Compiler.Unittests suite focuses on validation of compiler internals.
 
 ### Visual F# Tools IDE Unit Test Suite
 The test cases for this suite reside next to the Visual F# Tools code, at `vsintegration\src\unittests`.  This suite is a set of standard NUnit test cases, implemented in F#.  This suite exercises a wide range of behaviors in the F# Visual Studio project system and language service.
@@ -38,6 +38,7 @@ The script `tests\RunTests.cmd` has been provided to make execution of the above
 ```
 RunTests.cmd <debug|release> fsharp [tags to run] [tags not to run]
 RunTests.cmd <debug|release> fsharpqa [tags to run] [tags not to run]
+RunTests.cmd <debug|release> compilerunit
 RunTests.cmd <debug|release> coreunit
 RunTests.cmd <debug|release> coreunitportable47
 RunTests.cmd <debug|release> coreunitportable7
@@ -48,7 +49,7 @@ RunTests.cmd <debug|release> ideunit
 
 `RunTests.cmd` sets a handful of environment variables which allow for the tests to work, then puts together and executes the appropriate command line to start the specified test suite.
 
-All test execution logs and result files will be dropped into the `tests\TestResults` folder, and have file names matching `FSharp_*.*`, `FSharpQA_*.*`, `CoreUnit_*.*`, `IDEUnit_*.*`, e.g. `FSharpQA_Results.log` or `FSharp_Failures.log`.
+All test execution logs and result files will be dropped into the `tests\TestResults` folder, and have file names matching `FSharp_*.*`, `FSharpQA_*.*`, `CompilerUnit_*.*`, `CoreUnit_*.*`, `IDEUnit_*.*`, e.g. `FSharpQA_Results.log` or `FSharp_Failures.log`.
 
 For the FSharp and FSharpQA suites, the list of test areas and their associated "tags" is stored at
 
@@ -93,9 +94,14 @@ Test area directories in this suite will contain a number of source code files a
 Test cases will run an optional "pre command," compile some set of source files using some set of flags, optionally run the resulting binary, then optionally run a final "post command." 
 If all of these steps complete without issue, the test is considered to have passed.
 
-### Core Unit Test Suite
+### FSharp.Compiler and FSharp.Core Unit Test Suites
 
-To build the unit test binary, call `msbuild fsharp-library-unittests-build.proj` from the `src` directory.  Tests are contained in the binary `FSharp.Core.Unittests.dll`.
+To build these unit test binaries, from the `src` directory call 
+
+- `msbuild fsharp-compiler-unittests-build.proj`
+  - Output binary is `FSharp.Compiler.Unittests.dll`
+- `msbuild fsharp-library-unittests-build.proj`
+  - Output binary is `FSharp.Core.Unittests.dll`
 
 You can execute and re-run these tests using any standard NUnit approach - via graphical `nunit.exe` or on the command line via `nunit-console.exe`.
 
@@ -123,4 +129,4 @@ You can execute and re-run these tests using any standard NUnit approach - via g
 * Making the tests run faster
   * NGen-ing the F# bits (fsc, fsi, FSharp.Core, etc) will result in tests executing much faster.  Make sure you run `src\update.cmd` with the `-ngen` flag before running tests.
   * The Fsharp and FsharpQA suites will run test cases in parallel by default. You can comment out the relevant line in `RunTests.cmd` (look for `PARALLEL_ARG`) to disable this.
-  * By default, tests from the FSharpQA suite are run using a persistent, hosted version of the compiler.  This speeds up test execution, as there is no need for the `fsc.exe` process to spin up repeatedly.  To disable this, uncomment the relevant line in `RunTests.cmd` (look for `HOSTED_COMPILER`).
+  * By default, tests from the FSharpQA suite are run using a persistent, hosted version of the compiler.  This speeds up test execution, as there is no need for the `fsc.exe` process to spin up repeatedly.  To disable this, uncomment the relevant line in `RunTests.cmd` (look for `HOSTED_COMPILER`).
diff --git a/appveyor-build.cmd b/appveyor-build.cmd
@@ -3,17 +3,27 @@
 set APPVEYOR_CI=1
 
 :: Check prerequisites
-set _msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe"
-if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\12.0\Bin\MSBuild.exe"
-if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe.  Please see http://www.microsoft.com/en-us/download/details.aspx?id=40760. && goto :failure
+if not '%VisualStudioVersion%' == '' goto vsversionset
+if exist "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\common7\ide\devenv.exe" set VisualStudioVersion=14.0
+if exist "%ProgramFiles%\Microsoft Visual Studio 14.0\common7\ide\devenv.exe" set VisualStudioVersion=14.0
+if not '%VisualStudioVersion%' == '' goto vsversionset
+if exist "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe" set VisualStudioVersion=12.0
+if exist "%ProgramFiles%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe" set VisualStudioVersion=12.0
+
+:vsversionset
+if '%VisualStudioVersion%' == '' echo Error: Could not find an installation of Visual Studio && goto :eof
+
+if exist "%ProgramFiles(x86)%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe" set _msbuildexe="%ProgramFiles(x86)%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe"
+if exist "%ProgramFiles%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe"      set _msbuildexe="%ProgramFiles%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe"
+if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe. && goto :eof
 
 set _ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
 if not exist %_ngenexe% echo Error: Could not find ngen.exe. && goto :failure
 
 .\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages
 @if ERRORLEVEL 1 echo Error: Nuget restore failed  && goto :failure
 
-::Build
+:: Build
 %_msbuildexe% src\fsharp-proto-build.proj
 @if ERRORLEVEL 1 echo Error: compiler proto build failed && goto :failure
 
@@ -38,6 +48,9 @@ if not exist %_ngenexe% echo Error: Could not find ngen.exe. && goto :failure
 %_msbuildexe% src/fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
 @if ERRORLEVEL 1 echo Error: library portable259 build failed && goto :failure
 
+%_msbuildexe% src/fsharp-compiler-unittests-build.proj /p:Configuration=Release
+@if ERRORLEVEL 1 echo Error: compiler unittests build failed && goto :failure
+
 %_msbuildexe% src/fsharp-library-unittests-build.proj /p:Configuration=Release
 @if ERRORLEVEL 1 echo Error: library unittests build failed && goto :failure
 
@@ -67,7 +80,6 @@ call tests\BuildTestTools.cmd release
 @if ERRORLEVEL 1 echo Error: 'tests\BuildTestTools.cmd release' failed && goto :failure
 
 @echo on
-
 pushd tests
 
 call RunTests.cmd release fsharp Smoke
@@ -76,6 +88,9 @@ call RunTests.cmd release fsharp Smoke
 call RunTests.cmd release fsharpqa Smoke
 @if ERRORLEVEL 1 type testresults\fsharpqa_failures.log && echo Error: 'RunTests.cmd release fsharpqa Smoke' failed && goto :failure
 
+call RunTests.cmd release compilerunit
+@if ERRORLEVEL 1 echo Error: 'RunTests.cmd release compilerunit' failed && goto :failure
+
 call RunTests.cmd release coreunit
 @if ERRORLEVEL 1 echo Error: 'RunTests.cmd release coreunit' failed && goto :failure
 
@@ -84,4 +99,4 @@ popd
 goto :eof
 
 :failure
-exit /b 1
+exit /b 1
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,14 @@
+os: Windows Server 2012 R2
+
 init: 
 build_script: 
   - cmd: appveyor-build.cmd
+
+# scripts that run after cloning repository
+install:
+  # by default, all script lines are interpreted as batch
+  - set PATH=%ProgramFiles(x86)%\MSBuild\14.0\Bin;%PATH%
+
 test: off 
 version: 0.0.1.{build} 
 artifacts: