Merge branch 'master' of https://github.com/fsharp/FSharp.Compiler.Service

Author: boloutaredoubeni

.gitignore

@@ -58,8 +58,8 @@ scripts/*.patch
 /tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
 /tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
 /tests/Xnet40-fsharpqa-suite-failures.log.*
-/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
-/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ctofiles/
+/vsintegration/src/service/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
+/vsintegration/src/service/FsPkgs/FSharp.Project/FS/ctofiles/
 /tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
 /tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll
 /tests/fsharpqa/Source/*net40-fsharpqa-suite-failures.env
@@ -227,3 +227,4 @@ lib/netcore/fsc/bin/
 /fcs/TestResult.xml
 /tests/fcs/
 /fcs/.paket/Paket.Restore.targets
+msbuild.binlog

DEVGUIDE.md

@@ -97,11 +97,8 @@ Install Xamarin Studio, then
 To build and test Visual F# IDE Tools, install these requirements:
 - [Visual Studio 2017](https://www.visualstudio.com/downloads/)
   - Under the "Windows" workloads, select ".NET desktop development"
-    - Select "F# language support" under the optional components
+    - Select "F# desktop language support" under the optional components
   - Under the "Other Toolsets" workloads, select "Visual Studio extension development"
-  - Under the "Individual components" tab select "Windows 10 SDK" as shown below (needed for compiling RC resource, see #2556): \
-  ![image](https://cloud.githubusercontent.com/assets/1249087/23730261/5c78c850-041b-11e7-9d9d-62766351fd0f.png)
-  - Failing to install this will lead to error FS0193: Could not find file visualfsharp\vsintegration\src\FSharp.ProjectSystem.FSharp\obj\net40\ProjectResources.rc.res.
 
 Steps to build:
 
@@ -111,7 +108,6 @@ Steps to build:
 
 Use ``VisualFSharp.sln`` if you're building the Visual F# IDE Tools.
 
-
 Note on Debug vs Release: ``Release`` Configuration has a degraded debugging experience, so if you want to test a change locally, it is recommended to do it in the ``Debug`` configuration. For more information see https://github.com/Microsoft/visualfsharp/issues/2771 and https://github.com/Microsoft/visualfsharp/pull/2773.
 
 Note: if you face this error [#2351](https://github.com/Microsoft/visualfsharp/issues/2351):
@@ -125,7 +121,6 @@ Or hard crash on launch ("Unknown Error"), delete these folders:
 
 #### [Optional] Install the Visual F# IDE Tools  (Windows Only)
 
-At time of writing, the Visual F# IDE Tools can only be installed into the latest Visual Studio 2017 RC releases.
 The new builds of the Visual F# IDE Tools can no longer be installed into Visual Studio 2015.
 
 You can install Visual Studio 2017 from https://www.visualstudio.com/downloads/.
@@ -155,7 +150,6 @@ changes, but the root (default) hive will remain untouched. You can also start t
 
 Because this uses the "RoslynDev" hive you can simultaneously test changes to an appropriate build of Roslyn binaries.
 
-
 #### [Optional] Rapid deployment of incremental changes to Visual F# IDE Tools components
 
 For the brave, you can rapidly deploy incrementally updated versions of Visual F# IDE Tool components such as ``FSHarp.Editor.dll`` by copying them directly into the extension directory in your user AppData folder:
@@ -176,7 +170,6 @@ For **Release**:
 
     vsintegration\update-vsintegration.cmd release
 
-
 # Notes
 
 #### Windows: Links to  Additional frameworks
@@ -192,10 +185,9 @@ For **Release**:
 - [Windows 8.1 SDK](http://msdn.microsoft.com/en-us/library/windows/desktop/bg162891.aspx)
 - [Windows 10 SDK](https://developer.microsoft.com/en-US/windows/downloads/windows-10-sdk)
 
-
 #### Notes on the Windows .NET Framework build
 
-1. The `update.cmd` script adds required strong name validation skips, and NGens the compiler and libraries. This requires admin privileges.
+1. The `update.cmd` script adds required strong name validation skips and NGens the compiler and libraries. This requires admin privileges.
 1. The compiler binaries produced are "private" and strong-named signed with a test key.
 1. Some additional tools are required to build the compiler, notably `fslex.exe`, `fsyacc.exe`, `FSharp.PowerPack.Build.Tasks.dll`, `FsSrGen.exe`, `FSharp.SRGen.Build.Tasks.dll`, and the other tools found in the `lkg` directory.
 1. The overall bootstrapping process executes as follows
@@ -217,4 +209,3 @@ Where you should set proper proxy address, user name and password.
 #### 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.
-

PublishToBlob.proj

@@ -10,19 +10,25 @@
   <PropertyGroup>
     <FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
     <!-- This version should be kept in sync with `packages.config` -->
-    <FeedTasksPackageVersion>1.0.0-prerelease-02121-01</FeedTasksPackageVersion>
+    <FeedTasksPackageVersion>1.0.0-prerelease-02219-01</FeedTasksPackageVersion>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)packages\$(FeedTasksPackage).$(FeedTasksPackageVersion)\build\$(FeedTasksPackage).targets" />
 
   <ItemGroup>
-    <ItemsToPush Include="$(MSBuildThisFileDirectory)artifacts\**\*.nupkg" />
+    <NuGetPackages Include="$(MSBuildThisFileDirectory)artifacts\**\*.nupkg" />
+    <OtherAssets Include="$(MSBuildThisFileDirectory)insertion\**" />
   </ItemGroup>
 
   <Target Name="Build">
     <PushToBlobFeed ExpectedFeedUrl="$(ExpectedFeedUrl)"
                     AccountKey="$(AccountKey)"
-                    ItemsToPush="@(ItemsToPush)"
+                    ItemsToPush="@(NuGetPackages)"
+                    Overwrite="$(PublishOverwrite)" />
+    <PushToBlobFeed ExpectedFeedUrl="$(ExpectedFeedUrl)"
+                    AccountKey="$(AccountKey)"
+                    ItemsToPush="@(OtherAssets)"
+                    PublishFlatContainer="true"
                     Overwrite="$(PublishOverwrite)" />
   </Target>
 

build/config/AssemblySignToolData.json

@@ -0,0 +1,74 @@
+{
+  "sign": [
+    {
+      "certificate": "Microsoft",
+      "strongName": "StrongName",
+      "values": [
+        "net40\\bin\\FSharp.Core.dll",
+        "net40\\bin\\*\\FSharp.Core.resources.dll",
+        "net40\\bin\\FSharp.Build.dll",
+        "net40\\bin\\*\\FSharp.Build.resources.dll",
+        "net40\\bin\\FSharp.Compiler.Private.dll",
+        "net40\\bin\\*\\FSharp.Compiler.Private.resources.dll",
+        "net40\\bin\\FSharp.Compiler.Server.Shared.dll",
+        "net40\\bin\\FSharp.Compiler.Interactive.Settings.dll",
+        "net40\\bin\\*\\FSharp.Compiler.Interactive.Settings.resources.dll",
+        "net40\\bin\\fsc.exe",
+        "net40\\bin\\fsi.exe",
+        "net40\\bin\\fsiAnyCpu.exe",
+        "net40\\bin\\FSharp.VS.FSI.dll",
+        "net40\\bin\\*\\FSharp.VS.FSI.resources.dll",
+        "net40\\bin\\FSharp.LanguageService.Base.dll",
+        "net40\\bin\\*\\FSharp.LanguageService.Base.resources.dll",
+        "net40\\bin\\FSharp.LanguageService.dll",
+        "net40\\bin\\*\\FSharp.LanguageService.resources.dll",
+        "net40\\bin\\FSharp.UIResources.dll",
+        "net40\\bin\\*\\FSharp.UIResources.resources.dll",
+        "net40\\bin\\FSharp.Editor.dll",
+        "net40\\bin\\*\\FSharp.Editor.resources.dll",
+        "net40\\bin\\FSharp.ProjectSystem.Base.dll",
+        "net40\\bin\\*\\FSharp.ProjectSystem.Base.resources.dll",
+        "net40\\bin\\FSharp.ProjectSystem.PropertyPages.dll",
+        "net40\\bin\\*\\FSharp.ProjectSystem.PropertyPages.resources.dll",
+        "net40\\bin\\FSharp.ProjectSystem.FSharp.dll",
+        "net40\\bin\\*\\FSharp.ProjectSystem.FSharp.resources.dll",
+        "coreclr\\bin\\FSharp.Core.dll",
+        "coreclr\\bin\\*\\FSharp.Core.resources.dll",
+        "coreclr\\bin\\FSharp.Build.dll",
+        "coreclr\\bin\\*\\FSharp.Build.resources.dll",
+        "coreclr\\bin\\FSharp.Compiler.Private.dll",
+        "coreclr\\bin\\*\\FSharp.Compiler.Private.resources.dll",
+        "coreclr\\bin\\FSharp.Compiler.Interactive.Settings.dll",
+        "coreclr\\bin\\*\\FSharp.Compiler.Interactive.Settings.resources.dll",
+        "coreclr\\bin\\fsc.exe",
+        "coreclr\\bin\\fsi.exe"
+      ]
+    },
+    {
+      "certificate": "VsixSHA2",
+      "strongName": null,
+      "values": [
+        "net40\\bin\\VisualFSharpFull.vsix",
+        "net40\\bin\\VisualFSharpTemplate.vsix",
+        "net40\\bin\\VisualFSharpOpenSource.vsix",
+        "insertion\\Microsoft.FSharp.Dependencies.vsix",
+        "insertion\\Microsoft.FSharp.VSIX.Full.Resources.*.vsix"
+      ]
+    }
+  ],
+  "exclude": [
+    "Microsoft.Build.Conversion.Core.dll",
+    "Microsoft.Build.dll",
+    "Microsoft.Build.Engine.dll",
+    "Microsoft.Build.Framework.dll",
+    "Microsoft.Build.Tasks.Core.dll",
+    "Microsoft.Build.Utilities.Core.dll",
+    "Microsoft.DiaSymReader.dll",
+    "Microsoft.DiaSymReader.PortablePdb.dll",
+    "Newtonsoft.Json.dll",
+    "System.ValueTuple.4.3.1.nupkg",
+    "System.Collections.Immutable.dll",
+    "System.Reflection.Metadata.dll",
+    "System.ValueTuple.dll"
+  ]
+}

build/config/InsertionSignToolData.json

@@ -0,0 +1,14 @@
+{
+    "sign": [
+      {
+        "certificate": "VsixSHA2",
+        "strongName": null,
+        "values": [
+          "insertion\\Microsoft.FSharp.SDK.Resources.ENU.vsix"
+        ]
+      }
+    ],
+    "exclude": [
+    ]
+  }
+  

build/config/MsiSignToolData.json

@@ -0,0 +1,15 @@
+{
+    "sign": [
+      {
+        "certificate": "Microsoft400",
+        "strongName": null,
+        "values": [
+          "msi\\Microsoft.FSharp.SDK.Core.msi",
+          "msi\\Microsoft.FSharp.SDK.Resources.*.msi"
+        ]
+      }
+    ],
+    "exclude": [
+    ]
+  }
+  

build/config/packages.config

@@ -0,0 +1,5 @@
+<packages>
+  <package id="MicroBuild.Core" version="0.2.0" />
+  <package id="MicroBuild.Core.Sentinel" version="1.0.0" />
+  <package id="RoslynTools.SignTool" version="1.0.0-beta-62328-01" />
+</packages>

build/scripts/run-signtool.cmd

@@ -0,0 +1,65 @@
+@echo off
+:: Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+setlocal enableDelayedExpansion
+set scriptdir=%~dp0
+set MSBuild=
+set SignType=
+set ConfigFile=
+
+::
+:: Validate arguments
+::
+
+:parsearg
+if "%1" == "" goto doneargs
+set arg=%1
+set argv=%2
+
+if /i "%arg%" == "/?" goto help
+if /i "%arg%" == "-h" goto help
+if /i "%arg%" == "--help" goto help
+if /i "%arg%" == "-MSBuild" (
+    set MSBuild=%argv%
+    shift
+)
+if /i "%arg%" == "-SignType" (
+    set SignType=%argv%
+    shift
+)
+if /i "%arg%" == "-ConfigFile" (
+    set ConfigFile=%argv%
+    shift
+)
+
+shift
+goto parsearg
+
+:doneargs
+
+if not defined MSBuild echo Location of MSBuild.exe not specified. && goto error
+if not defined ConfigFile echo Configuration file not specified. && goto error
+if not exist "%MSBuild%" echo The specified MSBuild.exe does not exist. && goto error
+
+set NUGET_PACKAGES=%USERPROFILE%\.nuget\packages
+set _signtoolexe=%NUGET_PACKAGES%\RoslynTools.SignTool\1.0.0-beta-62328-01\tools\SignTool.exe
+set SignToolArgs=-msbuildPath %MSBuild% -config "%ConfigFile%" -nugetPackagesPath "%NUGET_PACKAGES%"
+if /i "%SignType%" == "real" goto runsigntool
+if /i "%SignType%" == "test" set SignToolArgs=%SignToolArgs% -testSign && goto runsigntool
+set SignToolArgs=%SignToolArgs% -test
+
+:runsigntool
+
+if not exist "%_signtoolexe%" echo The signing tool could not be found at location '%_signtoolexe%' && goto error
+set SignToolArgs=%SignToolArgs% "%scriptdir%..\..\release"
+echo "%_signtoolexe%" %SignToolArgs%
+     "%_signtoolexe%" %SignToolArgs%
+if errorlevel 1 goto error
+goto :EOF
+
+:help
+echo Usage: %0 -MSBuild path\to\msbuild.exe -ConfigFile path\to\SignToolData.json [-SignType ^<real/test^>]
+goto :EOF
+
+:error
+echo Error running the sign tool.
+exit /b 1

build/targets/GitHash.props

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+
+<!--
+Copied from RepoToolset. Might be slightly modified to adjust for the current F# build system specifics if necessary.
+-->
+
+<Project>
+  <!--
+
+  Defines the following properties:
+    GitHeadSha
+
+  -->
+
+  <PropertyGroup>
+    <RepoRoot>$(MSBuildThisFileDirectory)..\..\</RepoRoot>
+  </PropertyGroup>
+
+  <Choose>
+    <When Condition="'$(BUILD_SOURCEVERSION)' != ''">
+      <PropertyGroup>
+        <GitHeadSha>$(BUILD_SOURCEVERSION)</GitHeadSha>
+      </PropertyGroup>
+    </When>
+
+    <When Condition="'$(BUILD_SOURCEVERSION)' == '' and '$(GIT_COMMIT)' != ''">
+      <PropertyGroup>
+        <GitHeadSha>$(GIT_COMMIT)</GitHeadSha>
+      </PropertyGroup>
+    </When>
+
+    <When Condition="'$(CI)' != '1'">
+      <PropertyGroup>
+        <GitHeadSha>&lt;developer build&gt;</GitHeadSha>
+      </PropertyGroup>
+    </When>
+
+    <Otherwise>
+      <PropertyGroup>
+        <GitHeadSha></GitHeadSha>
+        <_DotGitDir>$(RepoRoot).git</_DotGitDir>
+        <_HeadFileContent Condition="Exists('$(_DotGitDir)/HEAD')">$([System.IO.File]::ReadAllText('$(_DotGitDir)/HEAD').Trim())</_HeadFileContent>
+        <_RefPath Condition="$(_HeadFileContent.StartsWith('ref: '))">$(_DotGitDir)/$(_HeadFileContent.Substring(5))</_RefPath>
+        <GitHeadSha Condition="'$(_RefPath)' != '' and Exists('$(_RefPath)')">$([System.IO.File]::ReadAllText('$(_RefPath)').Trim())</GitHeadSha>
+        <GitHeadSha Condition="'$(_HeadFileContent)' != '' and '$(_RefPath)' == ''">$(_HeadFileContent)</GitHeadSha>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+</Project>

fcs/.paket/Paket.Restore.targets

@@ -18,6 +18,11 @@
     <PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
     <PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
     <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
+
+    <!-- .net core fdd -->
+    <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
+    <PaketCommand Condition=" '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>
+
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
@@ -114,9 +119,11 @@
       <PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" >
         <PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
         <PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
+        <AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
       </PaketReferencesFileLinesInfo>
       <PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
         <Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
+        <PrivateAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'true'">All</PrivateAssets>
       </PackageReference>
     </ItemGroup>