Skip to content

Commit 579f4b3

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20231018.2 (#51563)
[main] Update dependencies from dotnet/arcade
1 parent fb90c47 commit 579f4b3

File tree

13 files changed

+79
-31
lines changed

13 files changed

+79
-31
lines changed

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -371,26 +371,26 @@
371371
<Uri>https://github.com/dotnet/winforms</Uri>
372372
<Sha>ca34c2a81932120026bfd33d1a806c66fe6d42dc</Sha>
373373
</Dependency>
374-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23513.3">
374+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23518.2">
375375
<Uri>https://github.com/dotnet/arcade</Uri>
376-
<Sha>b69bec8f104b7223379292a9ab9adb43c6ce8b5e</Sha>
376+
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
377377
<SourceBuild RepoName="arcade" ManagedOnly="true" />
378378
</Dependency>
379-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23513.3">
379+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23518.2">
380380
<Uri>https://github.com/dotnet/arcade</Uri>
381-
<Sha>b69bec8f104b7223379292a9ab9adb43c6ce8b5e</Sha>
381+
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
382382
</Dependency>
383-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.23513.3">
383+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.23518.2">
384384
<Uri>https://github.com/dotnet/arcade</Uri>
385-
<Sha>b69bec8f104b7223379292a9ab9adb43c6ce8b5e</Sha>
385+
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
386386
</Dependency>
387-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23513.3">
387+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23518.2">
388388
<Uri>https://github.com/dotnet/arcade</Uri>
389-
<Sha>b69bec8f104b7223379292a9ab9adb43c6ce8b5e</Sha>
389+
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
390390
</Dependency>
391-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.23513.3">
391+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.23518.2">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>b69bec8f104b7223379292a9ab9adb43c6ce8b5e</Sha>
393+
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
394394
</Dependency>
395395
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-alpha.1.23510.5">
396396
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@
160160
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
161161
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
162162
<!-- Packages from dotnet/arcade -->
163-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.23513.3</MicrosoftDotNetBuildTasksInstallersVersion>
164-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.23513.3</MicrosoftDotNetBuildTasksTemplatingVersion>
165-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.23513.3</MicrosoftDotNetRemoteExecutorVersion>
163+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.23518.2</MicrosoftDotNetBuildTasksInstallersVersion>
164+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.23518.2</MicrosoftDotNetBuildTasksTemplatingVersion>
165+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.23518.2</MicrosoftDotNetRemoteExecutorVersion>
166166
<!-- Packages from dotnet/source-build-externals -->
167167
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.23509.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
168168
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ while [[ $# > 0 ]]; do
105105
-binarylog|-bl)
106106
binary_log=true
107107
;;
108-
-excludeCIBinarylog|-nobl)
108+
-excludecibinarylog|-nobl)
109109
exclude_ci_binary_log=true
110110
;;
111111
-pipelineslog|-pl)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ if [[ "$__CodeName" == "alpine" ]]; then
487487
-X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
488488
-X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
489489
-U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" \
490-
search 'llvm*-libs' | sort | tail -1 | sed 's/-[^-]*//2g')"
490+
search 'llvm*-libs' | grep -E '^llvm' | sort | tail -1 | sed 's/-[^-]*//2g')"
491491
fi
492492

493493
# install all packages in one go

‎eng/common/cross/riscv64/tizen/tizen.patch

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
2+
--- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900
3+
+++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900
4+
@@ -2,4 +2,4 @@
5+
Use the shared library, but some functions are only in
6+
the static library, so try that secondarily. */
7+
OUTPUT_FORMAT(elf64-littleriscv)
8+
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-riscv64-lp64d.so.1 ) )
9+
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-riscv64-lp64d.so.1 ) )

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ case "$ARCH" in
2222
TIZEN_ARCH="x86_64"
2323
LINK_ARCH="x86"
2424
;;
25+
riscv64)
26+
TIZEN_ARCH="riscv64"
27+
LINK_ARCH="riscv"
28+
;;
2529
*)
2630
echo "Unsupported architecture for tizen: $ARCH"
2731
exit 1
@@ -58,4 +62,21 @@ rm -rf $TIZEN_TMP_DIR
5862
echo ">>Start configuring Tizen rootfs"
5963
ln -sfn asm-${LINK_ARCH} ./usr/include/asm
6064
patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
65+
if [[ "$TIZEN_ARCH" == "riscv64" ]]; then
66+
echo "Fixing broken symlinks in $PWD"
67+
rm ./usr/lib64/libresolv.so
68+
ln -s ../../lib64/libresolv.so.2 ./usr/lib64/libresolv.so
69+
rm ./usr/lib64/libpthread.so
70+
ln -s ../../lib64/libpthread.so.0 ./usr/lib64/libpthread.so
71+
rm ./usr/lib64/libdl.so
72+
ln -s ../../lib64/libdl.so.2 ./usr/lib64/libdl.so
73+
rm ./usr/lib64/libutil.so
74+
ln -s ../../lib64/libutil.so.1 ./usr/lib64/libutil.so
75+
rm ./usr/lib64/libm.so
76+
ln -s ../../lib64/libm.so.6 ./usr/lib64/libm.so
77+
rm ./usr/lib64/librt.so
78+
ln -s ../../lib64/librt.so.1 ./usr/lib64/librt.so
79+
rm ./lib/ld-linux-riscv64-lp64d.so.1
80+
ln -s ../lib64/ld-linux-riscv64-lp64d.so.1 ./lib/ld-linux-riscv64-lp64d.so.1
81+
fi
6182
echo "<<Finish configuring Tizen rootfs"

‎eng/common/cross/tizen-fetch.sh

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,28 @@ fetch_tizen_pkgs()
156156
done
157157
}
158158

159+
if [ "$TIZEN_ARCH" == "riscv64" ]; then
160+
BASE="Tizen-Base-RISCV"
161+
UNIFIED="Tizen-Unified-RISCV"
162+
else
163+
BASE="Tizen-Base"
164+
UNIFIED="Tizen-Unified"
165+
fi
166+
159167
Inform "Initialize ${TIZEN_ARCH} base"
160-
fetch_tizen_pkgs_init standard Tizen-Base
168+
fetch_tizen_pkgs_init standard $BASE
161169
Inform "fetch common packages"
162170
fetch_tizen_pkgs ${TIZEN_ARCH} gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
163171
Inform "fetch coreclr packages"
164-
fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
172+
fetch_tizen_pkgs ${TIZEN_ARCH} libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
173+
if [ "$TIZEN_ARCH" != "riscv64" ]; then
174+
fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel
175+
fi
165176
Inform "fetch corefx packages"
166177
fetch_tizen_pkgs ${TIZEN_ARCH} libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
167178

168179
Inform "Initialize standard unified"
169-
fetch_tizen_pkgs_init standard Tizen-Unified
180+
fetch_tizen_pkgs_init standard $UNIFIED
170181
Inform "fetch corefx packages"
171182
fetch_tizen_pkgs ${TIZEN_ARCH} gssdp gssdp-devel tizen-release
172183

‎eng/common/cross/toolchain.cmake

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm")
4040
set(TOOLCHAIN "arm-linux-gnueabihf")
4141
endif()
4242
if(TIZEN)
43-
set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
43+
set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/13.1.0")
4444
endif()
4545
elseif(TARGET_ARCH_NAME STREQUAL "arm64")
4646
set(CMAKE_SYSTEM_PROCESSOR aarch64)
@@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
4949
elseif(LINUX)
5050
set(TOOLCHAIN "aarch64-linux-gnu")
5151
if(TIZEN)
52-
set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
52+
set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/13.1.0")
5353
endif()
5454
elseif(FREEBSD)
5555
set(triple "aarch64-unknown-freebsd12")
@@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel")
5858
set(CMAKE_SYSTEM_PROCESSOR armv7l)
5959
set(TOOLCHAIN "arm-linux-gnueabi")
6060
if(TIZEN)
61-
set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
61+
set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/13.1.0")
6262
endif()
6363
elseif(TARGET_ARCH_NAME STREQUAL "armv6")
6464
set(CMAKE_SYSTEM_PROCESSOR armv6l)
@@ -80,6 +80,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "riscv64")
8080
set(TOOLCHAIN "riscv64-alpine-linux-musl")
8181
else()
8282
set(TOOLCHAIN "riscv64-linux-gnu")
83+
if(TIZEN)
84+
set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu/13.1.0")
85+
endif()
8386
endif()
8487
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
8588
set(CMAKE_SYSTEM_PROCESSOR s390x)
@@ -95,7 +98,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
9598
elseif(LINUX)
9699
set(TOOLCHAIN "x86_64-linux-gnu")
97100
if(TIZEN)
98-
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
101+
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/13.1.0")
99102
endif()
100103
elseif(FREEBSD)
101104
set(triple "x86_64-unknown-freebsd12")
@@ -112,7 +115,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
112115
set(TOOLCHAIN "i686-linux-gnu")
113116
endif()
114117
if(TIZEN)
115-
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
118+
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/13.1.0")
116119
endif()
117120
else()
118121
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!")
@@ -144,6 +147,10 @@ if(TIZEN)
144147
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
145148
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu)
146149
endif()
150+
if(TARGET_ARCH_NAME STREQUAL "riscv64")
151+
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
152+
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/riscv64-tizen-linux-gnu)
153+
endif()
147154
endif()
148155

149156
if(ANDROID)
@@ -270,7 +277,7 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
270277
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
271278
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
272279
endif()
273-
elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
280+
elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
274281
if(TIZEN)
275282
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
276283
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")

‎eng/common/post-build/check-channel-consistency.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ try {
77
. $PSScriptRoot\post-build-utils.ps1
88

99
if ($PromoteToChannels -eq "") {
10-
Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info."
10+
Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info."
1111
ExitWithExitCode 0
1212
}
1313

‎eng/common/sdk-task.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.7.2-1" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

0 commit comments

Comments
 (0)