From abc5ebc00489e18046854ee7f3114533c36222f3 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 9 Jan 2026 11:21:37 +0000
Subject: [PATCH 1/2] Initial plan


From 5dec6c1b0368441f6284808e82a1307b7db20d6b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 9 Jan 2026 11:33:38 +0000
Subject: [PATCH 2/2] Fix proto build error handling in build.sh

Remove commented-out error handling code so that the build properly exits
when the proto build step fails. Previously, the error handling was commented
out (everything after # was ignored), causing the build to continue even when
the bootstrap tools failed to build.

Fixes the issue where FSharp build would continue running when the proto
pre-build step fails, leading to confusing downstream errors instead of
clear proto build failures.

The fix changes line 312 from:
"$DOTNET_INSTALL_DIR/dotnet" "${args[@]}"  #$args || exit $?

To:
"$DOTNET_INSTALL_DIR/dotnet" "${args[@]}" || exit $?

This matches the error handling pattern used elsewhere in the script
(e.g., line 248 in the Test function).

Co-authored-by: ViktorHofer <7412651+ViktorHofer@users.noreply.github.com>
---
 eng/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/build.sh b/eng/build.sh
index 2ad44838587..4477ea35db4 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -309,7 +309,7 @@ function BuildSolution {
     BuildMessage="Error building tools"
     local args=("publish" "$repo_root/proto.proj" "$blrestore" "$bltools" "/p:Configuration=Proto" "/p:DotNetBuild=$product_build" "/p:DotNetBuildSourceOnly=$source_build" "/p:DotNetBuildFromVMR=$from_vmr" ${properties[@]+"${properties[@]}"})
     echo $args
-    "$DOTNET_INSTALL_DIR/dotnet" "${args[@]}"  #$args || exit $?
+    "$DOTNET_INSTALL_DIR/dotnet" "${args[@]}" || exit $?
   fi
 
   if [[ "$skip_build" != true ]]; then