4242
4343 - template : shouldSign.yml
4444
45- - powershell : |
45+ - pwsh : |
4646 $pkgFilter = if ( '$(Architecture)' -eq 'arm' ) { "arm32" } else { '$(Architecture)' }
4747 if ($env:BuildConfiguration -eq 'minSize') { $pkgFilter += '-gc' }
4848
6060 - template : cloneToOfficialPath.yml
6161
6262 - pwsh : |
63- # cleanup previous install
64- if((Test-Path "${env:ProgramFiles(x86)}\WiX Toolset xcopy")) {
65- Remove-Item "${env:ProgramFiles(x86)}\WiX Toolset xcopy" -Recurse -Force
66- }
67-
68- $toolsDir = New-Item -ItemType Directory -Path '$(Build.ArtifactStagingDirectory)\tools'
69- $wixUri = 'https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip'
70- Invoke-RestMethod -Uri $wixUri -OutFile '$(Build.ArtifactStagingDirectory)\tools\wix.zip' -MaximumRetryCount 5 -RetryIntervalSec 10
71-
72- Import-Module '$(PowerShellRoot)/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/wix.psm1'
73- Install-WixZip -zipPath '$(Build.ArtifactStagingDirectory)\tools\wix.zip'
74-
75- $msixUrl = '$(makeappUrl)'
76- Invoke-RestMethod -Uri $msixUrl -OutFile '\makeappx.zip'
77- Expand-Archive '\makeappx.zip' -destination '\' -Force
78-
79- displayName: Install packaging tools
80-
81- powershell : |
8263 $zipPathString = '$(System.ArtifactsDirectory)\Symbols\results\*$(PkgFilter).zip'
8364 Write-Verbose -Verbose "Zip Path: $zipPathString"
8465 $zipPath = Get-Item $zipPathString
@@ -208,12 +189,12 @@ jobs:
208189 shouldSign : $(SHOULD_SIGN)
209190 displayName : Sign ThirdParty binari
8000
es
210191
211- - powershell : |
192+ - pwsh : |
212193 Get-ChildItem '$(System.ArtifactsDirectory)\thirdPartySigned\*'
213194 displayName: Capture ThirdParty Signed files
214195 condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
215196
216- powershell : |
197+ pwsh : |
217198 Import-Module $(PowerShellRoot)/build.psm1 -Force
218199 Import-Module $(PowerShellRoot)/tools/packaging -Force
219200 $signedFilesPath = '$(System.ArtifactsDirectory)\thirdPartySigned'
@@ -231,7 +212,7 @@ jobs:
231212 PackageVersion : $(Version)
232213 sourceScanPath : ' $(PowerShellRoot)\tools'
233214
234- - powershell : |
215+ - pwsh : |
235216 Import-Module $(PowerShellRoot)/build.psm1 -Force
236217 Import-Module $(PowerShellRoot)/tools/packaging -Force
237218
@@ -272,7 +253,7 @@ jobs:
272253 $(PowerShellRoot)/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 -BuildZip $signedPkg -location '$(PowerShellRoot)' -destination '$(System.ArtifactsDirectory)\pkgSigned' -Runtime $runtime -ReleaseTag '$(ReleaseTagVar)' @params
273254 displayName: 'Build Windows Universal - $(Architecture) Package'
274255
275- powershell : |
256+ pwsh : |
276257 Get-ChildItem '$(System.ArtifactsDirectory)\pkgSigned' | ForEach-Object {
277258 $packagePath = $_.FullName
278259 Write-Host "Uploading $packagePath"
@@ -363,17 +344,12 @@ jobs:
363344 sourceScanPath : ' $(PowerShellRoot)\tools'
364345 snapshotForceEnabled : true
365346
366- - powershell : |
347+ - pwsh : |
367348 if ((Test-Path "\PowerShell")) {
368349 Remove-Item -Path "\PowerShell" -Force -Recurse -Verbose
369350 }
370351 else {
371352 Write-Verbose -Verbose -Message "No cleanup required."
372353 }
373-
374- if((Test-Path "${env:ProgramFiles(x86)}\WiX Toolset xcopy")) {
375- Write-Verbose -Verbose "Cleaning up Wix tools"
376- Remove-Item "${env:ProgramFiles(x86)}\WiX Toolset xcopy" -Recurse -Force
377- }
378354 displayName: Clean up local Clone
379355 condition: always()
0 commit comments