Skip to content

Commit 27035e8

Browse files
dotnet-maestro[bot]ViktorHofer
dotnet-maestro[bot]
and
ViktorHofer
authored
[main] Update dependencies from dotnet/arcade (#2319)
* Update dependencies from https://github.com/dotnet/arcade build 20231220.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23572.2 -> To Version 8.0.0-beta.23620.2 * Update Version.Details.xml * Update System.CommandLine.NamingConventionBinder.Tests.csproj * Update System.CommandLine.Tests.csproj * Update dependencies from https://github.com/dotnet/arcade build 20240109.1 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23572.2 -> To Version 8.0.0-beta.24059.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
1 parent 498bbc1 commit 27035e8

22 files changed

+50
-86
lines changed

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23572.2">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24059.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>c5e5051496efbcc9046b25628666377d6b97a670</Sha>
13+
<Sha>8000dd1a9ad9017e0cd1e9fd079c42b6dd7e6962</Sha>
1414
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1515
</Dependency>
16-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23572.2">
17-
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>c5e5051496efbcc9046b25628666377d6b97a670</Sha>
16+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
17+
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
18+
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
19+
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
1920
</Dependency>
2021
</ToolsetDependencies>
2122
</Dependencies>

‎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' | grep -E '^llvm' | sort | tail -1 | sed 's/-[^-]*//2g')"
490+
search 'llvm*-libs' | 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: 0 additions & 9 deletions
This file was deleted.

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ case "$ARCH" in
2222
TIZEN_ARCH="x86_64"
2323
LINK_ARCH="x86"
2424
;;
25-
riscv64)
26-
TIZEN_ARCH="riscv64"
27-
LINK_ARCH="riscv"
28-
;;
2925
*)
3026
echo "Unsupported architecture for tizen: $ARCH"
3127
exit 1
@@ -62,21 +58,4 @@ rm -rf $TIZEN_TMP_DIR
6258
echo ">>Start configuring Tizen rootfs"
6359
ln -sfn asm-${LINK_ARCH} ./usr/include/asm
6460
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
8261
echo "<<Finish configuring Tizen rootfs"

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

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -156,28 +156,17 @@ 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-
167159
Inform "Initialize ${TIZEN_ARCH} base"
168-
fetch_tizen_pkgs_init standard $BASE
160+
fetch_tizen_pkgs_init standard Tizen-Base
169161
Inform "fetch common packages"
170162
fetch_tizen_pkgs ${TIZEN_ARCH} gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
171163
Inform "fetch coreclr packages"
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
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
176165
Inform "fetch corefx packages"
177166
fetch_tizen_pkgs ${TIZEN_ARCH} libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
178167

179168
Inform "Initialize standard unified"
180-
fetch_tizen_pkgs_init standard $UNIFIED
169+
fetch_tizen_pkgs_init standard Tizen-Unified
181170
Inform "fetch corefx packages"
182171
fetch_tizen_pkgs ${TIZEN_ARCH} gssdp gssdp-devel tizen-release
183172

‎eng/common/cross/toolchain.cmake‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ 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()
8683
endif()
8784
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
8885
set(CMAKE_SYSTEM_PROCESSOR s390x)
@@ -147,10 +144,6 @@ if(TIZEN)
147144
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
148145
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu)
149146
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()
154147
endif()
155148

156149
if(ANDROID)
@@ -277,7 +270,7 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
277270
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
278271
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
279272
endif()
280-
elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
273+
elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
281274
if(TIZEN)
282275
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
283276
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
@@ -288,8 +281,6 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
288281
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
289282
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
290283
endif()
291-
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
292-
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
293284
elseif(TARGET_ARCH_NAME STREQUAL "x86")
294285
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
295286
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
@@ -337,8 +328,6 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
337328
if(TARGET_ARCH_NAME STREQUAL "armel")
338329
add_compile_options(-mfloat-abi=softfp)
339330
endif()
340-
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
341-
add_compile_options("--target=${TOOLCHAIN}")
342331
elseif(TARGET_ARCH_NAME STREQUAL "x86")
343332
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
344333
add_compile_options(--target=${TOOLCHAIN})

‎eng/common/darc-init.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
param (
22
$darcVersion = $null,
3-
$versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16',
3+
$versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16',
44
$verbosity = 'minimal',
55
$toolpath = $null
66
)

‎eng/common/darc-init.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source="${BASH_SOURCE[0]}"
44
darcVersion=''
5-
versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16'
5+
versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16'
66
verbosity='minimal'
77

88
while [[ $# > 0 ]]; do

‎eng/common/post-build/add-build-to-channel.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ param(
22
[Parameter(Mandatory=$true)][int] $BuildId,
33
[Parameter(Mandatory=$true)][int] $ChannelId,
44
[Parameter(Mandatory=$true)][string] $MaestroApiAccessToken,
5-
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
5+
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
66
[Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16'
77
)
88

0 commit comments

Comments
 (0)