diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 33d6692bb..8c763a677 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -193,18 +193,18 @@
-
+
https://github.com/dotnet/arcade
- 17d9eee32f20a6af0ebb620254a22f601d159578
+ fb14cae30eacbe844468ac297b3d4c61e0bb9dc0
-
+
https://github.com/dotnet/arcade
- 17d9eee32f20a6af0ebb620254a22f601d159578
+ fb14cae30eacbe844468ac297b3d4c61e0bb9dc0
-
+
https://github.com/dotnet/arcade
- 17d9eee32f20a6af0ebb620254a22f601d159578
+ fb14cae30eacbe844468ac297b3d4c61e0bb9dc0
https://github.com/dotnet/arcade-services
@@ -223,14 +223,14 @@
94178e62553730ae42f6e02bb2f0ca45d9c3e28d
-
+
https://github.com/dotnet/sourcelink
- 759f344923a0859f3fae83431d0ba1cc62108118
+ 4cf2eb17c295905edeca76a9afe6dda42988359e
-
+
https://github.com/dotnet/xliff-tasks
- 519d565b45c46ac452fe5a77ab63295138992e07
+ ce5066cd85c138c257a981f9c95257e9c577a5ee
diff --git a/eng/Versions.props b/eng/Versions.props
index 08a27856c..e75521aad 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -33,7 +33,7 @@
- 8.0.0-beta.23211.8
+ 8.0.0-beta.23213.1
diff --git a/eng/common/cross/arm/sources.list.xenial b/eng/common/cross/arm/sources.list.xenial
index eacd86b7d..56fbb36a5 100644
--- a/eng/common/cross/arm/sources.list.xenial
+++ b/eng/common/cross/arm/sources.list.xenial
@@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
-deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
\ No newline at end of file
+deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
diff --git a/eng/common/cross/arm64/sources.list.xenial b/eng/common/cross/arm64/sources.list.xenial
index eacd86b7d..56fbb36a5 100644
--- a/eng/common/cross/arm64/sources.list.xenial
+++ b/eng/common/cross/arm64/sources.list.xenial
@@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
-deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
\ No newline at end of file
+deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index d813dde6d..1c9d212d1 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -76,7 +76,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "s390x")
set(TOOLCHAIN "s390x-linux-gnu")
elseif(TARGET_ARCH_NAME STREQUAL "x64")
set(CMAKE_SYSTEM_PROCESSOR x86_64)
- if(LINUX)
+ if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/x86_64-alpine-linux-musl)
+ set(TOOLCHAIN "x86_64-alpine-linux-musl")
+ elseif(LINUX)
set(TOOLCHAIN "x86_64-linux-gnu")
if(TIZEN)
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
@@ -279,7 +281,7 @@ endif()
# Specify compile options
-if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU)
+if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU)
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
diff --git a/global.json b/global.json
index 97875b19a..c1a43a70a 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23211.8",
- "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23211.8"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23213.1",
+ "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23213.1"
}
}