integrate master

Author: dsyme

.gitignore

@@ -4,7 +4,7 @@ artifacts/
 /tests/scripts/current
 .dotnet/
 .packages/
-./tools
+.tools/
 
 # Patches that may have been generated by scripts.
 # (These aren't generally useful to commit directly; if anything, they should be applied.)

.nuget/NuGet.exe

@@ -90,7 +90,7 @@ jobs:
 
 - job: Windows
   pool:
-    vmImage: vs2017-win2016
+    vmImage: windows-2019
   timeoutInMinutes: 120
   strategy:
     maxParallel: 4
@@ -128,7 +128,7 @@ jobs:
 
 - job: Windows_FCS
   pool:
-    vmImage: vs2017-win2016
+    vmImage: windows-2019
   timeoutInMinutes: 120
   steps:
   - script: fcs\build.cmd TestAndNuget
@@ -140,3 +140,33 @@ jobs:
       publishLocation: Container
     continueOnError: true
     condition: not(succeeded())
+
+- job: SourceBuild_Linux
+  pool:
+    vmImage: ubuntu-16.04
+  timeoutInMinutes: 90
+  steps:
+  - script: ./eng/cibuild.sh --configuration Release /p:DotNetBuildFromSource=true /p:FSharpSourceBuild=true
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Build Logs
+    inputs:
+      PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/Release'
+      ArtifactName: 'SourceBuild_Linux build log'
+      publishLocation: Container
+    continueOnError: true
+    condition: not(succeeded())
+
+- job: SourceBuild_Windows
+  pool:
+    vmImage: windows-2019
+  timeoutInMinutes: 90
+  steps:
+  - script: eng\CIBuild.cmd -configuration Release -noSign /p:DotNetBuildFromSource=true /p:FSharpSourceBuild=true
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Build Logs
+    inputs:
+      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\log\Release'
+      ArtifactName: 'SourceBuild_Windows build log'
+      publishLocation: Container
+    continueOnError: true
+    condition: not(succeeded())

.nuget/NuGet.targets

@@ -8,7 +8,7 @@ variables:
 jobs:
 - job: Full_Signed
   pool:
-    name: VSEng-MicroBuildVS2017
+    name: VSEng-MicroBuildVS2019
   timeoutInMinutes: 300
   variables:
     BuildConfiguration: 'Release'
@@ -73,20 +73,20 @@ jobs:
       ArtifactName: 'VSSetup'
     condition: succeeded()
 
-    # Archive NuGet packages to DevOps.
+  # Archive NuGet packages to DevOps.
   - task: PublishBuildArtifacts@1
     displayName: Publish Artifact Packages
     inputs:
       PathtoPublish: '$(Build.SourcesDirectory)\artifacts\packages\$(BuildConfiguration)'
       ArtifactName: 'Packages'
     condition: succeeded()
 
-  # Publish nightly package to MyGet
-  - task: PowerShell@1
-    displayName: Publish nightly package to MyGet
+  # Publish nightly package to ADO
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Artifact Nightly
     inputs:
-      scriptName: 'setup\publish-assets.ps1'
-      arguments: '-artifactsPath artifacts -configuration $(BuildConfiguration) -branchName $(Build.SourceBranch) -apiKey $(FSharp.MyGetApiKey)'
+      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(BuildConfiguration)\VisualFSharpFull.vsix'
+      ArtifactName: 'Nightly'
     condition: succeeded()
 
   # Package publish
@@ -108,5 +108,5 @@ jobs:
     dependsOn:
     - Full_Signed
     pool:
-      vmImage: vs2017-win2016
+      vmImage: windows-2019
     enablePublishBuildArtifacts: true

.vsts-pr.yaml

@@ -66,7 +66,7 @@ Running tests:
 
 To build and test Visual F# IDE Tools, install these requirements:
 
-- Download [Visual Studio 2017](https://www.visualstudio.com/downloads/)
+- Download [Visual Studio 2019](https://www.visualstudio.com/downloads/)
 - Launch the Visual Studio Installer
   - Under the **"Windows"** workload, select **".NET desktop development"**
     - Select the optional component **"F# desktop language support"**
@@ -78,11 +78,11 @@ Steps to build:
 
     Build.cmd                             -- build all F# components under the default configuration (Debug)
     Build.cmd -configuration Release      -- build all F# components as Release
-    Build.cmd -testDesktop                -- build and test all net46 tests
+    Build.cmd -testDesktop                -- build and test all net472 tests
 
 All test options:
 
-    -testDesktop                          -- test all net46 target frameworks
+    -testDesktop                          -- test all net472 target frameworks
     -testCoreClr                          -- test all netstandard and netcoreapp target frameworks
     -testFSharpQA                         -- test all F# Cambridge tests
     -testVs                               -- test all VS integration points
@@ -95,18 +95,18 @@ Note on Debug vs Release: ``Release`` Configuration has a degraded debugging exp
 
 Note ([#2351](https://github.com/Microsoft/visualfsharp/issues/2351)): if you face this error:
 
-> error VSSDK1077: Unable to locate the extensions directory. "ExternalSettingsManager::GetScopePaths failed to initialize PkgDefManager for C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\devenv.exe".
+> error VSSDK1077: Unable to locate the extensions directory. "ExternalSettingsManager::GetScopePaths failed to initialize PkgDefManager for C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv.exe".
 
 Or hard crash on launch ("Unknown Error"), delete these folders:
 
-- `%localappdata%\Microsoft\VisualStudio\15.0_(some number here)RoslynDev`
-- `%localappdata%\Microsoft\VisualStudio\15.0_(some number here)`
+- `%localappdata%\Microsoft\VisualStudio\16.0_(some number here)RoslynDev`
+- `%localappdata%\Microsoft\VisualStudio\16.0_(some number here)`
 
 #### [Optional] Install the Visual F# IDE Tools  (Windows Only)
 
 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/.
+You can install Visual Studio 2019 from https://www.visualstudio.com/downloads/.
 
 **Note:** This step will install a VSIX extension into Visual Studio "Next" that changes the Visual F# IDE Tools 
 components installed in that VS installation.  You can revert this step by disabling or uninstalling the addin.
@@ -135,15 +135,15 @@ Because this uses the "RoslynDev" hive you can simultaneously test changes to an
 
 #### [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:
+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:
 
-    xcopy /y debug\net40\bin\FSharp.* "%USERPROFILE%\AppData\Local\Microsoft\VisualStudio\15.0_7c5620b7FSharpDev\Extensions\Microsoft.VisualFSharpTools\Visual F# Tools\15.4.1.9055"
+    xcopy /y debug\net40\bin\FSharp.* "%USERPROFILE%\AppData\Local\Microsoft\VisualStudio\16.0_7c5620b7FSharpDev\Extensions\Microsoft.VisualFSharpTools\Visual F# Tools\16.4.1.9055"
 
 This gives a much tighter inner development loop than uninstalling/reinstalling the VSIX, as you do not have to restart VIsual Studio. Caveat emptor.
 
 #### [Optional] Clobber the F# SDK on the machine
 
-**Note:** The step below will try to clobber the machine-wide installed F# SDK on your machine. This replaces the ``fsc.exe`` used by the standard install location or ``Microsoft.FSharp.Targets``.  **Repairing Visual Studio 15 is currently the only way to revert this step.**
+**Note:** The step below will try to clobber the machine-wide installed F# SDK on your machine. This replaces the ``fsc.exe`` used by the standard install location or ``Microsoft.FSharp.Targets``.  **Repairing Visual Studio 16 is currently the only way to revert this step.**
 
 For **Debug**:
 
@@ -184,7 +184,7 @@ If you change error messages you may need to update FSComp.fs in `src\buildfroms
 To do this, build the non-buildfromsource version of FSharp.Compiler.Private (src\fsharp\FSharp.Compiler.Private) then check its obj\ directory for `FSComp.fs` and manually copy that into the buildfromsource directory.
 
     .\build net40
-    copy /y artifacts\obj\FSharp.Compiler.Private\Release\net46\FSComp.* src\buildfromsource\FSharp.Compiler.Private\
+    copy /y artifacts\obj\FSharp.Compiler.Private\Release\net472\FSComp.* src\buildfromsource\FSharp.Compiler.Private\
 
 If your changes involve modifying the list of language keywords in any way, (e.g. when implementing a new keyword), the XLF localization files need to be synced with the corresponding resx files. This can be done automatically by running
 

.vsts-signed.yaml

@@ -39,7 +39,6 @@
     <DefineConstants>$(DefineConstants);FX_NO_WINFORMS</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_INDENTED_TEXT_WRITER</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_REDUCED_EXCEPTIONS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_REDUCED_CONSOLE</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_RESHAPED_REFEMIT</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_RESHAPED_GLOBALIZATION</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>

DEVGUIDE.md

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26403.7
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Private", "src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj", "{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
 EndProject
@@ -34,6 +34,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Build.UnitTests", "tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj", "{53C0DAAD-158C-4658-8EC7-D7341530239F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packages", "Packages", "{3840F2E7-3898-45F7-8CF7-1E6829E56DB8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FSharp.Compiler", "src\fsharp\FSharp.Compiler.nuget\Microsoft.FSharp.Compiler.csproj", "{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -164,6 +168,18 @@ Global
 		{53C0DAAD-158C-4658-8EC7-D7341530239F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{53C0DAAD-158C-4658-8EC7-D7341530239F}.Release|x86.ActiveCfg = Release|Any CPU
 		{53C0DAAD-158C-4658-8EC7-D7341530239F}.Release|x86.Build.0 = Release|Any CPU
+		{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Debug|x86.Build.0 = Debug|Any CPU
+		{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
+		{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Proto|Any CPU.Build.0 = Debug|Any CPU
+		{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Proto|x86.ActiveCfg = Debug|Any CPU
+		{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Proto|x86.Build.0 = Debug|Any CPU
+		{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Release|x86.ActiveCfg = Release|Any CPU
+		{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -179,6 +195,7 @@ Global
 		{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
 		{88E2D422-6852-46E3-A740-83E391DC7973} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
 		{53C0DAAD-158C-4658-8EC7-D7341530239F} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
+		{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7} = {3840F2E7-3898-45F7-8CF7-1E6829E56DB8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BD5177C7-1380-40E7-94D2-7768E1A8B1B8}