Skip to content

Commit d7e2448

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20250503.1 (#726)
[dev] Update dependencies from dotnet/arcade
1 parent 7e807f8 commit d7e2448

File tree

6 files changed

+194
-18
lines changed

6 files changed

+194
-18
lines changed

‎eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@
7373
</Dependency>
7474
</ProductDependencies>
7575
<ToolsetDependencies>
76-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25225.4">
76+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25253.1">
7777
<Uri>https://github.com/dotnet/arcade</Uri>
78-
<Sha>5fb72aaffeff9c6f2ce46d3b226a84772fb72f55</Sha>
78+
<Sha>cdf9c563205c673b7df205e24564aa48dbc341c3</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25225.4">
80+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25253.1">
8181
<Uri>https://github.com/dotnet/arcade</Uri>
82-
<Sha>5fb72aaffeff9c6f2ce46d3b226a84772fb72f55</Sha>
82+
<Sha>cdf9c563205c673b7df205e24564aa48dbc341c3</Sha>
8383
</Dependency>
8484
</ToolsetDependencies>
8585
</Dependencies>

‎eng/common/core-templates/jobs/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ parameters:
1414
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
1515
defaultManagedPlatform:
1616
name: 'Managed'
17-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
17+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64'
1818

1919
# Defines the platforms on which to run build jobs. One job is created for each platform, and the
2020
# object in this array is sent to the job template as 'platform'. If no platforms are specified,

‎eng/common/core-templates/steps/source-build.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,3 @@ steps:
121121
continueOnError: true
122122
condition: succeededOrFailed()
123123
sbomEnabled: false # we don't need SBOM for logs
124-
125-
# Manually inject component detection so that we can ignore the source build upstream cache, which contains
126-
# a nupkg cache of input packages (a local feed).
127-
# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir'
128-
# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets
129-
- template: /eng/common/core-templates/steps/component-governance.yml
130-
parameters:
131-
displayName: Component Detection (Exclude upstream cache)
132-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
133-
componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
134-
disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }}

‎eng/common/cross/arm64/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-littleaarch64)
8+
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-aarch64.so.1 ) )
9+
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-aarch64.so.1 ) )

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

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
if [[ -z "${VERBOSE// }" ]] || [ "$VERBOSE" -ne "$VERBOSE" ] 2>/dev/null; then
5+
VERBOSE=0
6+
fi
7+
8+
Log()
9+
{
10+
if [ $VERBOSE -ge 1 ]; then
11+
echo ${@:2}
12+
fi
13+
}
14+
15+
Inform()
16+
{
17+
Log 1 -e "\x1B[0;34m$@\x1B[m"
18+
}
19+
20+
Debug()
21+
{
22+
Log 2 -e "\x1B[0;32m$@\x1B[m"
23+
}
24+
25+
Error()
26+
{
27+
>&2 Log 0 -e "\x1B[0;31m$@\x1B[m"
28+
}
29+
30+
Fetch()
31+
{
32+
URL=$1
33+
FILE=$2
34+
PROGRESS=$3
35+
if [ $VERBOSE -ge 1 ] && [ $PROGRESS ]; then
36+
CURL_OPT="--progress-bar"
37+
else
38+
CURL_OPT="--silent"
39+
fi
40+
curl $CURL_OPT $URL > $FILE
41+
}
42+
43+
hash curl 2> /dev/null || { Error "Require 'curl' Aborting."; exit 1; }
44+
hash xmllint 2> /dev/null || { Error "Require 'xmllint' Aborting."; exit 1; }
45+
hash sha256sum 2> /dev/null || { Error "Require 'sha256sum' Aborting."; exit 1; }
46+
47+
TMPDIR=$1
48+
if [ ! -d $TMPDIR ]; then
49+
TMPDIR=./tizen_tmp
50+
Debug "Create temporary directory : $TMPDIR"
51+
mkdir -p $TMPDIR
52+
fi
53+
54+
TIZEN_ARCH=$2
55+
56+
TIZEN_URL=http://download.tizen.org/snapshots/TIZEN/Tizen
57+
BUILD_XML=build.xml
58+
REPOMD_XML=repomd.xml
59+
PRIMARY_XML=primary.xml
60+
TARGET_URL="http://__not_initialized"
61+
62+
Xpath_get()
63+
{
64+
XPATH_RESULT=''
65+
XPATH=$1
66+
XML_FILE=$2
67+
RESULT=$(xmllint --xpath $XPATH $XML_FILE)
68+
if [[ -z ${RESULT// } ]]; then
69+
Error "Can not find target from $XML_FILE"
70+
Debug "Xpath = $XPATH"
71+
exit 1
72+
fi
73+
XPATH_RESULT=$RESULT
74+
}
75+
76+
fetch_tizen_pkgs_init()
77+
{
78+
TARGET=$1
79+
PROFILE=$2
80+
Debug "Initialize TARGET=$TARGET, PROFILE=$PROFILE"
81+
82+
TMP_PKG_DIR=$TMPDIR/tizen_${PROFILE}_pkgs
83+
if [ -d $TMP_PKG_DIR ]; then rm -rf $TMP_PKG_DIR; fi
84+
mkdir -p $TMP_PKG_DIR
85+
86+
PKG_URL=$TIZEN_URL/$PROFILE/latest
87+
88+
BUILD_XML_URL=$PKG_URL/$BUILD_XML
89+
TMP_BUILD=$TMP_PKG_DIR/$BUILD_XML
90+
TMP_REPOMD=$TMP_PKG_DIR/$REPOMD_XML
91+
TMP_PRIMARY=$TMP_PKG_DIR/$PRIMARY_XML
92+
TMP_PRIMARYGZ=${TMP_PRIMARY}.gz
93+
94+
Fetch $BUILD_XML_URL $TMP_BUILD
95+
96+
Debug "fetch $BUILD_XML_URL to $TMP_BUILD"
97+
98+
TARGET_XPATH="//build/buildtargets/buildtarget[@name=\"$TARGET\"]/repo[@type=\"binary\"]/text()"
99+
Xpath_get $TARGET_XPATH $TMP_BUILD
100+
TARGET_PATH=$XPATH_RESULT
101+
TARGET_URL=$PKG_URL/$TARGET_PATH
102+
103+
REPOMD_URL=$TARGET_URL/repodata/repomd.xml
104+
PRIMARY_XPATH='string(//*[local-name()="data"][@type="primary"]/*[local-name()="location"]/@href)'
105+
106+
Fetch $REPOMD_URL $TMP_REPOMD
107+
108+
Debug "fetch $REPOMD_URL to $TMP_REPOMD"
109+
110+
Xpath_get $PRIMARY_XPATH $TMP_REPOMD
111+
PRIMARY_XML_PATH=$XPATH_RESULT
112+
PRIMARY_URL=$TARGET_URL/$PRIMARY_XML_PATH
113+
114+
Fetch $PRIMARY_URL $TMP_PRIMARYGZ
115+
116+
Debug "fetch $PRIMARY_URL to $TMP_PRIMARYGZ"
117+
118+
gunzip $TMP_PRIMARYGZ
119+
120+
Debug "unzip $TMP_PRIMARYGZ to $TMP_PRIMARY"
121+
}
122+
123+
fetch_tizen_pkgs()
124+
{
125+
ARCH=$1
126+
PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)'
127+
128+
PACKAGE_CHECKSUM_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="checksum"]/text())'
129+
130+
for pkg in ${@:2}
131+
do
132+
Inform "Fetching... $pkg"
133+
XPATH=${PACKAGE_XPATH_TPL/_PKG_/$pkg}
134+
XPATH=${XPATH/_ARCH_/$ARCH}
135+
Xpath_get $XPATH $TMP_PRIMARY
136+
PKG_PATH=$XPATH_RESULT
137+
138+
XPATH=${PACKAGE_CHECKSUM_XPATH_TPL/_PKG_/$pkg}
139+
XPATH=${XPATH/_ARCH_/$ARCH}
140+
Xpath_get $XPATH $TMP_PRIMARY
141+
CHECKSUM=$XPATH_RESULT
142+
143+
PKG_URL=$TARGET_URL/$PKG_PATH
144+
PKG_FILE=$(basename $PKG_PATH)
145+
PKG_PATH=$TMPDIR/$PKG_FILE
146+
147+
Debug "Download $PKG_URL to $PKG_PATH"
148+
Fetch $PKG_URL $PKG_PATH true
149+
150+
echo "$CHECKSUM $PKG_PATH" | sha256sum -c - > /dev/null
151+
if [ $? -ne 0 ]; then
152+
Error "Fail to fetch $PKG_URL to $PKG_PATH"
153+
Debug "Checksum = $CHECKSUM"
154+
exit 1
155+
fi
156+
done
157+
}
158+
159+
BASE="Tizen-Base"
160+
UNIFIED="Tizen-Unified"
161+
162+
Inform "Initialize ${TIZEN_ARCH} base"
163+
fetch_tizen_pkgs_init standard $BASE
164+
Inform "fetch common packages"
165+
fetch_tizen_pkgs ${TIZEN_ARCH} gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
166+
Inform "fetch coreclr packages"
167+
fetch_tizen_pkgs ${TIZEN_ARCH} libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
168+
if [ "$TIZEN_ARCH" != "riscv64" ]; then
169+
fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel
170+
fi
171+
Inform "fetch corefx packages"
172+
fetch_tizen_pkgs ${TIZEN_ARCH} libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
173+
174+
Inform "Initialize standard unified"
175+
fetch_tizen_pkgs_init standard $UNIFIED
176+
Inform "fetch corefx packages"
177+
fetch_tizen_pkgs ${TIZEN_ARCH} gssdp gssdp-devel tizen-release
178+

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25225.4",
22-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25225.4"
21+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25253.1",
22+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25253.1"
2323
}
2424
}

0 commit comments

Comments
 (0)