From 47d6dd96c1cca8668118a5ad9adfa8ed776b2715 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 18 Mar 2021 00:48:44 -0700
Subject: Ensure ICE cubs are copied to the output

---
 src/WixToolset.Core.Native/WixToolset.Core.Native.csproj         | 1 +
 src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec         | 1 +
 .../targets/WixToolset.Core.Native.targets                       | 9 +++++++++
 3 files changed, 11 insertions(+)
 create mode 100644 src/WixToolset.Core.Native/targets/WixToolset.Core.Native.targets

(limited to 'src')

diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
index 079e9d93..14de87cd 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
@@ -14,6 +14,7 @@
   <ItemGroup>
     <None Include="cubes\darice.cub" CopyToOutputDirectory="PreserveNewest" />
     <None Include="cubes\mergemod.cub" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="targets\WixToolset.Core.Native.targets" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
index 9e1fc72f..fa6a32b6 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
@@ -22,6 +22,7 @@
     <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
     <file src="netstandard2.0\$id$.xml" target="lib\netstandard2.0" />
 
+    <file src="netstandard2.0\targets\WixToolset.Core.Native.targets" target="build\WixToolset.Core.Native.targets" />
     <file src="netstandard2.0\cubes\darice.cub" target="lib\netstandard2.0\cubes" />
     <file src="netstandard2.0\cubes\mergemod.cub" target="lib\netstandard2.0\cubes" />
 
diff --git a/src/WixToolset.Core.Native/targets/WixToolset.Core.Native.targets b/src/WixToolset.Core.Native/targets/WixToolset.Core.Native.targets
new file mode 100644
index 00000000..aafbd405
--- /dev/null
+++ b/src/WixToolset.Core.Native/targets/WixToolset.Core.Native.targets
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemGroup>
+    <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)\..\lib\netstandard2.0\cubes\**\*.*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>cubes\%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
+    </ContentWithTargetPath>
+  </ItemGroup>
+</Project>
-- 
cgit v1.2.3-55-g6feb