diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ebe2442fb8..68f6faf66f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,25 +4,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 diff --git a/eng/Versions.props b/eng/Versions.props index 48d9f0df985..9a745d726cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.0-beta.21359.3 - 6.0.0-beta.21359.3 - 6.0.0-beta.21359.3 - 6.0.0-beta.21359.3 - 6.0.0-beta.21359.3 + 6.0.0-beta.21363.2 + 6.0.0-beta.21363.2 + 6.0.0-beta.21363.2 + 6.0.0-beta.21363.2 + 6.0.0-beta.21363.2 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 591d8666a84..735a4c82838 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 25ef26513c2..268ffaabe31 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "version": "6.0.100-preview.4.21255.9" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21359.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21359.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21363.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21363.2" } }