Skip to content

Commit 920ca2c

Browse files
committed
Release SBOM (#4201)
1 parent 3c6e8cb commit 920ca2c

File tree

6 files changed

+22
-25
lines changed

6 files changed

+22
-25
lines changed

.pipelines/PSReadLine-Official.yml

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,22 @@ pr: none
1515
variables:
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

2121
resources:
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

2828
extends:
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:

MockPSConsole/MockPSConsole.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
21-
<PackageReference Include="Microsoft.PowerShell.SDK" version="7.2.18" />
21+
<PackageReference Include="Microsoft.PowerShell.SDK" version="7.2.23" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

PSReadLine/PSReadLine.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</ItemGroup>
2323

2424
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
25-
<PackageReference Include="System.Management.Automation" Version="7.2.18" />
25+
<PackageReference Include="System.Management.Automation" Version="7.2.23" />
2626
</ItemGroup>
2727

2828
<ItemGroup>

Polyfill/Polyfill.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
15-
<PackageReference Include="System.Management.Automation" Version="7.2.18" />
15+
<PackageReference Include="System.Management.Automation" Version="7.2.23" />
1616
</ItemGroup>
1717

1818
<PropertyGroup Condition="'$(TargetFramework)' == 'net462'">

test/PSReadLine.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525

2626
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
27-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.18" />
27+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.23" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

tools/helper.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
$MinimalSDKVersion = '6.0.100'
2+
$MinimalSDKVersion = '6.0.425'
33
$IsWindowsEnv = [System.Environment]::OSVersion.Platform -eq "Win32NT"
44
$RepoRoot = (Resolve-Path "$PSScriptRoot/..").Path
55
$LocalDotnetDirPath = if ($IsWindowsEnv) { "$env:LocalAppData\Microsoft\dotnet" } else { "$env:HOME/.dotnet" }

0 commit comments

Comments
 (0)