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

[main] Update dependencies from dotnet/arcade
ThomasGoulet73 · Oct 28, 2024 · 86ef9ee · 86ef9ee
1 parent de09811
commit 86ef9ee
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 11 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -165,25 +165,25 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24523.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24525.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>89040b649a6aa8fa9b6bd6ddaad5a637cf091b07</Sha>
+      <Sha>ee7a468d815a3401b842e23ee336dd9d679d973d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24523.2">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24525.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>89040b649a6aa8fa9b6bd6ddaad5a637cf091b07</Sha>
+      <Sha>ee7a468d815a3401b842e23ee336dd9d679d973d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24523.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24525.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>89040b649a6aa8fa9b6bd6ddaad5a637cf091b07</Sha>
+      <Sha>ee7a468d815a3401b842e23ee336dd9d679d973d</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24523.2">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24525.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>89040b649a6aa8fa9b6bd6ddaad5a637cf091b07</Sha>
+      <Sha>ee7a468d815a3401b842e23ee336dd9d679d973d</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
       <Uri>https://github.com/dotnet/sourcelink</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -51,7 +51,7 @@
   <!-- Packages that come from https://github.com/dotnet/arcade -->
   <PropertyGroup>
     <MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.24523.2</MicrosoftDotNetCodeAnalysisPackageVersion>
+    <MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.24525.3</MicrosoftDotNetCodeAnalysisPackageVersion>
   </PropertyGroup>
   <!-- Sourcelink -->
   <PropertyGroup>

diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+set -e
+
+# This is a simple script primarily used for CI to install necessary dependencies
+#
+# Usage:
+#
+# ./install-dependencies.sh <OS>
+
+os="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
+
+if [ -z "$os" ]; then
+    . "$(dirname "$0")"/init-os-and-arch.sh
+fi
+
+case "$os" in
+    linux)
+        if [ -e /etc/os-release ]; then
+            . /etc/os-release
+        fi
+
+        if [ "$ID" = "debian" ] || [ "$ID_LIKE" = "debian" ]; then
+            apt update
+
+            apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
+                libssl-dev libkrb5-dev zlib1g-dev pigz
+
+            localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+        elif [ "$ID" = "fedora" ]; then
+            dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz
+        elif [ "$ID" = "alpine" ]; then
+            apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz
+        else
+            echo "Unsupported distro. distro: $ID"
+            exit 1
+        fi
+        ;;
+
+    osx|maccatalyst|ios|iossimulator|tvos|tvossimulator)
+        echo "Installed xcode version: $(xcode-select -p)"
+
+        export HOMEBREW_NO_INSTALL_CLEANUP=1
+        export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
+        # Skip brew update for now, see https://github.com/actions/setup-python/issues/577
+        # brew update --preinstall
+        brew bundle --no-upgrade --no-lock --file=- <<EOF
+brew "cmake"
+brew "icu4c"
+brew "openssl@3"
+brew "pkg-config"
+brew "python3"
+brew "pigz"
+EOF
+        ;;
+
+    *)
+        echo "Unsupported platform. OS: $os"
+        exit 1
+        ;;
+esac
diff --git a/global.json b/global.json
@@ -12,8 +12,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24523.2",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24523.2"
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24525.3",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24525.3"
   },
   "sdk": {
     "version": "9.0.100-rc.2.24474.11"