Skip to content

Commit 17d39d5

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#272)
[main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.2.0-beta-23151-02 to 8.0.0-beta.23361.2 (parent: Microsoft.DotNet.Arcade.Sdk) - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.23151.1 to 1.0.0-beta.23368.1 (parent: Microsoft.DotNet.Arcade.Sdk) - Remove sourcelink dependencies
1 parent 793f1c8 commit 17d39d5

21 files changed

+330
-137
lines changed

‎eng/Tools.props‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,4 @@
55
<_RepoToolManifest Condition="'$(ContinuousIntegrationBuild)' == 'true'" />
66
</PropertyGroup>
77

8-
<ItemGroup>
9-
<!-- enable source link in pkgproj -->
10-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
11-
<PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="$(MicrosoftSourceLinkAzureReposGitVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
12-
</ItemGroup>
13-
148
</Project>

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,27 @@
1212
</Dependency>
1313
</ProductDependencies>
1414
<ToolsetDependencies>
15-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23159.1">
15+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23371.1">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>e4e5e16cf38c950ed835f8b223ebfdeca3e112aa</Sha>
17+
<Sha>602351e3681015ea789b2aeaa7b2a9156a8baf38</Sha>
1818
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1919
</Dependency>
20-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23159.1">
20+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23371.1">
2121
<Uri>https://github.com/dotnet/arcade</Uri>
22-
<Sha>cb64095ec45ac34378a1a26db9932a3b561f9e4e</Sha>
22+
<Sha>602351e3681015ea789b2aeaa7b2a9156a8baf38</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23159.1">
24+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23371.1">
2525
<Uri>https://github.com/dotnet/arcade</Uri>
26-
<Sha>cb64095ec45ac34378a1a26db9932a3b561f9e4e</Sha>
26+
<Sha>602351e3681015ea789b2aeaa7b2a9156a8baf38</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-23151-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
28+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23361.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
2929
<Uri>https://github.com/dotnet/sourcelink</Uri>
30-
<Sha>5585cd4cd5779bc7efdf3e2f19ed0bef50b15f7b</Sha>
30+
<Sha>d2e046aec870a5a7601cc51c5607f34463cc2d42</Sha>
3131
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23151.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
33+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23368.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
3434
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
35-
<Sha>95794aa6747aa08b79869e7dac06a9ac5d922ab2</Sha>
35+
<Sha>3aa0b2b84cab7d94b9136547563d027fd78e82a6</Sha>
3636
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
3737
</Dependency>
3838
</ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</PropertyGroup>
1818
<PropertyGroup>
1919
<!-- Arcade dependencies -->
20-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23159.1</MicrosoftDotNetBuildTasksFeedVersion>
21-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23159.1</MicrosoftDotNetCodeAnalysisVersion>
20+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23371.1</MicrosoftDotNetBuildTasksFeedVersion>
21+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23371.1</MicrosoftDotNetCodeAnalysisVersion>
2222
<!--
2323
These are used as reference assemblies only, so they must not take a ProdCon/source-build
2424
version. Insert "RefOnly" to avoid assignment via PVP.

‎eng/common/cross/arm/sources.list.xenial‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
88
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
99

1010
deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
11-
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse

‎eng/common/cross/arm64/sources.list.xenial‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
88
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
99

1010
deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
11-
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 107 additions & 59 deletions
Large diffs are not rendered by default.

‎eng/common/cross/toolchain.cmake‎

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ unset(FREEBSD)
66
unset(ILLUMOS)
77
unset(ANDROID)
88
unset(TIZEN)
9+
unset(HAIKU)
910

1011
set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
1112
if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
@@ -16,6 +17,7 @@ elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc)
1617
set(ILLUMOS 1)
1718
elseif(EXISTS ${CROSS_ROOTFS}/boot/system/develop/headers/config/HaikuConfig.h)
1819
set(CMAKE_SYSTEM_NAME Haiku)
20+
set(HAIKU 1)
1921
else()
2022
set(CMAKE_SYSTEM_NAME Linux)
2123
set(LINUX 1)
@@ -67,16 +69,30 @@ elseif(TARGET_ARCH_NAME STREQUAL "armv6")
6769
endif()
6870
elseif(TARGET_ARCH_NAME STREQUAL "ppc64le")
6971
set(CMAKE_SYSTEM_PROCESSOR ppc64le)
70-
set(TOOLCHAIN "powerpc64le-linux-gnu")
72+
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/powerpc64le-alpine-linux-musl)
73+
set(TOOLCHAIN "powerpc64le-alpine-linux-musl")
74+
else()
75+
set(TOOLCHAIN "powerpc64le-linux-gnu")
76+
endif()
7177
elseif(TARGET_ARCH_NAME STREQUAL "riscv64")
7278
set(CMAKE_SYSTEM_PROCESSOR riscv64)
73-
set(TOOLCHAIN "riscv64-linux-gnu")
79+
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/riscv64-alpine-linux-musl)
80+
set(TOOLCHAIN "riscv64-alpine-linux-musl")
81+
else()
82+
set(TOOLCHAIN "riscv64-linux-gnu")
83+
endif()
7484
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
7585
set(CMAKE_SYSTEM_PROCESSOR s390x)
76-
set(TOOLCHAIN "s390x-linux-gnu")
86+
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/s390x-alpine-linux-musl)
87+
set(TOOLCHAIN "s390x-alpine-linux-musl")
88+
else()
89+
set(TOOLCHAIN "s390x-linux-gnu")
90+
endif()
7791
elseif(TARGET_ARCH_NAME STREQUAL "x64")
7892
set(CMAKE_SYSTEM_PROCESSOR x86_64)
79-
if(LINUX)
93+
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/x86_64-alpine-linux-musl)
94+
set(TOOLCHAIN "x86_64-alpine-linux-musl")
95+
elseif(LINUX)
8096
set(TOOLCHAIN "x86_64-linux-gnu")
8197
if(TIZEN)
8298
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
@@ -86,11 +102,15 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
86102
elseif(ILLUMOS)
87103
set(TOOLCHAIN "x86_64-illumos")
88104
elseif(HAIKU)
89-
set(TOOLCHAIN "x64_64-unknown-haiku")
105+
set(TOOLCHAIN "x86_64-unknown-haiku")
90106
endif()
91107
elseif(TARGET_ARCH_NAME STREQUAL "x86")
92108
set(CMAKE_SYSTEM_PROCESSOR i686)
93-
set(TOOLCHAIN "i686-linux-gnu")
109+
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
110+
set(TOOLCHAIN "i586-alpine-linux-musl")
111+
else()
112+
set(TOOLCHAIN "i686-linux-gnu")
113+
endif()
94114
if(TIZEN)
95115
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
96116
endif()
@@ -196,10 +216,8 @@ elseif(HAIKU)
196216
return()
197217
endif()
198218

199-
set(SEARCH_PATH "${CROSS_ROOTFS}/generated/cross-tools-x86_64/bin")
200-
201219
find_program(EXEC_LOCATION_${exec}
202-
PATHS ${SEARCH_PATH}
220+
PATHS "${CROSS_ROOTFS}/cross-tools-x86_64/bin"
203221
NAMES
204222
"${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}"
205223
"${TOOLSET_PREFIX}${exec}")
@@ -264,8 +282,11 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
264282
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
265283
endif()
266284
elseif(TARGET_ARCH_NAME STREQUAL "x86")
285+
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
286+
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
287+
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}")
288+
endif()
267289
add_toolchain_linker_flag(-m32)
268-
269290
if(TIZEN)
270291
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
271292
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
@@ -275,11 +296,14 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
275296
elseif(ILLUMOS)
276297
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64")
277298
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/amd64/lib")
299+
elseif(HAIKU)
300+
add_toolchain_linker_flag("-lnetwork")
301+
add_toolchain_linker_flag("-lroot")
278302
endif()
279303

280304
# Specify compile options
281305

282-
if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU)
306+
if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU)
283307
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
284308
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
285309
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
@@ -298,10 +322,16 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
298322

299323
add_definitions (-DCLR_ARM_FPU_CAPABILITY=${CLR_ARM_FPU_CAPABILITY})
300324

325+
# persist variables across multiple try_compile passes
326+
list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES CLR_ARM_FPU_TYPE CLR_ARM_FPU_CAPABILITY)
327+
301328
if(TARGET_ARCH_NAME STREQUAL "armel")
302329
add_compile_options(-mfloat-abi=softfp)
303330
endif()
304331
elseif(TARGET_ARCH_NAME STREQUAL "x86")
332+
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
333+
add_compile_options(--target=${TOOLCHAIN})
334+
endif()
305335
add_compile_options(-m32)
306336
add_compile_options(-Wno-error=unused-command-line-argument)
307337
endif()

‎eng/common/cross/x64/sources.list.bionic‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://archive.ubuntu.com/ubuntu/ bionic main restricted universe
2+
deb-src http://archive.ubuntu.com/ubuntu/ bionic main restricted universe
3+
4+
deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe
5+
deb-src http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe
6+
7+
deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted
8+
deb-src http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted
9+
10+
deb http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse
11+
deb-src http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse

‎eng/common/cross/x64/sources.list.xenial‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://archive.ubuntu.com/ubuntu/ xenial main restricted universe
2+
deb-src http://archive.ubuntu.com/ubuntu/ xenial main restricted universe
3+
4+
deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe
5+
deb-src http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe
6+
7+
deb http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted
8+
deb-src http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted
9+
10+
deb http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse
11+
deb-src http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse

‎eng/common/dotnet-install.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ cpuname=$(uname -m)
5454
case $cpuname in
5555
arm64|aarch64)
5656
buildarch=arm64
57+
if [ "$(getconf LONG_BIT)" -lt 64 ]; then
58+
# This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
59+
buildarch=arm
60+
fi
5761
;;
5862
loongarch64)
5963
buildarch=loongarch64

0 commit comments

Comments
 (0)