From 683afc454435c97ea6ee3d2b2a7066914dc2af8e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 16 Oct 2020 17:34:30 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20201014.1 (#705)
[master] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/common/cross/toolchain.cmake | 4 ++++
eng/common/performance/performance-setup.sh | 1 +
global.json | 2 +-
4 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 670e5496..974f29fa 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
-
+
https://github.com/dotnet/arcade
- f2f45f7a856fe4949735e574f7a0350bda48264f
+ d3cea00bba6539c68436ac9b3d9665318d76b47d
-
+
https://github.com/dotnet/arcade
- f2f45f7a856fe4949735e574f7a0350bda48264f
+ d3cea00bba6539c68436ac9b3d9665318d76b47d
-
+
https://github.com/dotnet/arcade
- f2f45f7a856fe4949735e574f7a0350bda48264f
+ d3cea00bba6539c68436ac9b3d9665318d76b47d
-
+
https://github.com/dotnet/arcade
- f2f45f7a856fe4949735e574f7a0350bda48264f
+ d3cea00bba6539c68436ac9b3d9665318d76b47d
-
+
https://github.com/dotnet/arcade
- f2f45f7a856fe4949735e574f7a0350bda48264f
+ d3cea00bba6539c68436ac9b3d9665318d76b47d
https://github.com/dotnet/arcade-services
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index 137736c0..8b437d8a 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -139,6 +139,10 @@ function(add_toolchain_linker_flag Flag)
set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
endfunction()
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib/${TOOLCHAIN}")
+ add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}")
+endif()
if(TARGET_ARCH_NAME STREQUAL "armel")
if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh
index 99d1b7bc..9c0f6c90 100755
--- a/eng/common/performance/performance-setup.sh
+++ b/eng/common/performance/performance-setup.sh
@@ -201,6 +201,7 @@ if [[ "$internal" == true ]]; then
fi
if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "false" ]]; then
+ configurations="$configurations LLVM=$llvm MonoInterpreter=$monointerpreter MonoAOT=$monoaot"
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoMono"
fi
diff --git a/global.json b/global.json
index 6c81a48e..4d70eaa9 100644
--- a/global.json
+++ b/global.json
@@ -11,6 +11,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20509.12"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20514.1"
}
}