Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/arcade build 20240…
Browse files Browse the repository at this point in the history
…614.1 (#464)

Microsoft.DotNet.Arcade.Sdk
 From Version 9.0.0-beta.24311.10 -> To Version 9.0.0-beta.24314.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
  • Loading branch information
dotnet-maestro[bot] and dotnet-maestro[bot] authored Jun 17, 2024
1 parent 40711d8 commit 4dda7da
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 7 deletions.
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24311.10">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24314.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<Sha>92a725aa4d9d6c13dc5229597b51b0b165b8b535</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
13 changes: 11 additions & 2 deletions eng/common/cross/build-rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ __AlpineKeys='
__Keyring=
__SkipSigCheck=0
__UseMirror=0
__UseDeb822Format=0

__UnprocessedBuildArgs=
while :; do
Expand Down Expand Up @@ -181,7 +182,6 @@ while :; do
__AlpinePackages="${__AlpinePackages// lldb-dev/}"
__QEMUArch=riscv64
__UbuntuArch=riscv64
__UbuntuRepo="http://deb.debian.org/debian"
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
unset __LLDB_Package

Expand Down Expand Up @@ -288,6 +288,12 @@ while :; do
__CodeName=jammy
fi
;;
noble) # Ubuntu 24.04
if [[ "$__CodeName" != "jessie" ]]; then
__CodeName=noble
fi
__UseDeb822Format=1
;;
jessie) # Debian 8
__CodeName=jessie

Expand Down Expand Up @@ -732,8 +738,11 @@ elif [[ -n "$__CodeName" ]]; then
fi

# shellcheck disable=SC2086
echo running debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"
debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"
cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list"
mkdir -p "$__RootfsDir/etc/apt/sources.list.d/"
grep -q "Types:" "$__CrossDir/$__BuildArch/sources.list.$__CodeName" && filename="$__CodeName.sources" || filename="$__CodeName.list"
cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list.d/$filename"
chroot "$__RootfsDir" apt-get update
chroot "$__RootfsDir" apt-get -f -y install
# shellcheck disable=SC2086
Expand Down
11 changes: 11 additions & 0 deletions eng/common/cross/riscv64/sources.list.noble
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Types: deb
URIs: http://ports.ubuntu.com/ubuntu-ports/
Suites: noble noble-updates noble-backports
Components: main universe restricted multiverse
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg

Types: deb
URIs: http://ports.ubuntu.com/ubuntu-ports/
Suites: noble-security
Components: main universe restricted multiverse
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
7 changes: 7 additions & 0 deletions eng/common/post-build/nuget-validation.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ param(
[Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are
)

# `tools.ps1` checks $ci to perform some actions. Since the post-build
# scripts don't necessarily execute in the same agent that run the
# build.ps1/sh script this variable isn't automatically set.
$ci = $true
$disableConfigureToolsetImport = $true
. $PSScriptRoot\..\tools.ps1

try {
& $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg
}
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"sdk": {
"version": "9.0.100-preview.4.24267.66",
"version": "9.0.100-preview.5.24307.3",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "9.0.100-preview.4.24267.66"
"dotnet": "9.0.100-preview.5.24307.3"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24311.10",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24314.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0"
}
Expand Down

0 comments on commit 4dda7da

Please sign in to comment.