Merge pull request #940 from baronfel/may-integration

Author: baronfel

.gitignore

@@ -236,3 +236,6 @@ msbuild.binlog
 .ionide
 .vscode
 **/.DS_Store
+/tests/fsharp/regression/5531/compilation.output.test.txt
+/tests/fsharp/core/fsfromfsviacs/compilation.langversion.old.output.txt
+/tests/fsharp/core/fsfromfsviacs/compilation.errors.output.txt

FSharpBuild.Directory.Build.targets

@@ -2,6 +2,7 @@
 
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
   <Import Project="eng\targets\Imports.targets" />
+  <Import Project="eng\targets\NGenBinaries.targets" />
   <Import Project="eng\targets\NuGet.targets" />
   <Import Project="FSharp.Profiles.props" />
 

benchmarks/CompilerServiceBenchmarks/Program.fs

@@ -146,7 +146,6 @@ type CompilerService() =
     let readerOptions =
         {
             pdbDirPath = None
-            ilGlobals = mkILGlobals ILScopeRef.Local
             reduceMemoryUsage = ReduceMemoryFlag.No
             metadataOnly = MetadataOnlyFlag.Yes
             tryGetMetadataSnapshot = fun _ -> None

clean.sh

@@ -4,28 +4,34 @@ DEAD_DIRS=(
     "azure-pipelines.yml"
     "DEVGUIDE.md"
     "eng/common/templates"
+    "eng/common/tools.ps1"
     "FSharp.sln"
+    "setup/"
     "src/fsharp/fsc/fsc.fsproj"
-    "src/fsharp/FSharp.Build/FSharp.Build.fsproj"
+    "src/fsharp/FSharp.Build"
     "src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec"
     "src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj"
-    "src/fsharp/FSharp.DependencyManager/xlf/"
     "src/fsharp/fsi/fsi.fsproj"
     "src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj"
+    "src/fsharp/Microsoft.DotNet.DependencyManager/xlf"
     "src/fsharp/Interactive.DependencyManager/xlf"
     "src/fsharp/xlf"
     "TESTGUIDE.md"
     "tests/EndToEndBuildTests"
+    "tests/FSharp.Build.UnitTests"
     "tests/FSharp.Compiler.Private.Scripting.UnitTests"
     "tests/FSharp.Compiler.UnitTests"
     "tests/FSharp.Core.UnitTests"
+    "tests/fsharp/*.fs"
     "tests/fsharp/Compiler"
     "tests/fsharp/conformance"
     "tests/fsharp/core"
     "tests/fsharp/FSharpSuite.Tests.fsproj"
+    "tests/fsharp/regression"
     "tests/fsharp/test-framework.fs"
     "tests/fsharp/tests.fs"
     "tests/fsharp/typecheck"
+    "tests/fsharp/typeProviders"
     "tests/fsharpqa"
     "tests/scripts"
     "VisualFSharp.sln"

eng/Build.ps1

@@ -273,9 +273,17 @@ function BuildCompiler() {
         $argNoRestore = if ($norestore) { " --no-restore" } else { "" }
         $argNoIncremental = if ($rebuild) { " --no-incremental" } else { "" }
 
+        if ($binaryLog) {
+            $logFilePath = Join-Path $LogDir "fscBootstrapLog.binlog"
+            $args += " /bl:$logFilePath"
+        }
         $args = "build $fscProject -c $configuration -v $verbosity -f netcoreapp3.0" + $argNoRestore + $argNoIncremental
         Exec-Console $dotnetExe $args
 
+        if ($binaryLog) {
+            $logFilePath = Join-Path $LogDir "fsiBootstrapLog.binlog"
+            $args += " /bl:$logFilePath"
+        }
         $args = "build $fsiProject -c $configuration -v $verbosity -f netcoreapp3.0" + $argNoRestore + $argNoIncremental
         Exec-Console $dotnetExe $args
     }
@@ -286,6 +294,100 @@ function Prepare-TempDir() {
     Copy-Item (Join-Path $RepoRoot "tests\Resources\Directory.Build.targets") $TempDir
 }
 
+function DownloadDotnetFrameworkSdk() {
+    $dlTempPath = [System.IO.Path]::GetTempPath()
+    $dlRandomFile = [System.IO.Path]::GetRandomFileName()
+    $net48Dir = Join-Path $dlTempPath $dlRandomFile
+    Create-Directory $net48Dir
+
+    $net48Exe = Join-Path $net48Dir "ndp48-devpack-enu.exe"
+    $dlLogFilePath = Join-Path $LogDir "dotnet48.install.log"
+    Invoke-WebRequest "https://go.microsoft.com/fwlink/?linkid=2088517" -OutFile $net48Exe
+
+    Write-Host "Exec-Console $net48Exe /install /quiet /norestart /log $dlLogFilePath"
+    Exec-Console $net48Exe "/install /quiet /norestart /log $dlLogFilePath"
+}
+
+function Test-IsAdmin {
+    ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator")
+}
+
+function TryDownloadDotnetFrameworkSdk() {
+    # If we are not running as admin user, don't bother grabbing ndp sdk -- since we don't need sn.exe
+    $isAdmin = Test-IsAdmin
+    Write-Host "TryDownloadDotnetFrameworkSdk -- Test-IsAdmin = '$isAdmin'"
+    if ($isAdmin -eq $true)
+    {
+        # Get program files(x86) location
+        if (${env:ProgramFiles(x86)} -eq $null) {
+            $programFiles = $env:ProgramFiles
+        }
+        else {
+            $programFiles = ${env:ProgramFiles(x86)}
+        }
+
+        # Get windowsSDK location for x86
+        $windowsSDK_ExecutablePath_x86 = $env:WindowsSDK_ExecutablePath_x86
+        $newWindowsSDK_ExecutablePath_x86 = Join-Path "$programFiles" "Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools"
+
+        if ($windowsSDK_ExecutablePath_x86 -eq $null) {
+            $snPathX86 = Join-Path $newWindowsSDK_ExecutablePath_x86 "sn.exe"
+        }
+        else {
+            $snPathX86 = Join-Path $windowsSDK_ExecutablePath_x86 "sn.exe"
+            $snPathX86Exists = Test-Path $snPathX86 -PathType Leaf
+            if ($snPathX86Exists -ne $true) {
+                $windowsSDK_ExecutablePath_x86 = null
+                $snPathX86 = Join-Path $newWindowsSDK_ExecutablePath_x86 "sn.exe"
+            }
+        }
+
+        $windowsSDK_ExecutablePath_x64 = $env:WindowsSDK_ExecutablePath_x64
+        $newWindowsSDK_ExecutablePath_x64 = Join-Path "$programFiles" "Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\x64"
+
+        if ($windowsSDK_ExecutablePath_x64 -eq $null) {
+            $snPathX64 = Join-Path $newWindowsSDK_ExecutablePath_x64 "sn.exe"
+        }
+        else {
+            $snPathX64 = Join-Path $windowsSDK_ExecutablePath_x64 "sn.exe"
+            $snPathX64Exists = Test-Path $snPathX64 -PathType Leaf
+            if ($snPathX64Exists -ne $true) {
+                $windowsSDK_ExecutablePath_x86 = null
+                $snPathX64 = Join-Path $newWindowsSDK_ExecutablePath_x64 "sn.exe"
+            }
+        }
+
+        $snPathX86Exists = Test-Path $snPathX86 -PathType Leaf
+        Write-Host "pre-dl snPathX86Exists : $snPathX86Exists - '$snPathX86'"
+        if ($snPathX86Exists -ne $true) {
+            DownloadDotnetFrameworkSdk
+        }
+
+        $snPathX86Exists = Test-Path $snPathX86 -PathType Leaf
+        if ($snPathX86Exists -eq $true) {
+            if ($windowsSDK_ExecutablePath_x86 -ne $newWindowsSDK_ExecutablePath_x86) {
+                $windowsSDK_ExecutablePath_x86 = $newWindowsSDK_ExecutablePath_x86
+                # x86 environment variable
+                Write-Host "set WindowsSDK_ExecutablePath_x86=$WindowsSDK_ExecutablePath_x86"
+                [System.Environment]::SetEnvironmentVariable("WindowsSDK_ExecutablePath_x86","$newWindowsSDK_ExecutablePath_x86",[System.EnvironmentVariableTarget]::Machine)
+                $env:WindowsSDK_ExecutablePath_x86 = $newWindowsSDK_ExecutablePath_x86
+            }
+        }
+
+        # Also update environment variable for x64
+        $snPathX64Exists = Test-Path $snPathX64 -PathType Leaf
+        if ($snPathX64Exists -eq $true) {
+            if ($windowsSDK_ExecutablePath_x64 -ne $newWindowsSDK_ExecutablePath_x64) {
+                $windowsSDK_ExecutablePath_x64 = $newWindowsSDK_ExecutablePath_x64
+                # x64 environment variable
+                Write-Host "set WindowsSDK_ExecutablePath_x64=$WindowsSDK_ExecutablePath_x64"
+                [System.Environment]::SetEnvironmentVariable("WindowsSDK_ExecutablePath_x64","$newWindowsSDK_ExecutablePath_x64",[System.EnvironmentVariableTarget]::Machine)
+                $env:WindowsSDK_ExecutablePath_x64 = $newWindowsSDK_ExecutablePath_x64
+            }
+        }
+    }
+}
+
 function EnablePreviewSdks() {
   if (Test-Path variable:global:_MSBuildExe) {
     return
@@ -322,9 +424,11 @@ try {
         EnablePreviewSdks
     }
 
+    $buildTool = InitializeBuildTool
+    $toolsetBuildProj = InitializeToolset
+    TryDownloadDotnetFrameworkSdk
     if ($bootstrap) {
         $script:BuildMessage = "Failure building bootstrap compiler"
-        $toolsetBuildProj = InitializeToolset
         $bootstrapDir = Make-BootstrapBuild
     }
 

eng/Version.Details.xml

@@ -3,9 +3,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20208.8">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20302.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0554dd21ef58e0ad23ad20388d05f11ab6cf3fa7</Sha>
+      <Sha>9b71be0663493cd0e111b55536a2e1eeb272f54c</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -14,23 +14,23 @@
     <PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
     <FSLanguageVersion>4.7</FSLanguageVersion>
     <FSCoreMajorVersion>$(FSLanguageVersion)</FSCoreMajorVersion>
-    <FSCorePackageVersion>$(FSCoreMajorVersion).2</FSCorePackageVersion>
+    <FSCorePackageVersion>$(FSCoreMajorVersion).3</FSCorePackageVersion>
     <FSCoreVersionPrefix>$(FSCoreMajorVersion).0</FSCoreVersionPrefix>
     <FSCoreVersion>$(FSCoreVersionPrefix).0</FSCoreVersion>
     <!-- The current published nuget package -->
-    <FSharpCoreShippedPackageVersion>4.7.1</FSharpCoreShippedPackageVersion>
+    <FSharpCoreShippedPackageVersion>4.7.2</FSharpCoreShippedPackageVersion>
     <!-- The pattern for specifying the preview package -->
     <FSharpCorePreviewPackageVersion>$(FSCorePackageVersion)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <FSPackageMajorVersion>10.8</FSPackageMajorVersion>
-    <FSPackageVersion>$(FSPackageMajorVersion).1</FSPackageVersion>
+    <FSPackageMajorVersion>10.10</FSPackageMajorVersion>
+    <FSPackageVersion>$(FSPackageMajorVersion).0</FSPackageVersion>
     <FSProductVersionPrefix>$(FSPackageVersion)</FSProductVersionPrefix>
     <FSProductVersion>$(FSPackageVersion).0</FSProductVersion>
   </PropertyGroup>
   <PropertyGroup>
     <VSMajorVersion>16</VSMajorVersion>
-    <VSMinorVersion>5</VSMinorVersion>
+    <VSMinorVersion>6</VSMinorVersion>
     <VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
     <VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
     <VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
@@ -177,7 +177,6 @@
     <MicrosoftNETCoreILDAsmVersion>3.0.0-preview-27318-01</MicrosoftNETCoreILDAsmVersion>
     <MicrosoftNETCoreILAsmVersion>3.0.0-preview-27318-01</MicrosoftNETCoreILAsmVersion>
     <MicrosoftNETTestSdkVersion>15.8.0</MicrosoftNETTestSdkVersion>
-    <MicrosoftVisualFSharpTypeProvidersRedistVersion>1.0.0</MicrosoftVisualFSharpTypeProvidersRedistVersion>
     <MicrosoftWin32RegistryVersion>4.3.0</MicrosoftWin32RegistryVersion>
     <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
     <NUnitVersion>3.11.0</NUnitVersion>

eng/build-utils.ps1

@@ -245,6 +245,10 @@ function Make-BootstrapBuild() {
     $argNoIncremental = if ($rebuild) { " --no-incremental" } else { "" }
 
     $args = "build $buildToolsProject -c $bootstrapConfiguration -v $verbosity -f netcoreapp3.0" + $argNoRestore + $argNoIncremental
+    if ($binaryLog) {
+        $logFilePath = Join-Path $LogDir "toolsBootstrapLog.binlog"
+        $args += " /bl:$logFilePath"
+    }
     Exec-Console $dotnetExe $args
 
     Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\netcoreapp3.0" -Destination "$dir\fslex" -Force -Recurse
@@ -254,6 +258,10 @@ function Make-BootstrapBuild() {
     # prepare compiler
     $protoProject = "$RepoRoot\proto.proj"
     $args = "build $protoProject -c $bootstrapConfiguration -v $verbosity -f $bootstrapTfm" + $argNoRestore + $argNoIncremental
+    if ($binaryLog) {
+        $logFilePath = Join-Path $LogDir "protoBootstrapLog.binlog"
+        $args += " /bl:$logFilePath"
+    }
     Exec-Console $dotnetExe $args
 
     Copy-Item "$ArtifactsDir\bin\fsc\$bootstrapConfiguration\$bootstrapTfm" -Destination "$dir\fsc" -Force -Recurse

eng/targets/NGenBinaries.targets

@@ -1,33 +1,70 @@
 <Project>
 
-  <!-- Windows permissions means that users can't even see the directory $(SystemRoot)System32\config -->
-  <PropertyGroup Condition="'$(OS)' != 'Unix' AND Exists('$(SystemRoot)\System32\config\system')">
-    <IsAdministrator>true</IsAdministrator>
-    <DelaySign>true</DelaySign>
-    <PublicSign>false</PublicSign>
-  </PropertyGroup>
+  <Target Name="SetIsAdministrator" Condition="'$(OS)' != 'Unix'"
+          BeforeTargets="MaybeSetSigning">
+    <Exec Command="net session &gt;nul 2&gt;&amp;1" ConsoleToMSBuild="true" IgnoreExitCode="true">
+      <Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
+    </Exec>
+    <PropertyGroup>
+      <IsAdministrator Condition="'$(ErrorCode)' != '0'">false</IsAdministrator>
+      <IsAdministrator Condition="'$(ErrorCode)' == '0'">true</IsAdministrator>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="MaybeSetSigning"
+          BeforeTargets="CoreCompile"
+          AfterTargets="BeforeCoreCompile"
+          Condition="'$(OS)' != 'Unix'">
+
+      <PropertyGroup Condition="'$(IsAdministrator)' == 'true' ">
+        <DelaySign>true</DelaySign>
+        <PublicSign>false</PublicSign>
+      </PropertyGroup>
+  </Target>
 
   <Target Name="NGenWindowsBinaries"
-          AfterTargets="AfterBuild"
-          Condition="'$(OS)' != 'Unix' AND
-                     $(TargetFramework.StartsWith('net4')) AND 
-                     '$(NGenBinary)' == 'true' AND
-                     Exists('$(TargetPath)') ">
+          AfterTargets="Build"
+          Condition="'$(OS)' != 'Unix' AND $(TargetFramework.StartsWith('net4')) AND '$(NGenBinary)' == 'true' AND '$(IsAdministrator)' == 'true' AND Exists('$(TargetPath)') ">
+
     <PropertyGroup>
-      <PathToNGen64>$(windir)\Microsoft.NET\Framework64\v4.0.30319\ngen.exe</PathToNGen64>
       <PathToNGen32>$(windir)\Microsoft.NET\Framework\v4.0.30319\ngen.exe</PathToNGen32>
-      <PathToSN32>$(WindowsSDK_ExecutablePath_x86)sn.exe</PathToSN32>
+      <PathToNGen64>$(windir)\Microsoft.NET\Framework64\v4.0.30319\ngen.exe</PathToNGen64>
     </PropertyGroup>
 
-    <!-- 
-        Enable Skip Verification and then NGen for both 32 and 64 bit product.
-        If compiling use the app config file, if present.
-    -->
-    <Exec Command='"$(PathToSN32)" /Vr "$(TargetPath)"' Condition = "Exists('$(PathToSN32)') AND Exists('$(TargetPath)') AND '$(IsAdministrator)' == 'true'"/>
+    <Exec Command='"$(PathToNGen32)" install "$(TargetPath)" /nologo /silent /ExeConfig:$(TargetPath)' 
+          Condition = "Exists('$(PathToNGen32)') AND '$(PlatformTarget)' != 'x64' AND Exists('$(TargetPath).config') AND '$(OutputType)' == 'Exe' AND '$(IsAdministrator)' == 'true'"
+          ConsoleToMSBuild="true"
+          IgnoreStandardErrorWarningFormat="true" />
+
+    <Exec Command='"$(PathToNGen32)" install "$(TargetPath)" /nologo /silent'
+          Condition = " Exists('$(PathToNGen32)') AND '$(PlatformTarget)' != 'x64' AND (!Exists('$(TargetPath).config') OR '$(OutputType)' != 'Exe') AND '$(IsAdministrator)' == 'true' "
+          ConsoleToMSBuild="true"
+          IgnoreStandardErrorWarningFormat="true"/>
+
+    <Exec Command='"$(PathToNGen64)" install "$(TargetPath)" /nologo /silent /ExeConfig:$(TargetPath)' 
+          Condition = "Exists('$(PathToNGen64)') AND '$(PlatformTarget)' != 'x86' AND Exists('$(TargetPath).config') AND '$(OutputType)' == 'Exe' AND '$(IsAdministrator)' == 'true'"
+          ConsoleToMSBuild="true"
+          IgnoreStandardErrorWarningFormat="true" />
+
+    <Exec Command='"$(PathToNGen64)" install "$(TargetPath)" /nologo /silent'
+          Condition = " Exists('$(PathToNGen64)') AND '$(PlatformTarget)' != 'x86' AND (!Exists('$(TargetPath).config') OR '$(OutputType)' != 'Exe') AND '$(IsAdministrator)' == 'true' "
+          ConsoleToMSBuild="true"
+          IgnoreStandardErrorWarningFormat="true"/>
 
-    <Exec Command='"$(PathToNGen64)" install "$(TargetPath)" /ExeConfig:$(TargetPath)' Condition = "Exists('$(PathToNGen64)') AND '$(PlatformTarget)' != 'x86' AND Exists('$(TargetPath).config') AND '$(IsAdministrator)' == 'true'"/>
-    <Exec Command='"$(PathToNGen32)" install "$(TargetPath)" /ExeConfig:$(TargetPath)' Condition = "Exists('$(PathToNGen32)') AND '$(PlatformTarget)' != 'x64' AND Exists('$(TargetPath).config') AND '$(IsAdministrator)' == 'true'"/>
-    <Exec Command='"$(PathToNGen64)" install "$(TargetPath)"' Condition = " Exists('$(PathToNGen64)') AND '$(PlatformTarget)' != 'x86' AND (!Exists('$(TargetPath).config')) AND '$(IsAdministrator)' == 'true' "/>
-    <Exec Command='"$(PathToNGen32)" install "$(TargetPath)"' Condition = " Exists('$(PathToNGen32)') AND '$(PlatformTarget)' != 'x64' AND (!Exists('$(TargetPath).config')) AND '$(IsAdministrator)' == 'true' "/>
   </Target>
-</Project>
+
+  <Target Name="SetSkipVerification"
+          BeforeTargets="NGenWindowsBinaries"
+          AfterTargets="CopyFilesToOutputDirectory"
+          Condition="'$(OS)' != 'Unix' AND '$(IsAdministrator)' == 'true' AND '$(AssemblyOriginatorKeyFile)' != '' AND Exists('$(TargetPath)') ">
+
+    <PropertyGroup>
+      <PathToSN32>$(WindowsSDK_ExecutablePath_x86)\sn.exe</PathToSN32>
+      <PathToSN64>$(WindowsSDK_ExecutablePath_x64)\sn.exe</PathToSN64>
+    </PropertyGroup>
+
+    <Exec Command='"$(PathToSN32)" /q /Vr "$(TargetPath)"' Condition = "Exists('$(PathToSN32)') AND '$(DelaySign)' == 'true' AND Exists('$(TargetPath)') AND '$(IsAdministrator)' == 'true'" ConsoleToMsBuild='true' />
+    <Exec Command='"$(PathToSN64)" /q /Vr "$(TargetPath)"' Condition = "Exists('$(PathToSN64)') AND '$(DelaySign)' == 'true' AND Exists('$(TargetPath)') AND '$(IsAdministrator)' == 'true'" ConsoleToMsBuild='true' />
+  </Target>
+
+</Project>