[main] Update dependencies from dotnet/arcade (#15685)

eng/Version.Details.xml

@@ -195,18 +195,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23128.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23151.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2</Sha>
+      <Sha>bdc59254cf108e1d48451dc43bb9ebc331cdca7b</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23128.1">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23151.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2</Sha>
+      <Sha>bdc59254cf108e1d48451dc43bb9ebc331cdca7b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23128.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23151.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>759bbe7e2a8fc570c8a742e52cf1605cb7d3e9c2</Sha>
+      <Sha>bdc59254cf108e1d48451dc43bb9ebc331cdca7b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23128.1">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -225,14 +225,14 @@
       <Sha>72584554974ece2019fbd3dd6743a282f39d9b87</Sha>
       <SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-23125-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+    <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-23128-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>161e4eb21f51d3c3397318cabcc9139718dea790</Sha>
+      <Sha>1d0b20231ab9387f2b6d1c645cac30f763fdf419</Sha>
       <SourceBuild RepoName="sourcelink" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23124.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23128.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
       <Uri>https://github.com/dotnet/xliff-tasks</Uri>
-      <Sha>6d69e885ef955272edd85b4da2360335ebeb98d2</Sha>
+      <Sha>dd049b903ad1a4d53208f3767d181c28058eaa3e</Sha>
       <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
     </Dependency>
   </ToolsetDependencies>

eng/Versions.props

@@ -26,7 +26,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23128.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23151.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade-services -->

eng/common/cross/build-rootfs.sh

@@ -55,7 +55,7 @@ __AlpinePackages+=" gettext-dev"
 __AlpinePackages+=" icu-dev"
 __AlpinePackages+=" libunwind-dev"
 __AlpinePackages+=" lttng-ust-dev"
-__AlpinePackages+=" compiler-rt-static"
+__AlpinePackages+=" compiler-rt"
 __AlpinePackages+=" numactl-dev"
 
 # runtime libraries' dependencies
@@ -150,7 +150,6 @@ while :; do
             __BuildArch=riscv64
             __AlpineArch=riscv64
             __AlpinePackages="${__AlpinePackages// lldb-dev/}"
-            __AlpinePackages="${__AlpinePackages// compiler-rt-static/}"
             __QEMUArch=riscv64
             __UbuntuArch=riscv64
             __UbuntuRepo="http://deb.debian.org/debian-ports"
@@ -160,10 +159,6 @@ while :; do
             if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then
                 __Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring"
             fi
-
-            if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then
-                __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive)
-            fi
             ;;
         ppc64le)
             __BuildArch=ppc64le
@@ -175,10 +170,6 @@ while :; do
             __UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
             __UbuntuPackages="${__UbuntuPackages// libomp5/}"
             unset __LLDB_Package
-
-            if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then
-                __AlpineVersion=3.15 # minimum version that supports compiler-rt
-            fi
             ;;
         s390x)
             __BuildArch=s390x
@@ -190,10 +181,6 @@ while :; do
             __UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
             __UbuntuPackages="${__UbuntuPackages// libomp5/}"
             unset __LLDB_Package
-
-            if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then
-                __AlpineVersion=3.15 # minimum version that supports compiler-rt
-            fi
             ;;
         x64)
             __BuildArch=x64
@@ -206,6 +193,7 @@ while :; do
         x86)
             __BuildArch=x86
             __UbuntuArch=i386
+            __AlpineArch=x86
             __UbuntuRepo="http://archive.ubuntu.com/ubuntu/"
             ;;
         lldb*)
@@ -311,29 +299,8 @@ while :; do
                 parts=(${version//./ })
                 __AlpineMajorVersion="${parts[0]}"
                 __AlpineMinoVersion="${parts[1]}"
-
-                if [[ -z "$__AlpineVersion" ]]; then
                 __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion"
             fi
-            fi
-
-            case "$__AlpineVersion" in
-                3.14) __AlpinePackages+=" llvm11-libs" ;;
-                3.15) __AlpinePackages+=" llvm12-libs" ;;
-                3.16) __AlpinePackages+=" llvm13-libs" ;;
-                3.17) __AlpinePackages+=" llvm15-libs" ;;
-                edge) __AlpineLlvmLibsLookup=1 ;;
-                *)
-                    if [[ "$__AlpineArch" =~ "s390x|ppc64le" ]]; then
-                        __AlpineVersion=3.15 # minimum version that supports compiler-rt
-                        __AlpinePackages+=" llvm12-libs"
-                    elif [[ "$__AlpineArch" == "riscv64" ]]; then
-                        __AlpineLlvmLibsLookup=1
-                        __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive)
-                    else
-                        __AlpineVersion=3.13 # 3.13 to maximize compatibility
-                    fi
-            esac
             ;;
         freebsd12)
             __CodeName=freebsd
@@ -376,10 +343,41 @@ while :; do
     shift
 done
 
+case "$__AlpineVersion" in
+    3.14) __AlpinePackages+=" llvm11-libs" ;;
+    3.15) __AlpinePackages+=" llvm12-libs" ;;
+    3.16) __AlpinePackages+=" llvm13-libs" ;;
+    3.17) __AlpinePackages+=" llvm15-libs" ;;
+    edge) __AlpineLlvmLibsLookup=1 ;;
+    *)
+        if [[ "$__AlpineArch" =~ s390x|ppc64le ]]; then
+        echo boo
+            __AlpineVersion=3.15 # minimum version that supports lldb-dev
+            __AlpinePackages+=" llvm12-libs"
+        elif [[ "$__AlpineArch" == "x86" ]]; then
+            __AlpineVersion=3.17 # minimum version that supports lldb-dev
+            __AlpinePackages+=" llvm15-libs"
+        elif [[ "$__AlpineArch" == "riscv64" ]]; then
+            __AlpineLlvmLibsLookup=1
+            __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive)
+        else
+            __AlpineVersion=3.13 # 3.13 to maximize compatibility
+            __AlpinePackages+=" llvm10-libs"
+
+            if [[ "$__AlpineArch" == "armv7" ]]; then
+                __AlpinePackages="${__AlpinePackages//numactl-dev/}"
+            fi
+        fi
+esac
+
+if [[ "$__AlpineVersion" =~ 3\.1[345] ]]; then
+    # compiler-rt--static was merged in compiler-rt package in alpine 3.16
+    # for older versions, we need compiler-rt--static, so replace the name
+    __AlpinePackages="${__AlpinePackages/compiler-rt/compiler-rt-static}"
+fi
+
 if [[ "$__BuildArch" == "armel" ]]; then
     __LLDB_Package="lldb-3.5-dev"
-elif [[ "$__BuildArch" == "arm" && "$__AlpineVersion" == "3.13" ]]; then
-    __AlpinePackages="${__AlpinePackages//numactl-dev/}"
 fi
 
 __UbuntuPackages+=" ${__LLDB_Package:-}"
@@ -422,26 +420,27 @@ if [[ "$__CodeName" == "alpine" ]]; then
         version="v$__AlpineVersion"
     fi
 
+    # initialize DB
     "$__ApkToolsDir/apk.static" \
         -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
         -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
-        -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb \
+        -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb add
-        add $__AlpinePackages
 
     if [[ "$__AlpineLlvmLibsLookup" == 1 ]]; then
-        "$__ApkToolsDir/apk.static" \
+        __AlpinePackages+=" $("$__ApkToolsDir/apk.static" \
             -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
             -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
             -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \
-            search 'llvm*-libs' | sort | tail -1 | while IFS=- read name rest; do
+            search 'llvm*-libs' | sort | tail -1 | sed 's/-[^-]*//2g')"
-                "$__ApkToolsDir/apk.static" \
-                    -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
-                    -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
-                    -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \
-                    add "$name-libs"
-            done
     fi
 
+    # install all packages in one go
+    "$__ApkToolsDir/apk.static" \
+        -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
+        -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
+        -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \
+        add $__AlpinePackages
+
     rm -r "$__ApkToolsDir"
 elif [[ "$__CodeName" == "freebsd" ]]; then
     mkdir -p "$__RootfsDir"/usr/local/etc

global.json

@@ -11,7 +11,7 @@
     "cmake": "3.21.0"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23128.1",
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23151.4",
-    "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23128.1"
+    "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23151.4"
   }
 }