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.

---
 .../WixToolset.Core.Native.csproj                  |   8 +++++++
 .../WixToolset.Core.Native.nuspec                  |   6 +++++
 src/winterop/winterop.vcxproj                      |  26 +++++++++++++++++----
 src/wixnative/ARM/mergemod.dll                     | Bin 0 -> 172704 bytes
 src/wixnative/ARM64/mergemod.dll                   | Bin 0 -> 194512 bytes
 src/wixnative/Win32/mergemod.dll                   | Bin 169304 -> 159176 bytes
 src/wixnative/wixnative.vcxproj                    |  26 +++++++++++++++++----
 src/wixnative/x64/mergemod.dll                     | Bin 183848 -> 180376 bytes
 8 files changed, 56 insertions(+), 10 deletions(-)
 create mode 100644 src/wixnative/ARM/mergemod.dll
 create mode 100644 src/wixnative/ARM64/mergemod.dll

(limited to 'src')

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" />
diff --git a/src/winterop/winterop.vcxproj b/src/winterop/winterop.vcxproj
index a4603557..be006c38 100644
--- a/src/winterop/winterop.vcxproj
+++ b/src/winterop/winterop.vcxproj
@@ -5,18 +5,34 @@
   <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
+    <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>ARM</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -27,7 +43,7 @@
     <ProjectGuid>{26D45E58-E703-431D-B67E-493C72C9DA0B}</ProjectGuid>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <TargetName>winterop</TargetName>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <ProjectModuleDefinitionFile>winterop.def</ProjectModuleDefinitionFile>
     <Description>Native component of WixToolset.Core</Description>
diff --git a/src/wixnative/ARM/mergemod.dll b/src/wixnative/ARM/mergemod.dll
new file mode 100644
index 00000000..739af831
Binary files /dev/null and b/src/wixnative/ARM/mergemod.dll differ
diff --git a/src/wixnative/ARM64/mergemod.dll b/src/wixnative/ARM64/mergemod.dll
new file mode 100644
index 00000000..564a75fc
Binary files /dev/null and b/src/wixnative/ARM64/mergemod.dll differ
diff --git a/src/wixnative/Win32/mergemod.dll b/src/wixnative/Win32/mergemod.dll
index 2bf647b2..4286df4d 100644
Binary files a/src/wixnative/Win32/mergemod.dll and b/src/wixnative/Win32/mergemod.dll differ
diff --git a/src/wixnative/wixnative.vcxproj b/src/wixnative/wixnative.vcxproj
index e53af651..373c8d06 100644
--- a/src/wixnative/wixnative.vcxproj
+++ b/src/wixnative/wixnative.vcxproj
@@ -5,18 +5,34 @@
   <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
+    <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>ARM</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -28,7 +44,7 @@
     <ConfigurationType>Application</ConfigurationType>
     <ProjectSubSystem>Console</ProjectSubSystem>
     <TargetName>wixnative</TargetName>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
 
diff --git a/src/wixnative/x64/mergemod.dll b/src/wixnative/x64/mergemod.dll
index 2f4cdc7c..b6422174 100644
Binary files a/src/wixnative/x64/mergemod.dll and b/src/wixnative/x64/mergemod.dll differ
-- 
cgit v1.2.3-55-g6feb