diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-24 14:32:26 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-24 20:36:35 +1000 |
| commit | 84a60ab50339f158715172ef24804c5b9cb5ba9d (patch) | |
| tree | f2052847f2a19c193ff7a92864ae0467e48dc464 /src/WixToolset.Core.Native | |
| parent | c1cc095efa7deec07ffe29034a076035458c260f (diff) | |
| download | wix-84a60ab50339f158715172ef24804c5b9cb5ba9d.tar.gz wix-84a60ab50339f158715172ef24804c5b9cb5ba9d.tar.bz2 wix-84a60ab50339f158715172ef24804c5b9cb5ba9d.zip | |
Add ARM/ARM64 wixnative.exe
Update mergemod.dll from SDK 10.0.19041.0.
Diffstat (limited to 'src/WixToolset.Core.Native')
| -rw-r--r-- | src/WixToolset.Core.Native/WixToolset.Core.Native.csproj | 8 | ||||
| -rw-r--r-- | src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj index d62de257..2626f749 100644 --- a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj +++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj | |||
| @@ -11,6 +11,14 @@ | |||
| 11 | <ItemGroup> | 11 | <ItemGroup> |
| 12 | <ProjectReference Include="..\wixnative\wixnative.vcxproj"> | 12 | <ProjectReference Include="..\wixnative\wixnative.vcxproj"> |
| 13 | <PrivateAssets>All</PrivateAssets> | 13 | <PrivateAssets>All</PrivateAssets> |
| 14 | <Properties>Platform=ARM</Properties> | ||
| 15 | </ProjectReference> | ||
| 16 | <ProjectReference Include="..\wixnative\wixnative.vcxproj"> | ||
| 17 | <PrivateAssets>All</PrivateAssets> | ||
| 18 | <Properties>Platform=ARM64</Properties> | ||
| 19 | </ProjectReference> | ||
| 20 | <ProjectReference Include="..\wixnative\wixnative.vcxproj"> | ||
| 21 | <PrivateAssets>All</PrivateAssets> | ||
| 14 | <Properties>Platform=Win32</Properties> | 22 | <Properties>Platform=Win32</Properties> |
| 15 | </ProjectReference> | 23 | </ProjectReference> |
| 16 | <ProjectReference Include="..\wixnative\wixnative.vcxproj"> | 24 | <ProjectReference Include="..\wixnative\wixnative.vcxproj"> |
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec index e862b1ba..2e4b491c 100644 --- a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec +++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec | |||
| @@ -19,6 +19,12 @@ | |||
| 19 | <files> | 19 | <files> |
| 20 | <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" /> | 20 | <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" /> |
| 21 | 21 | ||
| 22 | <file src="$mergemoddir$ARM\mergemod.dll" target="runtimes\win-arm\native" /> | ||
| 23 | <file src="ARM\wixnative.exe" target="runtimes\win-arm\native" /> | ||
| 24 | <file src="ARM\wixnative.pdb" target="runtimes\win-arm\native" /> | ||
| 25 | <file src="$mergemoddir$ARM64\mergemod.dll" target="runtimes\win-arm64\native" /> | ||
| 26 | <file src="ARM64\wixnative.exe" target="runtimes\win-arm64\native" /> | ||
| 27 | <file src="ARM64\wixnative.pdb" target="runtimes\win-arm64\native" /> | ||
| 22 | <file src="$mergemoddir$Win32\mergemod.dll" target="runtimes\win-x86\native" /> | 28 | <file src="$mergemoddir$Win32\mergemod.dll" target="runtimes\win-x86\native" /> |
| 23 | <file src="Win32\wixnative.exe" target="runtimes\win-x86\native" /> | 29 | <file src="Win32\wixnative.exe" target="runtimes\win-x86\native" /> |
| 24 | <file src="Win32\wixnative.pdb" target="runtimes\win-x86\native" /> | 30 | <file src="Win32\wixnative.pdb" target="runtimes\win-x86\native" /> |