From 3a93bde38206943cc014deb4ce62f0f55848f6d7 Mon Sep 17 00:00:00 2001
From: PhilippNaused <philipp.naused@t-online.de>
Date: Wed, 5 Nov 2025 21:40:30 +0100
Subject: [PATCH] Use GetPackOutputItemsTask to get the correct path the to
 generated .nupkg file

---
 .../Microsoft.Sbom.Targets.targets            | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/Microsoft.Sbom.Targets/Microsoft.Sbom.Targets.targets b/src/Microsoft.Sbom.Targets/Microsoft.Sbom.Targets.targets
index a3c547d1f..0a1e3b390 100644
--- a/src/Microsoft.Sbom.Targets/Microsoft.Sbom.Targets.targets
+++ b/src/Microsoft.Sbom.Targets/Microsoft.Sbom.Targets.targets
@@ -37,15 +37,25 @@
   <!-- After the Nuget Package is generated, we will unzip, scan, generate the SBOM and zip again. -->
   <Target Name="GenerateSbomTarget" AfterTargets="Pack" Condition="'$(IsPackable)' == 'true' AND '$(GenerateSBOM)' ==  'true'" >
     <!-- Unzip Nuget package, so it can be scanned by the SBOM Task. -->
-    <PropertyGroup>
-      <PackageOutputFullPath>$([System.IO.Path]::GetFullPath('$(PackageOutputPath)'))</PackageOutputFullPath>
+    <GetPackOutputItemsTask
+        PackageOutputPath="$(PackageOutputAbsolutePath)"
+        NuspecOutputPath="$(NuspecOutputAbsolutePath)"
+        PackageId="$(PackageId)"
+        PackageVersion="$(PackageVersion)"
+        IncludeSymbols="false"
+        IncludeSource="false"
+        SymbolPackageFormat="$(SymbolPackageFormat)">
+      <Output TaskParameter="OutputPackItems"
+              ItemName="_NugetPackageItems" />
+    </GetPackOutputItemsTask>
 
-      <NugetPackage>
-        $([System.IO.Path]::Combine($(PackageOutputFullPath), $(PackageId).$(PackageVersion).nupkg))
-      </NugetPackage>
-      <NugetPackageUnzip>
-        $([System.IO.Path]::Combine($(PackageOutputFullPath), $(PackageId).$(PackageVersion).$(ShortUnzipGuidFolder).temp))
-      </NugetPackageUnzip>
+    <ItemGroup>
+      <_NugetPackageItems Remove="@(_NugetPackageItems)"
+                          Condition="'%(Extension)' != '.nupkg'" />
+    </ItemGroup>
+    <PropertyGroup>
+      <NugetPackage>@(_NugetPackageItems)</NugetPackage>
+      <NugetPackageUnzip>$(NugetPackage).$(ShortUnzipGuidFolder).temp</NugetPackageUnzip>
     </PropertyGroup>
     <Microsoft.Build.Tasks.Unzip DestinationFolder="$(NugetPackageUnzip)" SourceFiles="$(NugetPackage)" OverwriteReadOnlyFiles="true" ContinueOnError="ErrorAndContinue" />