diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1d8c5cfd9..c4013dc7c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,17 +3,17 @@
-
+
https://github.com/dotnet/arcade
- 1f067970472e5eb1877797bc4304dd13f284c7ba
+ 576b0a6fca70266087aa247d68896376ecec8c6e
-
+
https://github.com/dotnet/arcade
- 1f067970472e5eb1877797bc4304dd13f284c7ba
+ 576b0a6fca70266087aa247d68896376ecec8c6e
-
+
https://github.com/dotnet/arcade
- 1f067970472e5eb1877797bc4304dd13f284c7ba
+ 576b0a6fca70266087aa247d68896376ecec8c6e
diff --git a/eng/Versions.props b/eng/Versions.props
index 41187cc58..9cc7de86b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -14,6 +14,6 @@
8.0.0-rc.1.23419.4
8.0.0-rc.1.23419.4
- 9.0.0-beta.23553.1
+ 9.0.0-beta.23560.1
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index 00288a300..3762640fd 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -288,6 +288,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
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 "s390x")
+ add_toolchain_linker_flag("--target=${TOOLCHAIN}")
elseif(TARGET_ARCH_NAME STREQUAL "x86")
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
@@ -335,6 +337,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
if(TARGET_ARCH_NAME STREQUAL "armel")
add_compile_options(-mfloat-abi=softfp)
endif()
+elseif(TARGET_ARCH_NAME STREQUAL "s390x")
+ add_compile_options("--target=${TOOLCHAIN}")
elseif(TARGET_ARCH_NAME STREQUAL "x86")
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
add_compile_options(--target=${TOOLCHAIN})
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index e7ec245bc..e98daf50c 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -310,7 +310,7 @@ function GetDotNetInstallScript {
curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
if command -v openssl &> /dev/null; then
echo "Curl failed; dumping some information about dotnet.microsoft.com for later investigation"
- echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443
+ echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443 || true
fi
echo "Will now retry the same URL with verbose logging."
with_retries curl "$install_script_url" -sSL --verbose --retry 10 --create-dirs -o "$install_script" || {
diff --git a/global.json b/global.json
index 1e4ef0a24..df2f731e6 100644
--- a/global.json
+++ b/global.json
@@ -16,7 +16,7 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23553.1",
- "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23553.1"
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23560.1",
+ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23560.1"
}
}