Merge pull request #894 from baronfel/integrate-vfsharp-feb-25-to-mar-02

Integrate vfsharp feb 25 to mar 29

Author: baronfel

.gitignore

@@ -1,9 +1,10 @@
 # output location
 artifacts/
 
-packages/
-
 /tests/scripts/current
+.dotnet/
+.packages/
+./tools
 
 # Patches that may have been generated by scripts.
 # (These aren't generally useful to commit directly; if anything, they should be applied.)
@@ -229,3 +230,5 @@ lib/netcore/fsc/bin/
 msbuild.binlog
 /fcs/FSharp.Compiler.Service.netstandard/*.fs
 /fcs/FSharp.Compiler.Service.netstandard/*.fsi
+
+.ionide

.vsts-pr.yaml

@@ -1,26 +1,48 @@
 jobs:
+
 - job: Linux
   pool:
     vmImage: ubuntu-16.04
   timeoutInMinutes: 90
   strategy:
     maxParallel: 3
     matrix:
-      dotnet_sdk:
-        _command: make
-        _args: Configuration=release
-      release_fcs:
-        _command: ./fcs/build.sh
-        _args: Build
+      coreclr_release:
+        _configuration: Release
+        _testKind: testcoreclr
+  steps:
+  - script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind)
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Build Logs
+    inputs:
+      PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_configuration)'
+      ArtifactName: 'Linux $(_configuration) $(_testKind) build log'
+      publishLocation: Container
+    continueOnError: true
+    condition: not(succeeded())
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Test Results
+    inputs:
+      PathtoPublish: '$(Build.SourcesDirectory)/artifacts/TestResults'
+      ArtifactName: 'Linux $(_configuration) $(_testKind)'
+      publishLocation: Container
+    continueOnError: true
+    condition: not(succeeded())
+
+- job: Linux_FCS
+  pool:
+    vmImage: ubuntu-16.04
+  timeoutInMinutes: 90
   steps:
-  - script: $(_command) $(_args)
+  - script: ./fcs/build.sh Build
   - task: PublishBuildArtifacts@1
+    displayName: Publish Test Results
     inputs:
       PathtoPublish: '$(Build.SourcesDirectory)/artifacts/TestResults'
-      ArtifactName: 'Linux $(_command) $(_args)'
+      ArtifactName: 'Linux FCS test results'
       publishLocation: Container
     continueOnError: true
-    condition: failed()
+    condition: not(succeeded())
 
 - job: MacOS
   pool:
@@ -29,56 +51,92 @@ jobs:
   strategy:
     maxParallel: 3
     matrix:
-      dotnet_sdk:
-        _command: make
-        _args: Configuration=release
-      release_fcs:
-        _command: ./fcs/build.sh
-        _args: Build
+      coreclr_release:
+        _configuration: Release
+        _testKind: testcoreclr
   steps:
-  - script: $(_command) $(_args)
+  - script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind)
   - task: PublishBuildArtifacts@1
+    displayName: Publish Build Logs
+    inputs:
+      PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_configuration)'
+      ArtifactName: 'MacOS $(_configuration) $(_testKind) build log'
+      publishLocation: Container
+    continueOnError: true
+    condition: not(succeeded())
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Test Results
     inputs:
       PathtoPublish: '$(Build.SourcesDirectory)/artifacts/TestResults'
-      ArtifactName: 'MacOS $(_command) $(_args)'
+      ArtifactName: 'MacOS $(_configuration) $(_testKind)'
       publishLocation: Container
     continueOnError: true
-    condition: failed()
+    condition: not(succeeded())
+
+- job: MacOS_FCS
+  pool:
+    vmImage: macOS-10.13
+  timeoutInMinutes: 90
+  steps:
+  - script: ./fcs/build.sh Build
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Test Results
+    inputs:
+      PathtoPublish: '$(Build.SourcesDirectory)/artifacts/TestResults'
+      ArtifactName: 'MacOS FCS test results'
+      publishLocation: Container
+    continueOnError: true
+    condition: not(succeeded())
 
 - job: Windows
   pool:
     vmImage: vs2017-win2016
   timeoutInMinutes: 120
   strategy:
-    maxParallel: 7
+    maxParallel: 4
     matrix:
-      ci_part1:
-        _command: build.cmd
-        _args: release ci_part1
-      ci_part2:
-        _command: build.cmd
-        _args: release ci_part2
-      ci_part3:
-        _command: build.cmd
-        _args: release ci_part3
-      ci_part4:
-        _command: build.cmd
-        _args: release ci_part4
-      debug_default:
-        _command: build.cmd
-        _args: debug
-      net40_no_vs:
-        _command: build.cmd
-        _args: release net40
-      release_fcs:
-        _command: fcs\build.cmd
-        _args: TestAndNuget
+      desktop_release:
+        _configuration: Release
+        _testKind: testDesktop
+      coreclr_release:
+        _configuration: Release
+        _testKind: testCoreclr
+      fsharpqa_release:
+        _configuration: Release
+        _testKind: testFSharpQA
+      vs_release:
+        _configuration: Release
+        _testKind: testVs
+  steps:
+  - script: eng\CIBuild.cmd -configuration $(_configuration) -$(_testKind)
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Build Logs
+    inputs:
+      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\log\$(_configuration)'
+      ArtifactName: 'Windows $(_configuration) $(_testKind) build log'
+      publishLocation: Container
+    continueOnError: true
+    condition: not(succeeded())
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Test Results
+    inputs:
+      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\TestResults'
+      ArtifactName: 'Windows $(_configuration) $(_testKind) test results'
+      publishLocation: Container
+    continueOnError: true
+    condition: not(succeeded())
+
+- job: Windows_FCS
+  pool:
+    vmImage: vs2017-win2016
+  timeoutInMinutes: 120
   steps:
-  - script: $(_command) $(_args)
+  - script: fcs\build.cmd TestAndNuget
   - task: PublishBuildArtifacts@1
+    displayName: Publish Test Results
     inputs:
       PathtoPublish: '$(Build.SourcesDirectory)\artifacts\TestResults'
-      ArtifactName: 'Windows $(_command) $(_args)'
+      ArtifactName: 'Windows FCS test results'
       publishLocation: Container
     continueOnError: true
-    condition: failed()
+    condition: not(succeeded())

Build.cmd

@@ -0,0 +1,2 @@
+@echo off
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\build.ps1""" -build -restore %*"

FSharp.Directory.Build.props renamed to Directory.Build.props

@@ -1,7 +1,5 @@
 <Project>
-
   <Import Project="FSharpBuild.Directory.Build.targets" Condition = " '$(FSharpTestCompilerVersion)' == '' "/>
   <Import Project="FSharpTests.Directory.Build.targets" Condition = " '$(FSharpTestCompilerVersion)' != '' "/>
   <Import Project="CoordinateXlif.targets" Condition = " '$(FSharpBuildAssemblyFile)' != '' and '$(XliffTasksAssembly)' != '' "/>
-
 </Project>

FSharp.Directory.Build.targets renamed to Directory.Build.targets

@@ -11,7 +11,6 @@
 
   <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('netcoreapp'))">
     <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
-    <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_BEGINEND_READWRITE</DefineConstants>
@@ -21,9 +20,7 @@
     <DefineConstants>$(DefineConstants);FX_NO_CORHOST_SIGNER</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_EVENTWAITHANDLE_IDISPOSABLE</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_HEAPTERMINATION</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_LINKEDRESOURCES</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_LOADER_OPTIMIZATION</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_PDB_WRITER</DefineConstants>

FSharp.Profiles.props

@@ -1,26 +1,20 @@
 <Project>
 
-  <Import Project="build\targets\AssemblyVersions.props" />
-  <Import Project="build\targets\PackageVersions.props" />
-  <Import Project="build\targets\GitHash.props" />
-  <Import Project="build\targets\CommonPackages.targets" />
+  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+  <Import Project="eng\targets\Settings.props" />
+
+  <PropertyGroup>
+    <BUILD_IN_FSHARP_REPOSITORY>true</BUILD_IN_FSHARP_REPOSITORY>
+  </PropertyGroup>
 
   <!-- directory locations -->
   <PropertyGroup>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
     <FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot>
-    <ArtifactsDir>$(RepoRoot)artifacts</ArtifactsDir>
-    <ToolsRoot>$(ArtifactsDir)\toolset</ToolsRoot>
-    <ArtifactsBinDir>$(ArtifactsDir)\bin</ArtifactsBinDir>
-    <ArtifactsObjDir>$(ArtifactsDir)\obj</ArtifactsObjDir>
-    <ArtifactsPackagesDir>$(ArtifactsDir)\packages</ArtifactsPackagesDir>
-    <BaseOutputPath>$(ArtifactsBinDir)\$(MSBuildProjectName)</BaseOutputPath>
-    <BaseIntermediateOutputPath>$(ArtifactsObjDir)\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <SymStoreDirectory>$(ArtifactsDir)\SymStore</SymStoreDirectory>
-    <ProtoOutputPath Condition="'$(OS)' != 'Unix'">$(ArtifactsBinDir)\fsc\Proto\net46</ProtoOutputPath>
-    <ProtoOutputPath Condition="'$(OS)' == 'Unix'">$(ArtifactsBinDir)/fsc/Proto/netcoreapp2.1</ProtoOutputPath>
+    <ProtoOutputPath Condition="'$(OS)' != 'Unix'">$(ArtifactsDir)\Bootstrap</ProtoOutputPath>
+    <ProtoOutputPath Condition="'$(OS)' == 'Unix'">$(ArtifactsDir)/fsc/Proto/netcoreapp2.1</ProtoOutputPath>
     <ValueTupleImplicitPackageVersion>4.4.0</ValueTupleImplicitPackageVersion>
+    <WarningsAsErrors>1182;0025;$(WarningsAsErrors)</WarningsAsErrors>
   </PropertyGroup>
 
   <!-- nuget -->
@@ -61,13 +55,8 @@
 
   <!-- signing -->
   <PropertyGroup>
-    <SkipSigning>false</SkipSigning>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\msft.pubkey</AssemblyOriginatorKeyFile>
-    <StrongNames>true</StrongNames>
-    <DelaySign>true</DelaySign>
+    <StrongNameKeyId>Microsoft</StrongNameKeyId>
   </PropertyGroup>
-
   <PropertyGroup Condition="'$(MonoPackaging)' == 'true'">
     <AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\test.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
@@ -82,14 +71,16 @@
 
   <!-- other -->
   <PropertyGroup>
+    <NoWarn Condition="'$(Language)' == 'F#'">$(NoWarn);FS2003</NoWarn><!-- warning when AssemblyInformationalVersion looks like '1.2.3-dev' -->
+    <NoCompilerStandardLib>true</NoCompilerStandardLib><!-- necessary for resource generation using csc.exe -->
     <DebugType>portable</DebugType>
     <MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
     <UseStandardResourceNames>false</UseStandardResourceNames>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <!-- SDK targets override -->
-  <PropertyGroup Condition="'$(Configuration)' != 'Proto' AND Exists('$(ProtoOutputPath)')">
+  <PropertyGroup Condition="'$(Configuration)' != 'Proto' AND '$(DisableCompilerRedirection)'!='true' AND Exists('$(ProtoOutputPath)')">
     <FSharpTargetsPath>$(ProtoOutputPath)\Microsoft.FSharp.Targets</FSharpTargetsPath>
     <FSharpPropsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
     <FSharpTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>

FSharpBuild.Directory.Build.props

@@ -1,18 +1,17 @@
 <Project>
-
+  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+  <Import Project="eng\targets\NuGet.targets" />
+  <Import Project="eng\targets\NGenBinaries.targets" />
   <Import Project="FSharp.Profiles.props" />
 
-  <PropertyGroup>
-    <XlfLanguages>en;$(XlfLanguages)</XlfLanguages>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(UseAssetTargetFallback)' == 'true'">
     <!--
     HACK: Necessary because the `netstandard1.6` version of FSharp.Compiler.Private requires a package that isn't
     necessary for `net46`, but the package has a requirement on `net462`.  The reference is excluded from the build
     during `net46`, but for purposes of restore needs to be present.
     -->
     <AssetTargetFallback>$(AssetTargetFallback);net462</AssetTargetFallback>
+    <NoWarn>$(NoWarn);NU1605;NU1701</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -34,9 +33,4 @@
     </CreateItem>
   </Target>
 
-  <Import Project="build\targets\NGenOrCrossGen.targets" />
-  <Import Project="build\targets\ConvertPortablePdbs.targets" />
-  <Import Project="build\targets\GenerateAssemblyAttributes.targets" />
-  <Import Project="build\targets\GenerateInternalsVisibleTo.targets" />
-
 </Project>

FSharpBuild.Directory.Build.targets

@@ -0,0 +1,2 @@
+@echo off
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\build.ps1""" -restore %*"

NuGet.Config renamed to NuGet.config

@@ -0,0 +1,2 @@
+@echo off
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\build.ps1""" -test %*"