From 0d60446b12993b7efacd86619615eb154d6614f2 Mon Sep 17 00:00:00 2001
From: "Gustavo Castellanos Alfonzo (from Dev Box)" <gustavoca@microsoft.com>
Date: Thu, 29 Aug 2024 13:50:37 -0700
Subject: [PATCH 1/5] Add an implicit reference to the SBOM Generation Task

---
 .../targets/Microsoft.NET.Sdk.targets                         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
index 958f1d62f075..0a4e29d3377b 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
@@ -238,6 +238,10 @@ Copyright (c) .NET Foundation. All rights reserved.
       <PackageReference Include="Microsoft.Net.Compilers.Toolset.Framework" PrivateAssets="all" Version="$(_NetFrameworkHostedCompilersVersion)" IsImplicitlyDefined="true" />
     </ItemGroup>
 
+    <Target Name="_AddGenerateSbomTask" BeforeTargets="CollectPackageReferences">
+      <ItemGroup Condition=" '$(GenerateSbom)' == 'true' ">
+        <PackageReference Include="Microsoft.Sbom.Targets" Version="0.0.0-preview.0" IsImplicitlyDefined="true" />
+      </ItemGroup>
   </Target>
 
   <!-- TODO: this target should not check GeneratePackageOnBuild.

From bec035ecf3ba3a136786e4a0e2b028b1ee87e5a7 Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Thu, 29 Aug 2024 20:48:07 -0500
Subject: [PATCH 2/5] fix Target syntax and introduce version for package that
 dependabot could update

---
 eng/Versions.props                                       | 1 +
 .../targets/Microsoft.NET.Sdk.targets                    | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 36b1bf36b003..8218c6c1e862 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -96,6 +96,7 @@
     <MicrosoftWindowsCsWin32PackageVersion>0.3.49-beta</MicrosoftWindowsCsWin32PackageVersion>
     <!-- This is the version of the zip archive for the WiX toolset and is different from the NuGet package version format. -->
     <WixVersion>3.14.1.8722</WixVersion>
+    <MicrosoftSbomTargetsPackageVersion>0.0.0-preview.0</MicrosoftSbomTargetsPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="NUnit3.DotNetNew.Template version">
     <!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
index 0a4e29d3377b..171b68fd6b86 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
@@ -237,11 +237,12 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ItemGroup Condition="'$(BuildWithNetFrameworkHostedCompiler)' == 'true' and '$(OS)' == 'Windows_NT' ">
       <PackageReference Include="Microsoft.Net.Compilers.Toolset.Framework" PrivateAssets="all" Version="$(_NetFrameworkHostedCompilersVersion)" IsImplicitlyDefined="true" />
     </ItemGroup>
+  </Target>
 
-    <Target Name="_AddGenerateSbomTask" BeforeTargets="CollectPackageReferences">
-      <ItemGroup Condition=" '$(GenerateSbom)' == 'true' ">
-        <PackageReference Include="Microsoft.Sbom.Targets" Version="0.0.0-preview.0" IsImplicitlyDefined="true" />
-      </ItemGroup>
+  <Target Name="_AddGenerateSbomTask" BeforeTargets="CollectPackageReferences">
+    <ItemGroup Condition=" '$(GenerateSbom)' == 'true' ">
+      <PackageReference Include="Microsoft.Sbom.Targets" Version="$(MicrosoftSbomTargetsPackageVersion)" IsImplicitlyDefined="true" />
+    </ItemGroup>
   </Target>
 
   <!-- TODO: this target should not check GeneratePackageOnBuild.

From b1bb8464876bc5b7ab4849b420ea832b3224f1aa Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Fri, 30 Aug 2024 09:21:25 -0500
Subject: [PATCH 3/5] Stamp the version of the SBOM tools package at SDK
 construction time.

---
 .../redist-installer/targets/GenerateBundledVersions.targets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets b/src/Installer/redist-installer/targets/GenerateBundledVersions.targets
index 33a2fc7ec4ff..d611f40c4e56 100644
--- a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets
+++ b/src/Installer/redist-installer/targets/GenerateBundledVersions.targets
@@ -137,6 +137,8 @@
 
       <_NETCoreSdkBeingBuiltIsPreview Condition=" '$(DotNetFinalVersionKind)' != 'release' ">true</_NETCoreSdkBeingBuiltIsPreview>
       <_NETCoreSdkBeingBuiltIsPreview Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</_NETCoreSdkBeingBuiltIsPreview>
+
+      <_MicrosoftSbomTargetsPackageVersion>$(MicrosoftSbomTargetsPackageVersion)</_MicrosoftSbomTargetsPackageVersion>
     </PropertyGroup>
 
     <ItemGroup>
@@ -525,7 +527,10 @@ Copyright (c) .NET Foundation. All rights reserved.
     <NETCoreSdkRuntimeIdentifier>$(ProductMonikerRid)</NETCoreSdkRuntimeIdentifier>
     <NETCoreSdkPortableRuntimeIdentifier>$(PortableProductMonikerRid)</NETCoreSdkPortableRuntimeIdentifier>
     <_NETCoreSdkIsPreview>$(_NETCoreSdkBeingBuiltIsPreview)</_NETCoreSdkIsPreview>
+    <!-- SBOM Tools Versions -->
+    <MicrosoftSbomTargetsPackageVersion Condition="'%24(MicrosoftSbomTargetsPackageVersion)' == ''">$(_MicrosoftSbomTargetsPackageVersion)</MicrosoftSbomTargetsPackageVersion>
   </PropertyGroup>
+
   <ItemGroup>
     @(ImplicitPackageVariable->'<ImplicitPackageReferenceVersion Include="%(Identity)" TargetFrameworkVersion="%(TargetFrameworkVersion)" DefaultVersion="%(DefaultVersion)" LatestVersion="%(LatestVersion)" />', '
     ')

From 4508093fadbc4bdd712c894849691cc88179841b Mon Sep 17 00:00:00 2001
From: Chet Husk <baronfel@users.noreply.github.com>
Date: Mon, 9 Sep 2024 22:17:51 -0500
Subject: [PATCH 4/5] Udpate baseline version

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index d757f97c1a1d..61dae96f1723 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -89,7 +89,7 @@
     <MicrosoftWindowsCsWin32PackageVersion>0.3.49-beta</MicrosoftWindowsCsWin32PackageVersion>
     <!-- This is the version of the zip archive for the WiX toolset and is different from the NuGet package version format. -->
     <WixVersion>3.14.1.8722</WixVersion>
-    <MicrosoftSbomTargetsPackageVersion>0.0.0-preview.0</MicrosoftSbomTargetsPackageVersion>
+    <MicrosoftSbomTargetsPackageVersion>2.2.8</MicrosoftSbomTargetsPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="NUnit3.DotNetNew.Template version">
     <!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->

From d794c782994f7f19b99009251d83da3aba21cb4b Mon Sep 17 00:00:00 2001
From: Chet Husk <baronfel@users.noreply.github.com>
Date: Thu, 19 Sep 2024 10:53:18 -0500
Subject: [PATCH 5/5] Update Versions.props for SBOM targets

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 61dae96f1723..9d051ede36cd 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -89,7 +89,7 @@
     <MicrosoftWindowsCsWin32PackageVersion>0.3.49-beta</MicrosoftWindowsCsWin32PackageVersion>
     <!-- This is the version of the zip archive for the WiX toolset and is different from the NuGet package version format. -->
     <WixVersion>3.14.1.8722</WixVersion>
-    <MicrosoftSbomTargetsPackageVersion>2.2.8</MicrosoftSbomTargetsPackageVersion>
+    <MicrosoftSbomTargetsPackageVersion>2.2.9</MicrosoftSbomTargetsPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="NUnit3.DotNetNew.Template version">
     <!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->