Skip to content

Commit 6d1f7ab

Browse files
authored
Respect _OverrideArcadeInitializeBuildToolFramework on Windows
Enable #14181 for tools.ps1 as well so that it doesn't just work on Unix.
1 parent bab85ba commit 6d1f7ab

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

eng/common/tools.ps1

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,15 @@ function InitializeBuildTool() {
596596
ExitWithExitCode 1
597597
}
598598
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
599-
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net9.0' }
599+
600+
# Use override if it exists - commonly set by source-build
601+
if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) {
602+
$initializeBuildToolFramework="net9.0"
603+
} else {
604+
$initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework
605+
}
606+
607+
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework }
600608
} elseif ($msbuildEngine -eq "vs") {
601609
try {
602610
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore

0 commit comments

Comments
 (0)