From 84a60ab50339f158715172ef24804c5b9cb5ba9d Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Wed, 24 Jun 2020 14:32:26 +1000
Subject: Add ARM/ARM64 wixnative.exe Update mergemod.dll from SDK
 10.0.19041.0.

---
 src/WixToolset.Core.Native/WixToolset.Core.Native.csproj | 8 ++++++++
 src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec | 6 ++++++
 2 files changed, 14 insertions(+)

(limited to 'src/WixToolset.Core.Native')

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
@@ -9,6 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\wixnative\wixnative.vcxproj">
+      <PrivateAssets>All</PrivateAssets>
+      <Properties>Platform=ARM</Properties>
+    </ProjectReference>
+    <ProjectReference Include="..\wixnative\wixnative.vcxproj">
+      <PrivateAssets>All</PrivateAssets>
+      <Properties>Platform=ARM64</Properties>
+    </ProjectReference>
     <ProjectReference Include="..\wixnative\wixnative.vcxproj">
       <PrivateAssets>All</PrivateAssets>
       <Properties>Platform=Win32</Properties>
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 @@
   <files>
     <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
 
+    <file src="$mergemoddir$ARM\mergemod.dll" target="runtimes\win-arm\native" />
+    <file src="ARM\wixnative.exe" target="runtimes\win-arm\native" />
+    <file src="ARM\wixnative.pdb" target="runtimes\win-arm\native" />
+    <file src="$mergemoddir$ARM64\mergemod.dll" target="runtimes\win-arm64\native" />
+    <file src="ARM64\wixnative.exe" target="runtimes\win-arm64\native" />
+    <file src="ARM64\wixnative.pdb" target="runtimes\win-arm64\native" />
     <file src="$mergemoddir$Win32\mergemod.dll" target="runtimes\win-x86\native" />
     <file src="Win32\wixnative.exe" target="runtimes\win-x86\native" />
     <file src="Win32\wixnative.pdb" target="runtimes\win-x86\native" />
-- 
cgit v1.2.3-55-g6feb