Switch from Windows Powershell to pwsh (#2906)

dpwatrous · web-flow · commit a10bb063c0c3 · 2024-05-22T11:52:14.000-04:00
diff --git a/.vsts/common/set-dist-vars.yml b/.vsts/common/set-dist-vars.yml
@@ -1,3 +1,3 @@
 steps:
-  - powershell: $(Build.SourcesDirectory)/.vsts/common/build-vars.ps1 "$(Build.SourceBranch)" "$(Build.BuildNumber)"
+  - pwsh: $(Build.SourcesDirectory)/.vsts/common/build-vars.ps1 "$(Build.SourceBranch)" "$(Build.BuildNumber)"
     displayName: Resolve build info
diff --git a/.vsts/node-setup.yml b/.vsts/node-setup.yml
@@ -19,7 +19,7 @@ steps:
       echo "##vso[task.setvariable variable=npm_config_userconfig]$(Agent.TempDirectory)/.npmrc"
     condition: ne( variables['Agent.OS'], 'Windows_NT' )
     displayName: Set NPM userconfig (Linux/MacOS)
-  - powershell: |
+  - pwsh: |
       Write-Host "##vso[task.setvariable variable=npm_config_userconfig]$env:AGENT_TEMPDIRECTORY\.npmrc"
     condition: eq( variables['Agent.OS'], 'Windows_NT' )
     displayName: Set NPM userconfig (Windows)
diff --git a/.vsts/python-setup.yml b/.vsts/python-setup.yml
@@ -19,7 +19,7 @@ steps:
     condition: ne( variables['Agent.OS'], 'Windows_NT' )
     displayName: Install Python dependencies (Linux)
 
-  - powershell: |
+  - pwsh: |
       . .vsts/win/exec.ps1
       $ErrorActionPreference = "Stop"
       $(Agent.WorkFolder)\.venv\batchexplorer\Scripts\Activate.ps1
diff --git a/.vsts/win/ci.yml b/.vsts/win/ci.yml
@@ -2,12 +2,12 @@ steps:
   - template: ./credscan.yml
   - template: ./win-dependencies.yml
 
-  - powershell: |
+  - pwsh: |
       $(Agent.WorkFolder)\.venv\batchexplorer\Scripts\Activate.ps1
       npm run build:package
     displayName: Build and package
 
-  - powershell: |
+  - pwsh: |
       . ../.vsts/win/exec.ps1
       $ErrorActionPreference = "Stop"
       $env:BE_TEST_AAD_USER_EMAIL = "$(uiTestingAccountEmail)"
diff --git a/.vsts/win/distribution.yml b/.vsts/win/distribution.yml
@@ -4,25 +4,25 @@ steps:
   - template: ./win-dependencies.yml
   - template: ../common/download-i18n-artifacts.yml
 
-  - powershell: |
+  - pwsh: |
       $(System.DefaultWorkingDirectory)/Localize/copy-translations.ps1 -artifactsPath "$(Agent.BuildDirectory)/drop/loc"
     displayName: 'Run copy-translations.ps1 with artifacts path (Windows)'
 
-  - powershell: |
+  - pwsh: |
       $version = npm run -s ts scripts/package/get-version
       Write-Host "Updating build number to $version"
       Write-Host "##vso[build.updatebuildnumber]$version"
     workingDirectory: desktop
     displayName: Update build version for packaging
 
-  - powershell: |
+  - pwsh: |
       . .vsts/win/exec.ps1
       $ErrorActionPreference = "Stop"
       $(Agent.WorkFolder)\.venv\batchexplorer\Scripts\Activate.ps1
       exec { npm run build:prod }
     displayName: Build all packages
 
-  - powershell: |
+  - pwsh: |
       . ../.vsts/win/exec.ps1
       $ErrorActionPreference = "Stop"
       $(Agent.WorkFolder)\.venv\batchexplorer\Scripts\Activate.ps1
@@ -41,7 +41,7 @@ steps:
         **/*.dll
         !**/python36.dll
 
-  - powershell: npm run package win-installer
+  - pwsh: npm run package win-installer
     workingDirectory: desktop
     displayName: Build installer
 
@@ -51,7 +51,7 @@ steps:
       pattern: |
         **/BatchExplorer*Setup*.exe
 
-  - powershell: npm run package win-manifest
+  - pwsh: npm run package win-manifest
     workingDirectory: desktop
     displayName: Create manifest
   - template: ../common/generate-sbom.yml
diff --git a/.vsts/win/win-dependencies.yml b/.vsts/win/win-dependencies.yml
@@ -1,6 +1,6 @@
 steps:
   - template: ../dependencies.yml
-  - powershell: |
+  - pwsh: |
       . .vsts/win/exec.ps1
       $ErrorActionPreference = "Stop"
       exec { Write-Host "Node.js version" $(node --version) }
diff --git a/desktop/scripts/docker/windows/Dockerfile b/desktop/scripts/docker/windows/Dockerfile
@@ -10,7 +10,7 @@ ENV GIT_VERSION 2.17.1
 
 LABEL Description="BatchLabs image for building for windows" Maintainer="batchexplorer@microsoft.com" Version="${node_version}"
 
-SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 # Install node
 ADD https://nodejs.org/dist/v${node_version}/node-v${node_version}-win-x64.zip C:/build/node.zip
diff --git a/desktop/scripts/proxy/virtual-machine.bicep b/desktop/scripts/proxy/virtual-machine.bicep
@@ -88,7 +88,7 @@ resource windowsVMExtensions 'Microsoft.Compute/virtualMachines/extensions@2020-
       fileUris: [
         'https://raw.githubusercontent.com/Azure/BatchExplorer/main/scripts/proxy/initVirtualMachine.ps1'
       ]
-      commandToExecute: 'powershell -ExecutionPolicy Bypass -File initVirtualMachine.ps1 -Address ${proxyServer} -Port ${proxyPort} -Build ${batchExplorerBuild}'
+      commandToExecute: 'pwsh -ExecutionPolicy Bypass -File initVirtualMachine.ps1 -Address ${proxyServer} -Port ${proxyPort} -Build ${batchExplorerBuild}'
     }
   }
 }
diff --git a/docs/setup.md b/docs/setup.md
@@ -6,8 +6,9 @@ The following are instructions for building and running Batch Explorer in a deve
 
     Make sure the following are installed:
 
-    - Node.js 18 or higher
-    - Python 3.6 or higher
+    - Node.js LTS
+    - Python 3.6+
+    - Powershell 7+
 
     **On Windows:**
 
diff --git a/package.json b/package.json
@@ -72,8 +72,8 @@
     "lint": "prettier -c . && lerna run --parallel workspace:lint --stream && npm run -s lint:markdown",
     "lint:fix": "prettier -w . && lerna run --parallel workspace:lint:fix --stream && npm run -s lint:markdown",
     "lint:markdown": "markdownlint-cli2 \"**/*.md\" \"#**/node_modules/**/*\" \"#SECURITY.md\"",
-    "loc:build": "powershell -ExecutionPolicy Bypass -File ./Localize/build.ps1 && powershell -ExecutionPolicy Bypass -File ./Localize/copy-translations.ps1",
-    "loc:restore": "cd Localize && powershell -ExecutionPolicy Bypass -File restore.ps1",
+    "loc:build": "pwsh -ExecutionPolicy Bypass -File ./Localize/build.ps1 && pwsh -ExecutionPolicy Bypass -File ./Localize/copy-translations.ps1",
+    "loc:restore": "cd Localize && pwsh -ExecutionPolicy Bypass -File restore.ps1",
     "start": "npm run -s start:web",
     "start:desktop": "lerna run --parallel workspace:start:desktop --stream",
     "start:web": "lerna run --parallel workspace:start:web --stream",

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ resource windowsVMExtensions 'Microsoft.Compute/virtualMachines/extensions@2020-`
`88`	`88`	`fileUris: [`
`89`	`89`	`'https://raw.githubusercontent.com/Azure/BatchExplorer/main/scripts/proxy/initVirtualMachine.ps1'`
`90`	`90`	`]`
`91`		`- commandToExecute: 'powershell -ExecutionPolicy Bypass -File initVirtualMachine.ps1 -Address ${proxyServer} -Port ${proxyPort} -Build ${batchExplorerBuild}'`
	`91`	`+ commandToExecute: 'pwsh -ExecutionPolicy Bypass -File initVirtualMachine.ps1 -Address ${proxyServer} -Port ${proxyPort} -Build ${batchExplorerBuild}'`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`	`}`