Skip to content

Commit 12b7243

Browse files
authored
Update to SBOM template to use newer .NET (#53)
* Update Sbom.yml * Update Sbom.yml
1 parent 5167bc8 commit 12b7243

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

Sbom.yml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ parameters:
1515
default: $(Build.SourcesDirectory)
1616
- name: signSBOM
1717
default: true
18+
- name: dotNetVersion
19+
default: 6.x
1820

1921
steps:
2022
- task: UseDotNet@2
21-
displayName: '${{ parameters.displayName }} - Install .NET Core sdk 3.x'
23+
displayName: '${{ parameters.displayName }} - Install .NET ${{ parameters.dotNetVersion }}'
2224
inputs:
23-
version: 3.x
25+
version: ${{ parameters.dotNetVersion }}
2426

2527
- pwsh: |
2628
Write-Verbose "$env:PACKAGENAME -eq 'Unknown'" -Verbose
@@ -42,6 +44,10 @@ steps:
4244
displayName: '${{ parameters.displayName }} - Capture Environment'
4345
env:
4446
Build.Repository.Uri: ${{ parameters.Build_Repository_Uri }}
47+
BuildComponentPath: ${{ parameters.sourceScanPath }}
48+
BuildDropPath: ${{ parameters.BuildDropPath }}
49+
PackageName: ${{ parameters.PackageName }}
50+
PackageVersion: ${{ parameters.PackageVersion }}
4551
SBOMGenerator_Formats: '${{ parameters.SBOMGenerator_Formats }}'
4652
sourceScanPath: ${{ parameters.sourceScanPath }}
4753

@@ -62,15 +68,3 @@ steps:
6268
# ManifestDirPath: ${{ parameters.BuildDropPath }}
6369
# configuration json for the tool
6470
# ConfigFilePath: config.json
65-
# This will break signing, but it is currently not enabled.
66-
- pwsh: |
67-
$manifestPath = Join-Path '${{ parameters.BuildDropPath }}' -ChildPath '_manifest\manifest.json'
68-
if (Test-Path $manifestPath) {
69-
Write-Verbose "manifestPath: $manifestPath" -verbose
70-
$manifest = Get-Content $manifestPath | ConvertFrom-Json
71-
Write-Verbose "oldRepo: $($manifest.Repo)" -verbose
72-
$manifest.Repo = '${{ parameters.Build_Repository_Uri}}'
73-
Write-Verbose "newRepo: $($manifest.Repo)" -verbose
74-
$manifest | convertto-json -Compress | Out-File -FilePath $manifestPath -Force
75-
} else { Write-Verbose "cloudbuild manifest doesn't exist" -verbose }
76-
displayName: '${{ parameters.displayName }} - Fix repo'

0 commit comments

Comments
 (0)