Update to use Install-PSResource

Author: andyleejordan

.github/workflows/ci-test.yml

@@ -32,12 +32,15 @@ jobs:
           dotnet-version: |
             6.0.x
             7.0.x
-      - name: Run setup and build script
+      - name: Install PSResources
         shell: pwsh
-        run: tools/azurePipelinesBuild.ps1
+        run: tools/installPSResources.ps1
+      - name: Build
+        shell: pwsh
+        run: Invoke-Build Build
       - name: Run tests
         shell: pwsh
-        run: Invoke-Build Test -Configuration Release
+        run: Invoke-Build Test
       - name: Upload test results
         uses: actions/upload-artifact@v3
         if: ${{ always() }}

.github/workflows/codeql-analysis.yml

@@ -40,9 +40,13 @@ jobs:
       with:
         languages: ${{ matrix.language }}
 
+    - name: Install PSResources
+      shell: pwsh
+      run: tools/installPSResources.ps1
+
     - name: Build
       shell: pwsh
-      run: tools/azurePipelinesBuild.ps1
+      run: Invoke-Build Build
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

.github/workflows/emacs-test.yml

@@ -22,9 +22,13 @@ jobs:
       - name: Install dotnet
         uses: actions/setup-dotnet@v4
 
-      - name: Build PSES
+      - name: Install PSResources
         shell: pwsh
-        run: tools/azurePipelinesBuild.ps1
+        run: tools/installPSResources.ps1
+
+      - name: Build
+        shell: pwsh
+        run: Invoke-Build Build
 
       - name: Install Emacs
         uses: purcell/setup-emacs@master

.github/workflows/vim-test.yml

@@ -22,9 +22,13 @@ jobs:
       - name: Install dotnet
         uses: actions/setup-dotnet@v4
 
-      - name: Build PSES
+      - name: Install PSResources
         shell: pwsh
-        run: tools/azurePipelinesBuild.ps1
+        run: tools/installPSResources.ps1
+
+      - name: Build
+        shell: pwsh
+        run: Invoke-Build Build
 
       - name: Install Vim
         uses: rhysd/action-setup-vim@v1

.vsts-ci/templates/ci-general.yml

@@ -20,10 +20,18 @@ steps:
     version: 6.0.x
     performMultiLevelLookup: true
 
+- task: PowerShell@2
+  displayName: Install PSResources
+  inputs:
+    pwsh: true
+    filePath: tools/installPSResources.ps1
+
 - task: PowerShell@2
   displayName: Build
   inputs:
-    filePath: tools/azurePipelinesBuild.ps1
+    targetType: inline
+    pwsh: true
+    script: Invoke-Build Build -Configuration Release
 
 - task: PowerShell@2
   displayName: Test

PowerShellEditorServices.build.ps1

@@ -311,13 +311,6 @@ task RestorePsesModules -After Build {
         $moduleInfos.Add($name, $body)
     }
 
-    if ($moduleInfos.Keys.Count -gt 0) {
-        # `#Requires` doesn't display the version needed in the error message and `using module` doesn't work with InvokeBuild in Windows PowerShell
-        # so we'll just use Import-Module to check that PowerShellGet 1.6.0 or higher is installed.
-        # This is needed in order to use the `-AllowPrerelease` parameter
-        Import-Module -Name PowerShellGet -MinimumVersion 1.6.0 -ErrorAction Stop
-    }
-
     # Save each module in the modules.json file
     foreach ($moduleName in $moduleInfos.Keys) {
         if (Test-Path -Path (Join-Path -Path $submodulePath -ChildPath $moduleName)) {
@@ -330,11 +323,15 @@ task RestorePsesModules -After Build {
         $splatParameters = @{
             Name            = $moduleName
             RequiredVersion = $moduleInstallDetails.Version
-            AllowPrerelease = $moduleInstallDetails.AllowPrerelease
             Repository      = if ($moduleInstallDetails.Repository) { $moduleInstallDetails.Repository } else { $DefaultModuleRepository }
             Path            = $submodulePath
         }
 
+        # There's a bug in PowerShell get where this argument isn't correctly translated when it's false.
+        if ($moduleInstallDetails.AllowPrerelease) {
+            $splatParameters["AllowPrerelease"] = $moduleInstallDetails.AllowPrerelease
+        }
+
         Write-Host "`tInstalling module: ${moduleName} with arguments $(ConvertTo-Json $splatParameters)"
 
         Save-Module @splatParameters

tools/azurePipelinesBuild.ps1

@@ -0,0 +1,16 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+$ErrorActionPreference = 'Stop'
+
+Set-PSRepository -Name PSGallery -InstallationPolicy Trusted | Out-Null
+if ($PSVersionTable.PSVersion.Major -lt 6) {
+    throw "The build script requires PowerShell 7!"
+}
+
+# TODO: Switch to Install-PSResource when CI uses PowerShell 7.4
+Install-Module -Name InvokeBuild -Scope CurrentUser
+Install-Module -Name platyPS -Scope CurrentUser
+
+# Update help needed for tests.
+Update-Help -Module Microsoft.PowerShell*