Skip to content

Commit 2305aed

Browse files
authored
Fix SBOM generation for VSIX projects (#6786)
1 parent cca0314 commit 2305aed

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

eng/pipelines/templates/Build_and_UnitTest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,15 +239,15 @@ steps:
239239
inputs:
240240
solution: "setup\\Microsoft.VisualStudio.NuGet.Core\\Microsoft.VisualStudio.NuGet.Core.vsmanproj"
241241
configuration: "$(BuildConfiguration)"
242-
msbuildArguments: "/property:ManifestDirPath=$(Build.SourcesDirectory)/artifacts /binarylogger:$(Build.StagingDirectory)\\binlog\\16.GenerateVSManifestForVSIX.binlog"
242+
msbuildArguments: "/property:ManifestDirPath=$(Build.ArtifactStagingDirectory)/sbom /binarylogger:$(Build.StagingDirectory)\\binlog\\16.GenerateVSManifestForVSIX.binlog"
243243
condition: "and(succeeded(),eq(variables['BuildRTM'], 'false'))"
244244

245245
- task: MSBuild@1
246246
displayName: "Generate VSMAN file for Build Tools VSIX"
247247
inputs:
248248
solution: "setup\\Microsoft.VisualStudio.NuGet.BuildTools\\Microsoft.VisualStudio.NuGet.BuildTools.vsmanproj"
249249
configuration: "$(BuildConfiguration)"
250-
msbuildArguments: "/property:IsVsixBuild=false /property:ManifestDirPath=$(Build.SourcesDirectory)/artifacts /binarylogger:$(Build.StagingDirectory)\\binlog\\17.GenerateVSManifestForToolsVSIX.binlog"
250+
msbuildArguments: "/property:IsVsixBuild=false /property:ManifestDirPath=$(Build.ArtifactStagingDirectory)/sbom /binarylogger:$(Build.StagingDirectory)\\binlog\\17.GenerateVSManifestForToolsVSIX.binlog"
251251
condition: "and(succeeded(),eq(variables['BuildRTM'], 'false'))"
252252

253253
- task: NuGetCommand@2

0 commit comments

Comments
 (0)