From 77d3efe5e4e7f2cf0fe10a537c5725c64c61e88a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Jan 2022 13:54:39 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20220125.6 (#1282) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/cross/build-rootfs.sh | 12 ++++-------- global.json | 2 +- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c109df8..f47b68e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - b6483cac5832aa5207692517f9a49ce1741a3041 + 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 - + https://github.com/dotnet/arcade - b6483cac5832aa5207692517f9a49ce1741a3041 + 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 - + https://github.com/dotnet/arcade - b6483cac5832aa5207692517f9a49ce1741a3041 + 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 - + https://github.com/dotnet/arcade - b6483cac5832aa5207692517f9a49ce1741a3041 + 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 - + https://github.com/dotnet/arcade - b6483cac5832aa5207692517f9a49ce1741a3041 + 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 https://github.com/dotnet/arcade-services diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index e94d13d6..f97dca77 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -7,7 +7,7 @@ usage() echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir ]" echo "BuildArch can be: arm(default), armel, arm64, x86" 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." - echo " for FreeBSD can be: freebsd11, freebsd12, freebsd13" + echo " for FreeBSD can be: freebsd12, freebsd13" echo " for illumos can be: illumos." echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD" echo "--skipunmount - optional, will skip the unmount of rootfs folder." @@ -60,13 +60,13 @@ __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" -__FreeBSDBase="12.2-RELEASE" -__FreeBSDPkg="1.12.0" +__FreeBSDBase="12.3-RELEASE" +__FreeBSDPkg="1.17.0" __FreeBSDABI="12" __FreeBSDPackages="libunwind" __FreeBSDPackages+=" icu" __FreeBSDPackages+=" libinotify" -__FreeBSDPackages+=" lttng-ust" +__FreeBSDPackages+=" openssl" __FreeBSDPackages+=" krb5" __FreeBSDPackages+=" terminfo-db" @@ -206,10 +206,6 @@ while :; do __AlpineVersion=3.14 __AlpinePackages+=" llvm11-libs" ;; - freebsd11) - __FreeBSDBase="11.3-RELEASE" - __FreeBSDABI="11" - ;& freebsd12) __CodeName=freebsd __BuildArch=x64 diff --git a/global.json b/global.json index bed574c7..a132d53f 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22074.13" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22075.6" } }