From af43f098d7d7cc0fe21c7d7b0fe991763e9cae07 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 10 Jul 2020 18:01:40 +1000
Subject: Add x64 and ARM64 versions of UtilBundleExtension.

---
 src/be/UtilBundleExtension.h |  2 +-
 src/be/beDecor.h             | 13 +++++++++++++
 src/be/precomp.h             |  1 +
 src/be/utilbe.vcxproj        | 25 +++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 src/be/beDecor.h

(limited to 'src/be')

diff --git a/src/be/UtilBundleExtension.h b/src/be/UtilBundleExtension.h
index 16c5b346..c55d6b85 100644
--- a/src/be/UtilBundleExtension.h
+++ b/src/be/UtilBundleExtension.h
@@ -4,7 +4,7 @@
 
 // constants
 
-#define UTIL_BUNDLE_EXTENSION_ID L"WixUtilBundleExtension"
+#define UTIL_BUNDLE_EXTENSION_ID BUNDLE_EXTENSION_DECORATION(L"UtilBundleExtension")
 
 
 // function declarations
diff --git a/src/be/beDecor.h b/src/be/beDecor.h
new file mode 100644
index 00000000..2c6a8818
--- /dev/null
+++ b/src/be/beDecor.h
@@ -0,0 +1,13 @@
+#pragma once
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+
+#if defined(_M_ARM64)
+#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_A64"
+#elif defined(_M_AMD64)
+#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_X64"
+#elif defined(_M_ARM)
+#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_ARM"
+#else
+#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_X86"
+#endif
diff --git a/src/be/precomp.h b/src/be/precomp.h
index a4ab7abf..76d24c7b 100644
--- a/src/be/precomp.h
+++ b/src/be/precomp.h
@@ -31,6 +31,7 @@
 #include <bextutil.h>
 #include <BextBundleExtensionEngine.h>
 
+#include "beDecor.h"
 #include "utilsearch.h"
 #include "detectsha2support.h"
 #include "UtilBundleExtension.h"
diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj
index b60fcf9f..3675ccc0 100644
--- a/src/be/utilbe.vcxproj
+++ b/src/be/utilbe.vcxproj
@@ -8,6 +8,30 @@
   <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
   <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|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|X64">
+      <Configuration>Debug</Configuration>
+      <Platform>X64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|X64">
+      <Configuration>Release</Configuration>
+      <Platform>X64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +65,7 @@
     <ClCompile Include="utilsearch.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="beDecor.h" />
     <ClInclude Include="detectsha2support.h" />
     <ClInclude Include="precomp.h" />
     <ClInclude Include="UtilBundleExtension.h" />
-- 
cgit v1.2.3-55-g6feb