From 305674eeedca1a0e48ef122b0d92191cba99f4be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Sep 2021 10:25:57 +0000 Subject: [PATCH 1/9] Update dependencies from https://github.com/dotnet/icu build 20210913.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 7.0.0-alpha.1.21430.1 -> To Version 7.0.0-alpha.1.21463.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b3b9219cb2f72..b3799c654c9b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 7a9473048bc72830468a444644bff9b3f9335822 + 5b0b5c219a368095392be86d0986422f95c28569 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index e567d77744766..284a1347880d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -171,7 +171,7 @@ 7.0.100-1.21460.1 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-alpha.1.21430.1 + 7.0.0-alpha.1.21463.1 6.0.0-preview.7.21458.1 From 9b3b8f9a31e80ad570d1521a5e0c020224831bcd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Sep 2021 10:26:27 +0000 Subject: [PATCH 2/9] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210913.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.2-alpha.0.21460.1 -> To Version 1.0.2-alpha.0.21463.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b3799c654c9b8..62c5cf0543221 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -222,9 +222,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 5a381ab01db422ea25a6ed23b61fab5d2a7cd748 - + https://github.com/dotnet/hotreload-utils - f91c066e8786615beda82f967d80e07cd4983049 + e21c997624c774c098e33111c5c8395ae1699f61 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 284a1347880d8..ebbacef7bb138 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -156,7 +156,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21460.2 1.0.0-prerelease.21460.2 - 1.0.2-alpha.0.21460.1 + 1.0.2-alpha.0.21463.1 2.4.1 2.4.2 1.3.0 From 2cbb0fa7213385566c369bc9a45d52a0a4311cbf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Sep 2021 10:26:55 +0000 Subject: [PATCH 3/9] Update dependencies from https://github.com/dotnet/llvm-project build 20210913.1 runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 11.1.0-alpha.1.21430.1 -> To Version 11.1.0-alpha.1.21463.1 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62c5cf0543221..cbb372539ff69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -126,37 +126,37 @@ https://github.com/dotnet/runtime-assets 0277a4eccfdc81728f8b750d75ed5110eb0289a0 - + https://github.com/dotnet/llvm-project - 3eb7f6877f525ceccf00f0fc03c7da9fb7d2400d + 35de2c8bd7ac4070a7524aeef4e4ada58452949b - + https://github.com/dotnet/llvm-project - 3eb7f6877f525ceccf00f0fc03c7da9fb7d2400d + 35de2c8bd7ac4070a7524aeef4e4ada58452949b - + https://github.com/dotnet/llvm-project - 3eb7f6877f525ceccf00f0fc03c7da9fb7d2400d + 35de2c8bd7ac4070a7524aeef4e4ada58452949b - + https://github.com/dotnet/llvm-project - 3eb7f6877f525ceccf00f0fc03c7da9fb7d2400d + 35de2c8bd7ac4070a7524aeef4e4ada58452949b - + https://github.com/dotnet/llvm-project - 3eb7f6877f525ceccf00f0fc03c7da9fb7d2400d + 35de2c8bd7ac4070a7524aeef4e4ada58452949b - + https://github.com/dotnet/llvm-project - 3eb7f6877f525ceccf00f0fc03c7da9fb7d2400d + 35de2c8bd7ac4070a7524aeef4e4ada58452949b - + https://github.com/dotnet/llvm-project - 3eb7f6877f525ceccf00f0fc03c7da9fb7d2400d + 35de2c8bd7ac4070a7524aeef4e4ada58452949b - + https://github.com/dotnet/llvm-project - 3eb7f6877f525ceccf00f0fc03c7da9fb7d2400d + 35de2c8bd7ac4070a7524aeef4e4ada58452949b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ebbacef7bb138..6b9537c3d5ee5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -175,14 +175,14 @@ 6.0.0-preview.7.21458.1 - 11.1.0-alpha.1.21430.1 - 11.1.0-alpha.1.21430.1 - 11.1.0-alpha.1.21430.1 - 11.1.0-alpha.1.21430.1 - 11.1.0-alpha.1.21430.1 - 11.1.0-alpha.1.21430.1 - 11.1.0-alpha.1.21430.1 - 11.1.0-alpha.1.21430.1 + 11.1.0-alpha.1.21463.1 + 11.1.0-alpha.1.21463.1 + 11.1.0-alpha.1.21463.1 + 11.1.0-alpha.1.21463.1 + 11.1.0-alpha.1.21463.1 + 11.1.0-alpha.1.21463.1 + 11.1.0-alpha.1.21463.1 + 11.1.0-alpha.1.21463.1 6.0.0-rc.1.21416.1 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From a54903e4fe3fcffc43103dae8d8d9bac0d571d33 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Sep 2021 10:27:24 +0000 Subject: [PATCH 4/9] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210914.6 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21460.6 -> To Version 1.0.0-prerelease.21464.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cbb372539ff69..86daa55909f46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,21 +206,21 @@ https://github.com/dotnet/arcade fa4a48044d33222537e6dbd000f8a2adaa7a15c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 5a381ab01db422ea25a6ed23b61fab5d2a7cd748 + 08b14ec510a3aba6e69fe5a3e6acc9408f1cd2dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 5a381ab01db422ea25a6ed23b61fab5d2a7cd748 + 08b14ec510a3aba6e69fe5a3e6acc9408f1cd2dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 5a381ab01db422ea25a6ed23b61fab5d2a7cd748 + 08b14ec510a3aba6e69fe5a3e6acc9408f1cd2dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 5a381ab01db422ea25a6ed23b61fab5d2a7cd748 + 08b14ec510a3aba6e69fe5a3e6acc9408f1cd2dd https://github.com/dotnet/hotreload-utils diff --git a/eng/Versions.props b/eng/Versions.props index 6b9537c3d5ee5..c437aab62e1f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,10 +127,10 @@ 7.0.0-beta.21460.3 7.0.0-beta.21460.3 - 1.0.0-prerelease.21460.6 - 1.0.0-prerelease.21460.6 - 1.0.0-prerelease.21460.6 - 1.0.0-prerelease.21460.6 + 1.0.0-prerelease.21464.6 + 1.0.0-prerelease.21464.6 + 1.0.0-prerelease.21464.6 + 1.0.0-prerelease.21464.6 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From 9b0ef5254e2fa82204482539eedacb1dd00f5d3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Sep 2021 10:28:18 +0000 Subject: [PATCH 5/9] Update dependencies from https://github.com/dotnet/arcade build 20210913.4 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 7.0.0-beta.21459.5 -> To Version 7.0.0-beta.21463.4 --- eng/Version.Details.xml | 72 +++++++------- eng/Versions.props | 28 +++--- eng/common/cross/build-rootfs.sh | 40 ++------ ...nd-native-compiler.sh => init-compiler.sh} | 98 ++++++++++--------- global.json | 8 +- 5 files changed, 114 insertions(+), 132 deletions(-) rename eng/common/native/{find-native-compiler.sh => init-compiler.sh} (52%) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86daa55909f46..1c2c087e6474c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,73 +14,73 @@ - + https://github.com/dotnet/arcade - fa4a48044d33222537e6dbd000f8a2adaa7a15c7 + 4b7c80f398fd3dcea03fdc4e454789b61181d300 - + https://github.com/dotnet/arcade - fa4a48044d33222537e6dbd000f8a2adaa7a15c7 + 4b7c80f398fd3dcea03fdc4e454789b61181d300 - + https://github.com/dotnet/arcade - fa4a48044d33222537e6dbd000f8a2adaa7a15c7 + 4b7c80f398fd3dcea03fdc4e454789b61181d300 - + https://github.com/dotnet/arcade - fa4a48044d33222537e6dbd000f8a2adaa7a15c7 + 4b7c80f398fd3dcea03fdc4e454789b61181d300 - + https://github.com/dotnet/arcade - fa4a48044d33222537e6dbd000f8a2adaa7a15c7 + 4b7c80f398fd3dcea03fdc4e454789b61181d300 - + https://github.com/dotnet/arcade - fa4a48044d33222537e6dbd000f8a2adaa7a15c7 + 4b7c80f398fd3dcea03fdc4e454789b61181d300 - + https://github.com/dotnet/arcade - fa4a48044d33222537e6dbd000f8a2adaa7a15c7 + 4b7c80f398fd3dcea03fdc4e454789b61181d300 - + https://github.com/dotnet/arcade - fa4a48044d33222537e6dbd000f8a2adaa7a15c7 + 4b7c80f398fd3dcea03fdc4e454789b61181d300 - + https://github.com/dotnet/arcade - fa4a48044d33222537e6dbd000f8a2adaa7a15c7 + 4b7c80f398fd3dcea03fdc4e454789b61181d300 - + https://github.com/dotnet/arcade - fa4a48044d33222537e6dbd000f8a2adaa7a15c7 + 4b7c80f398fd3dcea03fdc4e454789b61181d300 - + https://github.com/dotnet/arcade - fa4a48044d33222537e6dbd000f8a2adaa7a15c7 + 4b7c80f398fd3dcea03fdc4e454789b61181d300 - + https://github.com/dotnet/arcade - fa4a48044d33222537e6dbd000f8a2adaa7a15c7 + 4b7c80f398fd3dcea03fdc4e454789b61181d300 - + https://github.com/dotnet/arcade - fa4a48044d33222537e6dbd000f8a2adaa7a15c7 + 4b7c80f398fd3dcea03fdc4e454789b61181d300 - + https://github.com/dotnet/arcade - fa4a48044d33222537e6dbd000f8a2adaa7a15c7 + 4b7c80f398fd3dcea03fdc4e454789b61181d300 - + https://github.com/dotnet/arcade - fa4a48044d33222537e6dbd000f8a2adaa7a15c7 + 4b7c80f398fd3dcea03fdc4e454789b61181d300 - + https://github.com/dotnet/arcade - fa4a48044d33222537e6dbd000f8a2adaa7a15c7 + 4b7c80f398fd3dcea03fdc4e454789b61181d300 - + https://github.com/dotnet/arcade - fa4a48044d33222537e6dbd000f8a2adaa7a15c7 + 4b7c80f398fd3dcea03fdc4e454789b61181d300 https://github.com/microsoft/vstest @@ -202,9 +202,9 @@ https://github.com/dotnet/xharness fdcd4d95dcedd2cc88eaaf5674a9d8bb8aafb8a2 - + https://github.com/dotnet/arcade - fa4a48044d33222537e6dbd000f8a2adaa7a15c7 + 4b7c80f398fd3dcea03fdc4e454789b61181d300 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index c437aab62e1f9..bc7eed8da858f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,20 +53,20 @@ 1.0.0-rc.1.21459.41 - 7.0.0-beta.21459.5 - 7.0.0-beta.21459.5 - 7.0.0-beta.21459.5 - 7.0.0-beta.21459.5 - 7.0.0-beta.21459.5 - 7.0.0-beta.21459.5 - 2.5.1-beta.21459.5 - 7.0.0-beta.21459.5 - 7.0.0-beta.21459.5 - 7.0.0-beta.21459.5 - 7.0.0-beta.21459.5 - 7.0.0-beta.21459.5 - 7.0.0-beta.21459.5 - 7.0.0-beta.21459.5 + 7.0.0-beta.21463.4 + 7.0.0-beta.21463.4 + 7.0.0-beta.21463.4 + 7.0.0-beta.21463.4 + 7.0.0-beta.21463.4 + 7.0.0-beta.21463.4 + 2.5.1-beta.21463.4 + 7.0.0-beta.21463.4 + 7.0.0-beta.21463.4 + 7.0.0-beta.21463.4 + 7.0.0-beta.21463.4 + 7.0.0-beta.21463.4 + 7.0.0-beta.21463.4 + 7.0.0-beta.21463.4 6.0.0-preview.1.102 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 5c05b39f10197..6fa2c8aa5511d 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -6,7 +6,7 @@ usage() { echo "Usage: $0 [BuildArch] [CodeName] [lldbx.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.9 or alpine3.13. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." + 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: freebsd11, 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" @@ -32,9 +32,9 @@ __UbuntuPackages="build-essential" __AlpinePackages="alpine-base" __AlpinePackages+=" build-base" __AlpinePackages+=" linux-headers" -__AlpinePackagesEdgeCommunity=" lldb-dev" -__AlpinePackagesEdgeMain+=" python3" -__AlpinePackagesEdgeMain+=" libedit" +__AlpinePackages+=" lldb-dev" +__AlpinePackages+=" python3" +__AlpinePackages+=" libedit" # symlinks fixer __UbuntuPackages+=" symlinks" @@ -185,23 +185,17 @@ while :; do __UbuntuRepo= __Tizen=tizen ;; - alpine|alpine3.9) + alpine|alpine3.13) __CodeName=alpine __UbuntuRepo= - __AlpineVersion=3.9 - __AlpinePackagesEdgeMain+=" llvm11-libs" - __AlpinePackagesEdgeMain+=" clang-libs" + __AlpineVersion=3.13 + __AlpinePackages+=" llvm10-libs" ;; - alpine3.13) + alpine3.14) __CodeName=alpine __UbuntuRepo= - __AlpineVersion=3.13 - # Alpine 3.13 has all the packages we need in the 3.13 repository - __AlpinePackages+=$__AlpinePackagesEdgeCommunity - __AlpinePackagesEdgeCommunity= - __AlpinePackages+=$__AlpinePackagesEdgeMain - __AlpinePackagesEdgeMain= - __AlpinePackages+=" llvm10-libs" + __AlpineVersion=3.14 + __AlpinePackages+=" llvm11-libs" ;; freebsd11) __FreeBSDBase="11.3-RELEASE" @@ -279,20 +273,6 @@ if [[ "$__CodeName" == "alpine" ]]; then -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \ add $__AlpinePackages - if [[ -n "$__AlpinePackagesEdgeMain" ]]; then - $__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \ - -X http://dl-cdn.alpinelinux.org/alpine/edge/main \ - -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \ - add $__AlpinePackagesEdgeMain - fi - - if [[ -n "$__AlpinePackagesEdgeCommunity" ]]; then - $__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \ - -X http://dl-cdn.alpinelinux.org/alpine/edge/community \ - -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \ - add $__AlpinePackagesEdgeCommunity - fi - rm -r $__ApkToolsDir elif [[ "$__CodeName" == "freebsd" ]]; then mkdir -p $__RootfsDir/usr/local/etc diff --git a/eng/common/native/find-native-compiler.sh b/eng/common/native/init-compiler.sh similarity index 52% rename from eng/common/native/find-native-compiler.sh rename to eng/common/native/init-compiler.sh index 861d1931e55e3..1daadf32a524f 100644 --- a/eng/common/native/find-native-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -1,39 +1,32 @@ #!/usr/bin/env bash # -# This file locates the native compiler with the given name and version and sets the environment variables to locate it. +# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables # -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 )" - -if [ $# -lt 0 ] -then +if [[ "$#" -lt 2 ]]; then echo "Usage..." - echo "find-native-compiler.sh " + echo "init-compiler.sh " + echo "Specify the target architecture." echo "Specify the name of compiler (clang or gcc)." echo "Specify the major version of compiler." echo "Specify the minor version of compiler." exit 1 fi -. $scriptroot/../pipeline-logging-functions.sh +. "$( cd -P "$( dirname "$0" )" && pwd )"/../pipeline-logging-functions.sh -compiler="$1" +build_arch="$1" +compiler="$2" cxxCompiler="$compiler++" -majorVersion="$2" -minorVersion="$3" +majorVersion="$3" +minorVersion="$4" -if [ "$compiler" = "gcc" ]; then cxxCompiler="g++"; fi +# clear the existing CC and CXX from environment +CC= +CXX= +LDFLAGS= + +if [[ "$compiler" == "gcc" ]]; then cxxCompiler="g++"; fi check_version_exists() { desired_version=-1 @@ -50,38 +43,38 @@ check_version_exists() { echo "$desired_version" } -if [ -z "$CLR_CC" ]; then +if [[ -z "$CLR_CC" ]]; then # Set default versions - if [ -z "$majorVersion" ]; then + if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [ "$compiler" = "clang" ]; then versions=( 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) - elif [ "$compiler" = "gcc" ]; then versions=( 9 8 7 6 5 4.9 ); fi + if [[ "$compiler" == "clang" ]]; then versions=( 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + elif [[ "$compiler" == "gcc" ]]; then versions=( 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do parts=(${version//./ }) desired_version="$(check_version_exists "${parts[0]}" "${parts[1]}")" - if [ "$desired_version" != "-1" ]; then majorVersion="${parts[0]}"; break; fi + if [[ "$desired_version" != "-1" ]]; then majorVersion="${parts[0]}"; break; fi done - if [ -z "$majorVersion" ]; then + if [[ -z "$majorVersion" ]]; then if command -v "$compiler" > /dev/null; then - if [ "$(uname)" != "Darwin" ]; then + if [[ "$(uname)" != "Darwin" ]]; then Write-PipelineTelemetryError -category "Build" -type "warning" "Specific version of $compiler not found, falling back to use the one in PATH." fi - export CC="$(command -v "$compiler")" - export CXX="$(command -v "$cxxCompiler")" + CC="$(command -v "$compiler")" + CXX="$(command -v "$cxxCompiler")" else Write-PipelineTelemetryError -category "Build" "No usable version of $compiler found." exit 1 fi else - if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ]; then - if [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; then + if [[ "$compiler" == "clang" && "$majorVersion" -lt 5 ]]; then + if [[ "$build_arch" == "arm" || "$build_arch" == "armel" ]]; then if command -v "$compiler" > /dev/null; then Write-PipelineTelemetryError -category "Build" -type "warning" "Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH." - export CC="$(command -v "$compiler")" - export CXX="$(command -v "$cxxCompiler")" + CC="$(command -v "$compiler")" + CXX="$(command -v "$cxxCompiler")" else Write-PipelineTelemetryError -category "Build" "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH." exit 1 @@ -91,31 +84,40 @@ if [ -z "$CLR_CC" ]; then fi else desired_version="$(check_version_exists "$majorVersion" "$minorVersion")" - if [ "$desired_version" = "-1" ]; then + if [[ "$desired_version" == "-1" ]]; then Write-PipelineTelemetryError -category "Build" "Could not find specific version of $compiler: $majorVersion $minorVersion." exit 1 fi fi - if [ -z "$CC" ]; then - export CC="$(command -v "$compiler$desired_version")" - export CXX="$(command -v "$cxxCompiler$desired_version")" - if [ -z "$CXX" ]; then export CXX="$(command -v "$cxxCompiler")"; fi + if [[ -z "$CC" ]]; then + CC="$(command -v "$compiler$desired_version")" + CXX="$(command -v "$cxxCompiler$desired_version")" + if [[ -z "$CXX" ]]; then CXX="$(command -v "$cxxCompiler")"; fi fi else - if [ ! -f "$CLR_CC" ]; then + if [[ ! -f "$CLR_CC" ]]; then Write-PipelineTelemetryError -category "Build" "CLR_CC is set but path '$CLR_CC' does not exist" exit 1 fi - export CC="$CLR_CC" - export CXX="$CLR_CXX" + CC="$CLR_CC" + CXX="$CLR_CXX" fi -if [ -z "$CC" ]; then - Write-PipelineTelemetryError -category "Build" "Unable to find $compiler." +if [[ -z "$CC" ]]; then + Write-PipelineTelemetryError -category "Build" "Unable to find $compiler." exit 1 fi -export CCC_CC="$CC" -export CCC_CXX="$CXX" -export SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version")" +if [[ "$compiler" == "clang" ]]; then + if command -v "lld$desired_version" > /dev/null; then + # Only lld version >= 9 can be considered stable + if [[ "$majorVersion" -ge 9 ]]; then + LDFLAGS="-fuse-ld=lld" + fi + fi +fi + +SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version")" + +export CC CXX LDFLAGS SCAN_BUILD_COMMAND diff --git a/global.json b/global.json index 21e912c058025..4fec323b05864 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21459.5", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21459.5", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21459.5", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21459.5", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21463.4", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21463.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21463.4", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21463.4", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21456.1" From fdc7884fd4208d6594e5b70b93558ea6a83f1c6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Sep 2021 10:28:48 +0000 Subject: [PATCH 6/9] Update dependencies from https://github.com/dotnet/runtime-assets build 20210914.1 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.21460.3 -> To Version 7.0.0-beta.21464.1 --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c2c087e6474c..5cff4adaf836c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,45 +86,45 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 0277a4eccfdc81728f8b750d75ed5110eb0289a0 + d4cd815f54b09594e662d283c3886966586fe32f - + https://github.com/dotnet/runtime-assets - 0277a4eccfdc81728f8b750d75ed5110eb0289a0 + d4cd815f54b09594e662d283c3886966586fe32f - + https://github.com/dotnet/runtime-assets - 0277a4eccfdc81728f8b750d75ed5110eb0289a0 + d4cd815f54b09594e662d283c3886966586fe32f - + https://github.com/dotnet/runtime-assets - 0277a4eccfdc81728f8b750d75ed5110eb0289a0 + d4cd815f54b09594e662d283c3886966586fe32f - + https://github.com/dotnet/runtime-assets - 0277a4eccfdc81728f8b750d75ed5110eb0289a0 + d4cd815f54b09594e662d283c3886966586fe32f - + https://github.com/dotnet/runtime-assets - 0277a4eccfdc81728f8b750d75ed5110eb0289a0 + d4cd815f54b09594e662d283c3886966586fe32f - + https://github.com/dotnet/runtime-assets - 0277a4eccfdc81728f8b750d75ed5110eb0289a0 + d4cd815f54b09594e662d283c3886966586fe32f - + https://github.com/dotnet/runtime-assets - 0277a4eccfdc81728f8b750d75ed5110eb0289a0 + d4cd815f54b09594e662d283c3886966586fe32f - + https://github.com/dotnet/runtime-assets - 0277a4eccfdc81728f8b750d75ed5110eb0289a0 + d4cd815f54b09594e662d283c3886966586fe32f - + https://github.com/dotnet/runtime-assets - 0277a4eccfdc81728f8b750d75ed5110eb0289a0 + d4cd815f54b09594e662d283c3886966586fe32f https://github.com/dotnet/llvm-project @@ -226,9 +226,9 @@ https://github.com/dotnet/hotreload-utils e21c997624c774c098e33111c5c8395ae1699f61 - + https://github.com/dotnet/runtime-assets - 0277a4eccfdc81728f8b750d75ed5110eb0289a0 + d4cd815f54b09594e662d283c3886966586fe32f https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index bc7eed8da858f..a4628185498a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,17 +115,17 @@ 4.5.0 7.0.0-alpha.1.21456.1 - 7.0.0-beta.21460.3 - 7.0.0-beta.21460.3 - 7.0.0-beta.21460.3 - 7.0.0-beta.21460.3 - 7.0.0-beta.21460.3 - 7.0.0-beta.21460.3 - 7.0.0-beta.21460.3 - 7.0.0-beta.21460.3 - 7.0.0-beta.21460.3 - 7.0.0-beta.21460.3 - 7.0.0-beta.21460.3 + 7.0.0-beta.21464.1 + 7.0.0-beta.21464.1 + 7.0.0-beta.21464.1 + 7.0.0-beta.21464.1 + 7.0.0-beta.21464.1 + 7.0.0-beta.21464.1 + 7.0.0-beta.21464.1 + 7.0.0-beta.21464.1 + 7.0.0-beta.21464.1 + 7.0.0-beta.21464.1 + 7.0.0-beta.21464.1 1.0.0-prerelease.21464.6 1.0.0-prerelease.21464.6 From 36c11d8b5a5a1c34a26ee72f93c3321a1abff1fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Sep 2021 10:29:20 +0000 Subject: [PATCH 7/9] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20210914.20 Microsoft.CodeAnalysis.NetAnalyzers From Version 7.0.0-preview1.21460.1 -> To Version 7.0.0-preview1.21464.20 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5cff4adaf836c..e399413ae88ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,9 +230,9 @@ https://github.com/dotnet/runtime-assets d4cd815f54b09594e662d283c3886966586fe32f - + https://github.com/dotnet/roslyn-analyzers - 35ba66ee27276f966866d41c02602b8a2073fc8a + 897e65a14c24c9bf74109c9675f330cd215618be https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a4628185498a9..ef755a1269850 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,7 +49,7 @@ 3.10.0 3.10.0 - 7.0.0-preview1.21460.1 + 7.0.0-preview1.21464.20 1.0.0-rc.1.21459.41 From 006bacf10b3eb3eafdb1a06bd476c310ba4d81d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Sep 2021 12:10:12 +0000 Subject: [PATCH 8/9] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210915.4 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21460.6 -> To Version 1.0.0-prerelease.21465.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e399413ae88ab..df7b7a030451f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,21 +206,21 @@ https://github.com/dotnet/arcade 4b7c80f398fd3dcea03fdc4e454789b61181d300 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 08b14ec510a3aba6e69fe5a3e6acc9408f1cd2dd + e19d09877110b301750f58c9b2abf31445befa7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 08b14ec510a3aba6e69fe5a3e6acc9408f1cd2dd + e19d09877110b301750f58c9b2abf31445befa7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 08b14ec510a3aba6e69fe5a3e6acc9408f1cd2dd + e19d09877110b301750f58c9b2abf31445befa7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 08b14ec510a3aba6e69fe5a3e6acc9408f1cd2dd + e19d09877110b301750f58c9b2abf31445befa7c https://github.com/dotnet/hotreload-utils diff --git a/eng/Versions.props b/eng/Versions.props index ef755a1269850..e2cb7199b5f1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,10 +127,10 @@ 7.0.0-beta.21464.1 7.0.0-beta.21464.1 - 1.0.0-prerelease.21464.6 - 1.0.0-prerelease.21464.6 - 1.0.0-prerelease.21464.6 - 1.0.0-prerelease.21464.6 + 1.0.0-prerelease.21465.4 + 1.0.0-prerelease.21465.4 + 1.0.0-prerelease.21465.4 + 1.0.0-prerelease.21465.4 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From 99c0b4d190249897eab13aae7b092295a713858b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Sep 2021 13:33:44 +0000 Subject: [PATCH 9/9] Update dependencies from https://github.com/dotnet/xharness build 20210915.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21460.2 -> To Version 1.0.0-prerelease.21465.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 29083dc20b0c1..4775048d3d709 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21460.2", + "version": "1.0.0-prerelease.21465.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df7b7a030451f..b352d4e4a200b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,13 +194,13 @@ https://github.com/mono/linker 0c359eadea75bde0de74d784fdc45788b3668e73 - + https://github.com/dotnet/xharness - fdcd4d95dcedd2cc88eaaf5674a9d8bb8aafb8a2 + e045ce36ce5d46bbd44097592bcf1b69c5ca75a2 - + https://github.com/dotnet/xharness - fdcd4d95dcedd2cc88eaaf5674a9d8bb8aafb8a2 + e045ce36ce5d46bbd44097592bcf1b69c5ca75a2 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index e2cb7199b5f1c..15bc96c3fc36f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,8 +154,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21460.2 - 1.0.0-prerelease.21460.2 + 1.0.0-prerelease.21465.1 + 1.0.0-prerelease.21465.1 1.0.2-alpha.0.21463.1 2.4.1 2.4.2