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/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
5 files changed, 21 insertions(+), 5 deletions(-)
create mode 100644 src/wixnative/ARM/mergemod.dll
create mode 100644 src/wixnative/ARM64/mergemod.dll
(limited to 'src/wixnative')
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