Skip to content

Commit 3934694

Browse files
dotnet-maestro[bot]jonsequitur
dotnet-maestro[bot]
authored and
jonsequitur
committed
Update dependencies from https://github.com/dotnet/arcade build 20200630.3
Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20201.2 -> To Version 5.0.0-beta.20330.3
1 parent cbaeacd commit 3934694

40 files changed

+1578
-547
lines changed

‎NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<!-- Only specify feed for Arcade SDK (see https://github.com/Microsoft/msbuild/issues/2982) -->
44
<packageSources>

‎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="5.0.0-beta.20201.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20330.3">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
8+
<Sha>243cc92161ad44c2a07464425892daee19121c99</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/common/SetupNugetSources.ps1

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ function AddCredential($creds, $source, $username, $password) {
8383
$passwordElement.SetAttribute("value", $Password)
8484
}
8585

86-
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) {
86+
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) {
8787
$maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")
8888

8989
Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."
@@ -123,19 +123,21 @@ if ($creds -eq $null) {
123123
$doc.DocumentElement.AppendChild($creds) | Out-Null
124124
}
125125

126+
$userName = "dn-bot"
127+
126128
# Insert credential nodes for Maestro's private feeds
127-
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password
129+
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password
128130

129131
$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']")
130132
if ($dotnet3Source -ne $null) {
131-
AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
132-
AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
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
133135
}
134136

135137
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
136138
if ($dotnet31Source -ne $null) {
137-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
138-
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 "dn-bot" -Password $Password
139+
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
140+
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
139141
}
140142

141143
$doc.Save($filename)

‎eng/common/build.ps1

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Param(
2020
[switch] $publish,
2121
[switch] $clean,
2222
[switch][Alias('bl')]$binaryLog,
23+
[switch][Alias('nobl')]$excludeCIBinarylog,
2324
[switch] $ci,
2425
[switch] $prepareMachine,
2526
[switch] $help,
@@ -58,6 +59,7 @@ function Print-Usage() {
5859
Write-Host "Advanced settings:"
5960
Write-Host " -projects <value> Semi-colon delimited list of sln/proj's to build. Globbing is supported (*.sln)"
6061
Write-Host " -ci Set when running on CI server"
62+
Write-Host " -excludeCIBinarylog Don't output binary log (short: -nobl)"
6163
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
6264
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
6365
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
@@ -134,7 +136,9 @@ try {
134136
}
135137

136138
if ($ci) {
137-
$binaryLog = $true
139+
if (-not $excludeCIBinarylog) {
140+
$binaryLog = $true
141+
}
138142
$nodeReuse = $false
139143
}
140144

‎eng/common/build.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ usage()
3232
echo "Advanced settings:"
3333
echo " --projects <value> Project or solution file(s) to build"
3434
echo " --ci Set when running on CI server"
35+
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
3536
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
3637
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
3738
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
@@ -68,6 +69,7 @@ clean=false
6869
warn_as_error=true
6970
node_reuse=true
7071
binary_log=false
72+
exclude_ci_binary_log=false
7173
pipelines_log=false
7274

7375
projects=''
@@ -98,6 +100,9 @@ while [[ $# > 0 ]]; do
98100
-binarylog|-bl)
99101
binary_log=true
100102
;;
103+
-excludeCIBinarylog|-nobl)
104+
exclude_ci_binary_log=true
105+
;;
101106
-pipelineslog|-pl)
102107
pipelines_log=true
103108
;;
@@ -156,8 +161,10 @@ done
156161

157162
if [[ "$ci" == true ]]; then
158163
pipelines_log=true
159-
binary_log=true
160164
node_reuse=false
165+
if [[ "$exclude_ci_binary_log" == false ]]; then
166+
binary_log=true
167+
fi
161168
fi
162169

163170
. "$scriptroot/tools.sh"

‎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/armel/tizen-build-rootfs.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@ if [[ -z "$ROOTFS_DIR" ]]; then
99
exit 1;
1010
fi
1111

12-
# Clean-up (TODO-Cleanup: We may already delete $ROOTFS_DIR at ./cross/build-rootfs.sh.)
13-
# hk0110
14-
if [ -d "$ROOTFS_DIR" ]; then
15-
umount $ROOTFS_DIR/*
16-
rm -rf $ROOTFS_DIR
17-
fi
18-
1912
TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp
2013
mkdir -p $TIZEN_TMP_DIR
2114

0 commit comments

Comments
 (0)