From b2149a6e0a892627f4dc9cbd41b0a3e7f54e1fcf Mon Sep 17 00:00:00 2001
From: Felix Angelov <felix@shorebird.dev>
Date: Wed, 4 Jun 2025 09:59:58 -0500
Subject: [PATCH] fix: windows workspace installation/upgrade fixes (#3145)

---
 bin/shorebird.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/shorebird.ps1 b/bin/shorebird.ps1
index b5e70e68..5b8c3715 100644
--- a/bin/shorebird.ps1
+++ b/bin/shorebird.ps1
@@ -67,7 +67,7 @@ function Test-ShorebirdNeedsUpdate {
     $snapshotFile = [System.IO.FileInfo] $snapshotPath
     $stampFile = [System.IO.FileInfo] $stampPath
     $pubspecFile = [System.IO.FileInfo] "$shorebirdCliDir\pubspec.yaml"
-    $pubspecLockFile = [System.IO.FileInfo] "$shorebirdCliDir\pubspec.lock"
+    $pubspecLockFile = [System.IO.FileInfo] "$shorebirdRootDir\pubspec.lock"
 
     Push-Location $shorebirdRootDir
     $compileKey = & { git rev-parse HEAD } -split
@@ -150,7 +150,7 @@ function Update-Shorebird {
     # the script here (instead of from the compiled snapshot) invalidates a lot of
     # assumptions we make about the cwd in the shorebird_cli tool.
     & $dart --verbosity=error --disable-dart-dev --snapshot="$snapshotPath" `
-        --snapshot-kind="app-jit" --packages="$shorebirdCliDir/.dart_tool/package_config.json" `
+        --snapshot-kind="app-jit" --packages="$shorebirdRootDir/.dart_tool/package_config.json" `
         --no-enable-mirrors "$shorebirdScript" completion > $null
 
     Write-Debug "writing $compileKey to $stampPath"
@@ -165,4 +165,4 @@ if (Test-ShorebirdNeedsUpdate) {
     Update-Shorebird
 }
 
-& $dart --disable-dart-dev --packages="$shorebirdCliDir\.dart_tool\package_config.json" "$snapshotPath" $args
+& $dart --disable-dart-dev --packages="$shorebirdRootDir\.dart_tool\package_config.json" "$snapshotPath" $args