diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e97b552fa5e5..f149da6d6f5c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -384,31 +384,31 @@
https://github.com/dotnet/runtime
a9ca41321284c0d1e423bfc240e9c9f8be970b8b
-
+
https://github.com/dotnet/arcade
- 1818ed2babf890a1cd62fa96a1f03abdada2d003
+ 232061b49ae2157efbb83acde9acae79ef3d6d40
-
+
https://github.com/dotnet/arcade
- 1818ed2babf890a1cd62fa96a1f03abdada2d003
+ 232061b49ae2157efbb83acde9acae79ef3d6d40
-
+
https://github.com/dotnet/arcade
- 1818ed2babf890a1cd62fa96a1f03abdada2d003
+ 232061b49ae2157efbb83acde9acae79ef3d6d40
-
+
https://github.com/dotnet/arcade
- 1818ed2babf890a1cd62fa96a1f03abdada2d003
+ 232061b49ae2157efbb83acde9acae79ef3d6d40
-
+
https://github.com/dotnet/arcade
- 1818ed2babf890a1cd62fa96a1f03abdada2d003
+ 232061b49ae2157efbb83acde9acae79ef3d6d40
-
+
https://github.com/dotnet/arcade
- 1818ed2babf890a1cd62fa96a1f03abdada2d003
+ 232061b49ae2157efbb83acde9acae79ef3d6d40
https://github.com/dotnet/extensions
diff --git a/eng/Versions.props b/eng/Versions.props
index e84cea5d5868..8e0040c78f6f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -165,10 +165,10 @@
6.2.4
6.2.4
- 10.0.0-beta.24551.1
- 10.0.0-beta.24551.1
- 10.0.0-beta.24551.1
- 10.0.0-beta.24551.1
+ 10.0.0-beta.24560.1
+ 10.0.0-beta.24560.1
+ 10.0.0-beta.24560.1
+ 10.0.0-beta.24560.1
10.0.0-alpha.1.24554.1
diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh
index 03e47c48ac95..6d1f8a94a689 100644
--- a/eng/common/native/install-dependencies.sh
+++ b/eng/common/native/install-dependencies.sh
@@ -24,13 +24,13 @@ case "$os" in
apt update
apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
- libssl-dev libkrb5-dev zlib1g-dev pigz
+ libssl-dev libkrb5-dev zlib1g-dev pigz cpio
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
elif [ "$ID" = "fedora" ]; then
- dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz
+ dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz cpio
elif [ "$ID" = "alpine" ]; then
- apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz
+ apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz cpio
else
echo "Unsupported distro. distro: $ID"
exit 1
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 22954477a574..7bd54b6ba9b1 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -604,14 +604,7 @@ function InitializeBuildTool() {
}
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
- # 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 }
+ $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net' }
} elseif ($msbuildEngine -eq "vs") {
try {
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
@@ -620,7 +613,7 @@ function InitializeBuildTool() {
ExitWithExitCode 1
}
- $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472"; ExcludePrereleaseVS = $excludePrereleaseVS }
+ $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "netframework"; ExcludePrereleaseVS = $excludePrereleaseVS }
} else {
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unexpected value of -msbuildEngine: '$msbuildEngine'."
ExitWithExitCode 1
@@ -779,8 +772,10 @@ function MSBuild() {
# new scripts need to work with old packages, so we need to look for the old names/versions
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')),
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
- (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.ArcadeLogging.dll')),
- (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll')),
+
+ # This list doesn't need to be updated anymore and can eventually be removed.
+ (Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.ArcadeLogging.dll')),
+ (Join-Path $basePath (Join-Path net9.0 'Microsoft.DotNet.Arcade.Sdk.dll')),
(Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.ArcadeLogging.dll')),
(Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
)
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 00473c9f918d..79b4a28e1707 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -339,12 +339,6 @@ function InitializeBuildTool {
# return values
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
_InitializeBuildToolCommand="msbuild"
- # use override if it exists - commonly set by source-build
- if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then
- _InitializeBuildToolFramework="net9.0"
- else
- _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}"
- fi
}
# Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116
@@ -454,10 +448,12 @@ function MSBuild {
# new scripts need to work with old packages, so we need to look for the old names/versions
local selectedPath=
local possiblePaths=()
- possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.ArcadeLogging.dll" )
- possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" )
- possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.ArcadeLogging.dll" )
- possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.Arcade.Sdk.dll" )
+ possiblePaths+=( "$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll" )
+ possiblePaths+=( "$toolset_dir/net/Microsoft.DotNet.Arcade.Sdk.dll" )
+
+ # This list doesn't need to be updated anymore and can eventually be removed.
+ possiblePaths+=( "$toolset_dir/net9.0/Microsoft.DotNet.ArcadeLogging.dll" )
+ possiblePaths+=( "$toolset_dir/net9.0/Microsoft.DotNet.Arcade.Sdk.dll" )
possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.ArcadeLogging.dll" )
possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.Arcade.Sdk.dll" )
for path in "${possiblePaths[@]}"; do
diff --git a/global.json b/global.json
index fc4be154dbb8..ad18b96e6542 100644
--- a/global.json
+++ b/global.json
@@ -27,7 +27,7 @@
"jdk": "11.0.24"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24551.1",
- "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24551.1"
+ "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24560.1",
+ "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24560.1"
}
}
diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets
index 7b0a4577492b..eead478a6a8b 100644
--- a/src/Installers/Windows/Wix.targets
+++ b/src/Installers/Windows/Wix.targets
@@ -35,8 +35,8 @@
- $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\netcoreapp2.1\Microsoft.DotNet.Build.Tasks.Installers.dll
- $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\net472\Microsoft.DotNet.Build.Tasks.Installers.dll
+ $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\net\Microsoft.DotNet.Build.Tasks.Installers.dll
+ $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\netframework\Microsoft.DotNet.Build.Tasks.Installers.dll