diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b12195cacd..086504f703 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -7,25 +7,25 @@
-
+
https://github.com/dotnet/arcade
- 9e5fd26c0d1a187dfa08242d83e341634d4b1b07
+ d731f58a502086842739a358ab490bec08fdb8a7
-
+
https://github.com/dotnet/arcade
- 9e5fd26c0d1a187dfa08242d83e341634d4b1b07
+ d731f58a502086842739a358ab490bec08fdb8a7
-
+
https://github.com/dotnet/arcade
- 9e5fd26c0d1a187dfa08242d83e341634d4b1b07
+ d731f58a502086842739a358ab490bec08fdb8a7
-
+
https://github.com/dotnet/arcade
- 9e5fd26c0d1a187dfa08242d83e341634d4b1b07
+ d731f58a502086842739a358ab490bec08fdb8a7
-
+
https://github.com/dotnet/arcade
- 9e5fd26c0d1a187dfa08242d83e341634d4b1b07
+ d731f58a502086842739a358ab490bec08fdb8a7
https://github.com/dotnet/arcade-services
@@ -39,9 +39,9 @@
https://github.com/dotnet/xharness
89cb4b1d368e0f15b4df8e02a176dd1f1c33958b
-
+
https://github.com/dotnet/arcade
- 9e5fd26c0d1a187dfa08242d83e341634d4b1b07
+ d731f58a502086842739a358ab490bec08fdb8a7
https://github.com/dotnet/roslyn
@@ -63,9 +63,9 @@
https://github.com/dotnet/symreader-converter
c5ba7c88f92e2dde156c324a8c8edc04d9fa4fe0
-
+
https://github.com/dotnet/arcade
- 9e5fd26c0d1a187dfa08242d83e341634d4b1b07
+ d731f58a502086842739a358ab490bec08fdb8a7
diff --git a/eng/Versions.props b/eng/Versions.props
index 664669e5b8..9f985b1a1d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -81,7 +81,7 @@
8.0.0
5.10.2
1.1.2-beta1.23431.1
- 9.0.0-beta.23628.1
+ 9.0.0-beta.24062.5
2.1.0
3.0.1
0.0.6-test
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 4228f202e5..9b2791cf56 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 65f730d224..b5f7a7e6e1 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/helixpublish.proj b/eng/common/helixpublish.proj
index d7f185856e..c1323bf412 100644
--- a/eng/common/helixpublish.proj
+++ b/eng/common/helixpublish.proj
@@ -1,3 +1,4 @@
+
diff --git a/eng/common/internal/Directory.Build.props b/eng/common/internal/Directory.Build.props
index dbf99d82a5..a735fe9a13 100644
--- a/eng/common/internal/Directory.Build.props
+++ b/eng/common/internal/Directory.Build.props
@@ -1,4 +1,6 @@
+
+
diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj
index 7f5ce6d608..8fa77e5b18 100644
--- a/eng/common/internal/Tools.csproj
+++ b/eng/common/internal/Tools.csproj
@@ -1,5 +1,6 @@
+
net472
false
@@ -27,4 +28,5 @@
+
diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml
index d9c5b4aaf9..3115990d51 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 9048d60324..0da65b5748 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 40b88952ee..4ce45e24e1 100644
--- a/global.json
+++ b/global.json
@@ -13,8 +13,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23628.1",
- "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23628.1",
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24062.5",
+ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24062.5",
"Microsoft.Build.Traversal": "3.2.0",
"Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02",
"Microsoft.SourceLink.Common": "1.1.0-beta-20206-02"