Update dependencies from https:/dotnet/arcade build 20200…

…330.5 (#3024)

- Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20180.5
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20180.5
- Microsoft.DotNet.GenFacades - 5.0.0-beta.20180.5
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20180.5
- Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20180.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

eng/Version.Details.xml

@@ -67,25 +67,25 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
  <SourceBuildId>5596</SourceBuildId>
  </Dependency>
  <!-- Arcade -->
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20171.1">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20180.5">
  <Uri>https:/dotnet/arcade</Uri>
- <Sha>7dbc907fa03eacf4c57f827cb4235d77b7ed4fcd</Sha>
+ <Sha>09bb9d929120b402348c9a0e9c8c951e824059aa</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20171.1">
+ <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20180.5">
  <Uri>https:/dotnet/arcade</Uri>
- <Sha>7dbc907fa03eacf4c57f827cb4235d77b7ed4fcd</Sha>
+ <Sha>09bb9d929120b402348c9a0e9c8c951e824059aa</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20171.1">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20180.5">
  <Uri>https:/dotnet/arcade</Uri>
- <Sha>7dbc907fa03eacf4c57f827cb4235d77b7ed4fcd</Sha>
+ <Sha>09bb9d929120b402348c9a0e9c8c951e824059aa</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20171.1">
+ <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20180.5">
  <Uri>https:/dotnet/arcade</Uri>
- <Sha>7dbc907fa03eacf4c57f827cb4235d77b7ed4fcd</Sha>
+ <Sha>09bb9d929120b402348c9a0e9c8c951e824059aa</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20171.1">
+ <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20180.5">
  <Uri>https:/dotnet/arcade</Uri>
- <Sha>7dbc907fa03eacf4c57f827cb4235d77b7ed4fcd</Sha>
+ <Sha>09bb9d929120b402348c9a0e9c8c951e824059aa</Sha>
  </Dependency>
  </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -33,9 +33,9 @@
  </PropertyGroup>
  <!-- Arcade -->
  <PropertyGroup>
- <MicrosoftDotNetGenFacadesPackageVersion>5.0.0-beta.20171.1</MicrosoftDotNetGenFacadesPackageVersion>
- <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20171.1</MicrosoftDotNetRemoteExecutorVersion>
- <MicrosoftDotNetXUnitExtensionsPackageVersion>5.0.0-beta.20171.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
+ <MicrosoftDotNetGenFacadesPackageVersion>5.0.0-beta.20180.5</MicrosoftDotNetGenFacadesPackageVersion>
+ <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20180.5</MicrosoftDotNetRemoteExecutorVersion>
+ <MicrosoftDotNetXUnitExtensionsPackageVersion>5.0.0-beta.20180.5</MicrosoftDotNetXUnitExtensionsPackageVersion>
  </PropertyGroup>
  <!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->
  <!-- XUnit-related (not extensions) -->

eng/common/cross/build-rootfs.sh

@@ -2,15 +2,16 @@
 
 usage()
 {
- echo "Usage: $0 [BuildArch] [LinuxCodeName] [lldbx.y] [--skipunmount] --rootfsdir <directory>]"
+ echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir <directory>]"
  echo "BuildArch can be: arm(default), armel, arm64, x86"
- echo "LinuxCodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
- echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine"
+ echo "CodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
+ echo " for FreeBSD can be: freebsd11 or freebsd12."
+ echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FReeBSD"
  echo "--skipunmount - optional, will skip the unmount of rootfs folder."
  exit 1
 }
 
-__LinuxCodeName=xenial
+__CodeName=xenial
 __CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 __InitialDir=$PWD
 __BuildArch=arm
@@ -53,6 +54,15 @@ __AlpinePackages+=" krb5-dev"
 __AlpinePackages+=" openssl-dev"
 __AlpinePackages+=" zlib-dev"
 
+__FreeBSDBase="12.1-RELEASE"
+__FreeBSDPkg="1.10.5"
+__FreeBSDPackages="libunwind"
+__FreeBSDPackages+=" icu"
+__FreeBSDPackages+=" libinotify"
+__FreeBSDPackages+=" lttng-ust"
+__FreeBSDPackages+=" llvm-90"
+__FreeBSDPackages+=" krb5"
+
 __UnprocessedBuildArgs=
 while :; do
  if [ $# -le 0 ]; then
@@ -81,7 +91,7 @@ while :; do
  __BuildArch=armel
  __UbuntuArch=armel
  __UbuntuRepo="http://ftp.debian.org/debian/"
- __LinuxCodeName=jessie
+ __CodeName=jessie
  ;;
  x86)
  __BuildArch=x86
@@ -110,36 +120,36 @@ while :; do
  unset __LLDB_Package
  ;;
  trusty) # Ubuntu 14.04
- if [ "$__LinuxCodeName" != "jessie" ]; then
- __LinuxCodeName=trusty
+ if [ "$__CodeName" != "jessie" ]; then
+ __CodeName=trusty
  fi
  ;;
  xenial) # Ubuntu 16.04
- if [ "$__LinuxCodeName" != "jessie" ]; then
- __LinuxCodeName=xenial
+ if [ "$__CodeName" != "jessie" ]; then
+ __CodeName=xenial
  fi
  ;;
  zesty) # Ubuntu 17.04
- if [ "$__LinuxCodeName" != "jessie" ]; then
- __LinuxCodeName=zesty
+ if [ "$__CodeName" != "jessie" ]; then
+ __CodeName=zesty
  fi
  ;;
  bionic) # Ubuntu 18.04
- if [ "$__LinuxCodeName" != "jessie" ]; then
- __LinuxCodeName=bionic
+ if [ "$__CodeName" != "jessie" ]; then
+ __CodeName=bionic
  fi
  ;;
  jessie) # Debian 8
- __LinuxCodeName=jessie
+ __CodeName=jessie
  __UbuntuRepo="http://ftp.debian.org/debian/"
  ;;
  stretch) # Debian 9
- __LinuxCodeName=stretch
+ __CodeName=stretch
  __UbuntuRepo="http://ftp.debian.org/debian/"
  __LLDB_Package="liblldb-6.0-dev"
  ;;
  buster) # Debian 10
- __LinuxCodeName=buster
+ __CodeName=buster
  __UbuntuRepo="http://ftp.debian.org/debian/"
  __LLDB_Package="liblldb-6.0-dev"
  ;;
@@ -149,14 +159,22 @@ while :; do
  usage;
  exit 1;
  fi
- __LinuxCodeName=
+ __CodeName=
  __UbuntuRepo=
  __Tizen=tizen
  ;;
  alpine)
- __LinuxCodeName=alpine
+ __CodeName=alpine
  __UbuntuRepo=
  ;;
+ freebsd11)
+ __FreeBSDBase="11.3-RELEASE"
+ ;&
+ freebsd12)
+ __CodeName=freebsd
+ __BuildArch=x64
+ __SkipUnmount=1
+ ;;
  --skipunmount)
  __SkipUnmount=1
  ;;
@@ -192,7 +210,7 @@ if [ -d "$__RootfsDir" ]; then
  rm -rf $__RootfsDir
 fi
 
-if [[ "$__LinuxCodeName" == "alpine" ]]; then
+if [[ "$__CodeName" == "alpine" ]]; then
  __ApkToolsVersion=2.9.1
  __AlpineVersion=3.9
  __ApkToolsDir=$(mktemp -d)
@@ -218,9 +236,24 @@ if [[ "$__LinuxCodeName" == "alpine" ]]; then
  add $__AlpinePackagesEdgeTesting
 
  rm -r $__ApkToolsDir
-elif [[ -n $__LinuxCodeName ]]; then
- qemu-debootstrap --arch $__UbuntuArch $__LinuxCodeName $__RootfsDir $__UbuntuRepo
- cp $__CrossDir/$__BuildArch/sources.list.$__LinuxCodeName $__RootfsDir/etc/apt/sources.list
+elif [[ "$__CodeName" == "freebsd" ]]; then
+ mkdir -p $__RootfsDir/usr/local/etc
+ wget -O - https://download.freebsd.org/ftp/releases/amd64/${__FreeBSDBase}/base.txz | tar -C $__RootfsDir -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version
+ # For now, ask for 11 ABI even on 12. This can be revisited later.
+ echo "ABI = \"FreeBSD:11:amd64\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > ${__RootfsDir}/usr/local/etc/pkg.conf
+ echo "FreeBSD: { url: "pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > ${__RootfsDir}/etc/pkg/FreeBSD.conf
+ mkdir -p $__RootfsDir/tmp
+ # get and build package manager
+ wget -O - https:/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz | tar -C $__RootfsDir/tmp -zxf -
+ cd $__RootfsDir/tmp/pkg-${__FreeBSDPkg}
+ ./autogen.sh && ./configure --prefix=$__RootfsDir/host && make install
+ rm -rf $__RootfsDir/tmp/pkg-${__FreeBSDPkg}
+ # install packages we need.
+ $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf update
+ $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages
+elif [[ -n $__CodeName ]]; then
+ qemu-debootstrap --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo
+ cp $__CrossDir/$__BuildArch/sources.list.$__CodeName $__RootfsDir/etc/apt/sources.list
  chroot $__RootfsDir apt-get update
  chroot $__RootfsDir apt-get -f -y install
  chroot $__RootfsDir apt-get -y install $__UbuntuPackages
@@ -230,7 +263,7 @@ elif [[ -n $__LinuxCodeName ]]; then
  umount $__RootfsDir/*
  fi
 
- if [[ "$__BuildArch" == "arm" && "$__LinuxCodeName" == "trusty" ]]; then
+ if [[ "$__BuildArch" == "arm" && "$__CodeName" == "trusty" ]]; then
  pushd $__RootfsDir
  patch -p1 < $__CrossDir/$__BuildArch/trusty.patch
  patch -p1 < $__CrossDir/$__BuildArch/trusty-lttng-2.4.patch

eng/common/pipeline-logging-functions.ps1

@@ -67,12 +67,12 @@ function Write-PipelineTaskError {
  }
 
  if(($Type -ne 'error') -and ($Type -ne 'warning')) {
- Write-Host $Message
- return
+  Write-Host $Message
+  return
  }
  $PSBoundParameters.Remove('Force') | Out-Null 
  if(-not $PSBoundParameters.ContainsKey('Type')) {
- $PSBoundParameters.Add('Type', 'error')
+  $PSBoundParameters.Add('Type', 'error')
  }
  Write-LogIssue @PSBoundParameters
  }

eng/common/sdl/execute-all-sdl-tools.ps1

@@ -33,6 +33,10 @@ try {
  $disableConfigureToolsetImport = $true
  $LASTEXITCODE = 0
 
+ # `tools.ps1` checks $ci to perform some actions. Since the SDL
+ # scripts don't necessarily execute in the same agent that run the
+ # build.ps1/sh script this variable isn't automatically set.
+ $ci = $true
  . $PSScriptRoot\..\tools.ps1
 
  #Replace repo names to the format of org/repo

eng/common/sdl/extract-artifact-packages.ps1

@@ -6,10 +6,6 @@ param(
 $ErrorActionPreference = 'Stop'
 Set-StrictMode -Version 2.0
 
-# `tools.ps1` checks $ci to perform some actions. Since the post-build
-# scripts don't necessarily execute in the same agent that run the
-# build.ps1/sh script this variable isn't automatically set.
-$ci = $true
 $disableConfigureToolsetImport = $true
 
 function ExtractArtifacts {
@@ -29,6 +25,10 @@ function ExtractArtifacts {
 }
 
 try {
+ # `tools.ps1` checks $ci to perform some actions. Since the SDL
+ # scripts don't necessarily execute in the same agent that run the
+ # build.ps1/sh script this variable isn't automatically set.
+ $ci = $true
  . $PSScriptRoot\..\tools.ps1
 
  $ExtractPackage = {

eng/common/sdl/init-sdl.ps1

@@ -12,6 +12,10 @@ Set-StrictMode -Version 2.0
 $disableConfigureToolsetImport = $true
 $LASTEXITCODE = 0
 
+# `tools.ps1` checks $ci to perform some actions. Since the SDL
+# scripts don't necessarily execute in the same agent that run the
+# build.ps1/sh script this variable isn't automatically set.
+$ci = $true
 . $PSScriptRoot\..\tools.ps1
 
 # Don't display the console progress UI - it's a huge perf hit
@@ -58,6 +62,6 @@ try {
 }
 catch {
  Write-Host $_.ScriptStackTrace
- Write-PipelineTelemetryError -Category 'Sdl' -Message $_
+ Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
  ExitWithExitCode 1
 }

eng/common/sdl/push-gdn.ps1

@@ -12,6 +12,10 @@ $disableConfigureToolsetImport = $true
 $LASTEXITCODE = 0
 
 try {
+ # `tools.ps1` checks $ci to perform some actions. Since the SDL
+ # scripts don't necessarily execute in the same agent that run the
+ # build.ps1/sh script this variable isn't automatically set.
+ $ci = $true
  . $PSScriptRoot\..\tools.ps1
 
  # We create the temp directory where we'll store the sdl-config repository
@@ -62,4 +66,4 @@ catch {
  Write-Host $_.ScriptStackTrace
  Write-PipelineTelemetryError -Category 'Sdl' -Message $_
  ExitWithExitCode 1
-}
+}

eng/common/sdl/run-sdl.ps1

@@ -16,6 +16,10 @@ $disableConfigureToolsetImport = $true
 $LASTEXITCODE = 0
 
 try {
+ # `tools.ps1` checks $ci to perform some actions. Since the SDL
+ # scripts don't necessarily execute in the same agent that run the
+ # build.ps1/sh script this variable isn't automatically set.
+ $ci = $true
  . $PSScriptRoot\..\tools.ps1
 
  # We store config files in the r directory of .gdn
@@ -64,6 +68,6 @@ try {
 }
 catch {
  Write-Host $_.ScriptStackTrace
- Write-PipelineTelemetryError -Category 'Sdl' -Message $_
+ Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
  ExitWithExitCode 1
-}
+}

eng/common/templates/post-build/common-variables.yml

@@ -9,8 +9,8 @@ variables:
  - name: PublicDevRelease_31_Channel_Id
  value: 128
 
- # .NET Core 5 Dev
- - name: NetCore_5_Dev_Channel_Id
+ # .NET 5 Dev
+ - name: Net_5_Dev_Channel_Id
  value: 131
 
  # .NET Eng - Validation
@@ -96,4 +96,4 @@ variables:
  - name: skipComponentGovernanceDetection
  value: true
  - name: runCodesignValidationInjection
- value: false
+ value: false