Skip to content

Commit c461fdd

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250111.1 (dotnet#2711)
[main] Update dependencies from dotnet/arcade
1 parent 093ed77 commit c461fdd

File tree

6 files changed

+17
-20
lines changed

6 files changed

+17
-20
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25056.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25061.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
8+
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25056.1">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25061.1">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
12+
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25056.1">
14+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25061.1">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
16+
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
1717
</Dependency>
1818
</ToolsetDependencies>
1919
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
1616
<SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
1717
<MicrosoftBclTimeProviderVersion>8.0.0</MicrosoftBclTimeProviderVersion>
18-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24613.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
18+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25061.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
1919
<MicrosoftAspNetCoreTestHostVersion>6.0.36</MicrosoftAspNetCoreTestHostVersion>
2020
<MicrosoftCrankEventSourcesVersion>0.2.0-alpha.24576.2</MicrosoftCrankEventSourcesVersion>
2121
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25056.1</MicrosoftDotNetXUnitExtensionsPackageVersion>

eng/common/cross/build-rootfs.sh

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ __QEMUArch=arm
3333
__UbuntuArch=armhf
3434
__UbuntuRepo=
3535
__UbuntuSuites="updates security backports"
36-
__DebianSuites=
3736
__LLDB_Package="liblldb-3.9-dev"
3837
__SkipUnmount=0
3938

@@ -188,8 +187,7 @@ while :; do
188187
__AlpineArch=loongarch64
189188
__QEMUArch=loongarch64
190189
__UbuntuArch=loong64
191-
__UbuntuSuites=
192-
__DebianSuites=unreleased
190+
__UbuntuSuites=unreleased
193191
__LLDB_Package="liblldb-19-dev"
194192

195193
if [[ "$__CodeName" == "sid" ]]; then
@@ -782,6 +780,8 @@ elif [[ "$__CodeName" == "haiku" ]]; then
782780
popd
783781
rm -rf "$__RootfsDir/tmp"
784782
elif [[ -n "$__CodeName" ]]; then
783+
__Suites="$__CodeName $(for suite in $__UbuntuSuites; do echo -n "$__CodeName-$suite "; done)"
784+
785785
if [[ "$__SkipEmulation" == "1" ]]; then
786786
if [[ -z "$AR" ]]; then
787787
if command -v ar &>/dev/null; then
@@ -794,19 +794,16 @@ elif [[ -n "$__CodeName" ]]; then
794794
fi
795795
fi
796796

797-
# shellcheck disable=SC2086
798-
suites="$__CodeName $__DebianSuites $(echo $__UbuntuSuites | xargs -n 1 | xargs -I {} echo -n "$__CodeName-{} ")"
799-
800797
PYTHON=${PYTHON_EXECUTABLE:-python3}
801798

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

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

812809
exit 0
@@ -837,7 +834,7 @@ elif [[ -n "$__CodeName" ]]; then
837834
cat > "$__RootfsDir/etc/apt/sources.list.d/$__CodeName.sources" <<EOF
838835
Types: deb
839836
URIs: $__UbuntuRepo
840-
Suites: $__CodeName $__DebianSuites $(echo $__UbuntuSuites | xargs -n 1 | xargs -I {} echo -n "$__CodeName-{} ")
837+
Suites: $__Suites
841838
Components: main universe
842839
Signed-By: $__KeyringFile
843840
EOF

eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
262262
if (!(Test-Path $installScript)) {
263263
Create-Directory $dotnetRoot
264264
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
265-
$uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
265+
$uri = "https://raw.githubusercontent.com/dotnet/install-scripts/4b17227b30fbbad567d4d4fba17c59da51bc817b/src/dotnet-install.ps1"
266266

267267
Retry({
268268
Write-Host "GET $uri"

eng/common/tools.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ function with_retries {
295295
function GetDotNetInstallScript {
296296
local root=$1
297297
local install_script="$root/dotnet-install.sh"
298-
local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
298+
local install_script_url="https://raw.githubusercontent.com/dotnet/install-scripts/4b17227b30fbbad567d4d4fba17c59da51bc817b/src/dotnet-install.sh"
299299

300300
if [[ ! -a "$install_script" ]]; then
301301
mkdir -p "$root"

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
}
2121
},
2222
"msbuild-sdks": {
23-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25056.1",
24-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25056.1"
23+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25061.1",
24+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25061.1"
2525
}
2626
}

0 commit comments

Comments
 (0)