Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/2.1] Update dependencies from dotnet/arcade #2733

Merged
merged 1 commit into from
Feb 3, 2025
Merged

[release/2.1] Update dependencies from dotnet/arcade #2733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
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.25076.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25080.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25076.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25080.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25076.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25080.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
<Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
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.25076.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25080.7</MicrosoftDotNetXUnitExtensionsPackageVersion>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions eng/common/native/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ case "$os" in
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 cpio
libssl-dev libkrb5-dev pigz cpio

localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ]; then
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz cpio
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
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 cpio
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio
else
echo "Unsupported distro. distro: $ID"
exit 1
Expand Down
8 changes: 4 additions & 4 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "10.0.100-alpha.1.25074.2"
"version": "10.0.100-alpha.1.25077.2"
},
"tools": {
"dotnet": "10.0.100-alpha.1.25074.2",
"dotnet": "10.0.100-alpha.1.25077.2",
"runtimes": {
"dotnet": [
"6.0.36",
Expand All @@ -20,7 +20,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25076.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25076.1"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25080.7",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25080.7"
}
}
Loading