Merge from upstream

.gitattributes

@@ -21,11 +21,8 @@
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
 
-autogen.sh text eol=lf
-launcher.in text eol=lf
-config.make.in text eol=lf
+mono/launcher text eol=lf
+mono/config.make text eol=lf
 targets.make text eol=lf
-configure.ac text eol=lf
-Makefile.in text eol=lf
 
 *.bsl linguist-vendored=true

.gitignore

@@ -3,6 +3,11 @@
 /packages
 /Tools
 
+/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.)
 scripts/*.patch
@@ -58,8 +63,10 @@ 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/
+/tests/fsharp/typeProviders/splitAssemblyTools/provider.dll
+/tests/fsharp/typeProviders/splitAssemblyTypeproviders/provider.dll
+/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
@@ -82,10 +89,7 @@ Proto
 sign_temp
 .libs
 configure
-launcher
-autom4te.cache
 config.log
-mono/config.make
 config.status
 *~
 *.suo
@@ -95,7 +99,6 @@ ossreadme*.txt
 *.csproj.user
 *.fsproj.user
 *.sln.DotSettings.user
-*.ide
 *.log
 *.jrs
 *.chk
@@ -124,3 +127,6 @@ tests/fsharpqa/testenv/bin/System.ValueTuple.dll
 /fcs/TestResult.xml
 /tests/fcs/
 /fcs/.paket/Paket.Restore.targets
+msbuild.binlog
+/fcs/FSharp.Compiler.Service.netstandard/*.fs
+/fcs/FSharp.Compiler.Service.netstandard/*.fsi

.vsts-pr.yaml

@@ -0,0 +1,62 @@
+jobs:
+- job: Linux
+  pool:
+    vmImage: ubuntu-16.04
+  timeoutInMinutes: 90
+  strategy:
+    maxParallel: 2
+    matrix:
+      release_default:
+        _command: ./mono/cibuild.sh
+        _args: release
+      # disabled until it can be properly fixed
+      #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()
+
+- job: Windows
+  pool:
+    vmImage: vs2017-win2016
+  timeoutInMinutes: 90
+  strategy:
+    maxParallel: 7
+    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
+  steps:
+  - script: $(_command) $(_args)
+  - task: PublishBuildArtifacts@1
+    inputs:
+      PathtoPublish: '$(Build.SourcesDirectory)\tests\TestResults'
+      ArtifactName: 'Windows $(_command) $(_args)'
+      publishLocation: Container
+    continueOnError: true
+    condition: failed()

.vsts-signed.yaml

@@ -0,0 +1,96 @@
+jobs:
+- job: Full_Signed
+  pool:
+    name: VSEng-MicroBuildVS2017
+  timeoutInMinutes: 300
+  variables:
+    MSBuildConfiguration: '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'))
+
+  # 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
+
+  # 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'))
+
+  # 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: '$(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)\$(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)\$(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()
+
+  # 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)\Symbols'
+      usePat: false
+    condition: and(succeeded(), contains(variables['PB_PublishType'], 'symweb'))