Update to 3.0 preview4 manifest. (#1022)

* Update to 3.0 preview4 manifest.  core-sdk build 20190416.21, BAR build 8348.
* Update patches
* Allow writing restore sources and package versions to the same props file.
Newer Arcade versions eliminated the separate PackageVersion.props file.  Since this will go away in the near future with coherency changes, as a temporary fix we write package versions as well as the restore sources to the RestoreSources.props file, which is still used by Arcade.
* Update BuildTools and Arcade versions.
* Update preview version tag.
* Add patch to allow separate tool and SDK directories in CoreCLR.
* Update F# for build changes.
* Update Arcade build for new Arcade.
* Use 3.0 SDK in CLI and fix package output path.
* Core-setup always uses a 10.12 RID for OSX when non-portable.

Author: crummel

.gitignore

@@ -25,6 +25,7 @@ bld/
 msbuild.log
 msbuild.err
 msbuild.wrn
+*.binlog
 
 # Cross building rootfs
 cross/rootfs/

BuildToolsVersion.txt

@@ -1 +1 @@
-3.0.0-preview1-03715-01
+3.0.0-preview4-03906-01

build.ps1

@@ -43,4 +43,9 @@ $SDKPATH = "$CLIPATH\sdk\$SdkVersion"
 
 $captured_args = $args
 
+if (-Not ($captured_args.Contains("/t:") -or $captured_args.Contains("RootRepo")))
+{
+  Exec-Block { & "$CLIPATH\dotnet" "$SDKPATH/MSBuild.dll" "$SCRIPT_ROOT/build.proj" /flp:v=diag /bl /clp:v=m /p:RootRepo=arcade $captured_args } | Out-Host
+  taskkill /f /im dotnet.exe
+}
 Exec-Block { & "$CLIPATH\dotnet" "$SDKPATH/MSBuild.dll" "$SCRIPT_ROOT/build.proj" /flp:v=diag /bl /clp:v=m $captured_args } | Out-Host

build.sh

@@ -25,7 +25,32 @@ source "$SCRIPT_ROOT/init-tools.sh"
 CLIPATH="$SCRIPT_ROOT/Tools/dotnetcli"
 SDKPATH="$CLIPATH/sdk/$SDK_VERSION"
 
+# If running in Docker, make sure we have the UTF-8 locale or builds will error out.
+if [ -e /.dockerenv ]; then
+    if [ "$EUID" -ne "0" ]; then
+        echo "error: in docker but not root, so can't fix locale"
+        exit 1
+    fi
+    if [ -e /etc/os-release ]; then
+        source /etc/os-release
+        # work around a bad /etc/apt/sources.list in the image
+        if [[ "$ID" == "debian" ]]; then
+            printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list
+        fi
+        if [[ "$ID" == "debian" || "$ID" == "ubuntu" ]]; then
+            apt-get update
+            apt-get install -y locales
+            localedef -c -i en_US -f UTF-8 en_US.UTF-8
+        fi
+    fi
+fi
+
 set -x
 
-$CLIPATH/dotnet $SDKPATH/MSBuild.dll $SCRIPT_ROOT/build.proj /bl /flp:v=diag /clp:v=m "$@"
+# if we are not running a RootRepo or specific target already, build Arcade first separately
+if ! [[ "$@" =~ "RootRepo" || "$@" =~ "/t:" ]]; then
+    $CLIPATH/dotnet $SDKPATH/MSBuild.dll /bl:arcadeBuild.binlog $SCRIPT_ROOT/build.proj /p:RootRepo=arcade "$@" /p:FailOnPrebuiltBaselineError=false
+    pkill dotnet
+fi
+$CLIPATH/dotnet $SDKPATH/MSBuild.dll $SCRIPT_ROOT/build.proj /bl:build.binlog /flp:v=diag /clp:v=m "$@"
 

dependencies.props

@@ -36,7 +36,7 @@
   <!-- Build stabilization properties as passed in by ProdCon. -->
   <PropertyGroup>
     <UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>
-    <VersionStamp Condition="'$(VersionStamp)' == ''">preview</VersionStamp>
+    <VersionStamp Condition="'$(VersionStamp)' == ''">preview4</VersionStamp>
   </PropertyGroup>
 
   <ItemGroup>

init-tools.cmd

@@ -85,6 +85,9 @@ if not [%INIT_TOOLS_ERRORLEVEL%]==[0] (
   goto :error
 )
 
+REM CoreCLR expects this and has no way to pass in the dotnetcli director
+mklink /j "%TOOLRUNTIME_DIR%\.dotnet" "%DOTNET_PATH%"
+
 :: Create semaphore file
 if NOT exist "%BUILD_TOOLS_SEMAPHORE_DIR%" mkdir "%BUILD_TOOLS_SEMAPHORE_DIR%"
 echo Init-Tools.cmd completed for BuildTools Version: %BUILDTOOLS_VERSION% > "%BUILD_TOOLS_SEMAPHORE%"

init-tools.sh

@@ -236,6 +236,8 @@ ls "$__scriptpath/Tools/scripts/docker/"*.sh | xargs chmod +x
 
 "$__scriptpath/Tools/crossgen.sh" "$__scriptpath/Tools"
 
+# CoreCLR expects this and has no way to pass in the dotnetcli directory
+ln -s $__DOTNET_PATH $__TOOLRUNTIME_DIR/.dotnet
 
 mkdir -p "$(dirname "$__BUILD_TOOLS_SEMAPHORE")" && touch "$__BUILD_TOOLS_SEMAPHORE"
 mkdir -p "$(dirname "$__BUILD_TOOLS_ARCADE_SEMAPHORE")" && touch "$__BUILD_TOOLS_ARCADE_SEMAPHORE"

patches/arcade/0001-Exclude-all-SignCheck-from-source-build.patch

@@ -0,0 +1,44 @@
+From ad98a9a7da384dd450fec95b59071be8d8beba9b Mon Sep 17 00:00:00 2001
+From: Chris Rummel <[email protected]>
+Date: Thu, 25 Apr 2019 19:01:08 -0500
+Subject: [PATCH] Remove projects that fail to build in source-build.
+
+---
+ Arcade.sln | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/Arcade.sln b/Arcade.sln
+index 3d8b9ca5..8e5357db 100644
+--- a/Arcade.sln
++++ b/Arcade.sln
+@@ -2,8 +2,6 @@
+ # Visual Studio 15
+ VisualStudioVersion = 15.0.28307.271
+ MinimumVisualStudioVersion = 10.0.40219.1
+-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Build.Tasks.Feed", "src\Microsoft.DotNet.Build.Tasks.Feed\Microsoft.DotNet.Build.Tasks.Feed.csproj", "{941D335B-AA65-4089-9502-F306B108D182}"
+-EndProject
+ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.DotNet.Helix", "Microsoft.DotNet.Helix", "{6BE49638-F842-4329-BE8A-30C0F30CCAA5}"
+ EndProject
+ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Helix.Sdk", "src\Microsoft.DotNet.Helix\Sdk\Microsoft.DotNet.Helix.Sdk.csproj", "{86DC4DC7-DCEE-44AC-A7E3-B6D5A909422C}"
+@@ -108,18 +106,6 @@ Global
+ 		Release|x86 = Release|x86
+ 	EndGlobalSection
+ 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+-		{941D335B-AA65-4089-9502-F306B108D182}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+-		{941D335B-AA65-4089-9502-F306B108D182}.Debug|Any CPU.Build.0 = Debug|Any CPU
+-		{941D335B-AA65-4089-9502-F306B108D182}.Debug|x64.ActiveCfg = Debug|Any CPU
+-		{941D335B-AA65-4089-9502-F306B108D182}.Debug|x64.Build.0 = Debug|Any CPU
+-		{941D335B-AA65-4089-9502-F306B108D182}.Debug|x86.ActiveCfg = Debug|Any CPU
+-		{941D335B-AA65-4089-9502-F306B108D182}.Debug|x86.Build.0 = Debug|Any CPU
+-		{941D335B-AA65-4089-9502-F306B108D182}.Release|Any CPU.ActiveCfg = Release|Any CPU
+-		{941D335B-AA65-4089-9502-F306B108D182}.Release|Any CPU.Build.0 = Release|Any CPU
+-		{941D335B-AA65-4089-9502-F306B108D182}.Release|x64.ActiveCfg = Release|Any CPU
+-		{941D335B-AA65-4089-9502-F306B108D182}.Release|x64.Build.0 = Release|Any CPU
+-		{941D335B-AA65-4089-9502-F306B108D182}.Release|x86.ActiveCfg = Release|Any CPU
+-		{941D335B-AA65-4089-9502-F306B108D182}.Release|x86.Build.0 = Release|Any CPU
+ 		{86DC4DC7-DCEE-44AC-A7E3-B6D5A909422C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ 		{86DC4DC7-DCEE-44AC-A7E3-B6D5A909422C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ 		{86DC4DC7-DCEE-44AC-A7E3-B6D5A909422C}.Debug|x64.ActiveCfg = Debug|Any CPU
+-- 
+2.18.0
+

patches/arcade/0001-Remove-projects-that-fail-to-build-in-source-build.patch

@@ -1,17 +1,17 @@
-From 25d451e540a1f26b4007a4265ced013f33599c80 Mon Sep 17 00:00:00 2001
+From 51f8aa8e8332e6c8cc8f40bed28008261fe991fa Mon Sep 17 00:00:00 2001
 From: Chris Rummel <[email protected]>
 Date: Sun, 10 Feb 2019 17:55:21 -0600
 Subject: [PATCH] Fix InternalsVisibleTo generation.
 
 ---
- .../tools/GenerateInternalsVisibleTo.targets                 | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ .../tools/GenerateInternalsVisibleTo.targets                   | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateInternalsVisibleTo.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateInternalsVisibleTo.targets
-index eb730bcf..eb63f0fd 100644
+index cad55ca3..bf41fafc 100644
 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateInternalsVisibleTo.targets
 +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateInternalsVisibleTo.targets
-@@ -20,7 +20,8 @@
+@@ -15,7 +15,8 @@
      <ItemGroup>
        <_InternalsVisibleToAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
          <_Parameter1 Condition="'%(InternalsVisibleTo.Key)' != ''">%(InternalsVisibleTo.Identity), PublicKey=%(InternalsVisibleTo.Key)</_Parameter1>
@@ -21,13 +21,6 @@ index eb730bcf..eb63f0fd 100644
        </_InternalsVisibleToAttribute>
      </ItemGroup>
    </Target>
-@@ -45,4 +46,4 @@
-     </WriteCodeFragment>
-   </Target>
- 
--</Project>
-\ No newline at end of file
-+</Project>
 -- 
 2.18.0