Skip to content

Commit

Permalink
[release/8.0-rc1] Update dependencies from dotnet/arcade (#4345)
Browse files Browse the repository at this point in the history
* Update dependencies from https://github.com/dotnet/arcade build 20230831.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 8.0.0-beta.23429.1 -> To Version 8.0.0-beta.23431.2

* Update dependencies from https://github.com/dotnet/arcade build 20230901.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 8.0.0-beta.23429.1 -> To Version 8.0.0-beta.23451.1

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
  • Loading branch information
dotnet-maestro[bot] and dotnet-maestro[bot] committed Sep 3, 2023
1 parent b54ecf9 commit fc5fbf4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,13 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23429.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23451.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>804d586c07a6c598551a2913f0958680cb9135a9</Sha>
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23429.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23451.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>804d586c07a6c598551a2913f0958680cb9135a9</Sha>
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/common/cross/toolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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}")
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.2.0",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23429.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23429.1"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23451.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23451.1"
}
}

0 comments on commit fc5fbf4

Please sign in to comment.