From 516d7a5e1c4f7d62b56aec1b92e3620f4beb1f67 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 25 Oct 2024 12:16:44 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20241023.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.24523.2 -> To Version 10.0.0-beta.24523.3 --- eng/Version.Details.xml | 16 +++--- eng/Versions.props | 2 +- eng/common/native/install-dependencies.sh | 61 +++++++++++++++++++++++ global.json | 4 +- 4 files changed, 72 insertions(+), 11 deletions(-) create mode 100644 eng/common/native/install-dependencies.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de07ed504ff..abfe7430208 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -165,25 +165,25 @@ - + https://github.com/dotnet/arcade - 89040b649a6aa8fa9b6bd6ddaad5a637cf091b07 + 00e780071eb53d628a8f5bff7ecfc848eb88a1af - + https://github.com/dotnet/arcade - 89040b649a6aa8fa9b6bd6ddaad5a637cf091b07 + 00e780071eb53d628a8f5bff7ecfc848eb88a1af - + https://github.com/dotnet/arcade - 89040b649a6aa8fa9b6bd6ddaad5a637cf091b07 + 00e780071eb53d628a8f5bff7ecfc848eb88a1af https://github.com/dotnet/arcade f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 89040b649a6aa8fa9b6bd6ddaad5a637cf091b07 + 00e780071eb53d628a8f5bff7ecfc848eb88a1af https://github.com/dotnet/sourcelink diff --git a/eng/Versions.props b/eng/Versions.props index 1eda5b6db0d..213d272fcdf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ 9.0.0-beta.24053.1 - 10.0.0-beta.24523.2 + 10.0.0-beta.24523.3 diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh new file mode 100644 index 00000000000..03e47c48ac9 --- /dev/null +++ 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="$(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=- < Date: Sat, 26 Oct 2024 12:18:12 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20241025.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.24523.2 -> To Version 10.0.0-beta.24525.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index abfe7430208..b48b45f3b38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -165,25 +165,25 @@ - + https://github.com/dotnet/arcade - 00e780071eb53d628a8f5bff7ecfc848eb88a1af + ee7a468d815a3401b842e23ee336dd9d679d973d - + https://github.com/dotnet/arcade - 00e780071eb53d628a8f5bff7ecfc848eb88a1af + ee7a468d815a3401b842e23ee336dd9d679d973d - + https://github.com/dotnet/arcade - 00e780071eb53d628a8f5bff7ecfc848eb88a1af + ee7a468d815a3401b842e23ee336dd9d679d973d https://github.com/dotnet/arcade f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 00e780071eb53d628a8f5bff7ecfc848eb88a1af + ee7a468d815a3401b842e23ee336dd9d679d973d https://github.com/dotnet/sourcelink diff --git a/eng/Versions.props b/eng/Versions.props index 213d272fcdf..551deab3c9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ 9.0.0-beta.24053.1 - 10.0.0-beta.24523.3 + 10.0.0-beta.24525.3 diff --git a/global.json b/global.json index 8da6fcf131c..72c205c1753 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24523.3", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24523.3" + "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"