Update dependencies from https://github.com/dotnet/arcade build 20240…

…614.1 (#2524)

[release/2.1] Update dependencies from dotnet/arcade

eng/Version.Details.xml

@@ -3,17 +3,17 @@
  <ProductDependencies>
  </ProductDependencies>
  <ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24306.4">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24314.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
+ <Sha>92a725aa4d9d6c13dc5229597b51b0b165b8b535</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24306.4">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24314.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
+ <Sha>92a725aa4d9d6c13dc5229597b51b0b165b8b535</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24306.4">
+ <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24314.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
+ <Sha>92a725aa4d9d6c13dc5229597b51b0b165b8b535</Sha>
  </Dependency>
  </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -14,6 +14,6 @@
  <PropertyGroup>
  <SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
  <MicrosoftBclTimeProviderVersion>8.0.0</MicrosoftBclTimeProviderVersion>
- <MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24306.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
+ <MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24314.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
  </PropertyGroup>
 </Project>

eng/common/cross/build-rootfs.sh

@@ -131,6 +131,7 @@ __AlpineKeys='
 __Keyring=
 __SkipSigCheck=0
 __UseMirror=0
+__UseDeb822Format=0
 
 __UnprocessedBuildArgs=
 while :; do
@@ -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
 
@@ -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
 
@@ -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

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

@@ -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

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

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

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

@@ -43,7 +43,7 @@ try {
  --azdev-pat $AzdoToken `
  --bar-uri $MaestroApiEndPoint `
  --password $MaestroToken `
- --disable-interactive-auth `
+ --ci `
  @optionalParams
 
  if ($LastExitCode -ne 0) {

eng/common/tools.ps1

@@ -653,7 +653,7 @@ function GetNuGetPackageCachePath() {
  $env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\'
  } else {
  $env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages\'
- $env:RESTORENOCACHE = $true
+ $env:RESTORENOHTTPCACHE = $true
  }
  }
 

eng/common/tools.sh

@@ -347,14 +347,14 @@ function InitializeBuildTool {
  fi
 }
 
-# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
+# Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116
 function GetNuGetPackageCachePath {
  if [[ -z ${NUGET_PACKAGES:-} ]]; then
  if [[ "$use_global_nuget_cache" == true ]]; then
- export NUGET_PACKAGES="$HOME/.nuget/packages"
+ export NUGET_PACKAGES="$HOME/.nuget/packages/"
  else
- export NUGET_PACKAGES="$repo_root/.packages"
- export RESTORENOCACHE=true
+ export NUGET_PACKAGES="$repo_root/.packages/"
+ export RESTORENOHTTPCACHE=true
  fi
  fi
 

global.json

@@ -1,9 +1,9 @@
 {
  "sdk": {
- "version": "9.0.100-preview.4.24267.66"
+ "version": "9.0.100-preview.5.24307.3"
  },
  "tools": {
- "dotnet": "9.0.100-preview.4.24267.66",
+ "dotnet": "9.0.100-preview.5.24307.3",
  "runtimes": {
  "dotnet": [
  "6.0.29",
@@ -18,7 +18,7 @@
  }
  },
  "msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24306.4",
- "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24306.4"
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24314.1",
+ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24314.1"
  }
 }