Skip to content

Commit cd58f79

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20220728.16 (#6853)
[main] Update dependencies from dotnet/arcade
1 parent a3a58bf commit cd58f79

File tree

7 files changed

+67
-48
lines changed

7 files changed

+67
-48
lines changed

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,25 +75,25 @@
7575
</Dependency>
7676
</ProductDependencies>
7777
<ToolsetDependencies>
78-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22377.15">
78+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22378.16">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>7df67590fb080663ada77f269a8b132ef127a039</Sha>
80+
<Sha>6f93ec8da69a42fbe9a702a33e104f94773c3f03</Sha>
8181
</Dependency>
82-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22377.15">
82+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22378.16">
8383
<Uri>https://github.com/dotnet/arcade</Uri>
84-
<Sha>7df67590fb080663ada77f269a8b132ef127a039</Sha>
84+
<Sha>6f93ec8da69a42fbe9a702a33e104f94773c3f03</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22377.15">
86+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22378.16">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>7df67590fb080663ada77f269a8b132ef127a039</Sha>
88+
<Sha>6f93ec8da69a42fbe9a702a33e104f94773c3f03</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22377.15">
90+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22378.16">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>7df67590fb080663ada77f269a8b132ef127a039</Sha>
92+
<Sha>6f93ec8da69a42fbe9a702a33e104f94773c3f03</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22377.15">
94+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22378.16">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>7df67590fb080663ada77f269a8b132ef127a039</Sha>
96+
<Sha>6f93ec8da69a42fbe9a702a33e104f94773c3f03</Sha>
9797
</Dependency>
9898
</ToolsetDependencies>
9999
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
</PropertyGroup>
4949
<!-- Packages that come from https://github.com/dotnet/arcade -->
5050
<PropertyGroup>
51-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22377.15</MicrosoftDotNetApiCompatVersion>
52-
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.22377.15</MicrosoftDotNetCodeAnalysisPackageVersion>
51+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22378.16</MicrosoftDotNetApiCompatVersion>
52+
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.22378.16</MicrosoftDotNetCodeAnalysisPackageVersion>
5353
</PropertyGroup>
5454
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
5555
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->

‎eng/common/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ usage()
1919
echo "Actions:"
2020
echo " --restore Restore dependencies (short: -r)"
2121
echo " --build Build solution (short: -b)"
22-
echo " --source-build Source-build the solution (short: -sb)"
22+
echo " --sourceBuild Source-build the solution (short: -sb)"
2323
echo " Will additionally trigger the following actions: --restore, --build, --pack"
2424
echo " If --configuration is not set explicitly, will also set it to 'Release'"
2525
echo " --rebuild Rebuild solution"

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

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55
usage()
66
{
77
echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir <directory>]"
8-
echo "BuildArch can be: arm(default), armel, arm64, x86, x64"
8+
echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86"
99
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
1010
echo " for FreeBSD can be: freebsd12, freebsd13"
1111
echo " for illumos can be: illumos."
@@ -104,15 +104,6 @@ while :; do
104104
__AlpineArch=armv7
105105
__QEMUArch=arm
106106
;;
107-
armv6)
108-
__BuildArch=armv6
109-
__UbuntuArch=armhf
110-
__QEMUArch=arm
111-
__UbuntuRepo="http://raspbian.raspberrypi.org/raspbian/"
112-
__CodeName=buster
113-
__LLDB_Package="liblldb-6.0-dev"
114-
__Keyring="--keyring /usr/share/keyrings/raspbian-archive-keyring.gpg"
115-
;;
116107
arm64)
117108
__BuildArch=arm64
118109
__UbuntuArch=arm64
@@ -127,6 +118,18 @@ while :; do
127118
__UbuntuRepo="http://ftp.debian.org/debian/"
128119
__CodeName=jessie
129120
;;
121+
armv6)
122+
__BuildArch=armv6
123+
__UbuntuArch=armhf
124+
__QEMUArch=arm
125+
__UbuntuRepo="http://raspbian.raspberrypi.org/raspbian/"
126+
__CodeName=buster
127+
__LLDB_Package="liblldb-6.0-dev"
128+
129+
if [[ -e "/usr/share/keyrings/raspbian-archive-keyring.gpg" ]]; then
130+
__Keyring="--keyring /usr/share/keyrings/raspbian-archive-keyring.gpg"
131+
fi
132+
;;
130133
ppc64le)
131134
__BuildArch=ppc64le
132135
__UbuntuArch=ppc64el
@@ -136,6 +139,18 @@ while :; do
136139
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
137140
unset __LLDB_Package
138141
;;
142+
riscv64)
143+
__BuildArch=riscv64
144+
__UbuntuArch=riscv64
145+
__UbuntuRepo="http://deb.debian.org/debian-ports"
146+
__CodeName=sid
147+
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
148+
unset __LLDB_Package
149+
150+
if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then
151+
__Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring"
152+
fi
153+
;;
139154
s390x)
140155
__BuildArch=s390x
141156
__UbuntuArch=s390x
@@ -390,7 +405,7 @@ elif [[ -n "$__CodeName" ]]; then
390405
popd
391406
fi
392407
elif [[ "$__Tizen" == "tizen" ]]; then
393-
ROOTFS_DIR="$__RootfsDir $__CrossDir/$__BuildArch/tizen-build-rootfs.sh"
408+
ROOTFS_DIR="$__RootfsDir" "$__CrossDir/$__BuildArch/tizen-build-rootfs.sh"
394409
else
395410
echo "Unsupported target platform."
396411
usage;

‎eng/common/cross/riscv64/sources.list.sid

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
deb http://deb.debian.org/debian-ports sid main

‎eng/common/cross/toolchain.cmake

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,7 @@ elseif(EXISTS ${CROSS_ROOTFS}/android_platform)
1919
set(ANDROID 1)
2020
endif()
2121

22-
if(TARGET_ARCH_NAME STREQUAL "armel")
23-
set(CMAKE_SYSTEM_PROCESSOR armv7l)
24-
set(TOOLCHAIN "arm-linux-gnueabi")
25-
if(TIZEN)
26-
set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
27-
endif()
28-
elseif(TARGET_ARCH_NAME STREQUAL "arm")
22+
if(TARGET_ARCH_NAME STREQUAL "arm")
2923
set(CMAKE_SYSTEM_PROCESSOR armv7l)
3024
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv7-alpine-linux-musleabihf)
3125
set(TOOLCHAIN "armv7-alpine-linux-musleabihf")
@@ -37,13 +31,6 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm")
3731
if(TIZEN)
3832
set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
3933
endif()
40-
elseif(TARGET_ARCH_NAME STREQUAL "armv6")
41-
set(CMAKE_SYSTEM_PROCESSOR armv6l)
42-
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf)
43-
set(TOOLCHAIN "armv6-alpine-linux-musleabihf")
44-
else()
45-
set(TOOLCHAIN "arm-linux-gnueabihf")
46-
endif()
4734
elseif(TARGET_ARCH_NAME STREQUAL "arm64")
4835
set(CMAKE_SYSTEM_PROCESSOR aarch64)
4936
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl)
@@ -56,18 +43,28 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
5643
elseif(FREEBSD)
5744
set(triple "aarch64-unknown-freebsd12")
5845
endif()
46+
elseif(TARGET_ARCH_NAME STREQUAL "armel")
47+
set(CMAKE_SYSTEM_PROCESSOR armv7l)
48+
set(TOOLCHAIN "arm-linux-gnueabi")
49+
if(TIZEN)
50+
set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
51+
endif()
52+
elseif(TARGET_ARCH_NAME STREQUAL "armv6")
53+
set(CMAKE_SYSTEM_PROCESSOR armv6l)
54+
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf)
55+
set(TOOLCHAIN "armv6-alpine-linux-musleabihf")
56+
else()
57+
set(TOOLCHAIN "arm-linux-gnueabihf")
58+
endif()
5959
elseif(TARGET_ARCH_NAME STREQUAL "ppc64le")
6060
set(CMAKE_SYSTEM_PROCESSOR ppc64le)
6161
set(TOOLCHAIN "powerpc64le-linux-gnu")
62+
elseif(TARGET_ARCH_NAME STREQUAL "riscv64")
63+
set(CMAKE_SYSTEM_PROCESSOR riscv64)
64+
set(TOOLCHAIN "riscv64-linux-gnu")
6265
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
6366
set(CMAKE_SYSTEM_PROCESSOR s390x)
6467
set(TOOLCHAIN "s390x-linux-gnu")
65-
elseif(TARGET_ARCH_NAME STREQUAL "x86")
66-
set(CMAKE_SYSTEM_PROCESSOR i686)
67-
set(TOOLCHAIN "i686-linux-gnu")
68-
if(TIZEN)
69-
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
70-
endif()
7168
elseif(TARGET_ARCH_NAME STREQUAL "x64")
7269
set(CMAKE_SYSTEM_PROCESSOR x86_64)
7370
if(LINUX)
@@ -80,8 +77,14 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
8077
elseif(ILLUMOS)
8178
set(TOOLCHAIN "x86_64-illumos")
8279
endif()
80+
elseif(TARGET_ARCH_NAME STREQUAL "x86")
81+
set(CMAKE_SYSTEM_PROCESSOR i686)
82+
set(TOOLCHAIN "i686-linux-gnu")
83+
if(TIZEN)
84+
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
85+
endif()
8386
else()
84-
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, armv6, arm64, ppc64le, s390x and x86 are supported!")
87+
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!")
8588
endif()
8689

8790
if(DEFINED ENV{TOOLCHAIN})
@@ -226,7 +229,7 @@ endif()
226229

227230
# Specify compile options
228231

229-
if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|ppc64le|s390x)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS)
232+
if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS)
230233
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
231234
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
232235
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22377.15",
16-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22377.15"
15+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22378.16",
16+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22378.16"
1717
},
1818
"sdk": {
1919
"version": "7.0.100-preview.5.22307.18"

0 commit comments

Comments
 (0)