mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[main] Update dependencies from dotnet/arcade (#16118)

Browse source 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This commit is contained in:
dotnet-maestro[bot] 2023-04-14 10:39:00 -07:00 committed by GitHub
parent 7888f170b3
commit 45779537ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
eng/Version.Details.xml
View file

@ -193,18 +193,18 @@
</Dependency>
</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>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23211.8">
<Dependency Name="Microsoft.DotNet.CMake.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.Installers" Version="8.0.0-beta.23211.8">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" 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.Darc" Version="1.1.0-beta.23128.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
@ -223,14 +223,14 @@
<Sha>94178e62553730ae42f6e02bb2f0ca45d9c3e28d</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23210.3" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23211.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>759f344923a0859f3fae83431d0ba1cc62108118</Sha>
<Sha>4cf2eb17c295905edeca76a9afe6dda42988359e</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23206.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23211.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>519d565b45c46ac452fe5a77ab63295138992e07</Sha>
<Sha>ce5066cd85c138c257a981f9c95257e9c577a5ee</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>

2
eng/Versions.props
View file

@ -33,7 +33,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23211.8</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23213.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

6
eng/common/cross/toolchain.cmake
View file

@ -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})

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23211.8",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23211.8"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23213.1",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23213.1"
}
}