Skip to content
This repository was archived by the owner on Dec 23, 2024. It is now read-only.

Commit f00c951

Browse files
dotnet-maestro[bot]brettfo
authored and
nosami
committed
[master] Update dependencies from dotnet/arcade (dotnet#9710)
* Update dependencies from https://github.com/dotnet/arcade build 20200714.3 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20316.1 -> To Version 5.0.0-beta.20364.3 * remain on 3.1 sdk Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Brett V. Forsgren <[email protected]>
1 parent d25b7a1 commit f00c951

20 files changed

+421
-78
lines changed

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20326.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20364.3">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>ed69753a3ffbdaa08365252c710d57a64d17f859</Sha>
8+
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,16 @@ $userName = "dn-bot"
128128
# Insert credential nodes for Maestro's private feeds
129129
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password
130130

131-
$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']")
132-
if ($dotnet3Source -ne $null) {
133-
AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
134-
AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
135-
}
136-
137131
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
138132
if ($dotnet31Source -ne $null) {
139133
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
140134
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
141135
}
142136

137+
$dotnet5Source = $sources.SelectSingleNode("add[@key='dotnet5']")
138+
if ($dotnet5Source -ne $null) {
139+
AddPackageSource -Sources $sources -SourceName "dotnet5-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
140+
AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
141+
}
142+
143143
$doc.Save($filename)

‎eng/common/SetupNugetSources.sh‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -79,53 +79,52 @@ fi
7979

8080
PackageSources=()
8181

82-
# Ensure dotnet3-internal and dotnet3-internal-transport are in the packageSources if the public dotnet3 feeds are present
83-
grep -i "<add key=\"dotnet3\"" $ConfigFile
84-
82+
# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present
83+
grep -i "<add key=\"dotnet3.1\"" $ConfigFile
8584
if [ "$?" == "0" ]; then
86-
grep -i "<add key=\"dotnet3-internal\">" $ConfigFile
85+
grep -i "<add key=\"dotnet3.1-internal\"" $ConfigFile
8786
if [ "$?" != "0" ]; then
88-
echo "Adding dotnet3-internal to the packageSources."
87+
echo "Adding dotnet3.1-internal to the packageSources."
8988
PackageSourcesNodeFooter="</packageSources>"
90-
PackageSourceTemplate="${TB}<add key=\"dotnet3-internal\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2\" />"
89+
PackageSourceTemplate="${TB}<add key=\"dotnet3.1-internal\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2\" />"
9190

9291
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
9392
fi
94-
PackageSources+=('dotnet3-internal')
93+
PackageSources+=('dotnet3.1-internal')
9594

96-
grep -i "<add key=\"dotnet3-internal-transport\"" $ConfigFile
95+
grep -i "<add key=\"dotnet3.1-internal-transport\">" $ConfigFile
9796
if [ "$?" != "0" ]; then
98-
echo "Adding dotnet3-internal-transport to the packageSources."
97+
echo "Adding dotnet3.1-internal-transport to the packageSources."
9998
PackageSourcesNodeFooter="</packageSources>"
100-
PackageSourceTemplate="${TB}<add key=\"dotnet3-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2\" />"
99+
PackageSourceTemplate="${TB}<add key=\"dotnet3.1-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2\" />"
101100

102101
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
103102
fi
104-
PackageSources+=('dotnet3-internal-transport')
103+
PackageSources+=('dotnet3.1-internal-transport')
105104
fi
106105

107-
# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present
108-
grep -i "<add key=\"dotnet3.1\"" $ConfigFile
106+
# Ensure dotnet5-internal and dotnet5-internal-transport are in the packageSources if the public dotnet5 feeds are present
107+
grep -i "<add key=\"dotnet5\"" $ConfigFile
109108
if [ "$?" == "0" ]; then
110-
grep -i "<add key=\"dotnet3.1-internal\"" $ConfigFile
109+
grep -i "<add key=\"dotnet5-internal\"" $ConfigFile
111110
if [ "$?" != "0" ]; then
112-
echo "Adding dotnet3.1-internal to the packageSources."
111+
echo "Adding dotnet5-internal to the packageSources."
113112
PackageSourcesNodeFooter="</packageSources>"
114-
PackageSourceTemplate="${TB}<add key=\"dotnet3.1-internal\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2\" />"
113+
PackageSourceTemplate="${TB}<add key=\"dotnet5-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2\" />"
115114

116115
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
117116
fi
118-
PackageSources+=('dotnet3.1-internal')
117+
PackageSources+=('dotnet5-internal')
119118

120-
grep -i "<add key=\"dotnet3.1-internal-transport\">" $ConfigFile
119+
grep -i "<add key=\"dotnet5-internal-transport\">" $ConfigFile
121120
if [ "$?" != "0" ]; then
122-
echo "Adding dotnet3.1-internal-transport to the packageSources."
121+
echo "Adding dotnet5-internal-transport to the packageSources."
123122
PackageSourcesNodeFooter="</packageSources>"
124-
PackageSourceTemplate="${TB}<add key=\"dotnet3.1-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2\" />"
123+
PackageSourceTemplate="${TB}<add key=\"dotnet5-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2\" />"
125124

126125
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
127126
fi
128-
PackageSources+=('dotnet3.1-internal-transport')
127+
PackageSources+=('dotnet5-internal-transport')
129128
fi
130129

131130
# I want things split line by line

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
__CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
5+
__TIZEN_CROSSDIR="$__CrossDir/tizen"
6+
7+
if [[ -z "$ROOTFS_DIR" ]]; then
8+
echo "ROOTFS_DIR is not defined."
9+
exit 1;
10+
fi
11+
12+
TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp
13+
mkdir -p $TIZEN_TMP_DIR
14+
15+
# Download files
16+
echo ">>Start downloading files"
17+
VERBOSE=1 $__CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR
18+
echo "<<Finish downloading files"
19+
20+
echo ">>Start constructing Tizen rootfs"
21+
TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm`
22+
cd $ROOTFS_DIR
23+
for f in $TIZEN_RPM_FILES; do
24+
rpm2cpio $f | cpio -idm --quiet
25+
done
26+
echo "<<Finish constructing Tizen rootfs"
27+
28+
# Cleanup tmp
29+
rm -rf $TIZEN_TMP_DIR
30+
31+
# Configure Tizen rootfs
32+
echo ">>Start configuring Tizen rootfs"
33+
ln -sfn asm-arm64 ./usr/include/asm
34+
patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
35+
echo "<<Finish configuring Tizen rootfs"

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

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
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_URL=http://download.tizen.org/snapshots/tizen/
55+
BUILD_XML=build.xml
56+
REPOMD_XML=repomd.xml
57+
PRIMARY_XML=primary.xml
58+
TARGET_URL="http://__not_initialized"
59+
60+
Xpath_get()
61+
{
62+
XPATH_RESULT=''
63+
XPATH=$1
64+
XML_FILE=$2
65+
RESULT=$(xmllint --xpath $XPATH $XML_FILE)
66+
if [[ -z ${RESULT// } ]]; then
67+
Error "Can not find target from $XML_FILE"
68+
Debug "Xpath = $XPATH"
69+
exit 1
70+
fi
71+
XPATH_RESULT=$RESULT
72+
}
73+
74+
fetch_tizen_pkgs_init()
75+
{
76+
TARGET=$1
77+
PROFILE=$2
78+
Debug "Initialize TARGET=$TARGET, PROFILE=$PROFILE"
79+
80+
TMP_PKG_DIR=$TMPDIR/tizen_${PROFILE}_pkgs
81+
if [ -d $TMP_PKG_DIR ]; then rm -rf $TMP_PKG_DIR; fi
82+
mkdir -p $TMP_PKG_DIR
83+
84+
PKG_URL=$TIZEN_URL/$PROFILE/latest
85+
86+
BUILD_XML_URL=$PKG_URL/$BUILD_XML
87+
TMP_BUILD=$TMP_PKG_DIR/$BUILD_XML
88+
TMP_REPOMD=$TMP_PKG_DIR/$REPOMD_XML
89+
TMP_PRIMARY=$TMP_PKG_DIR/$PRIMARY_XML
90+
TMP_PRIMARYGZ=${TMP_PRIMARY}.gz
91+
92+
Fetch $BUILD_XML_URL $TMP_BUILD
93+
94+
Debug "fetch $BUILD_XML_URL to $TMP_BUILD"
95+
96+
TARGET_XPATH="//build/buildtargets/buildtarget[@name=\"$TARGET\"]/repo[@type=\"binary\"]/text()"
97+
Xpath_get $TARGET_XPATH $TMP_BUILD
98+
TARGET_PATH=$XPATH_RESULT
99+
TARGET_URL=$PKG_URL/$TARGET_PATH
100+
101+
REPOMD_URL=$TARGET_URL/repodata/repomd.xml
102+
PRIMARY_XPATH='string(//*[local-name()="data"][@type="primary"]/*[local-name()="location"]/@href)'
103+
104+
Fetch $REPOMD_URL $TMP_REPOMD
105+
106+
Debug "fetch $REPOMD_URL to $TMP_REPOMD"
107+
108+
Xpath_get $PRIMARY_XPATH $TMP_REPOMD
109+
PRIMARY_XML_PATH=$XPATH_RESULT
110+
PRIMARY_URL=$TARGET_URL/$PRIMARY_XML_PATH
111+
112+
Fetch $PRIMARY_URL $TMP_PRIMARYGZ
113+
114+
Debug "fetch $PRIMARY_URL to $TMP_PRIMARYGZ"
115+
116+
gunzip $TMP_PRIMARYGZ
117+
118+
Debug "unzip $TMP_PRIMARYGZ to $TMP_PRIMARY"
119+
}
120+
121+
fetch_tizen_pkgs()
122+
{
123+
ARCH=$1
124+
PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)'
125+
126+
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())'
127+
128+
for pkg in ${@:2}
129+
do
130+
Inform "Fetching... $pkg"
131+
XPATH=${PACKAGE_XPATH_TPL/_PKG_/$pkg}
132+
XPATH=${XPATH/_ARCH_/$ARCH}
133+
Xpath_get $XPATH $TMP_PRIMARY
134+
PKG_PATH=$XPATH_RESULT
135+
136+
XPATH=${PACKAGE_CHECKSUM_XPATH_TPL/_PKG_/$pkg}
137+
XPATH=${XPATH/_ARCH_/$ARCH}
138+
Xpath_get $XPATH $TMP_PRIMARY
139+
CHECKSUM=$XPATH_RESULT
140+
141+
PKG_URL=$TARGET_URL/$PKG_PATH
142+
PKG_FILE=$(basename $PKG_PATH)
143+
PKG_PATH=$TMPDIR/$PKG_FILE
144+
145+
Debug "Download $PKG_URL to $PKG_PATH"
146+
Fetch $PKG_URL $PKG_PATH true
147+
148+
echo "$CHECKSUM $PKG_PATH" | sha256sum -c - > /dev/null
149+
if [ $? -ne 0 ]; then
150+
Error "Fail to fetch $PKG_URL to $PKG_PATH"
151+
Debug "Checksum = $CHECKSUM"
152+
exit 1
153+
fi
154+
done
155+
}
156+
157+
Inform "Initialize arm base"
158+
fetch_tizen_pkgs_init standard base
159+
Inform "fetch common packages"
160+
fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel
161+
Inform "fetch coreclr packages"
162+
fetch_tizen_pkgs aarch64 lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
163+
Inform "fetch corefx packages"
164+
fetch_tizen_pkgs aarch64 libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl1.1-devel krb5 krb5-devel
165+
166+
Inform "Initialize standard unified"
167+
fetch_tizen_pkgs_init standard unified
168+
Inform "fetch corefx packages"
169+
fetch_tizen_pkgs aarch64 gssdp gssdp-devel tizen-release
170+

‎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 ( /lib/ld-linux-aarch64.so.1 ) )
9+
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-aarch64.so.1 ) )

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ while :; do
167167
__LLDB_Package="liblldb-6.0-dev"
168168
;;
169169
tizen)
170-
if [ "$__BuildArch" != "armel" ]; then
171-
echo "Tizen is available only for armel."
170+
if [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then
171+
echo "Tizen is available only for armel and arm64."
172172
usage;
173173
exit 1;
174174
fi

0 commit comments

Comments
 (0)