Skip to content

Commit 574efeb

Browse files
[main] Update dependencies from dotnet/arcade (#411)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent a389006 commit 574efeb

8 files changed

+44
-17
lines changed

eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
</Dependency>
1010
</ProductDependencies>
1111
<ToolsetDependencies>
12-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24306.4">
12+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24314.1">
1313
<Uri>https://github.com/dotnet/arcade</Uri>
14-
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
14+
<Sha>92a725aa4d9d6c13dc5229597b51b0b165b8b535</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24306.4">
16+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24314.1">
1717
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
18+
<Sha>92a725aa4d9d6c13dc5229597b51b0b165b8b535</Sha>
1919
</Dependency>
2020
<!-- Intermediate is necessary for source build. -->
21-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24306.4">
21+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24314.1">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
23+
<Sha>92a725aa4d9d6c13dc5229597b51b0b165b8b535</Sha>
2424
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2525
</Dependency>
2626
</ToolsetDependencies>

eng/common/cross/build-rootfs.sh

+11-2
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
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

+7
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
}

eng/common/post-build/publish-using-darc.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ try {
4343
--azdev-pat $AzdoToken `
4444
--bar-uri $MaestroApiEndPoint `
4545
--password $MaestroToken `
46-
--disable-interactive-auth `
46+
--ci `
4747
@optionalParams
4848

4949
if ($LastExitCode -ne 0) {

eng/common/tools.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ function GetNuGetPackageCachePath() {
653653
$env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\'
654654
} else {
655655
$env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages\'
656-
$env:RESTORENOCACHE = $true
656+
$env:RESTORENOHTTPCACHE = $true
657657
}
658658
}
659659

eng/common/tools.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -347,14 +347,14 @@ function InitializeBuildTool {
347347
fi
348348
}
349349

350-
# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
350+
# Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116
351351
function GetNuGetPackageCachePath {
352352
if [[ -z ${NUGET_PACKAGES:-} ]]; then
353353
if [[ "$use_global_nuget_cache" == true ]]; then
354-
export NUGET_PACKAGES="$HOME/.nuget/packages"
354+
export NUGET_PACKAGES="$HOME/.nuget/packages/"
355355
else
356-
export NUGET_PACKAGES="$repo_root/.packages"
357-
export RESTORENOCACHE=true
356+
export NUGET_PACKAGES="$repo_root/.packages/"
357+
export RESTORENOHTTPCACHE=true
358358
fi
359359
fi
360360

global.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"sdk": {
3-
"version": "9.0.100-preview.4.24267.66",
3+
"version": "9.0.100-preview.5.24307.3",
44
"allowPrerelease": true,
55
"rollForward": "patch"
66
},
77
"tools": {
8-
"dotnet": "9.0.100-preview.4.24267.66",
8+
"dotnet": "9.0.100-preview.5.24307.3",
99
"runtimes": {
1010
"dotnet/x64": [
1111
"7.0.7",
@@ -18,7 +18,7 @@
1818
}
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24306.4",
21+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24314.1",
2222
"MSTest.Sdk": "3.3.1"
2323
}
2424
}

0 commit comments

Comments
 (0)