aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-03-18 09:17:59 -0500
committerSean Hall <r.sean.hall@gmail.com>2021-03-18 09:20:10 -0500
commit50829b410e96d8cb62f557342e33f1815df7d82b (patch)
tree85bb60de4f3bc5c8797e9fa69af61d6c290facd4
parent47d6dd96c1cca8668118a5ad9adfa8ed776b2715 (diff)
downloadwix-50829b410e96d8cb62f557342e33f1815df7d82b.tar.gz
wix-50829b410e96d8cb62f557342e33f1815df7d82b.tar.bz2
wix-50829b410e96d8cb62f557342e33f1815df7d82b.zip
Deploy .targets file to buildTransitive folder
since the assets are needed in the final project.
-rw-r--r--src/WixToolset.Core.Native/WixToolset.Core.Native.csproj2
-rw-r--r--src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
index 14de87cd..d53a155b 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
@@ -9,6 +9,8 @@
9 <Description>WiX Toolset Native Processing</Description> 9 <Description>WiX Toolset Native Processing</Description>
10 <IncludeSymbols>true</IncludeSymbols> 10 <IncludeSymbols>true</IncludeSymbols>
11 <CreateDocumentationFile>true</CreateDocumentationFile> 11 <CreateDocumentationFile>true</CreateDocumentationFile>
12 <!-- https://github.com/NuGet/Home/issues/10665 -->
13 <NoWarn>NU5128</NoWarn>
12 </PropertyGroup> 14 </PropertyGroup>
13 15
14 <ItemGroup> 16 <ItemGroup>
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
index fa6a32b6..3091ccd5 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
@@ -22,10 +22,12 @@
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" />
26 <file src="netstandard2.0\cubes\darice.cub" target="lib\netstandard2.0\cubes" /> 25 <file src="netstandard2.0\cubes\darice.cub" target="lib\netstandard2.0\cubes" />
27 <file src="netstandard2.0\cubes\mergemod.cub" target="lib\netstandard2.0\cubes" /> 26 <file src="netstandard2.0\cubes\mergemod.cub" target="lib\netstandard2.0\cubes" />
28 27
28 <file src="netstandard2.0\targets\$id$.targets" target="build" />
29 <file src="netstandard2.0\targets\$id$.targets" target="buildTransitive" />
30
29 <file src="ARM64\mergemod.dll" target="runtimes\win-arm64\native" /> 31 <file src="ARM64\mergemod.dll" target="runtimes\win-arm64\native" />
30 <file src="ARM64\wixnative.exe" target="runtimes\win-arm64\native" /> 32 <file src="ARM64\wixnative.exe" target="runtimes\win-arm64\native" />
31 <file src="ARM64\wixnative.pdb" target="runtimes\win-arm64\native" /> 33 <file src="ARM64\wixnative.pdb" target="runtimes\win-arm64\native" />