diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ef33e6ebb23..65771dabbfa 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -58,14 +58,14 @@
-
+
https://github.com/dotnet/arcade
- 90c167d5c57de4a8bced566379dbd893556c94e8
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
-
+
https://github.com/dotnet/xliff-tasks
- ed9a83526483c094fb51e7000b6f816ce6cb0325
+ 194f32828726c3f1f63f79f3dc09b9e99c157b11
@@ -77,9 +77,9 @@
2fe37da588ea81d852d3a42e290f8da4d610882f
-
+
https://github.com/dotnet/arcade
- 90c167d5c57de4a8bced566379dbd893556c94e8
+ 1d451c32dda2314c721adbf8829e1c0cd4e681ff
diff --git a/eng/Versions.props b/eng/Versions.props
index 91dee9bdc4a..c8715dc2a0f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -47,7 +47,7 @@
Otherwise, this version of dotnet will not be installed and the build will error out. -->
$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))
4.2.0-1.22102.8
- 8.0.0-beta.23425.2
+ 8.0.0-beta.23463.1
7.0.0
6.0.0
4.8.0-3.23474.3
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index a88d643c8a7..0998e875e5f 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -207,6 +207,7 @@ elseif(ILLUMOS)
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
elseif(HAIKU)
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
+ set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
set(TOOLSET_PREFIX ${TOOLCHAIN}-)
function(locate_toolchain_exec exec var)
@@ -217,7 +218,6 @@ elseif(HAIKU)
endif()
find_program(EXEC_LOCATION_${exec}
- PATHS "${CROSS_ROOTFS}/cross-tools-x86_64/bin"
NAMES
"${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}"
"${TOOLSET_PREFIX}${exec}")
diff --git a/global.json b/global.json
index 4ec376b78fd..2b69538de3a 100644
--- a/global.json
+++ b/global.json
@@ -10,6 +10,6 @@
"xcopy-msbuild": "17.7.2"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23425.2"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1"
}
}
\ No newline at end of file