From 1fee2718655e836e9817e7b7d92512a8069ec896 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 26 Nov 2021 17:04:44 -0800
Subject: [PATCH] [main] Update dependencies from dotnet/arcade (#1735)

* Update dependencies from https://github.com/dotnet/arcade build 20211124.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21573.3 -> To Version 7.0.0-beta.21574.3

* Update dependencies from https://github.com/dotnet/arcade build 20211126.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.21573.3 -> To Version 7.0.0-beta.21576.2

* Don't run markdown lint on eng\common files

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jose Perez Rodriguez <joperezr@microsoft.com>
---
 .markdownlintignore                |  1 +
 eng/Version.Details.xml            | 12 ++++++------
 eng/Versions.props                 |  2 +-
 eng/common/README.md               |  2 +-
 eng/common/native/init-compiler.sh | 10 ++++------
 global.json                        |  4 ++--
 6 files changed, 15 insertions(+), 16 deletions(-)
 create mode 100644 .markdownlintignore

diff --git a/.markdownlintignore b/.markdownlintignore
new file mode 100644
index 00000000..497d3787
--- /dev/null
+++ b/.markdownlintignore
@@ -0,0 +1 @@
+eng/common/
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6cd85d33..850a742a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21573.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21576.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
+      <Sha>9c578f701e92c055ed752c3869a0f36c60630cea</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21573.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21576.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
+      <Sha>9c578f701e92c055ed752c3869a0f36c60630cea</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.21573.3">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.21576.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
+      <Sha>9c578f701e92c055ed752c3869a0f36c60630cea</Sha>
     </Dependency>
   </ToolsetDependencies>
   <!-- ProductDependencies -->
diff --git a/eng/Versions.props b/eng/Versions.props
index e68f42ba..f942355e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,7 +4,7 @@
     <!-- Disabling the check for End of live TFMs since we still target netcoreapp 2.1 -->
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
-    <MicrosoftDotNetGenAPIPackageVersion>7.0.0-beta.21573.3</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>7.0.0-beta.21576.2</MicrosoftDotNetGenAPIPackageVersion>
     <!-- dotnet/corefx dependencies -->
     <SystemDrawingCommonPackageVersion>5.0.3</SystemDrawingCommonPackageVersion>
     <SystemIOPortsPackageVersion>5.0.1</SystemIOPortsPackageVersion>
diff --git a/eng/common/README.md b/eng/common/README.md
index 3cdf61ce..ff49c371 100644
--- a/eng/common/README.md
+++ b/eng/common/README.md
@@ -25,4 +25,4 @@
 
 !!! Changes made in this directory are subject to being overwritten by automation !!!
 
-The files in this directory are shared by all Arcade repos and managed by automation. If you need to make changes to these files, open an issue or submit a pull request to <https://github.com/dotnet/arcade> first.
+The files in this directory are shared by all Arcade repos and managed by automation. If you need to make changes to these files, open an issue or submit a pull request to https://github.com/dotnet/arcade first.
diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh
index 03a99606..fd1d080e 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 47c46130..377e9d72 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "version": "6.0.100"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21573.3",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21573.3"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.2",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.2"
   }
 }
-- 
GitLab