Skip to content

Commit af79d4b

Browse files
authored
adds compatibility with dotnet cyclonedx 6.x
1 parent f9de769 commit af79d4b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

sbom/Create-SBOM.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dotnet tool install cyclonedx --tool-path $tempPath
2424

2525
# 2.b create nuget bom
2626
$cyclonDxToolPath = Join-Path $tempPath "dotnet-CycloneDX.exe"
27-
& "${cyclonDxToolPath}" --output "${tempPath}" -f "nuget.bom.xml" --exclude-dev src\DemoExample.csproj
27+
& "${cyclonDxToolPath}" --output "${tempPath}" --filename "nuget.bom.xml" --exclude-dev src\DemoExample.csproj
2828

2929
# 3 Create NPM SBOM
3030
$packageJsonPath = Join-Path $PSScriptRoot ".." "src" "package.json"
@@ -52,4 +52,4 @@ if (-Not (Test-Path $cycloneDxCliToolPath)) {
5252
# 4.b merge both SBOMs into a final one
5353
$nugetBomPath = Join-Path $tempPath "nuget.bom.xml"
5454
$finalBomPath = Join-Path $PSScriptRoot ".." "_BuildResult-unsigned" "bom.xml"
55-
& "${cycloneDxCliToolPath}" merge --input-files "${npmBomPath}" "${nugetBomPath}" --output-format "xml" --output-file "${finalBomPath}" --group "com.SignPath.demos" --name "SignPath Demo Application" --version "1.0.0"
55+
& "${cycloneDxCliToolPath}" merge --input-files "${npmBomPath}" "${nugetBomPath}" --output-format "xml" --output-file "${finalBomPath}" --group "com.SignPath.demos" --name "SignPath Demo Application" --version "1.0.0"

0 commit comments

Comments
 (0)