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] 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.