Skip to content

Commit 0e7922d

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#5579)
[main] Update dependencies from dotnet/arcade
1 parent 50cdbe6 commit 0e7922d

File tree

6 files changed

+40
-13
lines changed

6 files changed

+40
-13
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24312.1">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24314.1">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>a7f9929d8dfde18489958185375b50ad49fa7a58</Sha>
9+
<Sha>92a725aa4d9d6c13dc5229597b51b0b165b8b535</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24312.1">
11+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24314.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>a7f9929d8dfde18489958185375b50ad49fa7a58</Sha>
13+
<Sha>92a725aa4d9d6c13dc5229597b51b0b165b8b535</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24312.1">
15+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24314.1">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>a7f9929d8dfde18489958185375b50ad49fa7a58</Sha>
17+
<Sha>92a725aa4d9d6c13dc5229597b51b0b165b8b535</Sha>
1818
</Dependency>
1919
</ToolsetDependencies>
2020
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</PropertyGroup>
1919
<!-- Arcade dependencies -->
2020
<PropertyGroup>
21-
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24312.1</MicrosoftDotNetGenFacadesPackageVersion>
22-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24312.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
21+
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24314.1</MicrosoftDotNetGenFacadesPackageVersion>
22+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24314.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
2323
</PropertyGroup>
2424
<!-- CoreFx dependencies -->
2525
<PropertyGroup>

‎eng/common/cross/build-rootfs.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ __AlpineKeys='
131131
__Keyring=
132132
__SkipSigCheck=0
133133
__UseMirror=0
134+
__UseDeb822Format=0
134135

135136
__UnprocessedBuildArgs=
136137
while :; do
@@ -181,7 +182,6 @@ while :; do
181182
__AlpinePackages="${__AlpinePackages// lldb-dev/}"
182183
__QEMUArch=riscv64
183184
__UbuntuArch=riscv64
184-
__UbuntuRepo="http://deb.debian.org/debian"
185185
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
186186
unset __LLDB_Package
187187

@@ -288,6 +288,12 @@ while :; do
288288
__CodeName=jammy
289289
fi
290290
;;
291+
noble) # Ubuntu 24.04
292+
if [[ "$__CodeName" != "jessie" ]]; then
293+
__CodeName=noble
294+
fi
295+
__UseDeb822Format=1
296+
;;
291297
jessie) # Debian 8
292298
__CodeName=jessie
293299

@@ -732,8 +738,11 @@ elif [[ -n "$__CodeName" ]]; then
732738
fi
733739

734740
# shellcheck disable=SC2086
741+
echo running debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"
735742
debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"
736-
cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list"
743+
mkdir -p "$__RootfsDir/etc/apt/sources.list.d/"
744+
grep -q "Types:" "$__CrossDir/$__BuildArch/sources.list.$__CodeName" && filename="$__CodeName.sources" || filename="$__CodeName.list"
745+
cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list.d/$filename"
737746
chroot "$__RootfsDir" apt-get update
738747
chroot "$__RootfsDir" apt-get -f -y install
739748
# shellcheck disable=SC2086

‎eng/common/cross/riscv64/sources.list.noble

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Types: deb
2+
URIs: http://ports.ubuntu.com/ubuntu-ports/
3+
Suites: noble noble-updates noble-backports
4+
Components: main universe restricted multiverse
5+
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
6+
7+
Types: deb
8+
URIs: http://ports.ubuntu.com/ubuntu-ports/
9+
Suites: noble-security
10+
Components: main universe restricted multiverse
11+
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg

‎eng/common/post-build/nuget-validation.ps1

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ param(
55
[Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are
66
)
77

8+
# `tools.ps1` checks $ci to perform some actions. Since the post-build
9+
# scripts don't necessarily execute in the same agent that run the
10+
# build.ps1/sh script this variable isn't automatically set.
11+
$ci = $true
12+
$disableConfigureToolsetImport = $true
13+
. $PSScriptRoot\..\tools.ps1
14+
815
try {
916
& $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg
1017
}

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-preview.4.24267.66",
3+
"dotnet": "9.0.100-preview.5.24307.3",
44
"runtimes": {
55
"aspnetcore": [
66
"3.1.5",
@@ -11,10 +11,10 @@
1111
}
1212
},
1313
"sdk": {
14-
"version": "9.0.100-preview.4.24267.66"
14+
"version": "9.0.100-preview.5.24307.3"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24312.1",
17+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24314.1",
1818
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5"
1919
}
2020
}

0 commit comments

Comments
 (0)