Skip to content

Commit a869e31

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20250111.1 (#59844)
[main] Update dependencies from dotnet/arcade
1 parent 151d09e commit a869e31

File tree

6 files changed

+32
-35
lines changed

6 files changed

+32
-35
lines changed

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -388,39 +388,39 @@
388388
<Uri>https://github.com/dotnet/runtime</Uri>
389389
<Sha>82ab89241b90ca3d64b22971f3a1e248da72828a</Sha>
390390
</Dependency>
391-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25056.1">
391+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25061.1">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
393+
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
394394
</Dependency>
395395
<!-- Intermediate is necessary for source build. -->
396-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25056.1">
396+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25061.1">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
398+
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
399399
<SourceBuild RepoName="arcade" ManagedOnly="true" />
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25056.1">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25061.1">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
403+
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25056.1">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25061.1">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
407+
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25056.1">
409+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25061.1">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
411+
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25056.1">
413+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25061.1">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
415+
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
416416
</Dependency>
417-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25056.1">
417+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25061.1">
418418
<Uri>https://github.com/dotnet/arcade</Uri>
419-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
419+
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25056.1">
421+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25061.1">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
423+
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
424424
</Dependency>
425425
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0-preview.1.25056.1">
426426
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@
166166
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
167167
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
168168
<!-- Packages from dotnet/arcade -->
169-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksArchivesVersion>
170-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksInstallersVersion>
171-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksTemplatingVersion>
172-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25056.1</MicrosoftDotNetRemoteExecutorVersion>
173-
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.25056.1</MicrosoftSourceBuildIntermediatearcadeVersion>
169+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25061.1</MicrosoftDotNetBuildTasksArchivesVersion>
170+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25061.1</MicrosoftDotNetBuildTasksInstallersVersion>
171+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25061.1</MicrosoftDotNetBuildTasksTemplatingVersion>
172+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25061.1</MicrosoftDotNetRemoteExecutorVersion>
173+
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.25061.1</MicrosoftSourceBuildIntermediatearcadeVersion>
174174
<!-- Packages from dotnet/source-build-externals -->
175175
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.605601</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
176176
<!-- Packages from dotnet/source-build-reference-packages -->

‎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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "11.0.24"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25056.1",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25056.1",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25056.1",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25061.1",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25061.1",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25061.1",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

0 commit comments

Comments
 (0)