Merge dev16.1 to fsharp5

.vsts-pr.yaml

@@ -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())

FSharp.sln

@@ -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}

FSharpBuild.Directory.Build.props

@@ -69,6 +69,21 @@
     <UpdateXlfOnBuild Condition="'$(CI)' != '1'">true</UpdateXlfOnBuild>
   </PropertyGroup>
 
+  <!-- source-build workarounds -->
+  <PropertyGroup Condition="'$(FSharpSourceBuild)' == 'true'">
+    <DeterministicSourcePaths>false</DeterministicSourcePaths>
+    <PublishWindowsPdb>false</PublishWindowsPdb>
+    <RepositoryUrl Condition="'$(RepositoryUrl)' == ''">https://github.com/Microsoft/visualfsharp</RepositoryUrl>
+    <RepositoryType Condition="'$(RepositoryType)' == ''">git</RepositoryType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(FSharpSourceBuild)' == 'true' AND '$(RepositoryCommit)' == ''">
+    <_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>
+    <RepositoryCommit>$(BUILD_SOURCEVERSION)</RepositoryCommit>
+    <RepositoryCommit Condition="'$(RepositoryCommit)' == '' AND '$(_RefPath)' != '' and Exists('$(_RefPath)')">$([System.IO.File]::ReadAllText('$(_RefPath)').Trim())</RepositoryCommit>
+  </PropertyGroup>
+
   <!-- other -->
   <PropertyGroup>
     <NoWarn Condition="'$(Language)' == 'F#'">$(NoWarn);FS2003</NoWarn><!-- warning when AssemblyInformationalVersion looks like '1.2.3-dev' -->

eng/Build.ps1

@@ -26,6 +26,7 @@ param (
     [switch][Alias('b')]$build,
     [switch]$rebuild,
     [switch]$sign,
+    [switch]$noSign,
     [switch]$pack,
     [switch]$publish,
     [switch]$launch,
@@ -111,6 +112,10 @@ function Process-Arguments() {
         $script:restore = $False;
     }
 
+    if ($noSign) {
+        $script:sign = $False;
+    }
+
     foreach ($property in $properties) {
         if (!$property.StartsWith("/p:", "InvariantCultureIgnoreCase")) {
             Write-Host "Invalid argument: $property"

eng/Version.Details.xml

@@ -3,9 +3,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19205.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19209.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4217db4a23ffd15abb3771d635b66162994fb9e4</Sha>
+      <Sha>9d7e665ecf2606094677524ecd5af0fc39c7bb49</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/common/PublishToSymbolServers.proj

@@ -24,6 +24,14 @@
     <ItemGroup>
       <FilesToPublishToSymbolServer Include="$(PDBArtifactsDirectory)\*.pdb"/>
       <PackagesToPublishToSymbolServer Include="$(BlobBasePath)\*.symbols.nupkg"/>
+
+      <!--
+        These packages from Arcade-Services include some native libraries that
+        our current symbol uploader can't handle. Below is a workaround until
+        we get issue: https://github.com/dotnet/arcade/issues/2457 sorted.
+      -->
+      <PackagesToPublishToSymbolServer Remove="$(BlobBasePath)\Microsoft.DotNet.Darc.*" />
+      <PackagesToPublishToSymbolServer Remove="$(BlobBasePath)\Microsoft.DotNet.Maestro.Tasks.*" />
     </ItemGroup>
 
     <PropertyGroup>

eng/common/templates/phases/publish-build-assets.yml

@@ -5,6 +5,7 @@ parameters:
   condition: succeeded()
   continueOnError: false
   runAsPublic: false
+  publishUsingPipelines: false
 phases:
   - phase: Asset_Registry_Publish
     displayName: Publish to Build Asset Registry
@@ -36,6 +37,7 @@ phases:
               /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
               /p:BuildAssetRegistryToken=$(MaestroAccessToken)
               /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
+              /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
               /p:Configuration=$(_BuildConfig)
           condition: ${{ parameters.condition }}
           continueOnError: ${{ parameters.continueOnError }}

global.json

@@ -10,7 +10,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19205.6",
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19209.1",
     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
   }
 }

setup/Directory.Build.props

@@ -12,6 +12,7 @@
     <IntermediateOutputPath>$(ArtifactsDir)\VSSetup.obj\$(Configuration)\$(MSBuildProjectName)</IntermediateOutputPath>
     <VsixBuildLocation>$(SetupRootFolder)..\artifacts\VSSetup\$(Configuration)</VsixBuildLocation>
     <InsertionDir>$(SetupRootFolder)..\artifacts\VSSetup\$(Configuration)\Insertion</InsertionDir>
+    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
   </PropertyGroup>
 
 </Project>

setup/Swix/Directory.Build.targets

@@ -13,7 +13,9 @@
     </SwrProperty>
   </ItemDefinitionGroup>
 
-  <Target Name="Build" DependsOnTargets="ResolveProjectReferences">
+  <Target Name="Build"
+          DependsOnTargets="ResolveProjectReferences"
+          Condition="'$(DotNetBuildFromSource)' != 'true'">
     <MakeDir Directories="$(IntermediateOutputPath)" ContinueOnError="True"/>
   </Target>