Skip to content

Commit 25daf89

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20201029.1 (#425)
[master] Update dependencies from dotnet/arcade
1 parent b537260 commit 25daf89

File tree

14 files changed

+143
-2010
lines changed

14 files changed

+143
-2010
lines changed

‎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="6.0.0-beta.20522.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20529.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>c262e0121edb7df890528bb61589d4b6e440a1f6</Sha>
8+
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/common/build.ps1‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Param(
77
[string] $msbuildEngine = $null,
88
[bool] $warnAsError = $true,
99
[bool] $nodeReuse = $true,
10-
[bool] $useDefaultDotnetInstall = $false,
1110
[switch][Alias('r')]$restore,
1211
[switch] $deployDeps,
1312
[switch][Alias('b')]$build,
@@ -66,7 +65,6 @@ function Print-Usage() {
6665
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
6766
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
6867
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
69-
Write-Host " -useDefaultDotnetInstall <value> Use dotnet-install.* scripts from public location as opposed to from eng common folder"
7068
Write-Host ""
7169

7270
Write-Host "Command line arguments not listed above are passed thru to msbuild."

‎eng/common/build.sh‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ usage()
3636
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
3737
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
3838
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
39-
echo " --useDefaultDotnetInstall <value> Use dotnet-install.* scripts from public location as opposed to from eng common folder"
40-
4139
echo ""
4240
echo "Command line arguments not listed above are passed thru to msbuild."
4341
echo "Arguments can also be passed in with a single hyphen."
@@ -80,7 +78,6 @@ prepare_machine=false
8078
verbosity='minimal'
8179
runtime_source_feed=''
8280
runtime_source_feed_key=''
83-
use_default_dotnet_install=false
8481

8582
properties=''
8683
while [[ $# > 0 ]]; do
@@ -159,14 +156,10 @@ while [[ $# > 0 ]]; do
159156
runtime_source_feed=$2
160157
shift
161158
;;
162-
-runtimesourcefeedkey)
159+
-runtimesourcefeedkey)
163160
runtime_source_feed_key=$2
164161
shift
165162
;;
166-
-usedefaultdotnetinstall)
167-
use_default_dotnet_install=$2
168-
shift
169-
;;
170163
*)
171164
properties="$properties $1"
172165
;;

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,13 @@ while :; do
106106
__UbuntuRepo="http://ftp.debian.org/debian/"
107107
__CodeName=jessie
108108
;;
109+
s390x)
110+
__BuildArch=s390x
111+
__UbuntuArch=s390x
112+
__UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
113+
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
114+
unset __LLDB_Package
115+
;;
109116
x86)
110117
__BuildArch=x86
111118
__UbuntuArch=i386

‎eng/common/cross/s390x/sources.list.bionic‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe
2+
deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe
3+
4+
deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe
5+
deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe
6+
7+
deb http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted
8+
deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted
9+
10+
deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse

‎eng/common/cross/toolchain.cmake‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
3636
if("$ENV{__DistroRid}" MATCHES "tizen.*")
3737
set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
3838
endif()
39+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
40+
set(CMAKE_SYSTEM_PROCESSOR s390x)
41+
set(TOOLCHAIN "s390x-linux-gnu")
3942
elseif(TARGET_ARCH_NAME STREQUAL "x86")
4043
set(CMAKE_SYSTEM_PROCESSOR i686)
4144
set(TOOLCHAIN "i686-linux-gnu")
@@ -46,7 +49,7 @@ elseif (ILLUMOS)
4649
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
4750
set(TOOLCHAIN "x86_64-illumos")
4851
else()
49-
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, arm64 and x86 are supported!")
52+
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, arm64, s390x and x86 are supported!")
5053
endif()
5154

5255
if(DEFINED ENV{TOOLCHAIN})
@@ -171,7 +174,7 @@ endif()
171174

172175
# Specify compile options
173176

174-
if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$" AND NOT "$ENV{__DistroRid}" MATCHES "android.*") OR ILLUMOS)
177+
if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|s390x)$" AND NOT "$ENV{__DistroRid}" MATCHES "android.*") OR ILLUMOS)
175178
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
176179
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
177180
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})

0 commit comments

Comments
 (0)