Skip to content

Commit 8f0ff69

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20231110.1 (#428)
Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23553.1 -> To Version 9.0.0-beta.23560.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 2975ade commit 8f0ff69

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23553.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23560.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>1f067970472e5eb1877797bc4304dd13f284c7ba</Sha>
8+
<Sha>576b0a6fca70266087aa247d68896376ecec8c6e</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

eng/common/cross/toolchain.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
288288
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
289289
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
290290
endif()
291+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
292+
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
291293
elseif(TARGET_ARCH_NAME STREQUAL "x86")
292294
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
293295
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
@@ -335,6 +337,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
335337
if(TARGET_ARCH_NAME STREQUAL "armel")
336338
add_compile_options(-mfloat-abi=softfp)
337339
endif()
340+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
341+
add_compile_options("--target=${TOOLCHAIN}")
338342
elseif(TARGET_ARCH_NAME STREQUAL "x86")
339343
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
340344
add_compile_options(--target=${TOOLCHAIN})

eng/common/tools.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ function GetDotNetInstallScript {
310310
curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
311311
if command -v openssl &> /dev/null; then
312312
echo "Curl failed; dumping some information about dotnet.microsoft.com for later investigation"
313-
echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443
313+
echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443 || true
314314
fi
315315
echo "Will now retry the same URL with verbose logging."
316316
with_retries curl "$install_script_url" -sSL --verbose --retry 10 --create-dirs -o "$install_script" || {

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
}
1717
},
1818
"msbuild-sdks": {
19-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23553.1"
19+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23560.1"
2020
}
2121
}

0 commit comments

Comments
 (0)