From 33a8b886da52656e9a32a4faa3d1339a5dd55b98 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 26 Nov 2021 14:15:30 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
 build 20211126.2 (#12732)

[main] Update dependencies from dotnet/arcade
---
 eng/Version.Details.xml            | 12 ++++++------
 eng/Versions.props                 |  2 +-
 eng/common/native/init-compiler.sh | 10 ++++------
 global.json                        |  4 ++--
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c9cfb2fbf..977ed9698 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -172,19 +172,19 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21574.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21576.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>11fb2931671a47924e29b92e5fe06043fb3c6bbb</Sha>
+      <Sha>9c578f701e92c055ed752c3869a0f36c60630cea</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21574.3">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21576.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>11fb2931671a47924e29b92e5fe06043fb3c6bbb</Sha>
+      <Sha>9c578f701e92c055ed752c3869a0f36c60630cea</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21574.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21576.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>11fb2931671a47924e29b92e5fe06043fb3c6bbb</Sha>
+      <Sha>9c578f701e92c055ed752c3869a0f36c60630cea</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-alpha.1.21521.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 67a4e3370..e0e55c4bd 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21574.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21576.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh
index 03a996062..fd1d080e2 100644
--- a/eng/common/native/init-compiler.sh
+++ b/eng/common/native/init-compiler.sh
@@ -111,12 +111,10 @@ if [[ -z "$CC" ]]; then
     exit 1
 fi
 
-if [[ "$compiler" == "clang" ]]; then
-    if "$CC" -fuse-ld=lld -Wl,--version 2>&1; then
-        # Only lld version >= 9 can be considered stable
-        if [[ "$majorVersion" -ge 9 ]]; then
-            LDFLAGS="-fuse-ld=lld"
-        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
+        LDFLAGS="-fuse-ld=lld"
     fi
 fi
 
diff --git a/global.json b/global.json
index 5fad64b2c..8ef9ee947 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.21574.3",
-    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21574.3"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.2",
+    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21576.2"
   }
 }