Merge branch 'master' of https://github.com/Microsoft/visualfsharp into srtp-1

Author: dsyme

DEVGUIDE.md

@@ -50,6 +50,10 @@ There are various qualifiers:
     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 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. 
+
 Combinations are also allowed:
 
     build.cmd debug,compiler,notests   -- build the debug compiler and run smoke tests
@@ -147,8 +151,13 @@ 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 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.
+At time of writing, the Visual F# IDE Tools can only be installed into Visual Studio "Next" (aka "Dev15") 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.
+
+**Note:** This step will install a VSIX extension into Visual Studio "Next" (aka "Dev15") 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**:
 

VisualFSharp.sln

@@ -126,9 +126,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	EndProjectSection
 EndProject
 Global
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x86 = Debug|x86

appveyor.yml

@@ -1,5 +1,5 @@
 os: Visual Studio 2015
-
+ 
 environment:
   matrix:
     - BUILD_PROFILE: ci_part1

build.cmd

@@ -141,7 +141,8 @@ if /i '%ARG%' == 'ci' (
     set CONF_FSHARPQA_SUITE=Smoke
 )
 
-REM These divide 'ci' into three chunks which can be done in parallel
+
+REM These divide 'ci' into two chunks which can be done in parallel
 if /i '%ARG%' == 'ci_part1' (
     set BUILD_PROTO=1
     set SKIP_EXPENSIVE_TESTS=1
@@ -338,20 +339,20 @@ pushd .\lkg & %_dotnetexe% publish project.json &popd
 @if ERRORLEVEL 1 echo Error: dotnet publish failed  && goto :failure
 
 rem rename fsc and coreconsole to allow fsc.exe to to start compiler
-pushd .\lkg\bin\debug\dnxcore50\win7-x64\publish
-fc fsc.exe corehost.exe >nul
+pushd .\lkg\bin\debug\netstandard1.6\win7-x64\publish
+fc fsc.exe dotnet.exe >nul
 @if ERRORLEVEL 1 (
   copy fsc.exe fsc.dll
-  copy corehost.exe fsc.exe
+  copy dotnet.exe fsc.exe
 )
 popd
 
 rem rename fsc and coreconsole to allow fsc.exe to to start compiler
-pushd .\lkg\bin\debug\dnxcore50\win7-x64\publish
-fc fsi.exe corehost.exe >nul
+pushd .\lkg\bin\debug\netstandard1.6\win7-x64\publish
+fc fsi.exe dotnet.exe >nul
 @if ERRORLEVEL 1 (
   copy fsi.exe fsi.dll
-  copy corehost.exe fsi.exe
+  copy dotnet.exe fsi.exe
 )
 popd
 

lkg/project.json

@@ -1,6 +1,10 @@
+
 {
   "dependencies": {
-    "Microsoft.FSharp.Compiler.Host.netcore": "1.0.0-alpha-160406",
+    "Microsoft.FSharp.Compiler.Host.netcore": "1.0.0-alpha-160629",
+     "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2",
+     "Microsoft.NETCore.DotNetHostPolicy":  "1.0.1",
+     "Microsoft.NETCore.DotNetHost": "1.0.1"
   },
   "runtimes": {
     "win7-x86": { },
@@ -9,7 +13,7 @@
     "ubuntu.14.04-x64": { }
   },
   "frameworks": {
-    "dnxcore50": {
+    "netstandard1.6": {
       "imports": "portable-net45+win8"
     }
   }

src/FSharpSource.targets

@@ -742,7 +742,7 @@
     <When Condition="'$(BuildWith)' == 'LKG'">
       <PropertyGroup>
          <FSharpTargetsPath>..\lkg\FSharp-$(LkgVersion)\bin\Microsoft.FSharp.Targets</FSharpTargetsPath>
-         <FscToolPath>$(FSharpSourcesRoot)\..\lkg\bin\Debug\dnxcore50\win7-x64\publish</FscToolPath>
+         <FscToolPath>$(FSharpSourcesRoot)\..\lkg\bin\Debug\netstandard1.6\win7-x64\publish</FscToolPath>
          <FSLKGPath>$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin</FSLKGPath>
          <FSCoreLKGPath>$(FSLKGPath)\FSharp.Core.dll</FSCoreLKGPath>
       </PropertyGroup>

src/absil/il.fsi

@@ -2092,9 +2092,7 @@ type ILPropertyRef =
      member Name: string
      interface System.IComparable
 
-#if ENABLE_MONO_SUPPORT
 val runningOnMono: bool
-#endif
 
 type ILReferences = 
     { AssemblyReferences: ILAssemblyRef list; 

src/absil/ildiag.fs

@@ -7,6 +7,9 @@ module internal Microsoft.FSharp.Compiler.AbstractIL.Diagnostics
 open Internal.Utilities
 
 let diagnosticsLog = ref (Some stdout)
+
+let setDiagnosticsChannel s = diagnosticsLog := s 
+
 let dflushn () = match !diagnosticsLog with None -> () | Some d -> d.WriteLine(); d.Flush()
 let dflush () = match !diagnosticsLog with None -> () | Some d -> d.Flush()
 let dprintn (s:string) = 
@@ -18,4 +21,3 @@ let dprintf (fmt: Format<_,_,_,_>) =
 let dprintfn (fmt: Format<_,_,_,_>) = 
     Printf.kfprintf dflushn (match !diagnosticsLog with None -> System.IO.TextWriter.Null | Some d -> d) fmt
 
-let setDiagnosticsChannel s = diagnosticsLog := s

src/absil/ildiag.fsi

@@ -11,9 +11,8 @@ module internal Microsoft.FSharp.Compiler.AbstractIL.Diagnostics
 open System.IO
 open Microsoft.FSharp.Core.Printf
 
-val public setDiagnosticsChannel: TextWriter option -> unit
+val public setDiagnosticsChannel: TextWriter option -> unit 
 
 val public dprintfn: TextWriterFormat<'a> -> 'a 
 val public dprintf: TextWriterFormat<'a> -> 'a 
-
 val public dprintn: string -> unit