diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe4d19e4449095..dc8c9f207ac65c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,69 +12,69 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d https://github.com/dotnet/command-line-api @@ -90,9 +90,9 @@ fa5acbd2ccba88c9d46ce0dd8f5310f9d3c5c46d - + https://github.com/dotnet/emsdk - 66dbaefff04250dc72849f0172e0c53bcfb3ab38 + 300725997600f884161d74f9889251ba842e44f5 @@ -107,9 +107,9 @@ - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 @@ -117,69 +117,69 @@ 194f32828726c3f1f63f79f3dc09b9e99c157b11 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 https://github.com/dotnet/runtime-assets @@ -233,61 +233,61 @@ https://github.com/dotnet/runtime-assets 99168dcff56809205e7ef8530d1256f3a07fab1f - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d - + https://github.com/dotnet/llvm-project - 9b77c16a6061fb1160ec12bd307badb4c58dff98 + 08a449c9a9bf593b29fc05de2f424e6882320e5d https://github.com/dotnet/runtime @@ -330,9 +330,9 @@ https://github.com/dotnet/xharness 480b9159eb7e69b182a87581d5a336e97e0b6dae - + https://github.com/dotnet/arcade - 804d586c07a6c598551a2913f0958680cb9135a9 + ec030fdef9faf8b2bd6f5f422545e8d8f7054e48 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 93153b418cab7c..9a002c988304bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,21 +85,21 @@ 8.0.100-preview.7.23329.3 - 8.0.0-beta.23429.1 - 8.0.0-beta.23429.1 - 8.0.0-beta.23429.1 - 8.0.0-beta.23429.1 - 8.0.0-beta.23429.1 - 2.5.1-beta.23429.1 - 8.0.0-beta.23429.1 - 8.0.0-beta.23429.1 - 8.0.0-beta.23429.1 - 8.0.0-beta.23429.1 - 8.0.0-beta.23429.1 - 8.0.0-beta.23429.1 - 8.0.0-beta.23429.1 - 8.0.0-beta.23429.1 - 8.0.0-beta.23429.1 + 8.0.0-beta.23431.2 + 8.0.0-beta.23431.2 + 8.0.0-beta.23431.2 + 8.0.0-beta.23431.2 + 8.0.0-beta.23431.2 + 2.5.1-beta.23431.2 + 8.0.0-beta.23431.2 + 8.0.0-beta.23431.2 + 8.0.0-beta.23431.2 + 8.0.0-beta.23431.2 + 8.0.0-beta.23431.2 + 8.0.0-beta.23431.2 + 8.0.0-beta.23431.2 + 8.0.0-beta.23431.2 + 8.0.0-beta.23431.2 6.0.0-preview.1.102 @@ -108,14 +108,14 @@ 8.0.0-rc.1.23406.6 8.0.0-preview.7.23325.2 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 6.0.0 1.1.1 @@ -222,38 +222,38 @@ 2.2.2 8.0.0-alpha.1.23412.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 - 8.0.0-rc.1.23415.5 + 8.0.0-rc.2.23431.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) 1.1.87-gba258badda 1.0.0-v3.14.0.5722 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 - 16.0.5-alpha.1.23408.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 + 16.0.5-alpha.1.23423.1 3.1.7 1.0.406601 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index a88d643c8a765e..0998e875e5f78d 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 bdd818850a3add..dddad47ca24240 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.7.23376.3" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23429.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23429.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23429.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23431.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23431.2", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23431.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"