Merge pull request #1411 from otawfik-ms/roslyn

Update branch from master

Author: KevinRansom

.gitignore

@@ -98,3 +98,7 @@ ossreadme*.txt
 project.lock.json
 Tools/
 Backup/
+tests/fsharp/core/array/dont.run.peverify
+tests/fsharp/core/innerpoly/dont.run.peverify
+tests/fsharp/typecheck/sigs/neg94-pre.dll
+times

BuildToolsVersion.txt

@@ -1 +1 @@
-1.0.25-prerelease-00517-05
+1.0.26-prerelease-00625-01

DEVGUIDE.md

@@ -31,9 +31,10 @@ There are various qualifiers:
     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 protofx         -- build using a .NET Framework proto (no .NET Core is used)
 
-    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 net40           -- build/tests for .NET Framework version of the compiler (not the Visual F# IDE Tools or .NET Core)
+    build.cmd coreclr         -- build/tests only the coreclr version compiler (not the Visual F# IDE Tools or .NET Framework)
     build.cmd vs              -- build/tests the Visual F# IDE Tools
     build.cmd pcls            -- build/tests the PCL FSharp.Core libraries
 
@@ -44,7 +45,7 @@ There are various qualifiers:
 
     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-coreclr    -- build, run .NET Core 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

VisualFSharp.sln

@@ -2,6 +2,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.25302.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler", "src\fsharp\FSharp.Compiler\FSharp.Compiler.fsproj", "{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
 EndProject
@@ -100,8 +102,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetCoreProject", "vsintegra
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PortableLibraryProject", "vsintegration\ProjectTemplates\PortableLibraryProject\PortableLibraryProject.csproj", "{DB374A0C-7560-479F-9B21-D37C81F7624F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SilverlightProject", "vsintegration\ProjectTemplates\SilverlightProject\SilverlightProject.csproj", "{15A57828-F9F5-4FB4-8E1E-AE7622A10F70}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TutorialProject", "vsintegration\ProjectTemplates\TutorialProject\TutorialProject.csproj", "{2FACEE44-48BD-40B5-A2EE-B54A0C9BB7C4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ItemTemplates", "ItemTemplates", "{F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}"
@@ -608,18 +608,6 @@ Global
 		{DB374A0C-7560-479F-9B21-D37C81F7624F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DB374A0C-7560-479F-9B21-D37C81F7624F}.Release|x86.ActiveCfg = Release|Any CPU
 		{DB374A0C-7560-479F-9B21-D37C81F7624F}.Release|x86.Build.0 = Release|Any CPU
-		{15A57828-F9F5-4FB4-8E1E-AE7622A10F70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15A57828-F9F5-4FB4-8E1E-AE7622A10F70}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15A57828-F9F5-4FB4-8E1E-AE7622A10F70}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{15A57828-F9F5-4FB4-8E1E-AE7622A10F70}.Debug|x86.Build.0 = Debug|Any CPU
-		{15A57828-F9F5-4FB4-8E1E-AE7622A10F70}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
-		{15A57828-F9F5-4FB4-8E1E-AE7622A10F70}.Proto|Any CPU.Build.0 = Proto|Any CPU
-		{15A57828-F9F5-4FB4-8E1E-AE7622A10F70}.Proto|x86.ActiveCfg = Proto|Any CPU
-		{15A57828-F9F5-4FB4-8E1E-AE7622A10F70}.Proto|x86.Build.0 = Proto|Any CPU
-		{15A57828-F9F5-4FB4-8E1E-AE7622A10F70}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15A57828-F9F5-4FB4-8E1E-AE7622A10F70}.Release|Any CPU.Build.0 = Release|Any CPU
-		{15A57828-F9F5-4FB4-8E1E-AE7622A10F70}.Release|x86.ActiveCfg = Release|Any CPU
-		{15A57828-F9F5-4FB4-8E1E-AE7622A10F70}.Release|x86.Build.0 = Release|Any CPU
 		{2FACEE44-48BD-40B5-A2EE-B54A0C9BB7C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2FACEE44-48BD-40B5-A2EE-B54A0C9BB7C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2FACEE44-48BD-40B5-A2EE-B54A0C9BB7C4}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -787,7 +775,6 @@ Global
 		{D9D95330-3626-4199-B7AF-17B8E4AF6D87} = {C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
 		{5B739CF3-1116-4EB4-B598-6C16BEA81CE5} = {C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
 		{DB374A0C-7560-479F-9B21-D37C81F7624F} = {C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
-		{15A57828-F9F5-4FB4-8E1E-AE7622A10F70} = {C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
 		{2FACEE44-48BD-40B5-A2EE-B54A0C9BB7C4} = {C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
 		{F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
 		{6BA13AA4-C25F-480F-856B-8E8000299A72} = {F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}

build.cmd

@@ -13,19 +13,26 @@ echo Build and run a subset of test suites
 echo.
 echo Usage:
 echo.
-echo build.cmd ^<all^|proto^|build^|debug^|release^|diag^|compiler^|coreclr^|pcls^|vs^|ci^|ci_part1^|ci_part2^|microbuild^>
+echo build.cmd ^<all^|proto^|protofx^|build^|debug^|release^|diag^|compiler^|coreclr^|pcls^|vs^|ci^|ci_part1^|ci_part2^|microbuild^>
+echo           ^<test-coreunit^|test-corecompile^|test-smoke^|test-coreclr^|test-pcls^|test-fsharp^|test-fsharpqa^|test-vs^>
 echo.
-echo No arguments default to 'build' 
+echo No arguments default to 'build'
 echo.
 echo To specify multiple values, separate strings by comma
 echo.
+echo.This builds the net40 build of the compiler without running tests
+echo.
+echo.    build net40 notests
+echo.
 echo The example below run pcls, vs and qa:
 echo.
-echo build.cmd pcls,vs,debug
+echo     build.cmd pcls,vs,debug
 exit /b 1
 
 :ARGUMENTS_OK
 
+set BUILD_PROTO_WITH_CORECLR_LKG=1
+
 set BUILD_PROTO=0
 set BUILD_NET40=1
 set BUILD_CORECLR=0
@@ -100,6 +107,11 @@ if /i '%ARG%' == 'all' (
     set SKIP_EXPENSIVE_TESTS=0
 )
 
+if /i '%ARG%' == 'protofx' (
+    set BUILD_PROTO_WITH_CORECLR_LKG=0
+    set BUILD_PROTO=1
+)
+
 if /i '%ARG%' == 'microbuild' (
     set BUILD_PROTO=1
     set BUILD_NET40=1
@@ -257,6 +269,7 @@ REM after this point, ARG variable should not be used, use only BUILD_* or TEST_
 echo Build/Tests configuration:
 echo.
 echo BUILD_PROTO=%BUILD_PROTO%
+echo BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG%
 echo BUILD_NET40=%BUILD_NET40%
 echo BUILD_CORECLR=%BUILD_CORECLR%
 echo BUILD_PORTABLE=%BUILD_PORTABLE%
@@ -327,34 +340,29 @@ if '%RestorePackages%' == 'true' (
     .\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget\nuget.config
     @if ERRORLEVEL 1 echo Error: Nuget restore failed  && goto :failure
 )
+if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '1' (
 
-:: Restore the Tools directory
-call %~dp0init-tools.cmd
+    :: Restore the Tools directory
+    call %~dp0init-tools.cmd
+)
 
 set _dotnetexe=%~dp0Tools\dotnetcli\dotnet.exe
-pushd .\lkg & %_dotnetexe% restore &popd
-@if ERRORLEVEL 1 echo Error: dotnet restore failed  && goto :failure
 
-pushd .\lkg & %_dotnetexe% publish project.json &popd
-@if ERRORLEVEL 1 echo Error: dotnet publish failed  && goto :failure
+if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '1' (
+
+    :: Restore the Tools directory
+    call %~dp0init-tools.cmd
+
+    pushd .\lkg & %_dotnetexe% restore &popd
+    @if ERRORLEVEL 1 echo Error: dotnet restore failed  && goto :failure
 
-rem rename fsc and coreconsole to allow fsc.exe to to start compiler
-pushd .\lkg\bin\debug\netstandard1.6\win7-x64\publish
-fc fsc.exe dotnet.exe >nul
-@if ERRORLEVEL 1 (
-  copy fsc.exe fsc.dll
-  copy dotnet.exe fsc.exe
+    pushd .\lkg & %_dotnetexe% publish project.json -o %~dp0\Tools\lkg -r win7-x64 &popd
+    @if ERRORLEVEL 1 echo Error: dotnet publish failed  && goto :failure
 )
-popd
 
-rem rename fsc and coreconsole to allow fsc.exe to to start compiler
-pushd .\lkg\bin\debug\netstandard1.6\win7-x64\publish
-fc fsi.exe dotnet.exe >nul
-@if ERRORLEVEL 1 (
-  copy fsi.exe fsi.dll
-  copy dotnet.exe fsi.exe
+if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '0' (
+    rmdir /s /q %~dp0\Tools\lkg
 )
-popd
 
 rem copy targestfile into tools directory ... temporary fix until packaging complete.
 copy src\fsharp\FSharp.Build\Microsoft.FSharp.targets tools\Microsoft.FSharp.targets