diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a4a628661de58ebd345c48fff55a0370f35ef37..b1f19c97db03e9b59dc36865e31a989b434d2ec3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/arcade - b6483cac5832aa5207692517f9a49ce1741a3041 + 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 - + https://github.com/dotnet/arcade - b6483cac5832aa5207692517f9a49ce1741a3041 + 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 - + https://github.com/dotnet/arcade - b6483cac5832aa5207692517f9a49ce1741a3041 + 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 diff --git a/eng/Versions.props b/eng/Versions.props index 99e05da96a34f0dd38c1527d69c70fe15cfb1341..0eddd1402bc158e31ead839975307c93a090f205 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,7 +4,7 @@ false prerelease - 7.0.0-beta.22074.13 + 7.0.0-beta.22075.6 5.0.3 5.0.1 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index e94d13d62ef64df14cb0c9ca367206dff2e8cd07..f97dca770540894874bc3337a859ccf4161e1491 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 cfe4b02b9b2913490e45afe1d566602af5494169..2a0a1ce1f7f3cd9e5a6d399ebe8a9c3fc380d142 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "version": "6.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22074.13", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22074.13" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22075.6", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22075.6" } }