Skip to content

Commit dc477ed

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20200630.3 (#23696)
Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20316.1 -> To Version 5.0.0-beta.20330.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 849b5dc commit dc477ed

14 files changed

+337
-32
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -296,17 +296,17 @@
296296
<Uri>https://github.com/dotnet/runtime</Uri>
297297
<Sha>d3e6947f39ee04b0a6a44bfe6ba1310fbc10c7e5</Sha>
298298
</Dependency>
299-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20316.1">
299+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20330.3">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>71b580038fb704df63e03c6b7ae7d2c6a4fdd71d</Sha>
301+
<Sha>243cc92161ad44c2a07464425892daee19121c99</Sha>
302302
</Dependency>
303-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20316.1">
303+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20330.3">
304304
<Uri>https://github.com/dotnet/arcade</Uri>
305-
<Sha>71b580038fb704df63e03c6b7ae7d2c6a4fdd71d</Sha>
305+
<Sha>243cc92161ad44c2a07464425892daee19121c99</Sha>
306306
</Dependency>
307-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20316.1">
307+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20330.3">
308308
<Uri>https://github.com/dotnet/arcade</Uri>
309-
<Sha>71b580038fb704df63e03c6b7ae7d2c6a4fdd71d</Sha>
309+
<Sha>243cc92161ad44c2a07464425892daee19121c99</Sha>
310310
</Dependency>
311311
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.7.0-4.20319.6">
312312
<Uri>https://github.com/dotnet/roslyn</Uri>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
-->
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/arcade -->
65-
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20316.1</MicrosoftDotNetGenAPIPackageVersion>
65+
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20330.3</MicrosoftDotNetGenAPIPackageVersion>
6666
<!-- Packages from dotnet/roslyn -->
6767
<MicrosoftNetCompilersToolsetPackageVersion>3.7.0-4.20319.6</MicrosoftNetCompilersToolsetPackageVersion>
6868
<!-- Packages from dotnet/runtime -->

‎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

‎eng/common/cross/toolchain.cmake

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
3131
else()
3232
set(TOOLCHAIN "aarch64-linux-gnu")
3333
endif()
34+
if("$ENV{__DistroRid}" MATCHES "tizen.*")
35+
set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
36+
endif()
3437
elseif(TARGET_ARCH_NAME STREQUAL "x86")
3538
set(CMAKE_SYSTEM_PROCESSOR i686)
3639
set(TOOLCHAIN "i686-linux-gnu")
@@ -49,11 +52,15 @@ if(DEFINED ENV{TOOLCHAIN})
4952
endif()
5053

5154
# Specify include paths
52-
if(TARGET_ARCH_NAME STREQUAL "armel")
53-
if(DEFINED TIZEN_TOOLCHAIN)
55+
if(DEFINED TIZEN_TOOLCHAIN)
56+
if(TARGET_ARCH_NAME STREQUAL "armel")
5457
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
5558
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi)
5659
endif()
60+
if(TARGET_ARCH_NAME STREQUAL "arm64")
61+
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
62+
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu)
63+
endif()
5764
endif()
5865

5966
if("$ENV{__DistroRid}" MATCHES "android.*")
@@ -127,6 +134,17 @@ if(TARGET_ARCH_NAME STREQUAL "armel")
127134
add_link_options("-L${CROSS_ROOTFS}/usr/lib")
128135
add_link_options("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
129136
endif()
137+
elseif(TARGET_ARCH_NAME STREQUAL "arm64")
138+
if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
139+
add_link_options("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
140+
add_link_options("-L${CROSS_ROOTFS}/lib64")
141+
add_link_options("-L${CROSS_ROOTFS}/usr/lib64")
142+
add_link_options("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
143+
144+
add_link_options("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64")
145+
add_link_options("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
146+
add_link_options("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
147+
endif()
130148
elseif(TARGET_ARCH_NAME STREQUAL "x86")
131149
add_link_options(-m32)
132150
elseif(ILLUMOS)
@@ -157,16 +175,19 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
157175

158176
if(TARGET_ARCH_NAME STREQUAL "armel")
159177
add_compile_options(-mfloat-abi=softfp)
160-
if(DEFINED TIZEN_TOOLCHAIN)
161-
add_compile_options(-Wno-deprecated-declarations) # compile-time option
162-
add_compile_options(-D__extern_always_inline=inline) # compile-time option
163-
endif()
164178
endif()
165179
elseif(TARGET_ARCH_NAME STREQUAL "x86")
166180
add_compile_options(-m32)
167181
add_compile_options(-Wno-error=unused-command-line-argument)
168182
endif()
169183

184+
if(DEFINED TIZEN_TOOLCHAIN)
185+
if(TARGET_ARCH_NAME MATCHES "^(armel|arm64)$")
186+
add_compile_options(-Wno-deprecated-declarations) # compile-time option
187+
add_compile_options(-D__extern_always_inline=inline) # compile-time option
188+
endif()
189+
endif()
190+
170191
# Set LLDB include and library paths for builds that need lldb.
171192
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
172193
if(TARGET_ARCH_NAME STREQUAL "x86")

‎eng/common/internal-feed-operations.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ function SetupCredProvider {
6363
}
6464

6565
if (($endpoints | Measure-Object).Count -gt 0) {
66+
# [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Endpoint code example with no real credentials.")]
6667
# Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}'
6768
$endpointCredentials = @{endpointCredentials=$endpoints} | ConvertTo-Json -Compress
6869

‎eng/common/internal-feed-operations.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ function SetupCredProvider {
6262
endpoints+=']'
6363

6464
if [ ${#endpoints} -gt 2 ]; then
65+
# [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Endpoint code example with no real credentials.")]
6566
# Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}'
6667
local endpointCredentials="{\"endpointCredentials\": "$endpoints"}"
6768

0 commit comments

Comments
 (0)