Merge main to release/dev16.9

Build.cmd

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

FSharp.Profiles.props

@@ -2,24 +2,29 @@
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
 <Project>
 
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
-    <DefineConstants Condition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
-    <DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('netcoreapp'))">
-    <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_CORHOST_SIGNER</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_PDB_WRITER</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_SYMBOLSTORE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONFIGURATION</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_WIN_REGISTRY</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_WINFORMS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_INDENTED_TEXT_WRITER</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_RESHAPED_REFEMIT</DefineConstants>
-    <OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
-  </PropertyGroup>
+  <Choose>
+    <When Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
+      <PropertyGroup>
+        <DefineConstants Condition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
+        <DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_NO_CORHOST_SIGNER</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_NO_PDB_WRITER</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_NO_SYMBOLSTORE</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONFIGURATION</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_NO_WIN_REGISTRY</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_NO_WINFORMS</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_NO_INDENTED_TEXT_WRITER</DefineConstants>
+        <DefineConstants>$(DefineConstants);FX_RESHAPED_REFEMIT</DefineConstants>
+        <OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
 
 </Project>

FSharpBuild.Directory.Build.props

@@ -54,20 +54,9 @@
     <UpdateXlfOnBuild Condition="'$(CI)' != '1'">true</UpdateXlfOnBuild>
   </PropertyGroup>
 
-  <!-- source-build workarounds -->
-  <PropertyGroup Condition="'$(FSharpSourceBuild)' == 'true'">
-    <DeterministicSourcePaths>false</DeterministicSourcePaths>
+  <!-- source build -->
+  <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true' OR '$(ArcadeBuildFromSource)' == 'true'">
     <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 -->

azure-pipelines.yml

@@ -314,28 +314,6 @@ stages:
           - script: .\tests\EndToEndBuildTests\EndToEndBuildTests -c Release
             displayName: End to end build tests
 
-        # Source Build Linux - disabled until MSBuild/NuGet issues are resolved
-        # - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-        #   - job: SourceBuild_Linux
-        #     pool:
-        #       vmImage: ubuntu-latest
-        #     steps:
-        #     - checkout: self
-        #       clean: true
-        #     - script: ./eng/cibuild.sh --configuration Release /p:DotNetBuildFromSource=true /p:FSharpSourceBuild=true
-        #       displayName: Build
-        #     - script: dotnet build $(Build.SourcesDirectory)/eng/DumpPackageRoot/DumpPackageRoot.csproj
-        #       displayName: Dump NuGet cache contents
-        #       condition: failed()
-        #     - task: PublishBuildArtifacts@1
-        #       displayName: Publish NuGet cache contents
-        #       inputs:
-        #         PathtoPublish: '$(Build.SourcesDirectory)/artifacts/NugetPackageRootContents'
-        #         ArtifactName: 'NuGetPackageContents SourceBuild_Linux'
-        #         publishLocation: Container
-        #       continueOnError: true
-        #       condition: failed()
-
         # Source Build Windows
         - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
           - job: SourceBuild_Windows
@@ -344,19 +322,23 @@ stages:
             steps:
             - checkout: self
               clean: true
-            - script: eng\CIBuild.cmd -configuration Release -noSign /p:DotNetBuildFromSource=true /p:FSharpSourceBuild=true
+            - script: eng\CIBuild.cmd -configuration Release -noSign -prepareMachine -sourceBuild
               displayName: Build
-            - script: dotnet build $(Build.SourcesDirectory)/eng/DumpPackageRoot/DumpPackageRoot.csproj
-              displayName: Dump NuGet cache contents
-              condition: failed()
+            - task: PublishPipelineArtifact@1
+              displayName: Publish Logs
+              inputs:
+                targetPath: '$(Build.SourcesDirectory)/artifacts/log/Release'
+                artifactName: 'SourceBuild_Windows Logs'
+              continueOnError: true
+              condition: not(succeeded())
             - task: PublishBuildArtifacts@1
-              displayName: Publish NuGet cache contents
+              displayName: Publish Logs
               inputs:
-                PathtoPublish: '$(Build.SourcesDirectory)\artifacts\NugetPackageRootContents'
-                ArtifactName: 'NuGetPackageContents SourceBuild_Windows'
+                PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/Release'
+                ArtifactName: 'SourceBuild_Windows_Test'
                 publishLocation: Container
               continueOnError: true
-              condition: failed()
+              condition: not(succeeded())
 
         # Up-to-date - disabled due to it being flaky
         #- job: UpToDate_Windows
@@ -371,6 +353,49 @@ stages:
         #      filePath: eng\tests\UpToDate.ps1
         #      arguments: -configuration $(_BuildConfig) -ci -binaryLog
 
+        # Source Build Semi-Official
+        # used until https://github.com/dotnet/source-build/issues/1795 is fixed
+        - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+          - job: SourceBuild_Official
+            pool:
+              name: NetCorePublic-Pool
+              queue: BuildPool.Ubuntu.1604.amd64.Open
+            timeoutInMinutes: 90
+            steps:
+            - checkout: self
+              clean: true
+            - script: ./eng/cibuild.sh --configuration Release --prepareMachine --docker --sourceBuild
+              displayName: Build
+            - task: PublishPipelineArtifact@1
+              displayName: Publish Logs
+              inputs:
+                targetPath: '$(Build.SourcesDirectory)/artifacts/log/Release'
+                artifactName: 'SourceBuild_Official Logs'
+              continueOnError: true
+              condition: not(succeeded())
+            - task: PublishBuildArtifacts@1
+              displayName: Publish Logs
+              inputs:
+                PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/Release'
+                ArtifactName: 'SourceBuild_Official_Test'
+                publishLocation: Container
+              continueOnError: true
+              condition: not(succeeded())
+
+    # Arcade-powered source build
+    # turned off until https://github.com/dotnet/source-build/issues/1795 is fixed
+    # - template: /eng/common/templates/jobs/jobs.yml
+    #   parameters:
+    #     enablePublishUsingPipelines: true
+    #     enablePublishBuildArtifacts: true
+    #     enablePublishBuildAssets: true
+    #     artifacts:
+    #       publish:
+    #         artifacts: true
+    #         manifests: true
+    #     runSourceBuild: true
+    #     sourceBuildParameters:
+    #       includeDefaultManagedPlatform: true
 
 #---------------------------------------------------------------------------------------------------------------------#
 #                                                    Post Build                                                       #

build.sh

@@ -13,4 +13,4 @@ while [[ -h $source ]]; do
 done
 
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
-"$scriptroot/eng/build.sh" --build --restore $@
+"$scriptroot/eng/build.sh" --build --restore --binaryLog $@

eng/Build.ps1

@@ -58,6 +58,7 @@ param (
     [switch]$testpack,
     [string]$officialSkipTests = "false",
     [switch]$noVisualStudio,
+    [switch]$sourceBuild,
 
     [parameter(ValueFromRemainingArguments=$true)][string[]]$properties)
 
@@ -108,6 +109,7 @@ function Print-Usage() {
     Write-Host "  -prepareMachine           Prepare machine for CI run, clean up processes after build"
     Write-Host "  -useGlobalNuGetCache      Use global NuGet cache."
     Write-Host "  -noVisualStudio           Only build fsc and fsi as .NET Core applications. No Visual Studio required. '-configuration', '-verbosity', '-norestore', '-rebuild' are supported."
+    Write-Host "  -sourceBuild              Simulate building for source-build."
     Write-Host ""
     Write-Host "Command line arguments starting with '/p:' are passed through to MSBuild."
 }
@@ -154,10 +156,11 @@ function Process-Arguments() {
         $script:pack = $True;
     }
 
+    if ($sourceBuild) {
+        $script:testpack = $False;
+    }
+
     foreach ($property in $properties) {
-        if ($property.StartsWith("/p:DotNetBuildFromSource=true", "InvariantCultureIgnoreCase")) {
-            $script:testpack = $False;
-        }
         if (!$property.StartsWith("/p:", "InvariantCultureIgnoreCase")) {
             Write-Host "Invalid argument: $property"
             Print-Usage
@@ -220,6 +223,7 @@ function BuildSolution() {
         /p:QuietRestore=$quietRestore `
         /p:QuietRestoreBinaryLog=$binaryLog `
         /p:TestTargetFrameworks=$testTargetFrameworks `
+        /p:DotNetBuildFromSource=$sourceBuild `
         /v:$verbosity `
         $suppressExtensionDeployment `
         @properties

eng/build.sh

@@ -30,6 +30,7 @@ usage()
   echo "  --docker                   Run in a docker container if applicable"
   echo "  --skipAnalyzers            Do not run analyzers during build operations"
   echo "  --prepareMachine           Prepare machine for CI run, clean up processes after build"
+  echo "  --sourceBuild              Simulate building for source-build"
   echo ""
   echo "Command line arguments starting with '/p:' are passed through to MSBuild."
 }
@@ -130,14 +131,12 @@ while [[ $# > 0 ]]; do
       ;;
     --docker)
       docker=true
-      shift
-      continue
+      ;;
+    --sourcebuild)
+      source_build=true
       ;;
     /p:*)
       properties="$properties $1"
-      if [[ "$1" == "/p:dotnetbuildfromsource=true" ]]; then
-        source_build=true
-      fi
       ;;
     *)
       echo "Invalid argument: $1"
@@ -279,6 +278,7 @@ function BuildSolution {
     /p:ContinuousIntegrationBuild=$ci \
     /p:QuietRestore=$quiet_restore \
     /p:QuietRestoreBinaryLog="$binary_log" \
+    /p:DotNetBuildFromSource=$source_build \
     $properties
 }
 

setup/Swix/Directory.Build.targets

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