From 79cccebc8fcfd158a98e31574810a0231cd4c38d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 31 Jul 2020 18:11:42 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
 build 20200724.1

Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.Arcade.Sdk
 From Version 5.0.0-beta.20364.3 -> To Version 5.0.0-beta.20374.1
---
 eng/Version.Details.xml          |  8 +++----
 eng/common/cross/toolchain.cmake | 41 ++++++++++++++++++++------------
 global.json                      |  4 ++--
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3b884cae68af..2995c7f56489 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -305,13 +305,13 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20377.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20374.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>22d6355c4f3c9ac00b0e3abf9d85f2fb07e4787b</Sha>
+      <Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20364.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20374.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
+      <Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-2.20379.3">
       <Uri>https://github.com/dotnet/roslyn</Uri>
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index 88a758afb19c..b9fe796f0da7 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -127,29 +127,40 @@ endif()
 
 # Specify link flags
 
+function(add_toolchain_linker_flag Flag)
+  set(Config "${ARGV1}")
+  set(CONFIG_SUFFIX "")
+  if (NOT Config STREQUAL "")
+    set(CONFIG_SUFFIX "_${Config}")
+  endif()
+  set("CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
+  set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
+endfunction()
+
+
 if(TARGET_ARCH_NAME STREQUAL "armel")
   if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
-    add_link_options("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
-    add_link_options("-L${CROSS_ROOTFS}/lib")
-    add_link_options("-L${CROSS_ROOTFS}/usr/lib")
-    add_link_options("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
+    add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
+    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
+    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
+    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm64")
   if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
-    add_link_options("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
-    add_link_options("-L${CROSS_ROOTFS}/lib64")
-    add_link_options("-L${CROSS_ROOTFS}/usr/lib64")
-    add_link_options("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
-
-    add_link_options("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64")
-    add_link_options("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
-    add_link_options("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
+    add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
+    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
+    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64")
+    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
+
+    add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64")
+    add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
+    add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "x86")
-  add_link_options(-m32)
+  add_toolchain_linker_flag(-m32)
 elseif(ILLUMOS)
-   add_link_options("-L${CROSS_ROOTFS}/lib/amd64")
-   add_link_options("-L${CROSS_ROOTFS}/usr/amd64/lib")
+  add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64")
+  add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/amd64/lib")
 endif()
 
 # Specify compile options
diff --git a/global.json b/global.json
index 6496dffe47d9..43ce9ccf9d90 100644
--- a/global.json
+++ b/global.json
@@ -30,7 +30,7 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.15.2",
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20377.2",
-    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20364.3"
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20374.1",
+    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20374.1"
   }
 }