Skip to content

Commit 6d0d659

Browse files
authored
Add SBOM generation steps (#671)
1 parent 8a7d50f commit 6d0d659

4 files changed

+15
-4
lines changed

azure-pipelines/azure-pipeline.microbuild.after.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
steps:
2+
- task: ManifestGeneratorTask@0
3+
displayName: 'Generate SBOM For VSIX Insertion'
4+
inputs:
5+
BuildDropPath: '$(Build.SourcesDirectory)\bin\Microsoft.Web.LibraryManager.Vsix\Release'
26
- task: MSBuild@1
37
displayName: Build VS Installer Manifest
48
inputs:
@@ -14,11 +18,12 @@ steps:
1418
solution: build/CreateInsertionMetadata.proj
1519
msbuildArguments: /r
1620

17-
- task: CopyFiles@1
21+
- task: CopyFiles@2
1822
inputs:
1923
contents: |
2024
bin/**/*.vsman
2125
bin/**/*.vsix
26+
bin/sbom/*.json
2227
bin/InsertionParameters.txt
2328
targetFolder: $(Build.ArtifactStagingDirectory)/insertion
2429
flattenFolders: true

azure-pipelines/azure-pipeline.microbuild.before.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ steps:
66
zipSources: false
77
displayName: Install MicroBuild Signing Plugin
88

9-
- task: MicroBuildSwixPlugin@3
9+
- task: MicroBuildSwixPlugin@4
1010
displayName: Install MicroBuild Swix Plugin

azure-pipelines/official.yml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ variables:
88
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
99
BuildConfiguration: Release
1010
BuildPlatform: Any CPU
11+
Packaging.EnableSBOMSigning: true
1112

1213
jobs:
1314
- job: Windows

setup/Microsoft.Web.LibraryManager.vsmanproj

+7-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,19 @@
1111
<ProductFamilyVersion>2016</ProductFamilyVersion>
1212
<ComputeRelativeUrls>true</ComputeRelativeUrls>
1313
<OutputPath>$(BaseOutputPath)\setup</OutputPath>
14+
15+
<SBOMSourceDirectory>$(ManifestOutputPath)\_manifest\spdx_2.2</SBOMSourceDirectory>
16+
<SBOMDestinationDirectory>$(RepoRoot)\bin\sbom</SBOMDestinationDirectory>
1417
</PropertyGroup>
1518

1619
<ItemGroup>
17-
<MergeManifest Include="$(ManifestOutputPath)\*.json">
20+
<MergeManifest Include="$(ManifestOutputPath)\*.json"
21+
SBOMFileLocation="$(SBOMSourceDirectory)\manifest.spdx.json"
22+
SBOMFileDestPath="$(SBOMDestinationDirectory)">
1823
<RelativeUrl>/</RelativeUrl>
1924
</MergeManifest>
2025
</ItemGroup>
2126

22-
<Import Project="$(MicroBuildPluginDirectory)\MicroBuild.Plugins.SwixBuild.*\build\MicroBuild.Plugins.SwixBuild.targets"/>
27+
<Import Project="$(MicroBuildPluginDirectory)\Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild.*\build\Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild.targets"/>
2328

2429
</Project>

0 commit comments

Comments
 (0)