From dabbdb50e648af18cc9c124e2643dc870e19ce6d Mon Sep 17 00:00:00 2001
From: Gavin Lambert <gavin.lambert@tomra.com>
Date: Wed, 3 Jun 2026 14:20:17 +1200
Subject: [PATCH] Simplify multi-targeting files

---
 ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.csproj   | 1 +
 .../ILRepack.Lib.MSBuild.Task.multitarget.targets            | 3 +++
 .../build/ILRepack.Lib.MSBuild.Task.nuspec                   | 5 ++---
 3 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.multitarget.targets

diff --git a/ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.csproj b/ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.csproj
index 14b9dae..1276341 100644
--- a/ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.csproj
+++ b/ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.csproj
@@ -19,6 +19,7 @@
         <None Include="ILRepack.Config.props"/>
         <None Include="ILRepack.Lib.MSBuild.Task.snk"/>
         <None Include="ILRepack.Lib.MSBuild.Task.targets" CopyToOutputDirectory="PreserveNewest"/>
+        <None Include="ILRepack.Lib.MSBuild.Task.multitarget.targets" CopyToOutputDirectory="PreserveNewest"/>
     </ItemGroup>
 
     <Target Name="Repack" AfterTargets="Build">
diff --git a/ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.multitarget.targets b/ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.multitarget.targets
new file mode 100644
index 0000000..dfabd01
--- /dev/null
+++ b/ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.multitarget.targets
@@ -0,0 +1,3 @@
+<Project>
+    <Import Project="$(MSBuildThisFileDirectory)..\build\ILRepack.Lib.MSBuild.Task.targets" />
+</Project>
\ No newline at end of file
diff --git a/ILRepack.Lib.MSBuild.Task/build/ILRepack.Lib.MSBuild.Task.nuspec b/ILRepack.Lib.MSBuild.Task/build/ILRepack.Lib.MSBuild.Task.nuspec
index 73cd4af..649f2b6 100644
--- a/ILRepack.Lib.MSBuild.Task/build/ILRepack.Lib.MSBuild.Task.nuspec
+++ b/ILRepack.Lib.MSBuild.Task/build/ILRepack.Lib.MSBuild.Task.nuspec
@@ -19,8 +19,7 @@
     </metadata>
     <files>
         <file src="ILRepack.Lib.MSBuild.Task.dll" target="build"/>
-        <file src="ILRepack.Lib.MSBuild.Task.dll" target="buildCrossTargeting"/>
-		<file src="ILRepack.Lib.MSBuild.Task.targets" target="build"/>
-		<file src="ILRepack.Lib.MSBuild.Task.targets" target="buildCrossTargeting"/>
+        <file src="ILRepack.Lib.MSBuild.Task.targets" target="build"/>
+        <file src="ILRepack.Lib.MSBuild.Task.multitarget.targets" target="buildMultiTargeting\ILRepack.Lib.MSBuild.Task.targets"/>
     </files>
 </package>