Browse Source

Update dependencies from https://github.com/dotnet/arcade build 20230413.1 (#1571)

[main] Update dependencies from dotnet/arcade
pull/1573/head
dotnet-maestro[bot] 3 years ago
committed by GitHub
parent
commit
b522c16ae3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      eng/Version.Details.xml
  2. 6
      eng/common/cross/toolchain.cmake
  3. 2
      global.json

20
eng/Version.Details.xml

@ -3,25 +3,25 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23211.8">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>17d9eee32f20a6af0ebb620254a22f601d159578</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23211.8">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>17d9eee32f20a6af0ebb620254a22f601d159578</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23211.8">
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>17d9eee32f20a6af0ebb620254a22f601d159578</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23211.8">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>17d9eee32f20a6af0ebb620254a22f601d159578</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.23211.8">
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.23213.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>17d9eee32f20a6af0ebb620254a22f601d159578</Sha>
<Sha>fb14cae30eacbe844468ac297b3d4c61e0bb9dc0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
<Uri>https://github.com/dotnet/arcade-services</Uri>

6
eng/common/cross/toolchain.cmake

@ -76,7 +76,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "s390x")
set(TOOLCHAIN "s390x-linux-gnu")
elseif(TARGET_ARCH_NAME STREQUAL "x64")
set(CMAKE_SYSTEM_PROCESSOR x86_64)
if(LINUX)
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/x86_64-alpine-linux-musl)
set(TOOLCHAIN "x86_64-alpine-linux-musl")
elseif(LINUX)
set(TOOLCHAIN "x86_64-linux-gnu")
if(TIZEN)
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
@ -279,7 +281,7 @@ endif()
# Specify compile options
if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU)
if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU)
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})

2
global.json

@ -14,6 +14,6 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23211.8"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23213.1"
}
}

Loading…
Cancel
Save