Fixes from reviews

Author: johnml1135

Build/Agent/FwBuildHelpers.psm1

@@ -229,7 +229,16 @@ function Enter-WorktreeLock {
         }
     }
     catch {
-        if (-not $hasHandle -and $mutex) {
+        if ($mutex) {
+            if ($hasHandle) {
+                try {
+                    $mutex.ReleaseMutex()
+                }
+                catch {
+                    # Ignore release failures on the error path.
+                }
+            }
+
             $mutex.Dispose()
         }
         throw

build.ps1

@@ -229,18 +229,11 @@ if (-not (Test-Path $helpersPath)) {
 }
 Import-Module $helpersPath -Force
 
-$worktreeLock = Enter-WorktreeLock -RepoRoot $PSScriptRoot -Context "FieldWorks build" -StartedBy $StartedBy
-
-# Worktree-aware cleanup: only stop conflicting processes related to this repo root.
-Stop-ConflictingProcesses -IncludeOmniSharp -RepoRoot $PSScriptRoot
-
-$fwTasksSourcePath = Join-Path $PSScriptRoot "BuildTools/FwBuildTasks/$Configuration/FwBuildTasks.dll"
-$fwTasksDropPath = Join-Path $PSScriptRoot "BuildTools/FwBuildTasks/$Configuration/FwBuildTasks.dll"
-
 # =============================================================================
 # Environment Setup
 # =============================================================================
 
+$worktreeLock = $null
 $cleanupArgs = @{
 	IncludeOmniSharp = $true
 	RepoRoot = $PSScriptRoot
@@ -310,6 +303,14 @@ function Get-BuildStampPath {
 }
 
 try {
+	$worktreeLock = Enter-WorktreeLock -RepoRoot $PSScriptRoot -Context "FieldWorks build" -StartedBy $StartedBy
+
+	# Worktree-aware cleanup: only stop conflicting processes related to this repo root.
+	Stop-ConflictingProcesses -IncludeOmniSharp -RepoRoot $PSScriptRoot
+
+	$fwTasksSourcePath = Join-Path $PSScriptRoot "BuildTools/FwBuildTasks/$Configuration/FwBuildTasks.dll"
+	$fwTasksDropPath = Join-Path $PSScriptRoot "BuildTools/FwBuildTasks/$Configuration/FwBuildTasks.dll"
+
 	Invoke-WithFileLockRetry -Context "FieldWorks build" -IncludeOmniSharp -RepoRoot $PSScriptRoot -Action {
 		# Initialize Visual Studio Developer environment
 		Initialize-VsDevEnvironment
@@ -635,7 +636,9 @@ try {
 finally {
 	# Kill any lingering build processes that might hold file locks
 	Stop-ConflictingProcesses @cleanupArgs
-	Exit-WorktreeLock -LockHandle $worktreeLock
+	if ($worktreeLock) {
+		Exit-WorktreeLock -LockHandle $worktreeLock
+	}
 }
 
 if ($testExitCode -ne 0) {

test.ps1

@@ -89,18 +89,11 @@ if (-not (Test-Path $helpersPath)) {
 }
 Import-Module $helpersPath -Force
 
-$worktreeLock = $null
-if (-not $SkipWorktreeLock) {
-    $worktreeLock = Enter-WorktreeLock -RepoRoot $PSScriptRoot -Context "FieldWorks test run" -StartedBy $StartedBy
-}
-
-# Worktree-aware cleanup: only stop conflicting processes related to this repo root.
-Stop-ConflictingProcesses -IncludeOmniSharp -RepoRoot $PSScriptRoot
-
 # =============================================================================
 # Environment Setup
 # =============================================================================
 
+$worktreeLock = $null
 $cleanupArgs = @{
     IncludeOmniSharp = $true
     RepoRoot = $PSScriptRoot
@@ -109,6 +102,13 @@ $cleanupArgs = @{
 $testExitCode = 0
 
 try {
+    if (-not $SkipWorktreeLock) {
+        $worktreeLock = Enter-WorktreeLock -RepoRoot $PSScriptRoot -Context "FieldWorks test run" -StartedBy $StartedBy
+    }
+
+    # Worktree-aware cleanup: only stop conflicting processes related to this repo root.
+    Stop-ConflictingProcesses -IncludeOmniSharp -RepoRoot $PSScriptRoot
+
     Invoke-WithFileLockRetry -Context "FieldWorks test run" -IncludeOmniSharp -RepoRoot $PSScriptRoot -Action {
         # Initialize VS environment
         Initialize-VsDevEnvironment