Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/arcade build 20241…
Browse files Browse the repository at this point in the history
…027.1 (#2642)

[release/2.1] Update dependencies from dotnet/arcade
  • Loading branch information
dotnet-maestro[bot] authored Oct 28, 2024
1 parent 51ca685 commit dd1274e
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 9 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24515.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24527.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
<Sha>bee0a0f7b1e68e88c63261e127beee2ed06c6d13</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24515.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24527.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
<Sha>bee0a0f7b1e68e88c63261e127beee2ed06c6d13</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24515.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24527.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>31624193093a13f765ab5382509e693911264509</Sha>
<Sha>bee0a0f7b1e68e88c63261e127beee2ed06c6d13</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
<PropertyGroup>
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
<MicrosoftBclTimeProviderVersion>8.0.0</MicrosoftBclTimeProviderVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24515.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24527.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
</PropertyGroup>
</Project>
61 changes: 61 additions & 0 deletions eng/common/native/install-dependencies.sh
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24515.3",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24515.3"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24527.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24527.1"
}
}

0 comments on commit dd1274e

Please sign in to comment.