mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies from https://github.com/dotnet/arcade build 20190507.7 (#1911)

Browse source 
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19257.7
This commit is contained in:
dotnet-maestro[bot] 2019-05-08 12:25:49 +00:00 committed by GitHub
parent b24da693d9
commit 2a76d0f11b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 39 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -72,9 +72,9 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19256.12"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19257.7">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c31fac9f6899094226cb5cd77c85b8f60ecafa3d</Sha> <Sha>bda52d7619f9420de46f2c39ffc972864bbcab63</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>

11
eng/common/cross/arm/sources.list.vivid
View file

@ -1,11 +0,0 @@
deb http://ports.ubuntu.com/ubuntu-ports/ vivid main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ vivid-updates main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid-updates main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ vivid-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid-backports main restricted
deb http://ports.ubuntu.com/ubuntu-ports/ vivid-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid-security main restricted universe multiverse

11
eng/common/cross/arm/sources.list.wily
View file

@ -1,11 +0,0 @@
deb http://ports.ubuntu.com/ubuntu-ports/ wily main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ wily main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ wily-updates main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ wily-updates main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ wily-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ wily-backports main restricted
deb http://ports.ubuntu.com/ubuntu-ports/ wily-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ wily-security main restricted universe multiverse

11
eng/common/cross/arm64/sources.list.vivid
View file

@ -1,11 +0,0 @@
deb http://ports.ubuntu.com/ubuntu-ports/ vivid main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ vivid-updates main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid-updates main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ vivid-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid-backports main restricted
deb http://ports.ubuntu.com/ubuntu-ports/ vivid-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ vivid-security main restricted universe multiverse

11
eng/common/cross/arm64/sources.list.wily
View file

@ -1,11 +0,0 @@
deb http://ports.ubuntu.com/ubuntu-ports/ wily main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ wily main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ wily-updates main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ wily-updates main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ wily-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ wily-backports main restricted
deb http://ports.ubuntu.com/ubuntu-ports/ wily-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ wily-security main restricted universe multiverse

58
eng/common/cross/build-rootfs.sh
View file

@ -2,21 +2,21 @@
usage() usage()
{ {
echo "Usage: $0 [BuildArch] [LinuxCodeName] [lldbx.y] [--skipunmount]" echo "Usage: $0 [BuildArch] [LinuxCodeName] [lldbx.y] [--skipunmount] --rootfs <directory>]"
echo "BuildArch can be: arm(default), armel, arm64, x86" echo "BuildArch can be: arm(default), armel, arm64, x86"
echo "LinuxCodeName - optional, Code name for Linux, can be: trusty(default), vivid, wily, xenial, zesty, bionic, alpine. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." echo "LinuxCodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
echo "lldbx.y - optional, LLDB version, can be: lldb3.6(default), lldb3.8, lldb3.9, lldb4.0, no-lldb. Ignored for alpine" echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine"
echo "--skipunmount - optional, will skip the unmount of rootfs folder." echo "--skipunmount - optional, will skip the unmount of rootfs folder."
exit 1 exit 1
} }
__LinuxCodeName=trusty __LinuxCodeName=xenial
__CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) __CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
__InitialDir=$PWD __InitialDir=$PWD
__BuildArch=arm __BuildArch=arm
__UbuntuArch=armhf __UbuntuArch=armhf
__UbuntuRepo="http://ports.ubuntu.com/" __UbuntuRepo="http://ports.ubuntu.com/"
__LLDB_Package="lldb-3.6-dev" __LLDB_Package="liblldb-3.9-dev"
__SkipUnmount=0 __SkipUnmount=0
# base development support # base development support
@ -53,8 +53,12 @@ __AlpinePackages+=" openssl-dev"
__AlpinePackages+=" zlib-dev" __AlpinePackages+=" zlib-dev"
__UnprocessedBuildArgs= __UnprocessedBuildArgs=
for i in "$@" ; do while :; do
lowerI="$(echo $i | awk '{print tolower($0)}')" if [ $# -le 0 ]; then
break
fi
lowerI="$(echo $1 | awk '{print tolower($0)}')"
case $lowerI in case $lowerI in
-?|-h|--help) -?|-h|--help)
usage usage
@ -95,38 +99,40 @@ for i in "$@" ; do
lldb4.0) lldb4.0)
__LLDB_Package="liblldb-4.0-dev" __LLDB_Package="liblldb-4.0-dev"
;; ;;
lldb5.0)
__LLDB_Package="liblldb-5.0-dev"
;;
lldb6.0)
__LLDB_Package="liblldb-6.0-dev"
;;
no-lldb) no-lldb)
unset __LLDB_Package unset __LLDB_Package
;; ;;
vivid) trusty) # Ubuntu 14.04
if [ "$__LinuxCodeName" != "jessie" ]; then if [ "$__LinuxCodeName" != "jessie" ]; then
__LinuxCodeName=vivid __LinuxCodeName=trusty
fi fi
;; ;;
wily) xenial) # Ubunry 16.04
if [ "$__LinuxCodeName" != "jessie" ]; then
__LinuxCodeName=wily
fi
;;
xenial)
if [ "$__LinuxCodeName" != "jessie" ]; then if [ "$__LinuxCodeName" != "jessie" ]; then
__LinuxCodeName=xenial __LinuxCodeName=xenial
fi fi
;; ;;
zesty) zesty) # Ununtu 17.04
if [ "$__LinuxCodeName" != "jessie" ]; then if [ "$__LinuxCodeName" != "jessie" ]; then
__LinuxCodeName=zesty __LinuxCodeName=zesty
fi fi
;; ;;
bionic) bionic) # Ubuntu 18.04
if [ "$__LinuxCodeName" != "jessie" ]; then if [ "$__LinuxCodeName" != "jessie" ]; then
__LinuxCodeName=bionic __LinuxCodeName=bionic
fi fi
;; ;;
jessie) jessie) # Debian 8
__LinuxCodeName=jessie __LinuxCodeName=jessie
__UbuntuRepo="http://ftp.debian.org/debian/" __UbuntuRepo="http://ftp.debian.org/debian/"
;; ;;
# TBD Stretch -> Debian 9, Buster -> Debian 10
tizen) tizen)
if [ "$__BuildArch" != "armel" ]; then if [ "$__BuildArch" != "armel" ]; then
echo "Tizen is available only for armel." echo "Tizen is available only for armel."
@ -144,10 +150,16 @@ for i in "$@" ; do
--skipunmount) --skipunmount)
__SkipUnmount=1 __SkipUnmount=1
;; ;;
--rootfsdir|-rootfsdir)
shift
__RootfsDir=$1
;;
*) *)
__UnprocessedBuildArgs="$__UnprocessedBuildArgs $i" __UnprocessedBuildArgs="$__UnprocessedBuildArgs $1"
;; ;;
esac esac
shift
done done
if [ "$__BuildArch" == "armel" ]; then if [ "$__BuildArch" == "armel" ]; then
@ -155,12 +167,14 @@ if [ "$__BuildArch" == "armel" ]; then
fi fi
__UbuntuPackages+=" ${__LLDB_Package:-}" __UbuntuPackages+=" ${__LLDB_Package:-}"
__RootfsDir="$__CrossDir/rootfs/$__BuildArch" if [ -z "$__RootfsDir" ] && [ ! -z "$ROOTFS_DIR" ]; then
if [[ -n "$ROOTFS_DIR" ]]; then
__RootfsDir=$ROOTFS_DIR __RootfsDir=$ROOTFS_DIR
fi fi
if [ -z "$__RootfsDir" ]; then
__RootfsDir="$__CrossDir/rootfs/$__BuildArch"
fi
if [ -d "$__RootfsDir" ]; then if [ -d "$__RootfsDir" ]; then
if [ $__SkipUnmount == 0 ]; then if [ $__SkipUnmount == 0 ]; then
umount $__RootfsDir/* umount $__RootfsDir/*

11
eng/common/cross/x86/sources.list.vivid
View file

@ -1,11 +0,0 @@
deb http://archive.ubuntu.com/ubuntu/ vivid main restricted universe
deb-src http://archive.ubuntu.com/ubuntu/ vivid main restricted universe
deb http://archive.ubuntu.com/ubuntu/ vivid-updates main restricted universe
deb-src http://archive.ubuntu.com/ubuntu/ vivid-updates main restricted universe
deb http://archive.ubuntu.com/ubuntu/ vivid-backports main restricted
deb-src http://archive.ubuntu.com/ubuntu/ vivid-backports main restricted
deb http://archive.ubuntu.com/ubuntu/ vivid-security main restricted universe multiverse
deb-src http://archive.ubuntu.com/ubuntu/ vivid-security main restricted universe multiverse

11
eng/common/cross/x86/sources.list.wily
View file

@ -1,11 +0,0 @@
deb http://archive.ubuntu.com/ubuntu/ wily main restricted universe
deb-src http://archive.ubuntu.com/ubuntu/ wily main restricted universe
deb http://archive.ubuntu.com/ubuntu/ wily-updates main restricted universe
deb-src http://archive.ubuntu.com/ubuntu/ wily-updates main restricted universe
deb http://archive.ubuntu.com/ubuntu/ wily-backports main restricted
deb-src http://archive.ubuntu.com/ubuntu/ wily-backports main restricted
deb http://archive.ubuntu.com/ubuntu/ wily-security main restricted universe multiverse
deb-src http://archive.ubuntu.com/ubuntu/ wily-security main restricted universe multiverse

2
global.json
View file

@ -3,6 +3,6 @@
"dotnet": "3.0.100-preview4-011223" "dotnet": "3.0.100-preview4-011223"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19256.12" "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19257.7"
} }
} }