diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-03-18 00:48:44 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-03-18 02:01:08 -0700 |
| commit | 47d6dd96c1cca8668118a5ad9adfa8ed776b2715 (patch) | |
| tree | e3ea8cec9fe1b8340b93265dd0534158f678f71d | |
| parent | 4e3c12a45cb91828ac94963129495033a4402136 (diff) | |
| download | wix-47d6dd96c1cca8668118a5ad9adfa8ed776b2715.tar.gz wix-47d6dd96c1cca8668118a5ad9adfa8ed776b2715.tar.bz2 wix-47d6dd96c1cca8668118a5ad9adfa8ed776b2715.zip | |
Ensure ICE cubs are copied to the output
3 files changed, 11 insertions, 0 deletions
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 @@ | |||
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <None Include="cubes\darice.cub" CopyToOutputDirectory="PreserveNewest" /> | 15 | <None Include="cubes\darice.cub" CopyToOutputDirectory="PreserveNewest" /> |
| 16 | <None Include="cubes\mergemod.cub" CopyToOutputDirectory="PreserveNewest" /> | 16 | <None Include="cubes\mergemod.cub" CopyToOutputDirectory="PreserveNewest" /> |
| 17 | <None Include="targets\WixToolset.Core.Native.targets" CopyToOutputDirectory="PreserveNewest" /> | ||
| 17 | </ItemGroup> | 18 | </ItemGroup> |
| 18 | 19 | ||
| 19 | <ItemGroup Condition=" '$(NCrunch)'=='' "> | 20 | <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 @@ | |||
| 22 | <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" /> | 22 | <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" /> |
| 23 | <file src="netstandard2.0\$id$.xml" target="lib\netstandard2.0" /> | 23 | <file src="netstandard2.0\$id$.xml" target="lib\netstandard2.0" /> |
| 24 | 24 | ||
| 25 | <file src="netstandard2.0\targets\WixToolset.Core.Native.targets" target="build\WixToolset.Core.Native.targets" /> | ||
| 25 | <file src="netstandard2.0\cubes\darice.cub" target="lib\netstandard2.0\cubes" /> | 26 | <file src="netstandard2.0\cubes\darice.cub" target="lib\netstandard2.0\cubes" /> |
| 26 | <file src="netstandard2.0\cubes\mergemod.cub" target="lib\netstandard2.0\cubes" /> | 27 | <file src="netstandard2.0\cubes\mergemod.cub" target="lib\netstandard2.0\cubes" /> |
| 27 | 28 | ||
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 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project> | ||
| 3 | <ItemGroup> | ||
| 4 | <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)\..\lib\netstandard2.0\cubes\**\*.*"> | ||
| 5 | <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| 6 | <TargetPath>cubes\%(RecursiveDir)%(Filename)%(Extension)</TargetPath> | ||
| 7 | </ContentWithTargetPath> | ||
| 8 | </ItemGroup> | ||
| 9 | </Project> | ||