Merge pull request #2 from Microsoft/master

Merge branch 'master'

.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,26 +66,6 @@ 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
 Proto
@@ -39,51 +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
-vsintegration/src/FSharp.ProjectSystem.FSharp/ctofiles/MenusAndCommands.cto
-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
@@ -95,5 +94,6 @@ tests/fsharpqa/Source/*FSharpQA_Failures.lst
 *.mdf
 *.ldf
 *.cto
-tests/**/FSharp.Core.dll
 project.lock.json
+Tools/
+Backup/

BuildToolsVersion.txt

@@ -1 +1 @@
-1.0.25-prerelease-00317-01
+1.0.25-prerelease-00404-01

DEVGUIDE.md

@@ -30,18 +30,29 @@ There are various qualifiers:
     build.cmd release         -- build release (the default)
     build.cmd debug           -- build debug instead of release
 
+    build.cmd proto           -- force the rebuild of the Proto bootstrap compiler in addition to other things
+
+    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 smoke           -- build, run smoke tests
     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
 
 Combinations are also allowed:
 
-    build.cmd debug,compiler,smoke   -- build the debug compiler and run smoke tests
+    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:
 
@@ -136,8 +147,8 @@ For **Release** this corresponds to these steps, which you can run individually
 
 ### 4. [Optional] Install the Visual F# IDE Tools 
 
-**Note:** This step 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:** 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.
 
 For **Debug**:
 
@@ -153,7 +164,7 @@ Restart Visual Studio, it should now be running your freshly-built Visual F# IDE
 
 ### 5. [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 2015 is currently the only way to revert this step.  
+**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**:
 
@@ -163,7 +174,6 @@ For **Release**:
 
 1. Run ``vsintegration\update-vsintegration.cmd release`` (clobbers the installed F# SDK)
 
-
 ### 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.

DotnetCLIVersion.txt

@@ -1 +1 @@
-1.0.0-beta-002173
+1.0.0-rc2-002665

README.md

@@ -5,11 +5,11 @@
 
 ## Windows build
 
-|            |Debug (Build only)|Release (Build only)|Release (Build and tests)|
+|            |Debug (Build only)|Release (Tests Part 1)|Release (Tests Part 2)|
 |:----------:|:----------------:|:------------------:|:-----------------------:|
-|**master**  |[![Build Status](http://dotnet-ci.cloudapp.net/buildStatus/icon?job=Microsoft_visualfsharp/master/debug_windows_nt)](http://dotnet-ci.cloudapp.net/job/Microsoft_visualfsharp/job/master/job/debug_windows_nt/)|[![Build Status](http://dotnet-ci.cloudapp.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_windows_nt)](http://dotnet-ci.cloudapp.net/job/Microsoft_visualfsharp/job/master/job/release_windows_nt/)| [![Build status](https://img.shields.io/appveyor/ci/KevinRansom/visualfsharp-radou/master.svg)](https://ci.appveyor.com/project/KevinRansom/visualfsharp-radou/branch/master) |
-|**vs2015**  ||| [![Build status](https://img.shields.io/appveyor/ci/KevinRansom/visualfsharp-radou/vs2015.svg)](https://ci.appveyor.com/project/KevinRansom/visualfsharp-radou/branch/vs2015) |
-|**coreclr** ||| [![Build status](https://img.shields.io/appveyor/ci/KevinRansom/visualfsharp-radou/coreclr.svg)](https://ci.appveyor.com/project/KevinRansom/visualfsharp-radou/branch/coreclr) |
+|**master**  |[![Build Status](http://dotnet-ci.cloudapp.net/buildStatus/icon?job=Microsoft_visualfsharp/master/debug_windows_nt)](http://dotnet-ci.cloudapp.net/job/Microsoft_visualfsharp/job/master/job/debug_windows_nt/)|[![Build Status](http://dotnet-ci.cloudapp.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part1_windows_nt)](http://dotnet-ci.cloudapp.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part1_windows_nt/)|[![Build Status](http://dotnet-ci.cloudapp.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part2_windows_nt)](http://dotnet-ci.cloudapp.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part2_windows_nt/)|
+|**vs2015**  ||||
+|**roslyn** ||||
 
 ###Contributing to the F# Language, Library, and Tools
 
@@ -38,18 +38,30 @@ Quickstart guides for build and test can be found [here](https://github.com/Micr
 
 ####Development tools
 
-For F# 4.0+ development
+For F# 4.0 development
 
 - [Visual Studio 2015](http://www.visualstudio.com/en-us/downloads/visual-studio-2015-downloads-vs)
+  - Select Visual C++ / Common Tools For Visual C++
+  - Visual F#
+  - Visual Studio Extensibility Tools
 - [Visual Studio 2015 SDK](http://www.visualstudio.com/en-us/downloads/visual-studio-2015-downloads-vs)
 
+For F# 4.1 development
+
+- [Visual Studio 15](https://www.visualstudio.com/en-us/downloads/visual-studio-next-downloads-vs.aspx)
+  - Select Visual C++ / Common Tools For Visual C++
+  - Visual F#
+  - Visual Studio Extensibility Tools
+- [Visual Studio 15 SDK](https://www.visualstudio.com/en-us/downloads/visual-studio-next-downloads-vs.aspx)
+
 ####Additional frameworks
 
 - [Git for windows](http://msysgit.github.io/)
 - [Perl](http://www.perl.org/get.html#win32) (ActiveState 5.16.3 is known to be supported)
 - [.NET 3.5](http://www.microsoft.com/en-us/download/details.aspx?id=21)
 - [.NET 4.5](http://www.microsoft.com/en-us/download/details.aspx?id=30653)
 - [.NET 4.5.1](http://www.microsoft.com/en-us/download/details.aspx?id=40779)
+- [.NET 4.6](http://www.microsoft.com/en-us/download/details.aspx?id=48137)
 - [MSBuild 12.0](http://www.microsoft.com/en-us/download/details.aspx?id=40760)
 - [Windows 7 SDK](http://www.microsoft.com/en-us/download/details.aspx?id=8279)
 - [Windows 8 SDK](http://msdn.microsoft.com/en-us/windows/desktop/hh852363.aspx)

VisualFSharp.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.0.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnableOpenSource", "vsintegration\deployment\EnableOpenSource\EnableOpenSource.csproj", "{4D7BE558-E6BF-44DA-8CE2-46AA6E0DC2E7}"
 EndProject

appveyor.yml

@@ -13,7 +13,11 @@ build_script:
 
 # scripts that run after cloning repository
 install:
-# by default, all script lines are interpreted as batch
+  # by default, all script lines are interpreted as batch
+  # The newest version of MSBuild installed will overwrite the older ones.
+  - set PATH=%ProgramFiles(x86)%\MSBuild\12.0\Bin;%PATH%
+  - set PATH=%ProgramFiles(x86)%\MSBuild\14.0\Bin;%PATH%
+  - set PATH=%ProgramFiles(x86)%\MSBuild\15.0\Bin;%PATH%
 
 test: off 
 version: 0.0.1.{build}