diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 6d3f2efaf848cea1eb078986ef074cd7e7742830..89e27b1aeceecdd778a5da477083ce0545185577 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21622.1", + "version": "1.0.0-prerelease.22053.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17092039d920641e939bfcaefa9e99dc8037f59a..141580f82e2d9bae375e98ba976975deb840e9c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - d9371f17932fbf828f1d1e2f21a99b64ba40eba5 + 35aca8766e42ad0f9ef458c4106917f1075cf230 https://github.com/dotnet/msquic @@ -16,111 +16,111 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - ef5d90bc37b53288e32d78dbf34eae32cd0893d3 + 58a3ab6364cc934622ae0b09c3ef09768723a4e1 - + https://github.com/dotnet/llvm-project - ef5d90bc37b53288e32d78dbf34eae32cd0893d3 + 58a3ab6364cc934622ae0b09c3ef09768723a4e1 - + https://github.com/dotnet/llvm-project - ef5d90bc37b53288e32d78dbf34eae32cd0893d3 + 58a3ab6364cc934622ae0b09c3ef09768723a4e1 - + https://github.com/dotnet/llvm-project - ef5d90bc37b53288e32d78dbf34eae32cd0893d3 + 58a3ab6364cc934622ae0b09c3ef09768723a4e1 - + https://github.com/dotnet/llvm-project - ef5d90bc37b53288e32d78dbf34eae32cd0893d3 + 58a3ab6364cc934622ae0b09c3ef09768723a4e1 - + https://github.com/dotnet/llvm-project - ef5d90bc37b53288e32d78dbf34eae32cd0893d3 + 58a3ab6364cc934622ae0b09c3ef09768723a4e1 - + https://github.com/dotnet/llvm-project - ef5d90bc37b53288e32d78dbf34eae32cd0893d3 + 58a3ab6364cc934622ae0b09c3ef09768723a4e1 - + https://github.com/dotnet/llvm-project - ef5d90bc37b53288e32d78dbf34eae32cd0893d3 + 58a3ab6364cc934622ae0b09c3ef09768723a4e1 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 https://github.com/microsoft/vstest @@ -202,53 +202,53 @@ https://github.com/dotnet/llvm-project 662aff66999c435aec09c58643e9fd703eadc3e0 - + https://github.com/dotnet/runtime - 834b278911962102919b3a7dec22ca6cb26bfa8a + c8f3b36d6d5da74333c6755ccd5687127bcd9905 - + https://github.com/dotnet/runtime - 834b278911962102919b3a7dec22ca6cb26bfa8a + c8f3b36d6d5da74333c6755ccd5687127bcd9905 - + https://github.com/dotnet/runtime - 834b278911962102919b3a7dec22ca6cb26bfa8a + c8f3b36d6d5da74333c6755ccd5687127bcd9905 - + https://github.com/dotnet/runtime - 834b278911962102919b3a7dec22ca6cb26bfa8a + c8f3b36d6d5da74333c6755ccd5687127bcd9905 - + https://github.com/dotnet/runtime - 834b278911962102919b3a7dec22ca6cb26bfa8a + c8f3b36d6d5da74333c6755ccd5687127bcd9905 - + https://github.com/dotnet/runtime - 834b278911962102919b3a7dec22ca6cb26bfa8a + c8f3b36d6d5da74333c6755ccd5687127bcd9905 - + https://github.com/dotnet/runtime - 834b278911962102919b3a7dec22ca6cb26bfa8a + c8f3b36d6d5da74333c6755ccd5687127bcd9905 - + https://github.com/dotnet/runtime - 834b278911962102919b3a7dec22ca6cb26bfa8a + c8f3b36d6d5da74333c6755ccd5687127bcd9905 https://github.com/dotnet/linker e48859c88826f2cead6f5a7426c65391ad62a659 - + https://github.com/dotnet/xharness - 7ad8d01a879af9437a7c33d01409bd761700cdad + 7c293e5b676eb5b57418f775587badad65ec07f5 - + https://github.com/dotnet/xharness - 7ad8d01a879af9437a7c33d01409bd761700cdad + 7c293e5b676eb5b57418f775587badad65ec07f5 - + https://github.com/dotnet/arcade - 0cd94b1d02c03377d99f3739beb191591f6abee5 + a0f6d2432ce3d1bb30ee747bb534f477c75fd667 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -266,9 +266,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 91d6b3c1f51888d166701510189505f35714665c - + https://github.com/dotnet/hotreload-utils - f0d838421286fed81005fd4ddf6562555b641b3b + 49dd195f467aa45d467a38ca02ae95d1b59062ce https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index c7413c26ff63ab9784b7eff05ca813b08c9cb055..5ebd2c20ae293a7123fb849a35f5ad2e189a9518 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,38 +54,38 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.21621.3 - 7.0.0-beta.21621.3 - 7.0.0-beta.21621.3 - 7.0.0-beta.21621.3 - 7.0.0-beta.21621.3 - 7.0.0-beta.21621.3 - 2.5.1-beta.21621.3 - 7.0.0-beta.21621.3 - 7.0.0-beta.21621.3 - 7.0.0-beta.21621.3 - 7.0.0-beta.21621.3 - 7.0.0-beta.21621.3 - 7.0.0-beta.21621.3 - 7.0.0-beta.21621.3 - 7.0.0-beta.21621.3 + 7.0.0-beta.22053.2 + 7.0.0-beta.22053.2 + 7.0.0-beta.22053.2 + 7.0.0-beta.22053.2 + 7.0.0-beta.22053.2 + 7.0.0-beta.22053.2 + 2.5.1-beta.22053.2 + 7.0.0-beta.22053.2 + 7.0.0-beta.22053.2 + 7.0.0-beta.22053.2 + 7.0.0-beta.22053.2 + 7.0.0-beta.22053.2 + 7.0.0-beta.22053.2 + 7.0.0-beta.22053.2 + 7.0.0-beta.22053.2 6.0.0-preview.1.102 - 7.0.0-alpha.1.21620.1 - 7.0.0-alpha.1.21620.1 - 7.0.0-alpha.1.21620.1 + 7.0.0-alpha.1.22052.8 + 7.0.0-alpha.1.22052.8 + 7.0.0-alpha.1.22052.8 3.1.0 - 7.0.0-alpha.1.21620.1 - 1.0.0-alpha.1.21630.1 - 1.0.0-alpha.1.21630.1 - 1.0.0-alpha.1.21630.1 - 1.0.0-alpha.1.21630.1 - 1.0.0-alpha.1.21630.1 - 1.0.0-alpha.1.21630.1 - 1.0.0-alpha.1.21630.1 - 1.0.0-alpha.1.21630.1 + 7.0.0-alpha.1.22052.8 + 1.0.0-alpha.1.22052.1 + 1.0.0-alpha.1.22052.1 + 1.0.0-alpha.1.22052.1 + 1.0.0-alpha.1.22052.1 + 1.0.0-alpha.1.22052.1 + 1.0.0-alpha.1.22052.1 + 1.0.0-alpha.1.22052.1 + 1.0.0-alpha.1.22052.1 5.0.0 4.3.0 @@ -120,11 +120,11 @@ 5.0.0 5.0.0 4.9.0-rc2.21473.1 - 7.0.0-alpha.1.21620.1 - 7.0.0-alpha.1.21620.1 + 7.0.0-alpha.1.22052.8 + 7.0.0-alpha.1.22052.8 4.5.4 4.5.0 - 7.0.0-alpha.1.21620.1 + 7.0.0-alpha.1.22052.8 7.0.0-beta.21620.3 7.0.0-beta.21620.3 @@ -160,9 +160,9 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21622.1 - 1.0.0-prerelease.21622.1 - 1.0.2-alpha.0.21620.2 + 1.0.0-prerelease.22053.2 + 1.0.0-prerelease.22053.2 + 1.0.2-alpha.0.22053.3 2.4.2-pre.9 2.4.2 1.3.0 @@ -178,7 +178,7 @@ 7.0.100-1.21628.1 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-alpha.1.21620.1 + 7.0.0-alpha.1.22053.1 7.0.0-alpha.1.21529.3 diff --git a/eng/common/cross/arm/tizen-build-rootfs.sh b/eng/common/cross/arm/tizen-build-rootfs.sh new file mode 100644 index 0000000000000000000000000000000000000000..9fdb32e920e22cc434d272551aa342fdf4d0bbaa --- /dev/null +++ b/eng/common/cross/arm/tizen-build-rootfs.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env bash +set -e + +__ARM_HARDFP_CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +__TIZEN_CROSSDIR="$__ARM_HARDFP_CrossDir/tizen" + +if [[ -z "$ROOTFS_DIR" ]]; then + echo "ROOTFS_DIR is not defined." + exit 1; +fi + +TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp +mkdir -p $TIZEN_TMP_DIR + +# Download files +echo ">>Start downloading files" +VERBOSE=1 $__ARM_HARDFP_CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR +echo "<>Start constructing Tizen rootfs" +TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm` +cd $ROOTFS_DIR +for f in $TIZEN_RPM_FILES; do + rpm2cpio $f | cpio -idm --quiet +done +echo "<>Start configuring Tizen rootfs" +ln -sfn asm-arm ./usr/include/asm +patch -p1 < $__TIZEN_CROSSDIR/tizen.patch +echo "</dev/null; then + VERBOSE=0 +fi + +Log() +{ + if [ $VERBOSE -ge $1 ]; then + echo ${@:2} + fi +} + +Inform() +{ + Log 1 -e "\x1B[0;34m$@\x1B[m" +} + +Debug() +{ + Log 2 -e "\x1B[0;32m$@\x1B[m" +} + +Error() +{ + >&2 Log 0 -e "\x1B[0;31m$@\x1B[m" +} + +Fetch() +{ + URL=$1 + FILE=$2 + PROGRESS=$3 + if [ $VERBOSE -ge 1 ] && [ $PROGRESS ]; then + CURL_OPT="--progress-bar" + else + CURL_OPT="--silent" + fi + curl $CURL_OPT $URL > $FILE +} + +hash curl 2> /dev/null || { Error "Require 'curl' Aborting."; exit 1; } +hash xmllint 2> /dev/null || { Error "Require 'xmllint' Aborting."; exit 1; } +hash sha256sum 2> /dev/null || { Error "Require 'sha256sum' Aborting."; exit 1; } + +TMPDIR=$1 +if [ ! -d $TMPDIR ]; then + TMPDIR=./tizen_tmp + Debug "Create temporary directory : $TMPDIR" + mkdir -p $TMPDIR +fi + +TIZEN_URL=http://download.tizen.org/snapshots/tizen +BUILD_XML=build.xml +REPOMD_XML=repomd.xml +PRIMARY_XML=primary.xml +TARGET_URL="http://__not_initialized" + +Xpath_get() +{ + XPATH_RESULT='' + XPATH=$1 + XML_FILE=$2 + RESULT=$(xmllint --xpath $XPATH $XML_FILE) + if [[ -z ${RESULT// } ]]; then + Error "Can not find target from $XML_FILE" + Debug "Xpath = $XPATH" + exit 1 + fi + XPATH_RESULT=$RESULT +} + +fetch_tizen_pkgs_init() +{ + TARGET=$1 + PROFILE=$2 + Debug "Initialize TARGET=$TARGET, PROFILE=$PROFILE" + + TMP_PKG_DIR=$TMPDIR/tizen_${PROFILE}_pkgs + if [ -d $TMP_PKG_DIR ]; then rm -rf $TMP_PKG_DIR; fi + mkdir -p $TMP_PKG_DIR + + PKG_URL=$TIZEN_URL/$PROFILE/latest + + BUILD_XML_URL=$PKG_URL/$BUILD_XML + TMP_BUILD=$TMP_PKG_DIR/$BUILD_XML + TMP_REPOMD=$TMP_PKG_DIR/$REPOMD_XML + TMP_PRIMARY=$TMP_PKG_DIR/$PRIMARY_XML + TMP_PRIMARYGZ=${TMP_PRIMARY}.gz + + Fetch $BUILD_XML_URL $TMP_BUILD + + Debug "fetch $BUILD_XML_URL to $TMP_BUILD" + + TARGET_XPATH="//build/buildtargets/buildtarget[@name=\"$TARGET\"]/repo[@type=\"binary\"]/text()" + Xpath_get $TARGET_XPATH $TMP_BUILD + TARGET_PATH=$XPATH_RESULT + TARGET_URL=$PKG_URL/$TARGET_PATH + + REPOMD_URL=$TARGET_URL/repodata/repomd.xml + PRIMARY_XPATH='string(//*[local-name()="data"][@type="primary"]/*[local-name()="location"]/@href)' + + Fetch $REPOMD_URL $TMP_REPOMD + + Debug "fetch $REPOMD_URL to $TMP_REPOMD" + + Xpath_get $PRIMARY_XPATH $TMP_REPOMD + PRIMARY_XML_PATH=$XPATH_RESULT + PRIMARY_URL=$TARGET_URL/$PRIMARY_XML_PATH + + Fetch $PRIMARY_URL $TMP_PRIMARYGZ + + Debug "fetch $PRIMARY_URL to $TMP_PRIMARYGZ" + + gunzip $TMP_PRIMARYGZ + + Debug "unzip $TMP_PRIMARYGZ to $TMP_PRIMARY" +} + +fetch_tizen_pkgs() +{ + ARCH=$1 + PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)' + + 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())' + + for pkg in ${@:2} + do + Inform "Fetching... $pkg" + XPATH=${PACKAGE_XPATH_TPL/_PKG_/$pkg} + XPATH=${XPATH/_ARCH_/$ARCH} + Xpath_get $XPATH $TMP_PRIMARY + PKG_PATH=$XPATH_RESULT + + XPATH=${PACKAGE_CHECKSUM_XPATH_TPL/_PKG_/$pkg} + XPATH=${XPATH/_ARCH_/$ARCH} + Xpath_get $XPATH $TMP_PRIMARY + CHECKSUM=$XPATH_RESULT + + PKG_URL=$TARGET_URL/$PKG_PATH + PKG_FILE=$(basename $PKG_PATH) + PKG_PATH=$TMPDIR/$PKG_FILE + + Debug "Download $PKG_URL to $PKG_PATH" + Fetch $PKG_URL $PKG_PATH true + + echo "$CHECKSUM $PKG_PATH" | sha256sum -c - > /dev/null + if [ $? -ne 0 ]; then + Error "Fail to fetch $PKG_URL to $PKG_PATH" + Debug "Checksum = $CHECKSUM" + exit 1 + fi + done +} + +Inform "Initialize arm base" +fetch_tizen_pkgs_init standard base +Inform "fetch common packages" +fetch_tizen_pkgs armv7hl gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils +Inform "fetch coreclr packages" +fetch_tizen_pkgs armv7hl lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu +Inform "fetch corefx packages" +fetch_tizen_pkgs armv7hl libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel + +Inform "Initialize standard unified" +fetch_tizen_pkgs_init standard unified +Inform "fetch corefx packages" +fetch_tizen_pkgs armv7hl gssdp gssdp-devel tizen-release + diff --git a/eng/common/cross/arm/tizen/tizen.patch b/eng/common/cross/arm/tizen/tizen.patch new file mode 100644 index 0000000000000000000000000000000000000000..fb12ade7250ae9e44d7099b3e7034dcd53749bd9 --- /dev/null +++ b/eng/common/cross/arm/tizen/tizen.patch @@ -0,0 +1,9 @@ +diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so +--- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900 ++++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf32-littlearm) +-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-armhf.so.3 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-armhf.so.3 ) ) diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 5102245b7b5e3f2e88ff48e8b89758fe3772c11b..e94d13d62ef64df14cb0c9ca367206dff2e8cd07 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -185,8 +185,8 @@ while :; do __LLDB_Package="liblldb-6.0-dev" ;; tizen) - if [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then - echo "Tizen is available only for armel and arm64." + if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then + echo "Tizen is available only for arm, armel and arm64." usage; exit 1; fi diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 9d22fc926930315577a9d471f392db311781bff7..f7878dddd392119c3f5bc1f3937c00714fe3532e 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -34,6 +34,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm") else() set(TOOLCHAIN "arm-linux-gnueabihf") endif() + if(TIZEN) + set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") + endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl) @@ -66,6 +69,10 @@ endif() # Specify include paths if(TIZEN) + if(TARGET_ARCH_NAME STREQUAL "arm") + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf) + endif() if(TARGET_ARCH_NAME STREQUAL "armel") include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi) @@ -160,7 +167,7 @@ if(LINUX) add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}") endif() -if(TARGET_ARCH_NAME STREQUAL "armel") +if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") if(TIZEN) add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") @@ -215,7 +222,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") endif() if(TIZEN) - if(TARGET_ARCH_NAME MATCHES "^(armel|arm64)$") + if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$") add_compile_options(-Wno-deprecated-declarations) # compile-time option add_compile_options(-D__extern_always_inline=inline) # compile-time option endif() diff --git a/global.json b/global.json index e2c9f881274f55d45379229df4b0e48e56493221..16691a4405b23b95065256f2dbababddeb755b3c 100644 --- a/global.json +++ b/global.json @@ -12,12 +12,12 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21621.3", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21621.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21621.3", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21621.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22053.2", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22053.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22053.2", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22053.2", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", - "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21620.1" + "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.22052.8" } }