diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 71a3ec27..9b6c7d88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 55262f114b0c1b82f0b081bca0d919b657ba24c5 + 1b053babb8a542e3ab20f93b3d0aedc732b7e0c7 - + https://github.com/dotnet/arcade - 55262f114b0c1b82f0b081bca0d919b657ba24c5 + 1b053babb8a542e3ab20f93b3d0aedc732b7e0c7 - + https://github.com/dotnet/arcade - 55262f114b0c1b82f0b081bca0d919b657ba24c5 + 1b053babb8a542e3ab20f93b3d0aedc732b7e0c7 - + https://github.com/dotnet/arcade - 55262f114b0c1b82f0b081bca0d919b657ba24c5 + 1b053babb8a542e3ab20f93b3d0aedc732b7e0c7 - + https://github.com/dotnet/arcade - 55262f114b0c1b82f0b081bca0d919b657ba24c5 + 1b053babb8a542e3ab20f93b3d0aedc732b7e0c7 https://github.com/dotnet/arcade-services diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 591d8666..735a4c82 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -33,7 +33,6 @@ __AlpinePackages="alpine-base" __AlpinePackages+=" build-base" __AlpinePackages+=" linux-headers" __AlpinePackagesEdgeCommunity=" lldb-dev" -__AlpinePackagesEdgeMain=" llvm10-libs" __AlpinePackagesEdgeMain+=" python3" __AlpinePackagesEdgeMain+=" libedit" @@ -115,6 +114,8 @@ while :; do __UbuntuArch=s390x __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/" __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//') + __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//') + __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//') unset __LLDB_Package ;; x86) @@ -191,6 +192,8 @@ while :; do __CodeName=alpine __UbuntuRepo= __AlpineVersion=3.9 + __AlpinePackagesEdgeMain+=" llvm11-libs" + __AlpinePackagesEdgeMain+=" clang-libs" ;; alpine3.13) __CodeName=alpine @@ -201,6 +204,7 @@ while :; do __AlpinePackagesEdgeCommunity= __AlpinePackages+=$__AlpinePackagesEdgeMain __AlpinePackagesEdgeMain= + __AlpinePackages+=" llvm10-libs" ;; freebsd11) __FreeBSDBase="11.3-RELEASE" diff --git a/global.json b/global.json index c702054b..0acf8f13 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21359.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21363.2" } }