17 files changed, 109 insertions, 110 deletions

diff --git a/src/ext/Msmq/Msmq.wixext.sln b/src/ext/Msmq/Msmq.wixext.sln
index d6728547..84ef7097 100644
--- a/src/ext/Msmq/Msmq.wixext.sln
+++ b/src/ext/Msmq/Msmq.wixext.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2016
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32126.317
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msmqca", "ca\msmqca.vcxproj", "{CAD56A7E-342B-4324-9DCB-BCEB8F3BC80D}"
 EndProject
diff --git a/src/ext/Msmq/ca/mqqueuesched.cpp b/src/ext/Msmq/ca/mqqueuesched.cpp
index 01777ea4..ab4d1680 100644
--- a/src/ext/Msmq/ca/mqqueuesched.cpp
+++ b/src/ext/Msmq/ca/mqqueuesched.cpp
@@ -6,13 +6,13 @@
 // sql queries
 
 LPCWSTR vcsMessageQueueQuery =
-    L"SELECT `MessageQueue`, `Component_`, `BasePriority`, `JournalQuota`, `Label`, `MulticastAddress`, `PathName`, `PrivLevel`, `Quota`, `ServiceTypeGuid`, `Attributes` FROM `MessageQueue`";
+    L"SELECT `MessageQueue`, `Component_`, `BasePriority`, `JournalQuota`, `Label`, `MulticastAddress`, `PathName`, `PrivLevel`, `Quota`, `ServiceTypeGuid`, `Attributes` FROM `Wix4MessageQueue`";
 enum eMessageQueueQuery { mqqMessageQueue = 1, mqqComponent,  mqqBasePriority, mqqJournalQuota, mqqLabel, mqqMulticastAddress, mqqPathName, mqqPrivLevel, mqqQuota, mqqServiceTypeGuid, mqqAttributes };
 
 LPCWSTR vcsMessageQueueUserPermissionQuery =
-    L"SELECT `MessageQueueUserPermission`, `MessageQueue_`, `MessageQueueUserPermission`.`Component_`, `Domain`, `Name`, `Permissions` FROM `MessageQueueUserPermission`, `User` WHERE `User_` = `User`";
+    L"SELECT `MessageQueueUserPermission`, `MessageQueue_`, `MessageQueueUserPermission`.`Component_`, `Domain`, `Name`, `Permissions` FROM `Wix4MessageQueueUserPermission`, `User` WHERE `User_` = `User`";
 LPCWSTR vcsMessageQueueGroupPermissionQuery =
-    L"SELECT `MessageQueueGroupPermission`, `MessageQueue_`, `MessageQueueGroupPermission`.`Component_`, `Domain`, `Name`, `Permissions` FROM `MessageQueueGroupPermission`, `Group` WHERE `Group_` = `Group`";
+    L"SELECT `MessageQueueGroupPermission`, `MessageQueue_`, `MessageQueueGroupPermission`.`Component_`, `Domain`, `Name`, `Permissions` FROM `Wix4MessageQueueGroupPermission`, `Group` WHERE `Group_` = `Group`";
 enum eMessageQueuePermissionQuery { mqpqMessageQueuePermission = 1, mqpqMessageQueue, mqpqComponent, mqpqDomain, mqpqName, mqpqPermissions };
 
 
diff --git a/src/ext/Msmq/ca/mqutilexec.cpp b/src/ext/Msmq/ca/mqutilexec.cpp
index a9c56e02..7055333b 100644
--- a/src/ext/Msmq/ca/mqutilexec.cpp
+++ b/src/ext/Msmq/ca/mqutilexec.cpp
@@ -40,7 +40,7 @@ static HRESULT CreateSidFromDomainRidPair(
 static HRESULT InitLsaUnicodeString(
     PLSA_UNICODE_STRING plusStr,
     LPCWSTR pwzStr,
-    DWORD dwLen
+    SIZE_T dwLen
     );
 static void FreeLsaUnicodeString(
     PLSA_UNICODE_STRING plusStr
@@ -351,7 +351,7 @@ LExit:
 static HRESULT InitLsaUnicodeString(
     PLSA_UNICODE_STRING plusStr,
     LPCWSTR pwzStr,
-    DWORD dwLen
+    SIZE_T dwLen
     )
 {
     HRESULT hr = S_OK;
diff --git a/src/ext/Msmq/ca/mqutilsched.cpp b/src/ext/Msmq/ca/mqutilsched.cpp
deleted file mode 100644
index 4353a6d6..00000000
--- a/src/ext/Msmq/ca/mqutilsched.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// 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.
-
-#include "precomp.h"
-
-
-// function definitions
-
-HRESULT PcaGuidToRegFormat(
-    LPWSTR pwzGuid,
-    LPWSTR pwzDest,
-    SIZE_T cchDest
-    )
-{
-    HRESULT hr = S_OK;
-
-    GUID guid = GUID_NULL;
-    int cch = 0;
-
-    WCHAR wz[39];
-    ::ZeroMemory(wz, sizeof(wz));
-
-    cch = lstrlenW(pwzGuid);
-
-    if (38 == cch && L'{' == pwzGuid[0] && L'}' == pwzGuid[37])
-        StringCchCopyW(wz, countof(wz), pwzGuid);
-    else if (36 == cch)
-        StringCchPrintfW(wz, countof(wz), L"{%s}", pwzGuid);
-    else
-        ExitFunction1(hr = E_INVALIDARG);
-
-    // convert string to guid
-    hr = ::CLSIDFromString(wz, &guid);
-    ExitOnFailure(hr, "Failed to parse guid string");
-
-    // convert guid to string
-    if (0 == ::StringFromGUID2(guid, pwzDest, cchDest))
-        ExitOnFailure(hr = E_FAIL, "Failed to convert guid to string");
-
-    hr = S_OK;
-
-LExit:
-    return hr;
-}
diff --git a/src/ext/Msmq/ca/mqutilsched.h b/src/ext/Msmq/ca/mqutilsched.h
deleted file mode 100644
index e172257d..00000000
--- a/src/ext/Msmq/ca/mqutilsched.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#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.
-
-
-HRESULT PcaGuidToRegFormat(
-    LPWSTR pwzGuid,
-    LPWSTR pwzDest,
-    SIZE_T cchDest
-    );
diff --git a/src/ext/Msmq/ca/msmqca.vcxproj b/src/ext/Msmq/ca/msmqca.vcxproj
index b00cd88e..0e712f63 100644
--- a/src/ext/Msmq/ca/msmqca.vcxproj
+++ b/src/ext/Msmq/ca/msmqca.vcxproj
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
-
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\WixToolset.DUtil.4.0.0-preview.0-build.1\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.0-preview.0-build.1\build\WixToolset.DUtil.props')" />
   <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" />
-
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -14,8 +12,23 @@
       <Configuration>Release</Configuration>
       <Platform>Win32</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|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
-
   <PropertyGroup Label="Globals">
     <ProjectGuid>{CAD56A7E-342B-4324-9DCB-BCEB8F3BC80D}</ProjectGuid>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -24,14 +37,11 @@
     <ProjectModuleDefinitionFile>msmqca.def</ProjectModuleDefinitionFile>
     <Description>WiX Toolset MSMQ CustomAction</Description>
   </PropertyGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-
   <PropertyGroup>
     <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
-
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
@@ -41,28 +51,22 @@
     <ClCompile Include="mqqueuesched.cpp" />
     <ClCompile Include="mqsched.cpp" />
     <ClCompile Include="mqutilexec.cpp" />
-    <ClCompile Include="mqutilsched.cpp" />
   </ItemGroup>
-
   <ItemGroup>
     <ClInclude Include="mqcost.h" />
     <ClInclude Include="mqqueueexec.h" />
     <ClInclude Include="mqqueuesched.h" />
     <ClInclude Include="mqutilexec.h" />
-    <ClInclude Include="mqutilsched.h" />
     <ClInclude Include="precomp.h" />
   </ItemGroup>
-
   <ItemGroup>
     <None Include="msmqca.def" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="WixToolset.Dutil" />
     <PackageReference Include="WixToolset.WcaUtil" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
     <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/ext/Msmq/ca/precomp.h b/src/ext/Msmq/ca/precomp.h
index cbbff6ea..6fbd418c 100644
--- a/src/ext/Msmq/ca/precomp.h
+++ b/src/ext/Msmq/ca/precomp.h
@@ -17,7 +17,6 @@
 #include "CustomMsiErrors.h"
 
 #include "mqcost.h"
-#include "mqutilsched.h"
 #include "mqqueuesched.h"
 #include "mqutilexec.h"
 #include "mqqueueexec.h"
diff --git a/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs b/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs
index a0fac3ca..c9d40d10 100644
--- a/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs
+++ b/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs
@@ -16,17 +16,25 @@ namespace WixToolsetTest.Msmq
             var folder = TestData.Get(@"TestData\UsingMessageQueue");
             var build = new Builder(folder, typeof(MsmqExtensionFactory), new[] { folder });
 
-            var results = build.BuildAndQuery(Build, "MessageQueue");
+            var results = build.BuildAndQuery(Build, "Wix4MessageQueue", "CustomAction");
             WixAssert.CompareLineByLine(new[]
             {
-                "MessageQueue:TestMQ\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\t\t\tMQLabel\t\tMQPath\t\t\t\t0",
+                "CustomAction:Wix4MessageQueuingExecuteInstall_A64\t3073\tWix4MsmqCA_A64\tMessageQueuingExecuteInstall\t",
+                "CustomAction:Wix4MessageQueuingExecuteUninstall_A64\t3073\tWix4MsmqCA_A64\tMessageQueuingExecuteUninstall\t",
+                "CustomAction:Wix4MessageQueuingInstall_A64\t1\tWix4MsmqCA_A64\tMessageQueuingInstall\t",
+                "CustomAction:Wix4MessageQueuingRollbackInstall_A64\t3329\tWix4MsmqCA_A64\tMessageQueuingRollbackInstall\t",
+                "CustomAction:Wix4MessageQueuingRollbackUninstall_A64\t3329\tWix4MsmqCA_A64\tMessageQueuingRollbackUninstall\t",
+                "CustomAction:Wix4MessageQueuingUninstall_A64\t1\tWix4MsmqCA_A64\tMessageQueuingUninstall\t",
+                "Wix4MessageQueue:TestMQ\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\t\t\tMQLabel\t\tMQPath\t\t\t\t0",
             }, results);
         }
 
         private static void Build(string[] args)
         {
-            var result = WixRunner.Execute(args)
-                                  .AssertSuccess();
+            args = args.Concat(new[] { "-arch", "arm64" }).ToArray();
+
+            var result = WixRunner.Execute(args);
+            result.AssertSuccess();
         }
     }
 }
diff --git a/src/ext/Msmq/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/Package.wxs b/src/ext/Msmq/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/Package.wxs
index bd31e81f..9524f3a4 100644
--- a/src/ext/Msmq/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/Package.wxs
+++ b/src/ext/Msmq/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/Package.wxs
@@ -1,5 +1,5 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 
     <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
diff --git a/src/ext/Msmq/wixext/MsmqCompiler.cs b/src/ext/Msmq/wixext/MsmqCompiler.cs
index cfc4ef65..8a811d40 100644
--- a/src/ext/Msmq/wixext/MsmqCompiler.cs
+++ b/src/ext/Msmq/wixext/MsmqCompiler.cs
@@ -7,6 +7,7 @@ namespace WixToolset.Msmq
     using System.Xml.Linq;
     using WixToolset.Data;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Data;
     using WixToolset.Msmq.Symbols;
 
     /// <summary>
@@ -71,7 +72,6 @@ namespace WixToolset.Msmq
             {
                 case "Component":
                     var componentId = context["ComponentId"];
-                    var directoryId = context["DirectoryId"];
 
                     switch (element.Name.LocalName)
                     {
@@ -249,8 +249,8 @@ namespace WixToolset.Msmq
                 symbol.Quota = quota;
             }
 
-            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "MessageQueuingInstall");
-            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "MessageQueuingUninstall");
+            this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4MessageQueuingInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
+            this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4MessageQueuingUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
         }
 
         ///     <summary>
diff --git a/src/ext/Msmq/wixext/MsmqTableDefinitions.cs b/src/ext/Msmq/wixext/MsmqTableDefinitions.cs
index 46e2dd10..c48292bc 100644
--- a/src/ext/Msmq/wixext/MsmqTableDefinitions.cs
+++ b/src/ext/Msmq/wixext/MsmqTableDefinitions.cs
@@ -7,7 +7,7 @@ namespace WixToolset.Msmq
     public static class MsmqTableDefinitions
     {
         public static readonly TableDefinition MessageQueue = new TableDefinition(
-            "MessageQueue",
+            "Wix4MessageQueue",
             MsmqSymbolDefinitions.MessageQueue,
             new[]
             {
@@ -27,7 +27,7 @@ namespace WixToolset.Msmq
         );
 
         public static readonly TableDefinition MessageQueueUserPermission = new TableDefinition(
-            "MessageQueueUserPermission",
+            "Wix4MessageQueueUserPermission",
             MsmqSymbolDefinitions.MessageQueueUserPermission,
             new[]
             {
@@ -41,7 +41,7 @@ namespace WixToolset.Msmq
         );
 
         public static readonly TableDefinition MessageQueueGroupPermission = new TableDefinition(
-            "MessageQueueGroupPermission",
+            "Wix4MessageQueueGroupPermission",
             MsmqSymbolDefinitions.MessageQueueGroupPermission,
             new[]
             {
diff --git a/src/ext/Msmq/wixlib/MsmqExtension.wxs b/src/ext/Msmq/wixlib/MsmqExtension.wxs
index 87b2b382..a762575b 100644
--- a/src/ext/Msmq/wixlib/MsmqExtension.wxs
+++ b/src/ext/Msmq/wixlib/MsmqExtension.wxs
@@ -2,28 +2,13 @@
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?include ..\..\caerr.wxi ?>
-
-  <Fragment>
-    <UI>
-      <ProgressText Action="MessageQueuingExecuteInstall" Template="!(loc.MessageQueuingExecuteInstallTemplate)" Message="!(loc.MessageQueuingExecuteInstall)" />
-      <ProgressText Action="MessageQueuingExecuteUninstall" Template="!(loc.MessageQueuingExecuteUninstallTemplate)" Message="!(loc.MessageQueuingExecuteUninstall)" />
-    </UI>
-
-    <CustomAction Id="MessageQueuingInstall" DllEntry="MessageQueuingInstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="MsmqCA" />
-    <CustomAction Id="MessageQueuingUninstall" DllEntry="MessageQueuingUninstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="MsmqCA" />
-    <CustomAction Id="MessageQueuingExecuteInstall" DllEntry="MessageQueuingExecuteInstall" Execute="deferred" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="MsmqCA" />
-    <CustomAction Id="MessageQueuingRollbackInstall" DllEntry="MessageQueuingRollbackInstall" Execute="rollback" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="MsmqCA" />
-    <CustomAction Id="MessageQueuingExecuteUninstall" DllEntry="MessageQueuingExecuteUninstall" Execute="deferred" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="MsmqCA" />
-    <CustomAction Id="MessageQueuingRollbackUninstall" DllEntry="MessageQueuingRollbackUninstall" Execute="rollback" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="MsmqCA" />
-
-    <InstallExecuteSequence>
-      <Custom Action="MessageQueuingUninstall" After="DeleteServices" Overridable="yes" Condition="VersionNT &gt;= 500" />
-      <Custom Action="MessageQueuingInstall" Before="InstallServices" Overridable="yes" Condition="VersionNT &gt;= 500" />
-    </InstallExecuteSequence>
-  </Fragment>
-
-  <Fragment>
-    <Binary Id="MsmqCA" SourceFile="msmqca.dll" />
-  </Fragment>
+    <?include ..\..\caDecor.wxi ?>
+    <?include ..\..\caerr.wxi ?>
+
+    <Fragment>
+      <UI Id="MsmqUI">
+        <ProgressText Action="$(var.Prefix)MessageQueuingExecuteInstall$(var.Suffix)" Template="!(loc.MessageQueuingExecuteInstallTemplate)" Message="!(loc.MessageQueuingExecuteInstall)" />
+        <ProgressText Action="$(var.Prefix)MessageQueuingExecuteUninstall$(var.Suffix)" Template="!(loc.MessageQueuingExecuteUninstallTemplate)" Message="!(loc.MessageQueuingExecuteUninstall)" />
+      </UI>
+    </Fragment>
 </Wix>
diff --git a/src/ext/Msmq/wixlib/MsmqExtension_Platform.wxi b/src/ext/Msmq/wixlib/MsmqExtension_Platform.wxi
new file mode 100644
index 00000000..278bb3a8
--- /dev/null
+++ b/src/ext/Msmq/wixlib/MsmqExtension_Platform.wxi
@@ -0,0 +1,26 @@
+<!-- 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. -->
+
+
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <?include ..\..\caDecor.wxi ?>
+
+  <Fragment>
+    <UIRef Id="MsmqUI" />
+
+    <CustomAction Id="$(var.Prefix)MessageQueuingInstall$(var.Suffix)" DllEntry="MessageQueuingInstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)MsmqCA$(var.Suffix)" />
+    <CustomAction Id="$(var.Prefix)MessageQueuingUninstall$(var.Suffix)" DllEntry="MessageQueuingUninstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)MsmqCA$(var.Suffix)" />
+    <CustomAction Id="$(var.Prefix)MessageQueuingExecuteInstall$(var.Suffix)" DllEntry="MessageQueuingExecuteInstall" Execute="deferred" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="$(var.Prefix)MsmqCA$(var.Suffix)" />
+    <CustomAction Id="$(var.Prefix)MessageQueuingRollbackInstall$(var.Suffix)" DllEntry="MessageQueuingRollbackInstall" Execute="rollback" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="$(var.Prefix)MsmqCA$(var.Suffix)" />
+    <CustomAction Id="$(var.Prefix)MessageQueuingExecuteUninstall$(var.Suffix)" DllEntry="MessageQueuingExecuteUninstall" Execute="deferred" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="$(var.Prefix)MsmqCA$(var.Suffix)" />
+    <CustomAction Id="$(var.Prefix)MessageQueuingRollbackUninstall$(var.Suffix)" DllEntry="MessageQueuingRollbackUninstall" Execute="rollback" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="$(var.Prefix)MsmqCA$(var.Suffix)" />
+
+    <InstallExecuteSequence>
+      <Custom Action="$(var.Prefix)MessageQueuingUninstall$(var.Suffix)" After="DeleteServices" Overridable="yes" Condition="VersionNT &gt;= 500" />
+      <Custom Action="$(var.Prefix)MessageQueuingInstall$(var.Suffix)" Before="InstallServices" Overridable="yes" Condition="VersionNT &gt;= 500" />
+    </InstallExecuteSequence>
+  </Fragment>
+
+  <Fragment>
+    <Binary Id="$(var.Prefix)MsmqCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))msmqca.dll" />
+  </Fragment>
+</Include>
diff --git a/src/ext/Msmq/wixlib/MsmqExtension_arm64.wxs b/src/ext/Msmq/wixlib/MsmqExtension_arm64.wxs
new file mode 100644
index 00000000..f4ecad75
--- /dev/null
+++ b/src/ext/Msmq/wixlib/MsmqExtension_arm64.wxs
@@ -0,0 +1,7 @@
+<!-- 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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?define platform=arm64 ?>
+    <?include MsmqExtension_Platform.wxi ?>
+</Wix>
diff --git a/src/ext/Msmq/wixlib/MsmqExtension_x64.wxs b/src/ext/Msmq/wixlib/MsmqExtension_x64.wxs
new file mode 100644
index 00000000..3b1b3794
--- /dev/null
+++ b/src/ext/Msmq/wixlib/MsmqExtension_x64.wxs
@@ -0,0 +1,7 @@
+<!-- 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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?define platform=x64 ?>
+    <?include MsmqExtension_Platform.wxi ?>
+</Wix>
diff --git a/src/ext/Msmq/wixlib/MsmqExtension_x86.wxs b/src/ext/Msmq/wixlib/MsmqExtension_x86.wxs
new file mode 100644
index 00000000..a5c27ab5
--- /dev/null
+++ b/src/ext/Msmq/wixlib/MsmqExtension_x86.wxs
@@ -0,0 +1,7 @@
+<!-- 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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?define platform=x86 ?>
+    <?include MsmqExtension_Platform.wxi ?>
+</Wix>
diff --git a/src/ext/Msmq/wixlib/msmq.wixproj b/src/ext/Msmq/wixlib/msmq.wixproj
index 15111cb5..e2887823 100644
--- a/src/ext/Msmq/wixlib/msmq.wixproj
+++ b/src/ext/Msmq/wixlib/msmq.wixproj
@@ -7,7 +7,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ca\msmqca.vcxproj" ReferenceOutputAssembly="false" />
+    <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
+    <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
+    <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ca\msmqca.vcxproj" Properties="Platform=ARM64" />
+    <ProjectReference Include="..\ca\msmqca.vcxproj" Properties="Platform=x86" />
+    <ProjectReference Include="..\ca\msmqca.vcxproj" Properties="Platform=x64" />
   </ItemGroup>
 
   <ItemGroup>