Skip to content

Commit

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

[dotnet/main] Update dependencies from dotnet/arcade
  • Loading branch information
dotnet-maestro[bot] authored Jan 13, 2025
1 parent 91a4907 commit 4685dcc
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 20 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.25056.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25061.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25061.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25061.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.56.Node.linux-x64" Version="10.0.0-alpha.1.24628.1">
<Uri>https://github.com/dotnet/emsdk</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<MicrosoftNETRuntimeEmscripten3156Nodelinuxx64Version>10.0.0-alpha.1.24628.1</MicrosoftNETRuntimeEmscripten3156Nodelinuxx64Version>
<MicrosoftNETRuntimeEmscripten3156Sdklinuxx64Version>10.0.0-alpha.1.24628.1</MicrosoftNETRuntimeEmscripten3156Sdklinuxx64Version>
<MicrosoftNETRuntimeEmscripten3156Cachelinuxx64Version>10.0.0-alpha.1.24628.1</MicrosoftNETRuntimeEmscripten3156Cachelinuxx64Version>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25061.1</MicrosoftDotNetBuildTasksPackagingVersion>
</PropertyGroup>
<PropertyGroup>
<WasiSdkVersion>16</WasiSdkVersion>
Expand Down
15 changes: 6 additions & 9 deletions eng/common/cross/build-rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ __QEMUArch=arm
__UbuntuArch=armhf
__UbuntuRepo=
__UbuntuSuites="updates security backports"
__DebianSuites=
__LLDB_Package="liblldb-3.9-dev"
__SkipUnmount=0

Expand Down Expand Up @@ -188,8 +187,7 @@ while :; do
__AlpineArch=loongarch64
__QEMUArch=loongarch64
__UbuntuArch=loong64
__UbuntuSuites=
__DebianSuites=unreleased
__UbuntuSuites=unreleased
__LLDB_Package="liblldb-19-dev"

if [[ "$__CodeName" == "sid" ]]; then
Expand Down Expand Up @@ -782,6 +780,8 @@ elif [[ "$__CodeName" == "haiku" ]]; then
popd
rm -rf "$__RootfsDir/tmp"
elif [[ -n "$__CodeName" ]]; then
__Suites="$__CodeName $(for suite in $__UbuntuSuites; do echo -n "$__CodeName-$suite "; done)"

if [[ "$__SkipEmulation" == "1" ]]; then
if [[ -z "$AR" ]]; then
if command -v ar &>/dev/null; then
Expand All @@ -794,19 +794,16 @@ elif [[ -n "$__CodeName" ]]; then
fi
fi

# shellcheck disable=SC2086
suites="$__CodeName $__DebianSuites $(echo $__UbuntuSuites | xargs -n 1 | xargs -I {} echo -n "$__CodeName-{} ")"

PYTHON=${PYTHON_EXECUTABLE:-python3}

# shellcheck disable=SC2086,SC2046
echo running "$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \
$(echo $suites | xargs -n 1 | xargs -I {} echo -n "--suite {} ") \
$(for suite in $__Suites; do echo -n "--suite $suite "; done) \
$__UbuntuPackages

# shellcheck disable=SC2086,SC2046
"$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \
$(echo $suites | xargs -n 1 | xargs -I {} echo -n "--suite {} ") \
$(for suite in $__Suites; do echo -n "--suite $suite "; done) \
$__UbuntuPackages

exit 0
Expand Down Expand Up @@ -837,7 +834,7 @@ elif [[ -n "$__CodeName" ]]; then
cat > "$__RootfsDir/etc/apt/sources.list.d/$__CodeName.sources" <<EOF
Types: deb
URIs: $__UbuntuRepo
Suites: $__CodeName $__DebianSuites $(echo $__UbuntuSuites | xargs -n 1 | xargs -I {} echo -n "$__CodeName-{} ")
Suites: $__Suites
Components: main universe
Signed-By: $__KeyringFile
EOF
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
if (!(Test-Path $installScript)) {
Create-Directory $dotnetRoot
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
$uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
$uri = "https://raw.githubusercontent.com/dotnet/install-scripts/4b17227b30fbbad567d4d4fba17c59da51bc817b/src/dotnet-install.ps1"

Retry({
Write-Host "GET $uri"
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ function with_retries {
function GetDotNetInstallScript {
local root=$1
local install_script="$root/dotnet-install.sh"
local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
local install_script_url="https://raw.githubusercontent.com/dotnet/install-scripts/4b17227b30fbbad567d4d4fba17c59da51bc817b/src/dotnet-install.sh"

if [[ ! -a "$install_script" ]]; then
mkdir -p "$root"
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"msbuild-sdks": {
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25056.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25056.1"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25061.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25061.1"
}
}

0 comments on commit 4685dcc

Please sign in to comment.