Skip to content

Commit 535f840

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#45777)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 7ba9bea commit 535f840

File tree

4 files changed

+26
-29
lines changed

4 files changed

+26
-29
lines changed

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -559,34 +559,34 @@
559559
</Dependency>
560560
</ProductDependencies>
561561
<ToolsetDependencies>
562-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25056.1">
562+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25057.5">
563563
<Uri>https://github.com/dotnet/arcade</Uri>
564-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
564+
<Sha>43494f7be1c54e6a065f02f92842e08f29a1ff6f</Sha>
565565
</Dependency>
566-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25056.1">
566+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25057.5">
567567
<Uri>https://github.com/dotnet/arcade</Uri>
568-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
568+
<Sha>43494f7be1c54e6a065f02f92842e08f29a1ff6f</Sha>
569569
</Dependency>
570-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25056.1">
570+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25057.5">
571571
<Uri>https://github.com/dotnet/arcade</Uri>
572-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
572+
<Sha>43494f7be1c54e6a065f02f92842e08f29a1ff6f</Sha>
573573
</Dependency>
574-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25056.1">
574+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25057.5">
575575
<Uri>https://github.com/dotnet/arcade</Uri>
576-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
576+
<Sha>43494f7be1c54e6a065f02f92842e08f29a1ff6f</Sha>
577577
</Dependency>
578-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25056.1">
578+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25057.5">
579579
<Uri>https://github.com/dotnet/arcade</Uri>
580-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
580+
<Sha>43494f7be1c54e6a065f02f92842e08f29a1ff6f</Sha>
581581
</Dependency>
582-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25056.1">
582+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25057.5">
583583
<Uri>https://github.com/dotnet/arcade</Uri>
584-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
584+
<Sha>43494f7be1c54e6a065f02f92842e08f29a1ff6f</Sha>
585585
</Dependency>
586586
<!-- Intermediate is necessary for source build. -->
587-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25056.1">
587+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25057.5">
588588
<Uri>https://github.com/dotnet/arcade</Uri>
589-
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
589+
<Sha>43494f7be1c54e6a065f02f92842e08f29a1ff6f</Sha>
590590
<SourceBuild RepoName="arcade" ManagedOnly="true" />
591591
</Dependency>
592592
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-alpha.1.25058.4">

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,10 +262,10 @@
262262
</PropertyGroup>
263263
<PropertyGroup>
264264
<!-- Dependencies from https://github.com/dotnet/arcade -->
265-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
266-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25056.1</MicrosoftDotNetSignToolVersion>
267-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25056.1</MicrosoftDotNetXliffTasksVersion>
268-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25056.1</MicrosoftDotNetXUnitExtensionsVersion>
265+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25057.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
266+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25057.5</MicrosoftDotNetSignToolVersion>
267+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25057.5</MicrosoftDotNetXliffTasksVersion>
268+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25057.5</MicrosoftDotNetXUnitExtensionsVersion>
269269
</PropertyGroup>
270270
<PropertyGroup>
271271
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎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

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25056.1",
21-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25056.1",
20+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25057.5",
21+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25057.5",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)