Skip to content

Commit 8321d83

Browse files
authored
Fix exit code propagation when building inside the VMR (#55201)
* Fix exit code propagation when building inside the VMR Tested with dotnet/dotnet#90 Fixes dotnet/source-build#4277 * Update build.sh
1 parent 74f4fd1 commit 8321d83

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

eng/build.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,10 @@ Remove-Item variable:global:_DotNetInstallDir -ea Ignore
345345
Remove-Item variable:global:_ToolsetBuildProj -ea Ignore
346346
Remove-Item variable:global:_MSBuildExe -ea Ignore
347347

348+
# tools.ps1 expects the remaining arguments to be available via the $properties string array variable
349+
# TODO: Remove when https://github.com/dotnet/source-build/issues/4337 is implemented.
350+
[string[]] $properties = $MSBuildArguments
351+
348352
# Import Arcade
349353
. "$PSScriptRoot/common/tools.ps1"
350354

eng/build.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,10 @@ if [ "$(uname)" = "Darwin" ]; then
338338
ulimit -n 10000
339339
fi
340340

341+
# tools.sh expects the remaining arguments to be available via the $properties string array variable
342+
# TODO: Remove when https://github.com/dotnet/source-build/issues/4337 is implemented.
343+
properties=$msbuild_args
344+
341345
# Import Arcade
342346
. "$DIR/common/tools.sh"
343347

0 commit comments

Comments
 (0)