Skip to content

Commit f86f889

Browse files
authored
Use 1ES task to generate SBOM (#7289)
1 parent 5f69050 commit f86f889

4 files changed

Lines changed: 27 additions & 7 deletions

File tree

eng/pipelines/templates/Build.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,22 @@ steps:
154154
configuration: "$(BuildConfiguration)"
155155
msbuildArguments: "/restore:false /target:BuildVSIX /property:BuildRTM=$(BuildRTM) /property:ExcludeTestProjects=$(BuildRTM) /property:IsCIBuild=true /binarylogger:$(Build.StagingDirectory)\\binlog\\13.PackVSIX.binlog"
156156
condition: "and(succeeded(),eq(variables['BuildRTM'], 'false'))"
157+
157158
- ${{ if not(parameters.BuildRTM)}}:
158-
- template: /eng/common/templates-official/steps/generate-sbom.yml@self
159-
parameters:
159+
- task: PowerShell@1
160+
displayName: "Prepare for SBOM generation"
161+
inputs:
162+
scriptType: "inlineScript"
163+
inlineScript: |
164+
mkdir $(Build.ArtifactStagingDirectory)/sbom
165+
166+
- task: ManifestGeneratorTask@0
167+
displayName: 'Generate SBOM'
168+
inputs:
169+
BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
170+
ManifestDirPath: '$(Build.ArtifactStagingDirectory)/sbom'
160171
PackageName: "NuGet.Client"
161172
PackageVersion: "$(SemanticVersion)"
162-
publishArtifacts: false
163173

164174
- task: MSBuild@1
165175
displayName: "Generate Build Tools package"

eng/pipelines/vs-test/build.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,18 @@ steps:
113113
configuration: "$(BuildConfiguration)"
114114
msbuildArguments: "/restore:false /target:BuildVSIX /property:ExcludeTestProjects=false /property:IsCIBuild=true /binarylogger:$(Build.StagingDirectory)\\binlog\\07.PackVSIX.binlog"
115115

116-
- template: /eng/common/templates/steps/generate-sbom.yml@self
117-
parameters:
116+
- task: PowerShell@1
117+
displayName: "Prepare for SBOM generation"
118+
inputs:
119+
scriptType: "inlineScript"
120+
inlineScript: |
121+
mkdir $(Build.ArtifactStagingDirectory)/sbom
122+
123+
- task: ManifestGeneratorTask@0
124+
displayName: 'Generate SBOM'
125+
inputs:
126+
BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
127+
ManifestDirPath: '$(Build.ArtifactStagingDirectory)/sbom'
118128
PackageName: "NuGet.Client"
119129
PackageVersion: "$(NuGetVersion)"
120130

setup/Microsoft.VisualStudio.NuGet.BuildTools/Microsoft.VisualStudio.NuGet.BuildTools.vsmanproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<TargetName>$(MSBuildProjectName)</TargetName>
1010
<OutputPath>$(VsixPublishDestination)</OutputPath>
1111
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12-
<SBOMFileLocation>$(ManifestDirPath)\$(ARTIFACT_NAME)\_manifest\spdx_2.2\manifest.spdx.json</SBOMFileLocation>
12+
<SBOMFileLocation>$(ManifestDirPath)\_manifest\spdx_2.2\manifest.spdx.json</SBOMFileLocation>
1313
</PropertyGroup>
1414

1515
<PropertyGroup Condition=" '$(IsVsixBuild)' == 'true' ">

setup/Microsoft.VisualStudio.NuGet.Core/Microsoft.VisualStudio.NuGet.Core.vsmanproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<TargetName>$(MSBuildProjectName)</TargetName>
1010
<OutputPath>$(VsixPublishDestination)</OutputPath>
1111
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12-
<SBOMFileLocation>$(ManifestDirPath)\$(ARTIFACT_NAME)\_manifest\spdx_2.2\manifest.spdx.json</SBOMFileLocation>
12+
<SBOMFileLocation>$(ManifestDirPath)\_manifest\spdx_2.2\manifest.spdx.json</SBOMFileLocation>
1313
</PropertyGroup>
1414

1515
<ItemGroup>

0 commit comments

Comments
 (0)