diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 492d70f1..09296a99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 https://github.com/dotnet/arcade-services diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index fd1d080e..e361e03f 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -2,6 +2,7 @@ # # This file detects the C/C++ compiler and exports it to the CC/CXX environment variables # +# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here! if [[ "$#" -lt 3 ]]; then echo "Usage..." @@ -113,7 +114,7 @@ fi # Only lld version >= 9 can be considered stable if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then - if "$CC" -fuse-ld=lld -Wl,--version 2>/dev/null; then + if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then LDFLAGS="-fuse-ld=lld" fi fi diff --git a/global.json b/global.json index cbf32aa4..e084c3c9 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.4" } }