@@ -15,21 +15,22 @@ pr: none
1515variables :
1616 DOTNET_CLI_TELEMETRY_OPTOUT : 1
1717 POWERSHELL_TELEMETRY_OPTOUT : 1
18- DOTNET_SKIP_FIRST_TIME_EXPERIENCE : 1
18+ DOTNET_NOLOGO : 1
1919 WindowsContainerImage : onebranch.azurecr.io/windows/ltsc2022/vse2022:latest
2020
2121resources :
2222 repositories :
23- - repository : onebranchTemplates
24- type : git
25- name : OneBranch.Pipelines/GovernedTemplates
26- ref : refs/heads/main
23+ - repository : templates
24+ type : git
25+ name : OneBranch.Pipelines/GovernedTemplates
26+ ref : refs/heads/main
2727
2828extends :
29- template : v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates
29+ template : v2/OneBranch.Official.CrossPlat.yml@templates
3030 parameters :
3131 featureFlags :
32- WindowsHostVersion : ' 1ESWindows2022'
32+ WindowsHostVersion :
33+ Version : 2022
3334 globalSdl :
3435 disableLegacyManifest : true
3536 cg : # Component Governance parameters. Ignore test components.
@@ -43,7 +44,7 @@ extends:
4344 enabled : true
4445 asyncSdl : # https://aka.ms/obpipelines/asyncsdl
4546 enabled : true
46- forStages : [Build ]
47+ forStages : [buildstage ]
4748 credscan :
4849 enabled : true
4950 scanFolder : $(Build.SourcesDirectory)\PSReadLine\PSReadLine
@@ -154,7 +155,7 @@ extends:
154155 }
155156
156157 Write-Host "Display files in the folder ..." -ForegroundColor Yellow
157- Get-ChildItem -Path $(signSrcPath) -Recurse | Out-String -Width 120
158+ Get-ChildItem -Path $(signSrcPath) -Recurse | Out-String -Width 120 -Stream
158159 displayName: 'Verify the signed files'
159160
160161 - task : CopyFiles@2
@@ -212,7 +213,11 @@ extends:
212213 artifact : drop_buildstage_buildjob
213214
214215 - pwsh : |
215- Get-ChildItem $(signOutPath) -Recurse
216+ if (Test-Path '$(signOutPath)\_manifest') {
217+ Write-Verbose -Verbose "Delete SBOM files ..."
218+ Remove-Item -Path '$(signOutPath)\_manifest' -Recurse -Force
219+ }
220+ Get-ChildItem $(signOutPath) -Recurse | Out-String -Width 120 -Stream
216221 New-Item -Path $(nugetPath) -ItemType Directory > $null
217222 displayName: Capture artifacts structure
218223 env:
@@ -226,7 +231,7 @@ extends:
226231 } finally {
227232 Unregister-PSRepository -Name $RepoName -ErrorAction SilentlyContinue
228233 }
229- Get-ChildItem -Path $(nugetPath)
234+ Get-ChildItem -Path $(nugetPath) | Out-String -Width 120 -Stream
230235 displayName: 'Create the NuGet package'
231236 env:
232237 ob_restore_phase: true # This ensures this done in restore phase to workaround signing issue
@@ -290,17 +295,9 @@ extends:
290295 artifact : drop_buildstage_nupkg
291296
292297 - pwsh : |
293- Get-ChildItem $(nugetPath) -Recurse
298+ Get-ChildItem $(nugetPath) -Recurse | Out-String -Width 120 -Stream
294299 displayName: Find signed Nupkg
295300
296- - task : NuGetCommand@2
297- displayName : Push PSReadLine module to Azure feed
298- inputs :
299- command : push
300- packagesToPush : $(nugetPath)\PSReadLine.*.nupkg
301- nuGetFeedType : external
302- publishFeedCredentials : AzArtifactsFeed
303-
304301 - task : NuGetCommand@2
305302 displayName : Push PSReadLine module to PSGallery feed
306303 inputs :
0 commit comments