Update installPSResources.ps1 for CFS

Author: andyleejordan

.pipelines/vscode-powershell-Official.yml

@@ -53,6 +53,7 @@ extends:
         enabled: true
         forStages: [build]
     featureFlags:
+      EnableCDPxPAT: false
       WindowsHostVersion:
         Version: 2022
         Network: Netlock
@@ -93,9 +94,10 @@ extends:
               targetPath: $(Build.SourcesDirectory)/modules
           - pwsh: |
               Register-PSRepository -Name CFS -SourceLocation "https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v2" -InstallationPolicy Trusted
-              Install-Module -Name InvokeBuild -Repository CFS -RequiredVersion 5.11.3 -Verbose
-              Invoke-Build Build -Configuration $(BuildConfiguration)
-            # TODO: When the OneBuild container updates to 7.4, update to PSResourceGet
+              Install-Module -Repository CFS -Name Microsoft.PowerShell.PSResourceGet
+              ./tools/installPSResources.ps1 -PSRepository CFS
+            displayName: Install PSResources
+          - pwsh: Invoke-Build Build -Configuration $(BuildConfiguration)
             displayName: Build
           - task: onebranch.pipeline.signing@1
             displayName: Sign 1st-party example PowerShell files
@@ -126,11 +128,6 @@ extends:
             inputs:
               packageType: sdk
               version: 8.x
-          - task: PowerShell@2
-            displayName: Install PSResources
-            inputs:
-              pwsh: true
-              filePath: tools/installPSResources.ps1
           - task: DownloadPipelineArtifact@2
             displayName: Download PowerShellEditorServices
             inputs:
@@ -141,6 +138,11 @@ extends:
               branchName: refs/heads/main
               artifact: drop_build_main
               targetPath: $(Build.SourcesDirectory)/modules
+          - pwsh: |
+              Register-PSRepository -Name CFS -SourceLocation "https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v2" -InstallationPolicy Trusted
+              Install-Module -Repository CFS -Name Microsoft.PowerShell.PSResourceGet
+              ./tools/installPSResources.ps1 -PSRepository CFS
+            displayName: Install PSResources
           - pwsh: Invoke-Build Test -Configuration $(BuildConfiguration)
             displayName: Run tests
     - stage: release

tools/installPSResources.ps1

@@ -1,11 +1,13 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
+param(
+    [ValidateSet("PSGallery", "CFS")]
+    [string]$PSRepository = "PSGallery"
+)
 
-if ($PSVersionTable.PSVersion -lt [Version]"7.4") {
-    throw "The build script requires PowerShell 7.4 or higher!"
+if ($PSRepository -eq "CFS" -and -not (Get-PSResourceRepository -Name CFS -ErrorAction SilentlyContinue)) {
+    Register-PSResourceRepository -Name CFS -Uri "https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v3/index.json"
 }
 
-Register-PSResourceRepository -PSGallery -Trusted -Force
-
-Install-PSResource -Name InvokeBuild -Scope CurrentUser
-Install-PSResource -Name platyPS -Scope CurrentUser
+Install-PSResource -Repository $PSRepository -TrustRepository -Name InvokeBuild
+Install-PSResource -Repository $PSRepository -TrustRepository -Name platyPS

vscode-powershell.build.ps1

@@ -7,7 +7,7 @@ param(
     [string]$EditorServicesRepoPath = $null
 )
 
-#Requires -Modules @{ ModuleName = "InvokeBuild"; ModuleVersion = "3.0.0" }
+#Requires -Modules @{ ModuleName = "InvokeBuild"; ModuleVersion = "5.0.0" }
 
 function Get-EditorServicesPath {
     $psesRepoPath = if ($EditorServicesRepoPath) {
@@ -77,7 +77,7 @@ task Clean {
 }
 
 task CleanEditorServices -If (Get-EditorServicesPath) {
-    Write-Build DarkMagenta "Cleaning PowerShellEditorServices"
+    Write-Build DarkMagenta "Cleaning PSES"
     Invoke-Build Clean (Get-EditorServicesPath)
 }
 
@@ -115,7 +115,7 @@ task Test Lint, Build, {
 }
 
 task TestEditorServices -If (Get-EditorServicesPath) {
-    Write-Build DarkMagenta "Testing PowerShellEditorServices"
+    Write-Build DarkMagenta "Testing PSES"
     Invoke-Build Test (Get-EditorServicesPath)
 }