Skip to content

Commit 8b47b98

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20230901.1 (#775)
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23425.2 -> To Version 8.0.0-beta.23451.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 0030d23 commit 8b47b98

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<Sha>529fbc2aad419d0c1551d6685cc68be33e62a996</Sha>
1212
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23425.2">
14+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23451.1">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>90c167d5c57de4a8bced566379dbd893556c94e8</Sha>
16+
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
1717
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1818
</Dependency>
1919
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="8.0.100-rc.2.23428.1">

eng/common/cross/toolchain.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ elseif(ILLUMOS)
207207
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
208208
elseif(HAIKU)
209209
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
210+
set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
210211

211212
set(TOOLSET_PREFIX ${TOOLCHAIN}-)
212213
function(locate_toolchain_exec exec var)
@@ -217,7 +218,6 @@ elseif(HAIKU)
217218
endif()
218219

219220
find_program(EXEC_LOCATION_${exec}
220-
PATHS "${CROSS_ROOTFS}/cross-tools-x86_64/bin"
221221
NAMES
222222
"${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}"
223223
"${TOOLSET_PREFIX}${exec}")

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "8.0.100-preview.7.23376.3"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23425.2",
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23451.1",
77
"Microsoft.Build.NoTargets": "3.7.0"
88
}
99
}

0 commit comments

Comments
 (0)