Merge branch 'master' into nested-recd-update-recdexpr

.gitignore

@@ -1,12 +1,9 @@
-# Downloaded packages and build tools.
-/lkg
-/packages
-/Tools
+# output location
+artifacts/
+
+packages/
 
 /tests/scripts/current
-/release
-/debug
-/Proto
 
 # Patches that may have been generated by scripts.
 # (These aren't generally useful to commit directly; if anything, they should be applied.)
@@ -82,10 +79,9 @@ lib/bootstrap/4.1/*.xml
 lib/bootstrap/4.1/fsharpc
 lib/bootstrap/4.1/fsharpi
 lib/bootstrap/4.1/policy*
+obj/
+bin/
 aclocal.m4
-Debug
-Release
-Proto
 sign_temp
 .libs
 configure
@@ -109,7 +105,6 @@ ossreadme*.txt
 *.cto
 *.vstman
 project.lock.json
-Tools/
 Backup/
 tests/fsharp/core/array/dont.run.peverify
 tests/fsharp/core/innerpoly/dont.run.peverify
@@ -118,7 +113,6 @@ times
 /tests/fsharpqa/testenv/bin/System.ValueTuple.dll
 source_link.json
 .vs/
-/VSRelease/net40/bin
 System.ValueTuple.dll
 tests/fsharpqa/testenv/bin/System.ValueTuple.dll
 */.fake

.vsts-pr.yaml

@@ -1,32 +1,34 @@
-phases:
-- phase: Linux
-  queue:
-    name: Hosted Linux Preview
-    timeoutInMinutes: 90
-    parallel: 2
+jobs:
+- job: Linux
+  pool:
+    vmImage: ubuntu-16.04
+  timeoutInMinutes: 90
+  strategy:
+    maxParallel: 2
     matrix:
-      release_default:
-        _command: ./mono/cibuild.sh
-        _args: release
+      dotnet_sdk:
+        _command: make
+        _args: Configuration=release
       # disabled until it can be properly fixed
-      #release_fcs:
-      #  _command: ./fcs/build.sh
-      #  _args: Build
+      release_fcs:
+        _command: ./fcs/build.sh
+        _args: Build
   steps:
-    - script: $(_command) $(_args)
-    - task: PublishBuildArtifacts@1
-      inputs:
-        PathtoPublish: '$(Build.SourcesDirectory)/tests/TestResults'
-        ArtifactName: 'Linux $(_command) $(_args)'
-        publishLocation: Container
-      continueOnError: true
-      condition: failed()
+  - script: $(_command) $(_args)
+  - task: PublishBuildArtifacts@1
+    inputs:
+      PathtoPublish: '$(Build.SourcesDirectory)/artifacts/TestResults'
+      ArtifactName: 'Linux $(_command) $(_args)'
+      publishLocation: Container
+    continueOnError: true
+    condition: failed()
 
-- phase: Windows
-  queue:
-    name: Hosted VS2017
-    timeoutInMinutes: 90
-    parallel: 7
+- job: Windows
+  pool:
+    vmImage: vs2017-win2016
+  timeoutInMinutes: 120
+  strategy:
+    maxParallel: 7
     matrix:
       ci_part1:
         _command: build.cmd
@@ -50,11 +52,11 @@ phases:
         _command: fcs\build.cmd
         _args: TestAndNuget
   steps:
-    - script: $(_command) $(_args)
-    - task: PublishBuildArtifacts@1
-      inputs:
-        PathtoPublish: '$(Build.SourcesDirectory)\tests\TestResults'
-        ArtifactName: 'Windows $(_command) $(_args)'
-        publishLocation: Container
-      continueOnError: true
-      condition: failed()
+  - script: $(_command) $(_args)
+  - task: PublishBuildArtifacts@1
+    inputs:
+      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\TestResults'
+      ArtifactName: 'Windows $(_command) $(_args)'
+      publishLocation: Container
+    continueOnError: true
+    condition: failed()

.vsts-signed.yaml

@@ -1,100 +1,140 @@
-queue:
-  name: VSEng-MicroBuildVS2017
-  timeoutInMinutes: 300
-  demands:
-  - visualstudio
-  - DotNetFramework
-  - msbuild
-
 variables:
-  MSBuildConfiguration: 'Release'
+- name: PB_PublishBlobFeedUrl
+  value: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
+- group: DotNet-Blob-Feed
+- name: PB_PublishBlobFeedKey
+  value: $(dotnetfeed-storage-access-key-1)
+
+jobs:
+- job: Full_Signed
+  pool:
+    name: VSEng-MicroBuildVS2017
+  timeoutInMinutes: 300
+  variables:
+    BuildConfiguration: 'Release'
+  steps:
+  # Install Signing Plugin
+  - task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1
+    displayName: Install Signing Plugin
+    inputs:
+      signType: real
+    condition: and(succeeded(), in(variables['PB_SignType'], 'test', 'real'))
 
-steps:
-# Install Signing Plugin
-- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1
-  displayName: Install Signing Plugin
-  inputs:
-    signType: real
-  condition: and(succeeded(), in(variables['PB_SignType'], 'test', 'real'))
+  # Install Swix Plugin
+  - task: ms-vseng.MicroBuildTasks.32f78468-e895-4f47-962c-58a699361df8.MicroBuildSwixPlugin@1
+    displayName: Install Swix Plugin
 
-# Install Swix Plugin
-- task: ms-vseng.MicroBuildTasks.32f78468-e895-4f47-962c-58a699361df8.MicroBuildSwixPlugin@1
-  displayName: Install Swix Plugin
+  # Run build.cmd
+  - task: CmdLine@1
+    displayName: Run build.cmd
+    inputs:
+      filename: build.cmd
+      arguments: microbuild
 
-# Run build.cmd
-- task: CmdLine@1
-  displayName: Run build.cmd
-  inputs:
-    filename: build.cmd
-    arguments: microbuild
+  # Publish nightly package to MyGet
+  - task: PowerShell@1
+    displayName: Publish nightly package to MyGet
+    inputs:
+      scriptName: 'setup\publish-assets.ps1'
+      arguments: '-binariesPath artifacts\bin -configuration $(BuildConfiguration) -branchName $(Build.SourceBranch) -apiKey $(FSharp.MyGetApiKey)'
+    condition: and(succeeded(), contains(variables['PB_PublishType'], 'myget'))
 
-# Publish nightly package to MyGet
-- task: PowerShell@1
-  displayName: Publish nightly package to MyGet
-  inputs:
-    scriptName: 'setup\publish-assets.ps1'
-    arguments: '-binariesPath $(MSBuildConfiguration) -branchName $(Build.SourceBranch) -apiKey $(FSharp.MyGetApiKey)'
-  condition: and(succeeded(), contains(variables['PB_PublishType'], 'myget'))
+  # Package publish
+  - task: CmdLine@1
+    displayName: Restore package publishing
+    inputs:
+      filename: '.nuget\NuGet.exe'
+      arguments: 'restore packages.config -PackagesDirectory packages -Source https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json'
+    condition: and(succeeded(), contains(variables['PB_PublishType'], 'blob'))
+  - task: MSBuild@1
+    displayName: Publish packages to Azure Blob Storage
+    inputs:
+      solution: PublishToBlob.proj
+      msbuildArguments: '/t:Build /p:Configuration=$(BuildConfiguration) /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:AccountKey=$(PB_PublishBlobFeedKey) /p:ManifestRepouri=$(Build.Repository.Uri) /p:ManifestBranch=$(Build.SourceBranch) /p:ManifestCommit=$(Build.SourceVersion) /p:ManifestBuildId=$(Build.BuildNumber) /bl:$(Build.SourcesDirectory)/artifacts/log/$(BuildConfiguration)/pub/publish.binlog'
+    condition: and(succeeded(), contains(variables['PB_PublishType'], 'blob'))
+  - task: PublishBuildArtifacts@1
+    displayName: Publish publishing bin log
+    inputs:
+      PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(BuildConfiguration)/pub'
+      ArtifactName: 'Publish_bin_log'
+      publishLocation: Container
+    continueOnError: true
+    condition: and(succeeded(), contains(variables['PB_PublishType'], 'blob'))
+  - task: CopyFiles@2
+    displayName: Gather Asset Manifests
+    inputs:
+      SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(BuildConfiguration)/AssetManifest'
+      TargetFolder: '$(Build.StagingDirectory)/AssetManifests'
+    continueOnError: true
+    condition: and(succeeded(), contains(variables['PB_PublishType'], 'blob'))
+  - task: PublishBuildArtifacts@1
+    displayName: Push Asset Manifests
+    inputs:
+      PathtoPublish: '$(Build.StagingDirectory)/AssetManifests'
+      PublishLocation: Container
+      ArtifactName: AssetManifests
+    continueOnError: true
+    condition: and(succeeded(), contains(variables['PB_PublishType'], 'blob'))
 
-# Publish packages to Azure Blob Storage
-- task: MSBuild@1
-  displayName: Publish packages to Azure Blob Storage
-  inputs:
-    solution: PublishToBlob.proj
-    msbuildArguments: '/t:Build /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:AccountKey=$(PB_PublishBlobFeedKey) /p:ManifestBranch=$(SourceBranch) /p:ManifestCommit=$(SourceVersion) /p:ManifestBuildId=$(OfficialBuildId)'
-  condition: and(succeeded(), contains(variables['PB_PublishType'], 'blob'))
+  # Create static drop
+  - task: PublishBuildArtifacts@1
+    displayName: Create static drop
+    inputs:
+      PathtoPublish: 'artifacts'
+      ArtifactName: '$(Build.BuildNumber)'
+      publishLocation: FilePath
+      TargetPath: '$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)'
+      Parallel: true
+      ParallelCount: 64
+    condition: and(succeeded(), contains(variables['PB_PublishType'], 'drop'))
 
-# Create static drop
-- task: PublishBuildArtifacts@1
-  displayName: Create static drop
-  inputs:
-    PathtoPublish: '$(MSBuildConfiguration)'
-    ArtifactName: '$(Build.BuildNumber)'
-    publishLocation: FilePath
-    TargetPath: '$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)'
-    Parallel: true
-    ParallelCount: 64
-  condition: and(succeeded(), contains(variables['PB_PublishType'], 'drop'))
+  # Publish symbols
+  - task: PublishSymbols@1
+    displayName: Publish symbols
+    inputs:
+      SymbolsPath: '$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildNumber)\Symbols'
+      SearchPattern: '**\*.dll;**\*.exe;**\*.pdb'
+      SymbolsFolder: '$(Build.SourcesDirectory)\artifacts\SymStore'
+      TreatNotIndexedAsWarning: true
+      SymbolsProduct: '$(Build.DefinitionName)'
+      SymbolsVersion: '$(Build.BuildNumber)'
+    continueOnError: true
+    condition: and(succeeded(), contains(variables['PB_PublishType'], 'symbols'))
 
-# Publish symbols
-- task: PublishSymbols@1
-  displayName: Publish symbols
-  inputs:
-    SymbolsPath: '$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildNumber)\Symbols'
-    SearchPattern: '**\*.dll;**\*.exe;**\*.pdb'
-    SymbolsFolder: '$(Build.SourcesDirectory)\$(MSBuildConfiguration)'
-    TreatNotIndexedAsWarning: true
-    SymbolsProduct: '$(Build.DefinitionName)'
-    SymbolsVersion: '$(Build.BuildNumber)'
-  continueOnError: true
-  condition: and(succeeded(), contains(variables['PB_PublishType'], 'symbols'))
+  # Upload VSTS Drop
+  - task: ms-vseng.MicroBuildTasks.4305a8de-ba66-4d8b-b2d1-0dc4ecbbf5e8.MicroBuildUploadVstsDropFolder@1
+    displayName: Upload VSTS Drop
+    inputs:
+      DropFolder: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(BuildConfiguration)\Insertion'
+    condition: and(succeeded(), contains(variables['PB_PublishType'], 'vsts'))
 
-# Upload VSTS Drop
-- task: ms-vseng.MicroBuildTasks.4305a8de-ba66-4d8b-b2d1-0dc4ecbbf5e8.MicroBuildUploadVstsDropFolder@1
-  displayName: Upload VSTS Drop
-  inputs:
-    DropFolder: '$(Build.SourcesDirectory)\$(MSBuildConfiguration)\insertion'
-  condition: and(succeeded(), contains(variables['PB_PublishType'], 'vsts'))
+  # Execute cleanup tasks
+  - task: ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1
+    displayName: Execute cleanup tasks
+    condition: succeededOrFailed()
 
-# Execute cleanup tasks
-- task: ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1
-  displayName: Execute cleanup tasks
-  condition: succeededOrFailed()
+  # Publish Artifact: MicroBuildOutputs
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Artifact: MicroBuildOutputs'
+    inputs:
+      PathtoPublish: '$(Build.StagingDirectory)\MicroBuild\Output'
+      ArtifactName: MicroBuildOutputs
+      publishLocation: Container
+    condition: and(succeeded(), contains(variables['PB_PublishType'], 'microbuild'))
 
-# Publish Artifact: MicroBuildOutputs
-- task: PublishBuildArtifacts@1
-  displayName: 'Publish Artifact: MicroBuildOutputs'
-  inputs:
-    PathtoPublish: '$(Build.StagingDirectory)\MicroBuild\Output'
-    ArtifactName: MicroBuildOutputs
-    publishLocation: Container
-  condition: and(succeeded(), contains(variables['PB_PublishType'], 'microbuild'))
+  # Publish Symbols to Symweb
+  - task: ms-vscs-artifact.build-tasks.artifactSymbolTask-1.artifactSymbolTask@0
+    displayName: Publish symbols to SymWeb
+    inputs:
+      symbolServiceURI: 'https://microsoft.artifacts.visualstudio.com/DefaultCollection'
+      sourcePath: '$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildNumber)\SymStore'
+      usePat: false
+    condition: and(succeeded(), contains(variables['PB_PublishType'], 'symweb'))
 
-# Publish Symbols to Symweb
-- task: ms-vscs-artifact.build-tasks.artifactSymbolTask-1.artifactSymbolTask@0
-  displayName: Publish symbols to SymWeb
-  inputs:
-    symbolServiceURI: 'https://microsoft.artifacts.visualstudio.com/DefaultCollection'
-    sourcePath: '$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildNumber)\Symbols'
-    usePat: false
-  condition: and(succeeded(), contains(variables['PB_PublishType'], 'symweb'))
+- template: /eng/common/templates/job/publish-build-assets.yml
+  parameters:
+    dependsOn:
+    - Full_Signed
+    pool:
+      vmImage: vs2017-win2016
+    enablePublishBuildArtifacts: true

CoordinateXlif.targets

@@ -0,0 +1,3 @@
+<Project>
+  <Target Name = "CoordinateXlif" DependsOnTargets="GenerateFSharpTextResources" BeforeTargets="GetXlfSources" />
+</Project>