Skip to content

Commit 1e01c1b

Browse files
[main] Update dependencies from dotnet/arcade (#6839)
[main] Update dependencies from dotnet/arcade
1 parent 1a9a165 commit 1e01c1b

File tree

5 files changed

+88
-78
lines changed

5 files changed

+88
-78
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.22369.9">
78+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22377.15">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
80+
<Sha>7df67590fb080663ada77f269a8b132ef127a039</Sha>
8181
</Dependency>
82-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22369.9">
82+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22377.15">
8383
<Uri>https://github.com/dotnet/arcade</Uri>
84-
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
84+
<Sha>7df67590fb080663ada77f269a8b132ef127a039</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22369.9">
86+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22377.15">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
88+
<Sha>7df67590fb080663ada77f269a8b132ef127a039</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22369.9">
90+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22377.15">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
92+
<Sha>7df67590fb080663ada77f269a8b132ef127a039</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22369.9">
94+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22377.15">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
96+
<Sha>7df67590fb080663ada77f269a8b132ef127a039</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.22369.9</MicrosoftDotNetApiCompatVersion>
52-
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.22369.9</MicrosoftDotNetCodeAnalysisPackageVersion>
51+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22377.15</MicrosoftDotNetApiCompatVersion>
52+
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.22377.15</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: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ 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)"
23+
echo " Will additionally trigger the following actions: --restore, --build, --pack"
24+
echo " If --configuration is not set explicitly, will also set it to 'Release'"
2225
echo " --rebuild Rebuild solution"
2326
echo " --test Run all unit tests in the solution (short: -t)"
2427
echo " --integrationTest Run all integration tests in the solution"
@@ -55,6 +58,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
5558

5659
restore=false
5760
build=false
61+
source_build=false
5862
rebuild=false
5963
test=false
6064
integration_test=false
@@ -73,7 +77,7 @@ exclude_ci_binary_log=false
7377
pipelines_log=false
7478

7579
projects=''
76-
configuration='Debug'
80+
configuration=''
7781
prepare_machine=false
7882
verbosity='minimal'
7983
runtime_source_feed=''
@@ -119,6 +123,12 @@ while [[ $# > 0 ]]; do
119123
-pack)
120124
pack=true
121125
;;
126+
-sourcebuild|-sb)
127+
build=true
128+
source_build=true
129+
restore=true
130+
pack=true
131+
;;
122132
-test|-t)
123133
test=true
124134
;;
@@ -168,6 +178,10 @@ while [[ $# > 0 ]]; do
168178
shift
169179
done
170180

181+
if [[ -z "$configuration" ]]; then
182+
if [[ "$source_build" = true ]]; then configuration="Release"; else configuration="Debug"; fi
183+
fi
184+
171185
if [[ "$ci" == true ]]; then
172186
pipelines_log=true
173187
node_reuse=false
@@ -205,6 +219,7 @@ function Build {
205219
/p:RepoRoot="$repo_root" \
206220
/p:Restore=$restore \
207221
/p:Build=$build \
222+
/p:ArcadeBuildFromSource=$source_build \
208223
/p:Rebuild=$rebuild \
209224
/p:Test=$test \
210225
/p:Pack=$pack \

eng/common/cross/build-rootfs.sh

Lines changed: 58 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ usage()
1818

1919
__CodeName=xenial
2020
__CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
21-
__InitialDir=$PWD
2221
__BuildArch=arm
2322
__AlpineArch=armv7
2423
__FreeBSDArch=arm
@@ -43,7 +42,7 @@ __AlpinePackages+=" libedit"
4342
# symlinks fixer
4443
__UbuntuPackages+=" symlinks"
4544

46-
# CoreCLR and CoreFX dependencies
45+
# runtime dependencies
4746
__UbuntuPackages+=" libicu-dev"
4847
__UbuntuPackages+=" liblttng-ust-dev"
4948
__UbuntuPackages+=" libunwind8-dev"
@@ -54,7 +53,7 @@ __AlpinePackages+=" libunwind-dev"
5453
__AlpinePackages+=" lttng-ust-dev"
5554
__AlpinePackages+=" compiler-rt-static"
5655

57-
# CoreFX dependencies
56+
# runtime libraries' dependencies
5857
__UbuntuPackages+=" libcurl4-openssl-dev"
5958
__UbuntuPackages+=" libkrb5-dev"
6059
__UbuntuPackages+=" libssl-dev"
@@ -84,17 +83,18 @@ __IllumosPackages+=" zlib-1.2.11"
8483
__UbuntuPackages+=" libomp5"
8584
__UbuntuPackages+=" libomp-dev"
8685

86+
__Keyring=
8787
__UseMirror=0
8888

8989
__UnprocessedBuildArgs=
9090
while :; do
91-
if [ $# -le 0 ]; then
91+
if [[ "$#" -le 0 ]]; then
9292
break
9393
fi
9494

95-
lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")"
95+
lowerI="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
9696
case $lowerI in
97-
-?|-h|--help)
97+
-\?|-h|--help)
9898
usage
9999
exit 1
100100
;;
@@ -111,7 +111,7 @@ while :; do
111111
__UbuntuRepo="http://raspbian.raspberrypi.org/raspbian/"
112112
__CodeName=buster
113113
__LLDB_Package="liblldb-6.0-dev"
114-
__Keyring="/usr/share/keyrings/raspbian-archive-keyring.gpg"
114+
__Keyring="--keyring /usr/share/keyrings/raspbian-archive-keyring.gpg"
115115
;;
116116
arm64)
117117
__BuildArch=arm64
@@ -189,17 +189,17 @@ while :; do
189189
fi
190190
;;
191191
xenial) # Ubuntu 16.04
192-
if [ "$__CodeName" != "jessie" ]; then
192+
if [[ "$__CodeName" != "jessie" ]]; then
193193
__CodeName=xenial
194194
fi
195195
;;
196196
zesty) # Ubuntu 17.04
197-
if [ "$__CodeName" != "jessie" ]; then
197+
if [[ "$__CodeName" != "jessie" ]]; then
198198
__CodeName=zesty
199199
fi
200200
;;
201201
bionic) # Ubuntu 18.04
202-
if [ "$__CodeName" != "jessie" ]; then
202+
if [[ "$__CodeName" != "jessie" ]]; then
203203
__CodeName=bionic
204204
fi
205205
;;
@@ -253,7 +253,7 @@ while :; do
253253
;;
254254
--rootfsdir|-rootfsdir)
255255
shift
256-
__RootfsDir=$1
256+
__RootfsDir="$1"
257257
;;
258258
--use-mirror)
259259
__UseMirror=1
@@ -266,71 +266,66 @@ while :; do
266266
shift
267267
done
268268

269-
if [ -e "$__Keyring" ]; then
270-
__Keyring="--keyring=$__Keyring"
271-
else
272-
__Keyring=""
273-
fi
274-
275-
if [ "$__BuildArch" == "armel" ]; then
269+
if [[ "$__BuildArch" == "armel" ]]; then
276270
__LLDB_Package="lldb-3.5-dev"
277271
fi
272+
278273
__UbuntuPackages+=" ${__LLDB_Package:-}"
279274

280-
if [ ! -z "$__LLVM_MajorVersion" ]; then
275+
if [[ -n "$__LLVM_MajorVersion" ]]; then
281276
__UbuntuPackages+=" libclang-common-${__LLVM_MajorVersion}${__LLVM_MinorVersion:+.$__LLVM_MinorVersion}-dev"
282277
fi
283278

284-
if [ -z "$__RootfsDir" ] && [ ! -z "$ROOTFS_DIR" ]; then
285-
__RootfsDir=$ROOTFS_DIR
279+
if [[ -z "$__RootfsDir" && -n "$ROOTFS_DIR" ]]; then
280+
__RootfsDir="$ROOTFS_DIR"
286281
fi
287282

288-
if [ -z "$__RootfsDir" ]; then
283+
if [[ -z "$__RootfsDir" ]]; then
289284
__RootfsDir="$__CrossDir/../../../.tools/rootfs/$__BuildArch"
290285
fi
291286

292-
if [ -d "$__RootfsDir" ]; then
293-
if [ $__SkipUnmount == 0 ]; then
294-
umount $__RootfsDir/* || true
287+
if [[ -d "$__RootfsDir" ]]; then
288+
if [[ "$__SkipUnmount" == "0" ]]; then
289+
umount "$__RootfsDir"/* || true
295290
fi
296-
rm -rf $__RootfsDir
291+
rm -rf "$__RootfsDir"
297292
fi
298293

299-
mkdir -p $__RootfsDir
294+
mkdir -p "$__RootfsDir"
300295
__RootfsDir="$( cd "$__RootfsDir" && pwd )"
301296

302297
if [[ "$__CodeName" == "alpine" ]]; then
303298
__ApkToolsVersion=2.9.1
304-
__ApkToolsDir=$(mktemp -d)
305-
wget https://github.com/alpinelinux/apk-tools/releases/download/v$__ApkToolsVersion/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -P $__ApkToolsDir
306-
tar -xf $__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -C $__ApkToolsDir
307-
mkdir -p $__RootfsDir/usr/bin
308-
cp -v /usr/bin/qemu-$__QEMUArch-static $__RootfsDir/usr/bin
299+
__ApkToolsDir="$(mktemp -d)"
300+
wget "https://github.com/alpinelinux/apk-tools/releases/download/v$__ApkToolsVersion/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz" -P "$__ApkToolsDir"
301+
tar -xf "$__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz" -C "$__ApkToolsDir"
302+
mkdir -p "$__RootfsDir"/usr/bin
303+
cp -v "/usr/bin/qemu-$__QEMUArch-static" "$__RootfsDir/usr/bin"
309304

310-
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
311-
-X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/main \
312-
-X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/community \
313-
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
305+
"$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk" \
306+
-X "http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/main" \
307+
-X "http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/community" \
308+
-U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb \
314309
add $__AlpinePackages
315310

316-
rm -r $__ApkToolsDir
311+
rm -r "$__ApkToolsDir"
317312
elif [[ "$__CodeName" == "freebsd" ]]; then
318-
mkdir -p $__RootfsDir/usr/local/etc
313+
mkdir -p "$__RootfsDir"/usr/local/etc
319314
JOBS="$(getconf _NPROCESSORS_ONLN)"
320-
wget -O - https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz | tar -C $__RootfsDir -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version
321-
echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > ${__RootfsDir}/usr/local/etc/pkg.conf
322-
echo "FreeBSD: { url: "pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > ${__RootfsDir}/etc/pkg/FreeBSD.conf
323-
mkdir -p $__RootfsDir/tmp
315+
wget -O - "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version
316+
echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > "${__RootfsDir}"/usr/local/etc/pkg.conf
317+
echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf
318+
mkdir -p "$__RootfsDir"/tmp
324319
# get and build package manager
325-
wget -O - https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz | tar -C $__RootfsDir/tmp -zxf -
326-
cd $__RootfsDir/tmp/pkg-${__FreeBSDPkg}
320+
wget -O - "https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz" | tar -C "$__RootfsDir"/tmp -zxf -
321+
cd "$__RootfsDir/tmp/pkg-${__FreeBSDPkg}"
327322
# needed for install to succeed
328-
mkdir -p $__RootfsDir/host/etc
329-
./autogen.sh && ./configure --prefix=$__RootfsDir/host && make -j "$JOBS" && make install
330-
rm -rf $__RootfsDir/tmp/pkg-${__FreeBSDPkg}
323+
mkdir -p "$__RootfsDir"/host/etc
324+
./autogen.sh && ./configure --prefix="$__RootfsDir"/host && make -j "$JOBS" && make install
325+
rm -rf "$__RootfsDir/tmp/pkg-${__FreeBSDPkg}"
331326
# install packages we need.
332-
INSTALL_AS_USER=$(whoami) $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf update
333-
INSTALL_AS_USER=$(whoami) $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages
327+
INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf update
328+
INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages
334329
elif [[ "$__CodeName" == "illumos" ]]; then
335330
mkdir "$__RootfsDir/tmp"
336331
pushd "$__RootfsDir/tmp"
@@ -358,7 +353,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then
358353
if [[ "$__UseMirror" == 1 ]]; then
359354
BaseUrl=http://pkgsrc.smartos.skylime.net
360355
fi
361-
BaseUrl="$BaseUrl"/packages/SmartOS/2020Q1/${__illumosArch}/All
356+
BaseUrl="$BaseUrl/packages/SmartOS/2020Q1/${__illumosArch}/All"
362357
echo "Downloading dependencies."
363358
read -ra array <<<"$__IllumosPackages"
364359
for package in "${array[@]}"; do
@@ -376,26 +371,26 @@ elif [[ "$__CodeName" == "illumos" ]]; then
376371
wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/dlt.h
377372
wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h
378373
wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h
379-
elif [[ -n $__CodeName ]]; then
380-
qemu-debootstrap $__Keyring --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo
381-
cp $__CrossDir/$__BuildArch/sources.list.$__CodeName $__RootfsDir/etc/apt/sources.list
382-
chroot $__RootfsDir apt-get update
383-
chroot $__RootfsDir apt-get -f -y install
384-
chroot $__RootfsDir apt-get -y install $__UbuntuPackages
385-
chroot $__RootfsDir symlinks -cr /usr
386-
chroot $__RootfsDir apt-get clean
374+
elif [[ -n "$__CodeName" ]]; then
375+
qemu-debootstrap $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"
376+
cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list"
377+
chroot "$__RootfsDir" apt-get update
378+
chroot "$__RootfsDir" apt-get -f -y install
379+
chroot "$__RootfsDir" apt-get -y install $__UbuntuPackages
380+
chroot "$__RootfsDir" symlinks -cr /usr
381+
chroot "$__RootfsDir" apt-get clean
387382

388-
if [ $__SkipUnmount == 0 ]; then
389-
umount $__RootfsDir/* || true
383+
if [[ "$__SkipUnmount" == "0" ]]; then
384+
umount "$__RootfsDir"/* || true
390385
fi
391386

392387
if [[ "$__BuildArch" == "armel" && "$__CodeName" == "jessie" ]]; then
393-
pushd $__RootfsDir
394-
patch -p1 < $__CrossDir/$__BuildArch/armel.jessie.patch
388+
pushd "$__RootfsDir"
389+
patch -p1 < "$__CrossDir/$__BuildArch/armel.jessie.patch"
395390
popd
396391
fi
397392
elif [[ "$__Tizen" == "tizen" ]]; then
398-
ROOTFS_DIR=$__RootfsDir $__CrossDir/$__BuildArch/tizen-build-rootfs.sh
393+
ROOTFS_DIR="$__RootfsDir $__CrossDir/$__BuildArch/tizen-build-rootfs.sh"
399394
else
400395
echo "Unsupported target platform."
401396
usage;

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.22369.9",
16-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22369.9"
15+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22377.15",
16+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22377.15"
1717
},
1818
"sdk": {
1919
"version": "7.0.100-preview.5.22307.18"

0 commit comments

Comments
 (0)