From 379671ef2afd01e55168929c33c6b5cbcd0b06b0 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 13:26:16 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20240112.5 (#2375)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 12 ++++++------
eng/Versions.props | 2 +-
eng/common/cross/build-rootfs.sh | 6 +++---
eng/common/cross/riscv64/sources.list.sid | 2 +-
eng/common/templates/job/publish-build-assets.yml | 4 ++++
eng/common/tools.ps1 | 10 +++++++++-
global.json | 4 ++--
7 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 26c96d8c0..6cc7ae8a6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,17 +3,17 @@
-
+
https://github.com/dotnet/arcade
- bab85ba4579526962b0dbb0aa4db625c50da8859
+ d731f58a502086842739a358ab490bec08fdb8a7
-
+
https://github.com/dotnet/arcade
- bab85ba4579526962b0dbb0aa4db625c50da8859
+ d731f58a502086842739a358ab490bec08fdb8a7
-
+
https://github.com/dotnet/arcade
- bab85ba4579526962b0dbb0aa4db625c50da8859
+ d731f58a502086842739a358ab490bec08fdb8a7
diff --git a/eng/Versions.props b/eng/Versions.props
index c936aa015..62af77c1e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -14,6 +14,6 @@
8.0.0
8.0.0
- 9.0.0-beta.24055.2
+ 9.0.0-beta.24062.5
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 4228f202e..9b2791cf5 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -182,12 +182,12 @@ while :; do
__AlpinePackages="${__AlpinePackages// lldb-dev/}"
__QEMUArch=riscv64
__UbuntuArch=riscv64
- __UbuntuRepo="http://deb.debian.org/debian-ports"
+ __UbuntuRepo="http://deb.debian.org/debian"
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
unset __LLDB_Package
- if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then
- __Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring"
+ if [[ -e "/usr/share/keyrings/debian-archive-keyring.gpg" ]]; then
+ __Keyring="--keyring /usr/share/keyrings/debian-archive-keyring.gpg --include=debian-archive-keyring"
fi
;;
ppc64le)
diff --git a/eng/common/cross/riscv64/sources.list.sid b/eng/common/cross/riscv64/sources.list.sid
index 65f730d22..b5f7a7e6e 100644
--- a/eng/common/cross/riscv64/sources.list.sid
+++ b/eng/common/cross/riscv64/sources.list.sid
@@ -1 +1 @@
-deb http://deb.debian.org/debian-ports sid main
+deb http://deb.debian.org/debian sid main
diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml
index d9c5b4aaf..3115990d5 100644
--- a/eng/common/templates/job/publish-build-assets.yml
+++ b/eng/common/templates/job/publish-build-assets.yml
@@ -63,6 +63,10 @@ jobs:
steps:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+ - checkout: self
+ fetchDepth: 3
+ clean: true
+
- task: DownloadBuildArtifacts@0
displayName: Download artifact
inputs:
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 9048d6032..0da65b574 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -596,7 +596,15 @@ function InitializeBuildTool() {
ExitWithExitCode 1
}
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
- $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net9.0' }
+
+ # Use override if it exists - commonly set by source-build
+ if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) {
+ $initializeBuildToolFramework="net9.0"
+ } else {
+ $initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework
+ }
+
+ $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework }
} elseif ($msbuildEngine -eq "vs") {
try {
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
diff --git a/global.json b/global.json
index fce8acf65..6849add77 100644
--- a/global.json
+++ b/global.json
@@ -18,7 +18,7 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24055.2",
- "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24055.2"
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24062.5",
+ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24062.5"
}
}