Update dependencies from https://github.com/dotnet/arcade build 20230831.2 (#548)
[main] Update dependencies from dotnet/arcade
This commit is contained in:
Родитель
89e9041f1b
Коммит
a618ad627f
|
@ -3,9 +3,9 @@
|
|||
<ProductDependencies>
|
||||
</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.23431.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>804d586c07a6c598551a2913f0958680cb9135a9</Sha>
|
||||
<Sha>ec030fdef9faf8b2bd6f5f422545e8d8f7054e48</Sha>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
@ -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}")
|
||||
|
|
|
@ -3,6 +3,6 @@
|
|||
"dotnet": "8.0.100-preview.7.23376.3"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23429.1"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23431.2"
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче