Improve PowerShell command execution for tsp-client usage

Co-authored-by: JoshLove-msft <[email protected]>

Author: Copilot

eng/common/scripts/TypeSpec-Project-Generate.ps1

@@ -108,25 +108,29 @@ try {
         }
     }
 
-    # Use tsp from pinned version in eng/common/tsp-client
-    $typespecCompileCommand = "Push-Location '$tspClientDir'; npx tsp compile '$mainTypeSpecFile' --emit $emitterName$emitterAdditionalOptions"
-    if ($TypespecAdditionalOptions) {
-        $options = $TypespecAdditionalOptions.Split(";");
-        foreach ($option in $options) {
-            $typespecCompileCommand += " --option $emitterName.$option"
+    # Use tsp from pinned version in eng/common/tsp-client by changing to that directory
+    Push-Location $tspClientDir
+    try {
+        $typespecCompileCommand = "npx tsp compile '$mainTypeSpecFile' --emit $emitterName$emitterAdditionalOptions"
+        if ($TypespecAdditionalOptions) {
+            $options = $TypespecAdditionalOptions.Split(";");
+            foreach ($option in $options) {
+                $typespecCompileCommand += " --option $emitterName.$option"
+            }
         }
-    }
-
-    if ($SaveInputs) {
-        $typespecCompileCommand += " --option $emitterName.save-inputs=true"
-    }
-    
-    $typespecCompileCommand += "; Pop-Location"
 
-    Write-Host($typespecCompileCommand)
-    Invoke-Expression $typespecCompileCommand
+        if ($SaveInputs) {
+            $typespecCompileCommand += " --option $emitterName.save-inputs=true"
+        }
 
-    if ($LASTEXITCODE) { exit $LASTEXITCODE }
+        Write-Host($typespecCompileCommand)
+        Invoke-Expression $typespecCompileCommand
+        
+        if ($LASTEXITCODE) { exit $LASTEXITCODE }
+    }
+    finally {
+        Pop-Location
+    }
 }
 finally {
     Pop-Location

eng/packages/http-client-csharp-mgmt/eng/scripts/Generation.psm1

@@ -47,7 +47,12 @@ function Get-Mgmt-TspCommand {
     )
     Install-TspClient
 
-    $command = "cd `"$tspClientDir`" && npx tsp compile `"$specFile`""
+    # Change to tsp-client directory to use pinned version, then run tsp compile
+    if ($IsLinux -or $IsMacOs) {
+        $command = "cd '$tspClientDir' && npx tsp compile '$specFile'"
+    } else {
+        $command = "pushd `"$tspClientDir`" && npx tsp compile `"$specFile`" && popd"
+    }
     $command += " --trace @azure-typespec/http-client-csharp-mgmt"
     $command += " --emit `"$repoRoot/..`""
     $configFile = Join-Path $generationDir "tspconfig.yaml"

eng/packages/http-client-csharp/eng/scripts/Generation.psm1

@@ -49,7 +49,12 @@ function Get-TspCommand {
     )
     Install-TspClient
 
-    $command = "cd `"$tspClientDir`" && npx tsp compile `"$specFile`""
+    # Change to tsp-client directory to use pinned version, then run tsp compile
+    if ($IsLinux -or $IsMacOs) {
+        $command = "cd '$tspClientDir' && npx tsp compile '$specFile'"
+    } else {
+        $command = "pushd `"$tspClientDir`" && npx tsp compile `"$specFile`" && popd"
+    }
     $command += " --trace @azure-typespec/http-client-csharp"
     $command += " --emit `"$repoRoot/..`""
     $configFile = Join-Path $generationDir "tspconfig.yaml"
@@ -85,7 +90,12 @@ function Get-Mgmt-TspCommand {
     )
     Install-TspClient
 
-    $command = "cd `"$tspClientDir`" && npx tsp compile `"$specFile`""
+    # Change to tsp-client directory to use pinned version, then run tsp compile
+    if ($IsLinux -or $IsMacOs) {
+        $command = "cd '$tspClientDir' && npx tsp compile '$specFile'"
+    } else {
+        $command = "pushd `"$tspClientDir`" && npx tsp compile `"$specFile`" && popd"
+    }
     $command += " --trace @azure-typespec/http-client-csharp-mgmt"
     $command += " --emit `"$repoRoot/../../http-client-csharp-mgmt`""
 

eng/scripts/Invoke-GenerateAndBuildV2.ps1

@@ -142,18 +142,19 @@ if ($relatedTypeSpecProjectFolder) {
                     exit $LASTEXITCODE
                 }
             }
+            
+            # Use tsp-client from pinned version by running from tsp-client directory
+            $tspclientCommand = "npm exec --no -- tsp-client init --update-if-exists --tsp-config $tspConfigFile --repo $repo --commit $commitid"
+            if ($swaggerDir) {
+                $tspclientCommand += " --local-spec-repo $typespecFolder"
+            }
+            Write-Host $tspclientCommand
+            Invoke-Expression $tspclientCommand
         }
         finally {
             Pop-Location
         }
 
-        $tspclientCommand = "Push-Location '$tspClientDir'; npm exec --no -- tsp-client init --update-if-exists --tsp-config $tspConfigFile --repo $repo --commit $commitid"
-        if ($swaggerDir) {
-            $tspclientCommand += " --local-spec-repo $typespecFolder"
-        }
-        $tspclientCommand += "; Pop-Location"
-        Write-Host $tspclientCommand
-        Invoke-Expression $tspclientCommand
         if ($LASTEXITCODE) {
           # If Process script call fails, then return with failure to CI and don't need to call GeneratePackage
           Write-Host "[ERROR] Failed to generate typespec project:$typespecFolder. Exit code: $LASTEXITCODE. Please review the detail errors for potential fixes. If the issue persists, contact the DotNet language support channel at $DotNetSupportChannelLink and include this spec pull request."