diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a05c89d98..9f8f06969 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,33 +192,33 @@ - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 https://github.com/dotnet/source-build-reference-packages 3147e7ae7ba3ba499d4a2d18c8a4d89bab6769d0 - + https://github.com/dotnet/sourcelink - 4cfdefec78fbdebf53c10a62e9073ecb49e01869 + b74d568abf257cbac3d9a595e7223b25d8d6b90d - + https://github.com/dotnet/xliff-tasks - d528135ad7b01075fc9fc7364423c013ee64939a + 28617cebcd7f9615323b6db84ad871fa76db9004 diff --git a/eng/Versions.props b/eng/Versions.props index 2e8ac8c7f..f2e1c934a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.22221.2 + 7.0.0-beta.22222.4 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index e784c9c00..5a59dcff2 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -4,12 +4,13 @@ set -e usage() { - echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir ]" + echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir ]" echo "BuildArch can be: arm(default), armel, arm64, x86" 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." 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 "llvmx[.y] - optional, LLVM version for LLVM related packages." echo "--skipunmount - optional, will skip the unmount of rootfs folder." echo "--use-mirror - optional, use mirror URL to fetch resources, when available." exit 1 @@ -48,6 +49,7 @@ __AlpinePackages+=" gettext-dev" __AlpinePackages+=" icu-dev" __AlpinePackages+=" libunwind-dev" __AlpinePackages+=" lttng-ust-dev" +__AlpinePackages+=" compiler-rt-static" # CoreFX dependencies __UbuntuPackages+=" libcurl4-openssl-dev" @@ -164,6 +166,15 @@ while :; do no-lldb) unset __LLDB_Package ;; + llvm*) + version="$(echo "$lowerI" | tr -d '[:alpha:]-=')" + parts=(${version//./ }) + __LLVM_MajorVersion="${parts[0]}" + __LLVM_MinorVersion="${parts[1]}" + if [[ -z "$__LLVM_MinorVersion" && "$__LLVM_MajorVersion" -le 6 ]]; then + __LLVM_MinorVersion=0; + fi + ;; xenial) # Ubuntu 16.04 if [ "$__CodeName" != "jessie" ]; then __CodeName=xenial @@ -261,6 +272,10 @@ if [ "$__BuildArch" == "armel" ]; then fi __UbuntuPackages+=" ${__LLDB_Package:-}" +if [ ! -z "$__LLVM_MajorVersion" ]; then + __UbuntuPackages+=" libclang-common-${__LLVM_MajorVersion}${__LLVM_MinorVersion:+.$__LLVM_MinorVersion}-dev" +fi + if [ -z "$__RootfsDir" ] && [ ! -z "$ROOTFS_DIR" ]; then __RootfsDir=$ROOTFS_DIR fi diff --git a/global.json b/global.json index 8ebd61391..1a5ad7cd3 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22221.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22221.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22222.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22222.4" } }