From 90b2c861a45bc48081f4a78fdbf7e3c847d03676 Mon Sep 17 00:00:00 2001
From: Patrick Dwyer <patrick@pi.tail33a760.ts.net>
Date: Sat, 16 May 2026 14:11:56 +1000
Subject: [PATCH 1/2] Bump Microsoft.Build.Utilities.Core/Framework to 18.6.*
 and upgrade to net10.0

Updates Microsoft.Build.Utilities.Core and Microsoft.Build.Framework from
17.11.* to 18.6.*, and upgrades all project TargetFrameworks from net8.0
to net10.0 (required by MSBuild 18.6.x packages). Also updates the hardcoded
assembly path in the build targets file to match the new TFM output folder.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 src/CycloneDX.MSBuildTask/CycloneDX.MSBuildTask.csproj      | 4 ++--
 .../build/CycloneDX.MSBuildTask.targets                     | 2 +-
 .../CycloneDX.MSBuildTask.IntegrationTests.csproj           | 2 +-
 .../CycloneDX.MSBuildTask.Tests.csproj                      | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/CycloneDX.MSBuildTask/CycloneDX.MSBuildTask.csproj b/src/CycloneDX.MSBuildTask/CycloneDX.MSBuildTask.csproj
index d3c703e..4e7c6e1 100644
--- a/src/CycloneDX.MSBuildTask/CycloneDX.MSBuildTask.csproj
+++ b/src/CycloneDX.MSBuildTask/CycloneDX.MSBuildTask.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>CycloneDX.MSBuildTask</RootNamespace>
 
     <!-- NuGet package metadata -->
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.11.*" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="18.6.*" PrivateAssets="all" ExcludeAssets="runtime" />
     <PackageReference Include="CycloneDX.Core" Version="12.*" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/src/CycloneDX.MSBuildTask/build/CycloneDX.MSBuildTask.targets b/src/CycloneDX.MSBuildTask/build/CycloneDX.MSBuildTask.targets
index 8644d24..08abc5b 100644
--- a/src/CycloneDX.MSBuildTask/build/CycloneDX.MSBuildTask.targets
+++ b/src/CycloneDX.MSBuildTask/build/CycloneDX.MSBuildTask.targets
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <CycloneDxMSBuildTaskAssembly Condition="'$(CycloneDxMSBuildTaskAssembly)' == ''">$(MSBuildThisFileDirectory)../tasks/net8.0/CycloneDX.MSBuildTask.dll</CycloneDxMSBuildTaskAssembly>
+    <CycloneDxMSBuildTaskAssembly Condition="'$(CycloneDxMSBuildTaskAssembly)' == ''">$(MSBuildThisFileDirectory)../tasks/net10.0/CycloneDX.MSBuildTask.dll</CycloneDxMSBuildTaskAssembly>
   </PropertyGroup>
 
   <UsingTask TaskName="CycloneDX.MSBuildTask.GenerateSbomTask"
diff --git a/test/CycloneDX.MSBuildTask.IntegrationTests/CycloneDX.MSBuildTask.IntegrationTests.csproj b/test/CycloneDX.MSBuildTask.IntegrationTests/CycloneDX.MSBuildTask.IntegrationTests.csproj
index 9696b5d..e60d0d8 100644
--- a/test/CycloneDX.MSBuildTask.IntegrationTests/CycloneDX.MSBuildTask.IntegrationTests.csproj
+++ b/test/CycloneDX.MSBuildTask.IntegrationTests/CycloneDX.MSBuildTask.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
diff --git a/test/CycloneDX.MSBuildTask.Tests/CycloneDX.MSBuildTask.Tests.csproj b/test/CycloneDX.MSBuildTask.Tests/CycloneDX.MSBuildTask.Tests.csproj
index 05f30a1..ead5889 100644
--- a/test/CycloneDX.MSBuildTask.Tests/CycloneDX.MSBuildTask.Tests.csproj
+++ b/test/CycloneDX.MSBuildTask.Tests/CycloneDX.MSBuildTask.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
@@ -15,8 +15,8 @@
     </PackageReference>
     <PackageReference Include="NSubstitute" Version="5.*" />
     <PackageReference Include="CycloneDX.Core" Version="12.*" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.11.*" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="17.11.*" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="18.6.*" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="18.6.*" />
   </ItemGroup>
 
   <ItemGroup>

From 8a4fb1c225252b287a66c2d4356e38080451829a Mon Sep 17 00:00:00 2001
From: Patrick Dwyer <patrick@pi.tail33a760.ts.net>
Date: Sat, 16 May 2026 14:19:16 +1000
Subject: [PATCH 2/2] Fix remaining net8.0 hardcoded paths after TFM upgrade to
 net10.0

TestProjectHelper.cs was resolving the task DLL from the net8.0 output
folder, causing integration tests to fail with MSB4062. SampleApp.csproj
had the same stale path.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 samples/SampleApp/SampleApp.csproj                              | 2 +-
 .../CycloneDX.MSBuildTask.IntegrationTests/TestProjectHelper.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/SampleApp/SampleApp.csproj b/samples/SampleApp/SampleApp.csproj
index 130c5a1..38be5e5 100644
--- a/samples/SampleApp/SampleApp.csproj
+++ b/samples/SampleApp/SampleApp.csproj
@@ -12,7 +12,7 @@
 
   <!-- Reference the local CycloneDX.MSBuildTask task (override assembly path for source tree) -->
   <PropertyGroup>
-    <CycloneDxMSBuildTaskAssembly>$(MSBuildThisFileDirectory)../../src/CycloneDX.MSBuildTask/bin/$(Configuration)/net8.0/CycloneDX.MSBuildTask.dll</CycloneDxMSBuildTaskAssembly>
+    <CycloneDxMSBuildTaskAssembly>$(MSBuildThisFileDirectory)../../src/CycloneDX.MSBuildTask/bin/$(Configuration)/net10.0/CycloneDX.MSBuildTask.dll</CycloneDxMSBuildTaskAssembly>
   </PropertyGroup>
   <Import Project="../../src/CycloneDX.MSBuildTask/build/CycloneDX.MSBuildTask.props" />
   <Import Project="../../src/CycloneDX.MSBuildTask/build/CycloneDX.MSBuildTask.targets" />
diff --git a/test/CycloneDX.MSBuildTask.IntegrationTests/TestProjectHelper.cs b/test/CycloneDX.MSBuildTask.IntegrationTests/TestProjectHelper.cs
index abd001c..e763f5c 100644
--- a/test/CycloneDX.MSBuildTask.IntegrationTests/TestProjectHelper.cs
+++ b/test/CycloneDX.MSBuildTask.IntegrationTests/TestProjectHelper.cs
@@ -28,7 +28,7 @@ public TestProjectHelper(
         _tempDir = tempDir;
         _taskPackageDir = Path.GetDirectoryName(taskPackagePath)!;
         _repoRoot = FindRepoRoot();
-        _taskDll = Path.Combine(_repoRoot, "src", "CycloneDX.MSBuildTask", "bin", "Debug", "net8.0", "CycloneDX.MSBuildTask.dll");
+        _taskDll = Path.Combine(_repoRoot, "src", "CycloneDX.MSBuildTask", "bin", "Debug", "net10.0", "CycloneDX.MSBuildTask.dll");
     }
 
     /// <summary>