Skip to content

Commit a0175a2

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20200308.2 (#19703)
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20158.2 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20158.2 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20158.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 0c3c6d8 commit a0175a2

14 files changed

+83
-228
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -336,17 +336,17 @@
336336
<Uri>https://github.com/dotnet/extensions</Uri>
337337
<Sha>540b4e8f129a132749a60174464b8c8274bfed7d</Sha>
338338
</Dependency>
339-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20151.1">
339+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20158.2">
340340
<Uri>https://github.com/dotnet/arcade</Uri>
341-
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
341+
<Sha>527179abfbb5cd738035c4ac2d2566c571ce85db</Sha>
342342
</Dependency>
343-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20151.1">
343+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20158.2">
344344
<Uri>https://github.com/dotnet/arcade</Uri>
345-
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
345+
<Sha>527179abfbb5cd738035c4ac2d2566c571ce85db</Sha>
346346
</Dependency>
347-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20151.1">
347+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20158.2">
348348
<Uri>https://github.com/dotnet/arcade</Uri>
349-
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
349+
<Sha>527179abfbb5cd738035c4ac2d2566c571ce85db</Sha>
350350
</Dependency>
351351
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.5.0-beta4-20153-05" CoherentParentDependency="Microsoft.Extensions.Logging">
352352
<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.20151.1</MicrosoftDotNetGenAPIPackageVersion>
65+
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20158.2</MicrosoftDotNetGenAPIPackageVersion>
6666
<!-- Packages from dotnet/roslyn -->
6767
<MicrosoftNetCompilersToolsetPackageVersion>3.5.0-beta4-20153-05</MicrosoftNetCompilersToolsetPackageVersion>
6868
<!-- Packages from dotnet/core-setup -->

‎eng/common/SigningValidation.proj

Lines changed: 0 additions & 83 deletions
This file was deleted.

‎eng/common/build.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ Param(
2626
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
2727
)
2828

29+
# Unset 'Platform' environment variable to avoid unwanted collision in InstallDotNetCore.targets file
30+
# some computer has this env var defined (e.g. Some HP)
31+
if($env:Platform) {
32+
$env:Platform=""
33+
}
2934
function Print-Usage() {
3035
Write-Host "Common settings:"
3136
Write-Host " -configuration <value> Build configuration: 'Debug' or 'Release' (short: -c)"

‎eng/common/cross/android/arm/toolchain.cmake

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎eng/common/cross/android/arm64/toolchain.cmake

Lines changed: 0 additions & 42 deletions
This file was deleted.

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

Lines changed: 26 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
set -e
3-
__NDK_Version=r14
3+
__NDK_Version=r21
44

55
usage()
66
{
@@ -16,11 +16,11 @@ usage()
1616
echo.
1717
echo "By default, the NDK will be downloaded into the cross/android-rootfs/android-ndk-$__NDK_Version directory. If you already have an NDK installation,"
1818
echo "you can set the NDK_DIR environment variable to have this script use that installation of the NDK."
19-
echo "By default, this script will generate a file, android_platform, in the root of the ROOTFS_DIR directory that contains the RID for the supported and tested Android build: android.21-arm64. This file is to replace '/etc/os-release', which is not available for Android."
19+
echo "By default, this script will generate a file, android_platform, in the root of the ROOTFS_DIR directory that contains the RID for the supported and tested Android build: android.28-arm64. This file is to replace '/etc/os-release', which is not available for Android."
2020
exit 1
2121
}
2222

23-
__ApiLevel=21 # The minimum platform for arm64 is API level 21
23+
__ApiLevel=28 # The minimum platform for arm64 is API level 21 but the minimum version that support glob(3) is 28. See $ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/glob.h
2424
__BuildArch=arm64
2525
__AndroidArch=aarch64
2626
__AndroidToolchain=aarch64-linux-android
@@ -54,12 +54,11 @@ done
5454

5555
# Obtain the location of the bash script to figure out where the root of the repo is.
5656
__CrossDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
57+
__Android_Cross_Dir="$(cd "$__CrossDir/../../../.tools/android-rootfs" && pwd)"
5758

58-
__Android_Cross_Dir="$__CrossDir/android-rootfs"
5959
__NDK_Dir="$__Android_Cross_Dir/android-ndk-$__NDK_Version"
60-
__libunwind_Dir="$__Android_Cross_Dir/libunwind"
6160
__lldb_Dir="$__Android_Cross_Dir/lldb"
62-
__ToolchainDir="$__Android_Cross_Dir/toolchain/$__BuildArch"
61+
__ToolchainDir="$__Android_Cross_Dir/android-ndk-$__NDK_Version"
6362

6463
if [[ -n "$TOOLCHAIN_DIR" ]]; then
6564
__ToolchainDir=$TOOLCHAIN_DIR
@@ -89,49 +88,33 @@ if [ ! -d $__lldb_Dir ]; then
8988
unzip -q $__Android_Cross_Dir/lldb-2.3.3614996-linux-x86_64.zip -d $__lldb_Dir
9089
fi
9190

92-
# Create the RootFS for both arm64 as well as aarch
93-
rm -rf $__Android_Cross_Dir/toolchain
91+
echo "Download dependencies..."
92+
mkdir -p $__Android_Cross_Dir/tmp/$arch/
9493

95-
echo Generating the $__BuildArch toolchain
96-
$__NDK_Dir/build/tools/make_standalone_toolchain.py --arch $__BuildArch --api $__ApiLevel --install-dir $__ToolchainDir
94+
# combined dependencies for coreclr, installer and libraries
95+
__AndroidPackages="libicu"
96+
__AndroidPackages+=" libandroid-glob"
97+
__AndroidPackages+=" liblzma"
98+
__AndroidPackages+=" krb5"
99+
__AndroidPackages+=" openssl"
97100

98-
# Install the required packages into the toolchain
99-
# TODO: Add logic to get latest pkg version instead of specific version number
100-
rm -rf $__Android_Cross_Dir/deb/
101-
rm -rf $__Android_Cross_Dir/tmp
101+
for path in $(wget -qO- http://termux.net/dists/stable/main/binary-$__AndroidArch/Packages |\
102+
grep -A15 "Package: \(${__AndroidPackages// /\\|}\)" | grep -v "static\|tool" | grep Filename); do
102103

103-
mkdir -p $__Android_Cross_Dir/deb/
104-
mkdir -p $__Android_Cross_Dir/tmp/$arch/
105-
wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libicu_60.2_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libicu_60.2_$__AndroidArch.deb
106-
wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libicu-dev_60.2_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libicu-dev_60.2_$__AndroidArch.deb
107-
108-
wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-glob-dev_0.4_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-glob-dev_0.4_$__AndroidArch.deb
109-
wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-glob_0.4_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-glob_0.4_$__AndroidArch.deb
110-
wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-support-dev_22_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-support-dev_22_$__AndroidArch.deb
111-
wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-support_22_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-support_22_$__AndroidArch.deb
112-
wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/liblzma-dev_5.2.3_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/liblzma-dev_5.2.3_$__AndroidArch.deb
113-
wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/liblzma_5.2.3_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/liblzma_5.2.3_$__AndroidArch.deb
114-
wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libunwind-dev_1.2.20170304_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libunwind-dev_1.2.20170304_$__AndroidArch.deb
115-
wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libunwind_1.2.20170304_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libunwind_1.2.20170304_$__AndroidArch.deb
116-
117-
echo Unpacking Termux packages
118-
dpkg -x $__Android_Cross_Dir/deb/libicu_60.2_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/
119-
dpkg -x $__Android_Cross_Dir/deb/libicu-dev_60.2_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/
120-
dpkg -x $__Android_Cross_Dir/deb/libandroid-glob-dev_0.4_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/
121-
dpkg -x $__Android_Cross_Dir/deb/libandroid-glob_0.4_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/
122-
dpkg -x $__Android_Cross_Dir/deb/libandroid-support-dev_22_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/
123-
dpkg -x $__Android_Cross_Dir/deb/libandroid-support_22_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/
124-
dpkg -x $__Android_Cross_Dir/deb/liblzma-dev_5.2.3_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/
125-
dpkg -x $__Android_Cross_Dir/deb/liblzma_5.2.3_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/
126-
dpkg -x $__Android_Cross_Dir/deb/libunwind-dev_1.2.20170304_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/
127-
dpkg -x $__Android_Cross_Dir/deb/libunwind_1.2.20170304_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/
104+
if [[ "$path" != "Filename:" ]]; then
105+
echo "Working on: $path"
106+
wget -qO- http://termux.net/$path | dpkg -x - $__Android_Cross_Dir/tmp/$__AndroidArch/
107+
fi
108+
done
128109

129110
cp -R $__Android_Cross_Dir/tmp/$__AndroidArch/data/data/com.termux/files/usr/* $__ToolchainDir/sysroot/usr/
130111

131112
# Generate platform file for build.sh script to assign to __DistroRid
132113
echo "Generating platform file..."
114+
echo "RID=android.${__ApiLevel}-${__BuildArch}" > $__ToolchainDir/sysroot/android_platform
133115

134-
echo "RID=android.21-arm64" > $__ToolchainDir/sysroot/android_platform
135-
echo Now run:
136-
echo CONFIG_DIR=\`realpath cross/android/$__BuildArch\` ROOTFS_DIR=\`realpath $__ToolchainDir/sysroot\` ./build.sh cross $__BuildArch skipgenerateversion skipnuget cmakeargs -DENABLE_LLDBPLUGIN=0
137-
116+
echo "Now to build coreclr, libraries and installers; run:"
117+
echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \
118+
--subsetCategory coreclr \
119+
--subsetCategory libraries \
120+
--subsetCategory installer

‎eng/common/cross/toolchain.cmake

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,30 @@ if(TARGET_ARCH_NAME STREQUAL "armel")
4343
endif()
4444
endif()
4545

46-
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
47-
set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/usr")
48-
set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/usr")
49-
set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/usr")
46+
if("$ENV{__DistroRid}" MATCHES "android.*")
47+
if(TARGET_ARCH_NAME STREQUAL "arm")
48+
set(ANDROID_ABI armeabi-v7a)
49+
elseif(TARGET_ARCH_NAME STREQUAL "arm64")
50+
set(ANDROID_ABI arm64-v8a)
51+
endif()
52+
53+
# extract platform number required by the NDK's toolchain
54+
string(REGEX REPLACE ".*\\.([0-9]+)-.*" "\\1" ANDROID_PLATFORM "$ENV{__DistroRid}")
55+
56+
set(ANDROID_TOOLCHAIN clang)
57+
set(FEATURE_EVENT_TRACE 0) # disable event trace as there is no lttng-ust package in termux repository
58+
set(CMAKE_SYSTEM_LIBRARY_PATH "${CROSS_ROOTFS}/usr/lib")
59+
set(CMAKE_SYSTEM_INCLUDE_PATH "${CROSS_ROOTFS}/usr/include")
60+
61+
# include official NDK toolchain script
62+
include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake)
63+
else()
64+
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
65+
66+
set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/usr")
67+
set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/usr")
68+
set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/usr")
69+
endif()
5070

5171
# Specify link flags
5272

@@ -63,7 +83,7 @@ endif()
6383

6484
# Specify compile options
6585

66-
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$")
86+
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$" AND NOT "$ENV{__DistroRid}" MATCHES "android.*")
6787
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
6888
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
6989
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})

‎eng/common/darc-init.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ param (
77

88
. $PSScriptRoot\tools.ps1
99

10-
function InstallDarcCli ($darcVersion) {
10+
function InstallDarcCli ($darcVersion, $toolpath) {
1111
$darcCliPackageName = 'microsoft.dotnet.darc'
1212

1313
$dotnetRoot = InitializeDotNetCli -install:$true
@@ -32,13 +32,13 @@ function InstallDarcCli ($darcVersion) {
3232
Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity -g"
3333
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g
3434
}else {
35-
Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity -g --tool-path '$toolpath'"
35+
Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity --tool-path '$toolpath'"
3636
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath"
3737
}
3838
}
3939

4040
try {
41-
InstallDarcCli $darcVersion
41+
InstallDarcCli $darcVersion $toolpath
4242
}
4343
catch {
4444
Write-Host $_.ScriptStackTrace

0 commit comments

Comments
 (0)