6 files changed, 65 insertions, 25 deletions
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 ?>
+    <?include ..\..\caDecor.wxi ?>
+    <?include ..\..\caerr.wxi ?>
-  <Fragment>
-    <UI>
+    <Fragment>
-      <ProgressText Action="MessageQueuingExecuteInstall" Template="!(loc.MessageQueuingExecuteInstallTemplate)" Message="!(loc.MessageQueuingExecuteInstall)" />
+      <UI Id="MsmqUI">
-      <ProgressText Action="MessageQueuingExecuteUninstall" Template="!(loc.MessageQueuingExecuteUninstallTemplate)" Message="!(loc.MessageQueuingExecuteUninstall)" />
+        <ProgressText Action="$(var.Prefix)MessageQueuingExecuteInstall$(var.Suffix)" Template="!(loc.MessageQueuingExecuteInstallTemplate)" Message="!(loc.MessageQueuingExecuteInstall)" />
-    </UI>
+        <ProgressText Action="$(var.Prefix)MessageQueuingExecuteUninstall$(var.Suffix)" Template="!(loc.MessageQueuingExecuteUninstallTemplate)" Message="!(loc.MessageQueuingExecuteUninstall)" />
+      </UI>
-    <CustomAction Id="MessageQueuingInstall" DllEntry="MessageQueuingInstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="MsmqCA" />
+    </Fragment>
-    <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>
 </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>

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 @@
2		2
3		3
4	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">	4	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5	<?include ..\..\caerr.wxi ?>	5	<?include ..\..\caDecor.wxi ?>
6		6	<?include ..\..\caerr.wxi ?>
7	<Fragment>	7
8	<UI>	8	<Fragment>
9	<ProgressText Action="MessageQueuingExecuteInstall" Template="!(loc.MessageQueuingExecuteInstallTemplate)" Message="!(loc.MessageQueuingExecuteInstall)" />	9	<UI Id="MsmqUI">
10	<ProgressText Action="MessageQueuingExecuteUninstall" Template="!(loc.MessageQueuingExecuteUninstallTemplate)" Message="!(loc.MessageQueuingExecuteUninstall)" />	10	<ProgressText Action="$(var.Prefix)MessageQueuingExecuteInstall$(var.Suffix)" Template="!(loc.MessageQueuingExecuteInstallTemplate)" Message="!(loc.MessageQueuingExecuteInstall)" />
11	</UI>	11	<ProgressText Action="$(var.Prefix)MessageQueuingExecuteUninstall$(var.Suffix)" Template="!(loc.MessageQueuingExecuteUninstallTemplate)" Message="!(loc.MessageQueuingExecuteUninstall)" />
12		12	</UI>
13	<CustomAction Id="MessageQueuingInstall" DllEntry="MessageQueuingInstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="MsmqCA" />	13	</Fragment>
14	<CustomAction Id="MessageQueuingUninstall" DllEntry="MessageQueuingUninstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="MsmqCA" />
15	<CustomAction Id="MessageQueuingExecuteInstall" DllEntry="MessageQueuingExecuteInstall" Execute="deferred" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="MsmqCA" />
16	<CustomAction Id="MessageQueuingRollbackInstall" DllEntry="MessageQueuingRollbackInstall" Execute="rollback" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="MsmqCA" />
17	<CustomAction Id="MessageQueuingExecuteUninstall" DllEntry="MessageQueuingExecuteUninstall" Execute="deferred" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="MsmqCA" />
18	<CustomAction Id="MessageQueuingRollbackUninstall" DllEntry="MessageQueuingRollbackUninstall" Execute="rollback" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="MsmqCA" />
19
20	<InstallExecuteSequence>
21	<Custom Action="MessageQueuingUninstall" After="DeleteServices" Overridable="yes" Condition="VersionNT >= 500" />
22	<Custom Action="MessageQueuingInstall" Before="InstallServices" Overridable="yes" Condition="VersionNT >= 500" />
23	</InstallExecuteSequence>
24	</Fragment>
25
26	<Fragment>
27	<Binary Id="MsmqCA" SourceFile="msmqca.dll" />
28	</Fragment>
29	</Wix>	14	</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 @@
		1	<!-- 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. -->
		2
		3
		4	<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
		5	<?include ..\..\caDecor.wxi ?>
		6
		7	<Fragment>
		8	<UIRef Id="MsmqUI" />
		9
		10	<CustomAction Id="$(var.Prefix)MessageQueuingInstall$(var.Suffix)" DllEntry="MessageQueuingInstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)MsmqCA$(var.Suffix)" />
		11	<CustomAction Id="$(var.Prefix)MessageQueuingUninstall$(var.Suffix)" DllEntry="MessageQueuingUninstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)MsmqCA$(var.Suffix)" />
		12	<CustomAction Id="$(var.Prefix)MessageQueuingExecuteInstall$(var.Suffix)" DllEntry="MessageQueuingExecuteInstall" Execute="deferred" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="$(var.Prefix)MsmqCA$(var.Suffix)" />
		13	<CustomAction Id="$(var.Prefix)MessageQueuingRollbackInstall$(var.Suffix)" DllEntry="MessageQueuingRollbackInstall" Execute="rollback" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="$(var.Prefix)MsmqCA$(var.Suffix)" />
		14	<CustomAction Id="$(var.Prefix)MessageQueuingExecuteUninstall$(var.Suffix)" DllEntry="MessageQueuingExecuteUninstall" Execute="deferred" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="$(var.Prefix)MsmqCA$(var.Suffix)" />
		15	<CustomAction Id="$(var.Prefix)MessageQueuingRollbackUninstall$(var.Suffix)" DllEntry="MessageQueuingRollbackUninstall" Execute="rollback" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="$(var.Prefix)MsmqCA$(var.Suffix)" />
		16
		17	<InstallExecuteSequence>
		18	<Custom Action="$(var.Prefix)MessageQueuingUninstall$(var.Suffix)" After="DeleteServices" Overridable="yes" Condition="VersionNT >= 500" />
		19	<Custom Action="$(var.Prefix)MessageQueuingInstall$(var.Suffix)" Before="InstallServices" Overridable="yes" Condition="VersionNT >= 500" />
		20	</InstallExecuteSequence>
		21	</Fragment>
		22
		23	<Fragment>
		24	<Binary Id="$(var.Prefix)MsmqCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))msmqca.dll" />
		25	</Fragment>
		26	</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 @@
		1	<!-- 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. -->
		2
		3
		4	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
		5	<?define platform=arm64 ?>
		6	<?include MsmqExtension_Platform.wxi ?>
		7	</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 @@
		1	<!-- 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. -->
		2
		3
		4	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
		5	<?define platform=x64 ?>
		6	<?include MsmqExtension_Platform.wxi ?>
		7	</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 @@
		1	<!-- 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. -->
		2
		3
		4	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
		5	<?define platform=x86 ?>
		6	<?include MsmqExtension_Platform.wxi ?>
		7	</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 @@
7	</PropertyGroup>	7	</PropertyGroup>
8		8
9	<ItemGroup>	9	<ItemGroup>
10	<ProjectReference Include="..\ca\msmqca.vcxproj" ReferenceOutputAssembly="false" />	10	<BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
		11	<BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
		12	<BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
		13	</ItemGroup>
		14
		15	<ItemGroup>
		16	<ProjectReference Include="..\ca\msmqca.vcxproj" Properties="Platform=ARM64" />
		17	<ProjectReference Include="..\ca\msmqca.vcxproj" Properties="Platform=x86" />
		18	<ProjectReference Include="..\ca\msmqca.vcxproj" Properties="Platform=x64" />
11	</ItemGroup>	19	</ItemGroup>
12		20
13	<ItemGroup>	21	<ItemGroup>