diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e59ee1ed104e2..8faaf40f8140b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 https://github.com/microsoft/vstest @@ -254,9 +254,9 @@ https://github.com/dotnet/xharness 7871eb473366b7246d628ba30bfc70dd84f8dbb9 - + https://github.com/dotnet/arcade - bd18f30f71daf7eaaf1d70363c303bd7dfac65a2 + 2da4f9da491ecf07fe08d8a117f3265a0433fc23 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index f1d21ca9c68bc6..ed55666ac8dd5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 2.0.0-preview.4.22252.4 - 7.0.0-beta.22362.1 - 7.0.0-beta.22362.1 - 7.0.0-beta.22362.1 - 7.0.0-beta.22362.1 - 7.0.0-beta.22362.1 - 7.0.0-beta.22362.1 - 2.5.1-beta.22362.1 - 7.0.0-beta.22362.1 - 7.0.0-beta.22362.1 - 7.0.0-beta.22362.1 - 7.0.0-beta.22362.1 - 7.0.0-beta.22362.1 - 7.0.0-beta.22362.1 - 7.0.0-beta.22362.1 - 7.0.0-beta.22362.1 - 7.0.0-beta.22362.1 + 7.0.0-beta.22370.1 + 7.0.0-beta.22370.1 + 7.0.0-beta.22370.1 + 7.0.0-beta.22370.1 + 7.0.0-beta.22370.1 + 7.0.0-beta.22370.1 + 2.5.1-beta.22370.1 + 7.0.0-beta.22370.1 + 7.0.0-beta.22370.1 + 7.0.0-beta.22370.1 + 7.0.0-beta.22370.1 + 7.0.0-beta.22370.1 + 7.0.0-beta.22370.1 + 7.0.0-beta.22370.1 + 7.0.0-beta.22370.1 + 7.0.0-beta.22370.1 6.0.0-preview.1.102 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 5a59dcff28fb35..c8540474aa13fa 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -5,7 +5,7 @@ set -e usage() { echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir ]" - echo "BuildArch can be: arm(default), armel, arm64, x86" + echo "BuildArch can be: arm(default), armel, arm64, x86, x64" echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." echo " for FreeBSD can be: freebsd12, freebsd13" echo " for illumos can be: illumos." @@ -21,6 +21,9 @@ __CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) __InitialDir=$PWD __BuildArch=arm __AlpineArch=armv7 +__FreeBSDArch=arm +__FreeBSDMachineArch=armv7 +__IllumosArch=arm7 __QEMUArch=arm __UbuntuArch=armhf __UbuntuRepo="http://ports.ubuntu.com/" @@ -115,6 +118,8 @@ while :; do __UbuntuArch=arm64 __AlpineArch=aarch64 __QEMUArch=aarch64 + __FreeBSDArch=arm64 + __FreeBSDMachineArch=aarch64 ;; armel) __BuildArch=armel @@ -140,6 +145,14 @@ while :; do __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//') unset __LLDB_Package ;; + x64) + __BuildArch=x64 + __UbuntuArch=amd64 + __FreeBSDArch=amd64 + __FreeBSDMachineArch=amd64 + __illumosArch=x86_64 + __UbuntuRepo= + ;; x86) __BuildArch=x86 __UbuntuArch=i386 @@ -205,11 +218,6 @@ while :; do __LLDB_Package="liblldb-6.0-dev" ;; tizen) - if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ] && [ "$__BuildArch" != "x86" ] ; then - echo "Tizen is available only for arm, armel, arm64 and x86." - usage; - exit 1; - fi __CodeName= __UbuntuRepo= __Tizen=tizen @@ -228,19 +236,16 @@ while :; do ;; freebsd12) __CodeName=freebsd - __BuildArch=x64 __SkipUnmount=1 ;; freebsd13) __CodeName=freebsd __FreeBSDBase="13.0-RELEASE" __FreeBSDABI="13" - __BuildArch=x64 __SkipUnmount=1 ;; illumos) __CodeName=illumos - __BuildArch=x64 __SkipUnmount=1 ;; --skipunmount) @@ -312,8 +317,8 @@ if [[ "$__CodeName" == "alpine" ]]; then elif [[ "$__CodeName" == "freebsd" ]]; then mkdir -p $__RootfsDir/usr/local/etc JOBS="$(getconf _NPROCESSORS_ONLN)" - 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 - echo "ABI = \"FreeBSD:${__FreeBSDABI}:amd64\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > ${__RootfsDir}/usr/local/etc/pkg.conf + wget -O - https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz | tar -C $__RootfsDir -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version + echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; 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 @@ -335,7 +340,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then echo "Building binutils. Please wait.." wget -O - https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf - mkdir build-binutils && cd build-binutils - ../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="x86_64-sun-solaris2.10" --program-prefix="x86_64-illumos-" --with-sysroot="$__RootfsDir" + ../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" make -j "$JOBS" && make install && cd .. echo "Building gcc. Please wait.." wget -O - https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf - @@ -345,7 +350,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then CFLAGS_FOR_TARGET="-fPIC" export CFLAGS CXXFLAGS CXXFLAGS_FOR_TARGET CFLAGS_FOR_TARGET mkdir build-gcc && cd build-gcc - ../gcc-8.4.0/configure --prefix="$__RootfsDir" --target="x86_64-sun-solaris2.10" --program-prefix="x86_64-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \ + ../gcc-8.4.0/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \ --with-gnu-ld --disable-nls --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv --disable-libcilkrts --disable-libada --disable-libsanitizer \ --disable-libquadmath-support --disable-shared --enable-tls make -j "$JOBS" && make install && cd .. @@ -353,7 +358,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then if [[ "$__UseMirror" == 1 ]]; then BaseUrl=http://pkgsrc.smartos.skylime.net fi - BaseUrl="$BaseUrl"/packages/SmartOS/2020Q1/x86_64/All + BaseUrl="$BaseUrl"/packages/SmartOS/2020Q1/${__illumosArch}/All echo "Downloading dependencies." read -ra array <<<"$__IllumosPackages" for package in "${array[@]}"; do diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index eaeeab38fa1f32..d5dfc13504b1f5 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -48,11 +48,13 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl) set(TOOLCHAIN "aarch64-alpine-linux-musl") - else() + elseif(LINUX) set(TOOLCHAIN "aarch64-linux-gnu") - endif() - if(TIZEN) - set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") + if(TIZEN) + set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") + endif() + elseif(FREEBSD) + set(triple "aarch64-unknown-freebsd12") endif() elseif(TARGET_ARCH_NAME STREQUAL "ppc64le") set(CMAKE_SYSTEM_PROCESSOR ppc64le) @@ -66,12 +68,18 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") if(TIZEN) set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") endif() -elseif (FREEBSD) - set(CMAKE_SYSTEM_PROCESSOR "x86_64") - set(triple "x86_64-unknown-freebsd12") -elseif (ILLUMOS) - set(CMAKE_SYSTEM_PROCESSOR "x86_64") - set(TOOLCHAIN "x86_64-illumos") +elseif(TARGET_ARCH_NAME STREQUAL "x64") + set(CMAKE_SYSTEM_PROCESSOR x86_64) + if(LINUX) + set(TOOLCHAIN "x86_64-linux-gnu") + if(TIZEN) + set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0") + endif() + elseif(FREEBSD) + set(triple "x86_64-unknown-freebsd12") + elseif(ILLUMOS) + set(TOOLCHAIN "x86_64-illumos") + endif() else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, armv6, arm64, ppc64le, s390x and x86 are supported!") endif() @@ -218,7 +226,7 @@ endif() # Specify compile options -if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|ppc64le|s390x)$" AND NOT ANDROID) OR ILLUMOS) +if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|ppc64le|s390x)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS) set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 index a733a8885824a9..3e5c1c74a1c50d 100644 --- a/eng/common/generate-sbom-prep.ps1 +++ b/eng/common/generate-sbom-prep.ps1 @@ -2,6 +2,8 @@ Param( [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed ) +. $PSScriptRoot\pipeline-logging-functions.ps1 + Write-Host "Creating dir $ManifestDirPath" # create directory for sbom manifest to be placed if (!(Test-Path -path $ManifestDirPath)) diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh index f6c77453142a28..d5c76dc827b496 100644 --- a/eng/common/generate-sbom-prep.sh +++ b/eng/common/generate-sbom-prep.sh @@ -2,6 +2,18 @@ source="${BASH_SOURCE[0]}" +# resolve $SOURCE until the file is no longer a symlink +while [[ -h $source ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" +. $scriptroot/pipeline-logging-functions.sh + manifest_dir=$1 if [ ! -d "$manifest_dir" ] ; then diff --git a/global.json b/global.json index 99119648099f10..ab775bb11f267e 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-preview.5.22307.18" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22362.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22362.1", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22362.1", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22370.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22370.1", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22370.1", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-preview.7.22358.7"