@joebigelow / wix / commits / 1be6baef

Versioned extension ids: ComPlus, Msmq

Bob Arnson committed Feb 13, 2022 at 00:46 UTC 1be6baef099aa75fd45f41e55b8138ac2c7e0da3
38 files changed +292 -289
src/ext/ComPlus/ComPlus.wixext.sln
+2 -2
@@ -1,7 +1,7 @@
1 
2 Microsoft Visual Studio Solution File, Format Version 12.00
3 -# Visual Studio Version 16
4 -VisualStudioVersion = 16.0.30611.23
3 +# Visual Studio Version 17
4 +VisualStudioVersion = 17.0.32126.317
5 MinimumVisualStudioVersion = 10.0.40219.1
6 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "complusca", "ca\complusca.vcxproj", "{BDEF51ED-E242-4FA2-801A-01B127DF851A}"
7 EndProject
src/ext/ComPlus/ca/complusca.vcxproj
+8
@@ -19,6 +19,14 @@
19 <Configuration>Release</Configuration>
20 <Platform>x64</Platform>
21 </ProjectConfiguration>
22 + <ProjectConfiguration Include="Debug|ARM64">
23 + <Configuration>Debug</Configuration>
24 + <Platform>ARM64</Platform>
25 + </ProjectConfiguration>
26 + <ProjectConfiguration Include="Release|ARM64">
27 + <Configuration>Release</Configuration>
28 + <Platform>ARM64</Platform>
29 + </ProjectConfiguration>
30 </ItemGroup>
31
32 <PropertyGroup Label="Globals">
src/ext/ComPlus/ca/cpapprolesched.cpp
+4 -4
@@ -6,17 +6,17 @@
6 // sql queries
7
8 LPCWSTR vcsApplicationRoleQuery =
9 - L"SELECT `ApplicationRole`, `Application_`, `Component_`, `Name` FROM `ComPlusApplicationRole`";
9 + L"SELECT `ApplicationRole`, `Application_`, `Component_`, `Name` FROM `Wix4ComPlusApplicationRole`";
10 enum eApplicationRoleQuery { arqApplicationRole = 1, arqApplication, arqComponent, arqName };
11
12 LPCWSTR vcsUserInApplicationRoleQuery =
13 - L"SELECT `UserInApplicationRole`, `ApplicationRole_`, `ComPlusUserInApplicationRole`.`Component_`, `Domain`, `Name` FROM `ComPlusUserInApplicationRole`, `User` WHERE `User_` = `User`";
13 + L"SELECT `UserInApplicationRole`, `ApplicationRole_`, `ComPlusUserInApplicationRole`.`Component_`, `Domain`, `Name` FROM `Wix4ComPlusUserInApplicationRole`, `Wix4User` WHERE `User_` = `User`";
14 LPCWSTR vcsGroupInApplicationRoleQuery =
15 - L"SELECT `GroupInApplicationRole`, `ApplicationRole_`, `ComPlusGroupInApplicationRole`.`Component_`, `Domain`, `Name` FROM `ComPlusGroupInApplicationRole`, `Group` WHERE `Group_` = `Group`";
15 + L"SELECT `GroupInApplicationRole`, `ApplicationRole_`, `ComPlusGroupInApplicationRole`.`Component_`, `Domain`, `Name` FROM `Wix4ComPlusGroupInApplicationRole`, `Group` WHERE `Group_` = `Group`";
16 enum eTrusteeInApplicationRoleQuery { tiarqUserInApplicationRole = 1, tiarqApplicationRole, tiarqComponent, tiarqDomain, tiarqName };
17
18 LPCWSTR vcsApplicationRolePropertyQuery =
19 - L"SELECT `Name`, `Value` FROM `ComPlusApplicationRoleProperty` WHERE `ApplicationRole_` = ?";
19 + L"SELECT `Name`, `Value` FROM `Wix4ComPlusApplicationRoleProperty` WHERE `ApplicationRole_` = ?";
20
21
22 // property definitions
src/ext/ComPlus/ca/cpappsched.cpp
+2 -2
@@ -6,11 +6,11 @@
6 // sql queries
7
8 LPCWSTR vcsApplicationQuery =
9 - L"SELECT `Application`, `Component_`, `Partition_`, `Id`, `Name` FROM `ComPlusApplication`";
9 + L"SELECT `Application`, `Component_`, `Partition_`, `Id`, `Name` FROM `Wix4ComPlusApplication`";
10 enum eApplicationQuery { aqApplication = 1, aqComponent, aqPartition, aqID, aqName };
11
12 LPCWSTR vcsApplicationPropertyQuery =
13 - L"SELECT `Name`, `Value` FROM `ComPlusApplicationProperty` WHERE `Application_` = ?";
13 + L"SELECT `Name`, `Value` FROM `Wix4ComPlusApplicationProperty` WHERE `Application_` = ?";
14
15
16 // property definitions
src/ext/ComPlus/ca/cpasmsched.cpp
+11 -11
@@ -14,36 +14,36 @@ LPCWSTR vcsModuleQuery =
14 enum eModuleQuery { mqModule = 1 };
15
16 LPCWSTR vcsAssemblyQuery =
17 - L"SELECT `Assembly`, `Component_`, `Application_`, `AssemblyName`, `DllPath`, `TlbPath`, `PSDllPath`, `Attributes` FROM `ComPlusAssembly`";
17 + L"SELECT `Assembly`, `Component_`, `Application_`, `AssemblyName`, `DllPath`, `TlbPath`, `PSDllPath`, `Attributes` FROM `Wix4ComPlusAssembly`";
18 enum eAssemblyQuery { aqAssembly = 1, aqComponent, aqApplication, aqAssemblyName, aqDllPath, aqTlbPath, aqPSDllPath, aqAttributes };
19
20 LPCWSTR vcsComponentQuery =
21 - L"SELECT `ComPlusComponent`, `CLSID` FROM `ComPlusComponent` WHERE `Assembly_` = ?";
21 + L"SELECT `ComPlusComponent`, `CLSID` FROM `Wix4ComPlusComponent` WHERE `Assembly_` = ?";
22 enum eComponentQuery { cqComponent = 1, cqCLSID };
23
24 LPCWSTR vcsComponentPropertyQuery =
25 - L"SELECT `Name`, `Value` FROM `ComPlusComponentProperty` WHERE `ComPlusComponent_` = ?";
25 + L"SELECT `Name`, `Value` FROM `Wix4ComPlusComponentProperty` WHERE `ComPlusComponent_` = ?";
26
27 LPCWSTR vcsInterfaceQuery =
28 - L"SELECT `Interface`, `IID` FROM `ComPlusInterface` WHERE `ComPlusComponent_` = ?";
28 + L"SELECT `Interface`, `IID` FROM `Wix4ComPlusInterface` WHERE `ComPlusComponent_` = ?";
29 enum eInterfaceQuery { iqInterface = 1, iqIID };
30
31 LPCWSTR vcsInterfacePropertyQuery =
32 - L"SELECT `Name`, `Value` FROM `ComPlusInterfaceProperty` WHERE `Interface_` = ?";
32 + L"SELECT `Name`, `Value` FROM `Wix4ComPlusInterfaceProperty` WHERE `Interface_` = ?";
33
34 LPCWSTR vcsMethodQuery =
35 - L"SELECT `Method`, `Index`, `Name` FROM `ComPlusMethod` WHERE `Interface_` = ?";
35 + L"SELECT `Method`, `Index`, `Name` FROM `Wix4ComPlusMethod` WHERE `Interface_` = ?";
36 enum eMethodQuery { mqMethod = 1, mqIndex, mqName };
37
38 LPCWSTR vcsMethodPropertyQuery =
39 - L"SELECT `Name`, `Value` FROM `ComPlusMethodProperty` WHERE `Method_` = ?";
39 + L"SELECT `Name`, `Value` FROM `Wix4ComPlusMethodProperty` WHERE `Method_` = ?";
40
41 LPCWSTR vcsRoleForComponentQuery =
42 - L"SELECT `RoleForComponent`, `ApplicationRole_`, `Component_` FROM `ComPlusRoleForComponent` WHERE `ComPlusComponent_` = ?";
42 + L"SELECT `RoleForComponent`, `ApplicationRole_`, `Component_` FROM `Wix4ComPlusRoleForComponent` WHERE `ComPlusComponent_` = ?";
43 LPCWSTR vcsRoleForInterfaceQuery =
44 - L"SELECT `RoleForInterface`, `ApplicationRole_`, `Component_` FROM `ComPlusRoleForInterface` WHERE `Interface_` = ?";
44 + L"SELECT `RoleForInterface`, `ApplicationRole_`, `Component_` FROM `Wix4ComPlusRoleForInterface` WHERE `Interface_` = ?";
45 LPCWSTR vcsRoleForMethodQuery =
46 - L"SELECT `RoleForMethod`, `ApplicationRole_`, `Component_` FROM `ComPlusRoleForMethod` WHERE `Method_` = ?";
46 + L"SELECT `RoleForMethod`, `ApplicationRole_`, `Component_` FROM `Wix4ComPlusRoleForMethod` WHERE `Method_` = ?";
47
48 enum eRoleAssignmentQuery { raqKey = 1, raqApplicationRole, raqComponent };
49
@@ -52,7 +52,7 @@ LPCWSTR vcsModuleComponentsQuery =
52 LPCWSTR vcsModuleDependencyQuery =
53 L"SELECT `ModuleID`, `RequiredID` FROM `ModuleDependency`";
54 LPCWSTR vcsAssemblyDependencyQuery =
55 - L"SELECT `Assembly_`, `RequiredAssembly_` FROM `ComPlusAssemblyDependency`";
55 + L"SELECT `Assembly_`, `RequiredAssembly_` FROM `Wix4ComPlusAssemblyDependency`";
56
57 enum eKeyPairQuery { kpqFirstKey = 1, kpqSecondKey };
58
src/ext/ComPlus/ca/cppartrolesched.cpp
+3 -3
@@ -6,13 +6,13 @@
6 // sql queries
7
8 LPCWSTR vcsPartitionRoleQuery =
9 - L"SELECT `PartitionRole`, `Partition_`, `Component_`, `Name` FROM `ComPlusPartitionRole`";
9 + L"SELECT `PartitionRole`, `Partition_`, `Component_`, `Name` FROM `Wix4ComPlusPartitionRole`";
10 enum ePartitionRoleQuery { prqPartitionRole = 1, prqPartition, prqComponent, prqName };
11
12 LPCWSTR vcsUserInPartitionRoleQuery =
13 - L"SELECT `UserInPartitionRole`, `PartitionRole_`, `ComPlusUserInPartitionRole`.`Component_`, `Domain`, `Name` FROM `ComPlusUserInPartitionRole`, `User` WHERE `User_` = `User`";
13 + L"SELECT `UserInPartitionRole`, `PartitionRole_`, `ComPlusUserInPartitionRole`.`Component_`, `Domain`, `Name` FROM `Wix4ComPlusUserInPartitionRole`, `Wix4User` WHERE `User_` = `User`";
14 LPCWSTR vcsGroupInPartitionRoleQuery =
15 - L"SELECT `GroupInPartitionRole`, `PartitionRole_`, `ComPlusGroupInPartitionRole`.`Component_`, `Domain`, `Name` FROM `ComPlusGroupInPartitionRole`, `Group` WHERE `Group_` = `Group`";
15 + L"SELECT `GroupInPartitionRole`, `PartitionRole_`, `ComPlusGroupInPartitionRole`.`Component_`, `Domain`, `Name` FROM `Wix4ComPlusGroupInPartitionRole`, `Group` WHERE `Group_` = `Group`";
16 enum eTrusteeInPartitionRoleQuery { tiprqUserInPartitionRole = 1, tiprqPartitionRole, tiprqComponent, tiprqDomain, tiprqName };
17
18
src/ext/ComPlus/ca/cppartsched.cpp
+3 -3
@@ -6,14 +6,14 @@
6 // sql queries
7
8 LPCWSTR vcsPartitionQuery =
9 - L"SELECT `Partition`, `Component_`, `Id`, `Name` FROM `ComPlusPartition`";
9 + L"SELECT `Partition`, `Component_`, `Id`, `Name` FROM `Wix4ComPlusPartition`";
10 enum ePartitionQuery { pqPartition = 1, pqComponent, pqID, pqName };
11
12 LPCWSTR vcsPartitionPropertyQuery =
13 - L"SELECT `Name`, `Value` FROM `ComPlusPartitionProperty` WHERE `Partition_` = ?";
13 + L"SELECT `Name`, `Value` FROM `Wix4ComPlusPartitionProperty` WHERE `Partition_` = ?";
14
15 LPCWSTR vcsPartitionUserQuery =
16 - L"SELECT `PartitionUser`, `Partition_`, `ComPlusPartitionUser`.`Component_`, `Domain`, `Name` FROM `ComPlusPartitionUser`, `User` WHERE `User_` = `User`";
16 + L"SELECT `PartitionUser`, `Partition_`, `ComPlusPartitionUser`.`Component_`, `Domain`, `Name` FROM `Wix4ComPlusPartitionUser`, `Wix4User` WHERE `User_` = `User`";
17 enum ePartitionUserQuery { puqPartitionUser = 1, puqPartition, puqComponent, puqDomain, puqName };
18
19
src/ext/ComPlus/ca/cpsubssched.cpp
+2 -2
@@ -6,11 +6,11 @@
6 // sql queries
7
8 LPCWSTR vcsSubscriptionQuery =
9 - L"SELECT `Subscription`, `ComPlusComponent_`, `Component_`, `Id`, `Name`, `EventCLSID`, `PublisherID` FROM `ComPlusSubscription`";
9 + L"SELECT `Subscription`, `ComPlusComponent_`, `Component_`, `Id`, `Name`, `EventCLSID`, `PublisherID` FROM `Wix4ComPlusSubscription`";
10 enum eSubscriptionQuery { sqSubscription = 1, sqComPlusComponent, sqComponent, sqID, sqName, sqEventCLSID, sqPublisherID };
11
12 LPCWSTR vcsSubscriptionPropertyQuery =
13 - L"SELECT `Name`, `Value` FROM `ComPlusSubscriptionProperty` WHERE `Subscription_` = ?";
13 + L"SELECT `Name`, `Value` FROM `Wix4ComPlusSubscriptionProperty` WHERE `Subscription_` = ?";
14
15
16 // property definitions
src/ext/ComPlus/ca/cputilsched.cpp
+1 -1
@@ -13,7 +13,7 @@ LPCWSTR vcsComponentAttributesQuery =
13 L"SELECT `Attributes` FROM `Component` WHERE `Component` = ?";
14 enum eComponentAttributesQuery { caqAttributes = 1 };
15
16 -LPCWSTR vcsUserQuery = L"SELECT `Domain`, `Name` FROM `User` WHERE `User` = ?";
16 +LPCWSTR vcsUserQuery = L"SELECT `Domain`, `Name` FROM `Wix4User` WHERE `User` = ?";
17 enum eUserQuery { uqDomain = 1, uqName };
18
19 enum ePropertyQuery { pqName = 1, pqValue };
src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs
+19 -4
@@ -16,17 +16,32 @@ namespace WixToolsetTest.ComPlus
16 var folder = TestData.Get(@"TestData\UsingComPlusPartition");
17 var build = new Builder(folder, typeof(ComPlusExtensionFactory), new[] { folder });
18
19 - var results = build.BuildAndQuery(Build, "ComPlusPartition");
19 + var results = build.BuildAndQuery(Build, "Wix4ComPlusPartition", "CustomAction");
20 WixAssert.CompareLineByLine(new[]
21 {
22 - "ComPlusPartition:MyPartition\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tMyPartitionId\tMyPartition",
22 + "CustomAction:Wix4ComPlusInstallCommit_A64\t11777\tWix4cpca_A64\tComPlusCleanup\t",
23 + "CustomAction:Wix4ComPlusInstallExecute_A64\t11265\tWix4cpca_A64\tComPlusInstallExecute\t",
24 + "CustomAction:Wix4ComPlusInstallExecuteCommit_A64\t11777\tWix4cpca_A64\tComPlusInstallExecuteCommit\t",
25 + "CustomAction:Wix4ComPlusInstallPrepare_A64\t11265\tWix4cpca_A64\tComPlusPrepare\t",
26 + "CustomAction:Wix4ComPlusRollbackInstallExecute_A64\t11521\tWix4cpca_A64\tComPlusRollbackInstallExecute\t",
27 + "CustomAction:Wix4ComPlusRollbackInstallPrepare_A64\t11521\tWix4cpca_A64\tComPlusCleanup\t",
28 + "CustomAction:Wix4ComPlusRollbackUninstallExecute_A64\t11521\tWix4cpca_A64\tComPlusInstallExecute\t",
29 + "CustomAction:Wix4ComPlusRollbackUninstallPrepare_A64\t11521\tWix4cpca_A64\tComPlusCleanup\t",
30 + "CustomAction:Wix4ComPlusUninstallCommit_A64\t11777\tWix4cpca_A64\tComPlusCleanup\t",
31 + "CustomAction:Wix4ComPlusUninstallExecute_A64\t11265\tWix4cpca_A64\tComPlusUninstallExecute\t",
32 + "CustomAction:Wix4ComPlusUninstallPrepare_A64\t11265\tWix4cpca_A64\tComPlusPrepare\t",
33 + "CustomAction:Wix4ConfigureComPlusInstall_A64\t1\tWix4cpca_A64\tConfigureComPlusInstall\t",
34 + "CustomAction:Wix4ConfigureComPlusUninstall_A64\t1\tWix4cpca_A64\tConfigureComPlusUninstall\t",
35 + "Wix4ComPlusPartition:MyPartition\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tMyPartitionId\tMyPartition",
36 }, results);
37 }
38
39 private static void Build(string[] args)
40 {
28 - var result = WixRunner.Execute(args)
29 - .AssertSuccess();
41 + args = args.Concat(new[] { "-arch", "arm64" }).ToArray();
42 +
43 + var result = WixRunner.Execute(args);
44 + result.AssertSuccess();
45 }
46 }
47 }
src/ext/ComPlus/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/Package.wxs
+2 -2
@@ -1,5 +1,5 @@
1 -<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 - <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
1 +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 + <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
4
5 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
src/ext/ComPlus/wixext/ComPlusCompiler.cs
+3 -12
@@ -8,6 +8,7 @@ namespace WixToolset.ComPlus
8 using WixToolset.ComPlus.Symbols;
9 using WixToolset.Data;
10 using WixToolset.Extensibility;
11 + using WixToolset.Extensibility.Data;
12
13 /// <summary>
14 /// The compiler for the WiX Toolset COM+ Extension.
@@ -40,7 +41,6 @@ namespace WixToolset.ComPlus
41 {
42 case "Component":
43 var componentId = context["ComponentId"];
43 - var directoryId = context["DirectoryId"];
44 var win64 = Boolean.Parse(context["Win64"]);
45
46 switch (element.Name.LocalName)
@@ -2148,17 +2148,8 @@ namespace WixToolset.ComPlus
2148
2149 private void AddReferenceToConfigureComPlus(IntermediateSection section, SourceLineNumber sourceLineNumbers, string elementName, bool win64)
2150 {
2151 - if (win64)
2152 - {
2153 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureComPlusInstall_x64");
2154 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureComPlusUninstall_x64");
2155 - }
2156 - else
2157 - {
2158 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureComPlusInstall");
2159 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureComPlusUninstall");
2160 - }
2161 -
2151 + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureComPlusInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2152 + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureComPlusUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2153 }
2154 }
2155 }
src/ext/ComPlus/wixext/ComPlusTableDefinitions.cs
+25 -25
@@ -7,7 +7,7 @@ namespace WixToolset.ComPlus
7 public static class ComPlusTableDefinitions
8 {
9 public static readonly TableDefinition ComPlusPartition = new TableDefinition(
10 - "ComPlusPartition",
10 + "Wix4ComPlusPartition",
11 ComPlusSymbolDefinitions.ComPlusPartition,
12 new[]
13 {
@@ -20,7 +20,7 @@ namespace WixToolset.ComPlus
20 );
21
22 public static readonly TableDefinition ComPlusPartitionProperty = new TableDefinition(
23 - "ComPlusPartitionProperty",
23 + "Wix4ComPlusPartitionProperty",
24 ComPlusSymbolDefinitions.ComPlusPartitionProperty,
25 new[]
26 {
@@ -32,7 +32,7 @@ namespace WixToolset.ComPlus
32 );
33
34 public static readonly TableDefinition ComPlusPartitionRole = new TableDefinition(
35 - "ComPlusPartitionRole",
35 + "Wix4ComPlusPartitionRole",
36 ComPlusSymbolDefinitions.ComPlusPartitionRole,
37 new[]
38 {
@@ -45,7 +45,7 @@ namespace WixToolset.ComPlus
45 );
46
47 public static readonly TableDefinition ComPlusUserInPartitionRole = new TableDefinition(
48 - "ComPlusUserInPartitionRole",
48 + "Wix4ComPlusUserInPartitionRole",
49 ComPlusSymbolDefinitions.ComPlusUserInPartitionRole,
50 new[]
51 {
@@ -58,7 +58,7 @@ namespace WixToolset.ComPlus
58 );
59
60 public static readonly TableDefinition ComPlusGroupInPartitionRole = new TableDefinition(
61 - "ComPlusGroupInPartitionRole",
61 + "Wix4ComPlusGroupInPartitionRole",
62 ComPlusSymbolDefinitions.ComPlusGroupInPartitionRole,
63 new[]
64 {
@@ -71,7 +71,7 @@ namespace WixToolset.ComPlus
71 );
72
73 public static readonly TableDefinition ComPlusPartitionUser = new TableDefinition(
74 - "ComPlusPartitionUser",
74 + "Wix4ComPlusPartitionUser",
75 ComPlusSymbolDefinitions.ComPlusPartitionUser,
76 new[]
77 {
@@ -84,7 +84,7 @@ namespace WixToolset.ComPlus
84 );
85
86 public static readonly TableDefinition ComPlusApplication = new TableDefinition(
87 - "ComPlusApplication",
87 + "Wix4ComPlusApplication",
88 ComPlusSymbolDefinitions.ComPlusApplication,
89 new[]
90 {
@@ -98,7 +98,7 @@ namespace WixToolset.ComPlus
98 );
99
100 public static readonly TableDefinition ComPlusApplicationProperty = new TableDefinition(
101 - "ComPlusApplicationProperty",
101 + "Wix4ComPlusApplicationProperty",
102 ComPlusSymbolDefinitions.ComPlusApplicationProperty,
103 new[]
104 {
@@ -110,7 +110,7 @@ namespace WixToolset.ComPlus
110 );
111
112 public static readonly TableDefinition ComPlusApplicationRole = new TableDefinition(
113 - "ComPlusApplicationRole",
113 + "Wix4ComPlusApplicationRole",
114 ComPlusSymbolDefinitions.ComPlusApplicationRole,
115 new[]
116 {
@@ -123,7 +123,7 @@ namespace WixToolset.ComPlus
123 );
124
125 public static readonly TableDefinition ComPlusApplicationRoleProperty = new TableDefinition(
126 - "ComPlusApplicationRoleProperty",
126 + "Wix4ComPlusApplicationRoleProperty",
127 ComPlusSymbolDefinitions.ComPlusApplicationRoleProperty,
128 new[]
129 {
@@ -135,7 +135,7 @@ namespace WixToolset.ComPlus
135 );
136
137 public static readonly TableDefinition ComPlusUserInApplicationRole = new TableDefinition(
138 - "ComPlusUserInApplicationRole",
138 + "Wix4ComPlusUserInApplicationRole",
139 ComPlusSymbolDefinitions.ComPlusUserInApplicationRole,
140 new[]
141 {
@@ -148,7 +148,7 @@ namespace WixToolset.ComPlus
148 );
149
150 public static readonly TableDefinition ComPlusGroupInApplicationRole = new TableDefinition(
151 - "ComPlusGroupInApplicationRole",
151 + "Wix4ComPlusGroupInApplicationRole",
152 ComPlusSymbolDefinitions.ComPlusGroupInApplicationRole,
153 new[]
154 {
@@ -161,7 +161,7 @@ namespace WixToolset.ComPlus
161 );
162
163 public static readonly TableDefinition ComPlusAssembly = new TableDefinition(
164 - "ComPlusAssembly",
164 + "Wix4ComPlusAssembly",
165 ComPlusSymbolDefinitions.ComPlusAssembly,
166 new[]
167 {
@@ -178,7 +178,7 @@ namespace WixToolset.ComPlus
178 );
179
180 public static readonly TableDefinition ComPlusAssemblyDependency = new TableDefinition(
181 - "ComPlusAssemblyDependency",
181 + "Wix4ComPlusAssemblyDependency",
182 ComPlusSymbolDefinitions.ComPlusAssemblyDependency,
183 new[]
184 {
@@ -189,7 +189,7 @@ namespace WixToolset.ComPlus
189 );
190
191 public static readonly TableDefinition ComPlusComponent = new TableDefinition(
192 - "ComPlusComponent",
192 + "Wix4ComPlusComponent",
193 ComPlusSymbolDefinitions.ComPlusComponent,
194 new[]
195 {
@@ -201,7 +201,7 @@ namespace WixToolset.ComPlus
201 );
202
203 public static readonly TableDefinition ComPlusComponentProperty = new TableDefinition(
204 - "ComPlusComponentProperty",
204 + "Wix4ComPlusComponentProperty",
205 ComPlusSymbolDefinitions.ComPlusComponentProperty,
206 new[]
207 {
@@ -213,7 +213,7 @@ namespace WixToolset.ComPlus
213 );
214
215 public static readonly TableDefinition ComPlusRoleForComponent = new TableDefinition(
216 - "ComPlusRoleForComponent",
216 + "Wix4ComPlusRoleForComponent",
217 ComPlusSymbolDefinitions.ComPlusRoleForComponent,
218 new[]
219 {
@@ -226,7 +226,7 @@ namespace WixToolset.ComPlus
226 );
227
228 public static readonly TableDefinition ComPlusInterface = new TableDefinition(
229 - "ComPlusInterface",
229 + "Wix4ComPlusInterface",
230 ComPlusSymbolDefinitions.ComPlusInterface,
231 new[]
232 {
@@ -238,7 +238,7 @@ namespace WixToolset.ComPlus
238 );
239
240 public static readonly TableDefinition ComPlusInterfaceProperty = new TableDefinition(
241 - "ComPlusInterfaceProperty",
241 + "Wix4ComPlusInterfaceProperty",
242 ComPlusSymbolDefinitions.ComPlusInterfaceProperty,
243 new[]
244 {
@@ -250,7 +250,7 @@ namespace WixToolset.ComPlus
250 );
251
252 public static readonly TableDefinition ComPlusRoleForInterface = new TableDefinition(
253 - "ComPlusRoleForInterface",
253 + "Wix4ComPlusRoleForInterface",
254 ComPlusSymbolDefinitions.ComPlusRoleForInterface,
255 new[]
256 {
@@ -263,7 +263,7 @@ namespace WixToolset.ComPlus
263 );
264
265 public static readonly TableDefinition ComPlusMethod = new TableDefinition(
266 - "ComPlusMethod",
266 + "Wix4ComPlusMethod",
267 ComPlusSymbolDefinitions.ComPlusMethod,
268 new[]
269 {
@@ -276,7 +276,7 @@ namespace WixToolset.ComPlus
276 );
277
278 public static readonly TableDefinition ComPlusMethodProperty = new TableDefinition(
279 - "ComPlusMethodProperty",
279 + "Wix4ComPlusMethodProperty",
280 ComPlusSymbolDefinitions.ComPlusMethodProperty,
281 new[]
282 {
@@ -288,7 +288,7 @@ namespace WixToolset.ComPlus
288 );
289
290 public static readonly TableDefinition ComPlusRoleForMethod = new TableDefinition(
291 - "ComPlusRoleForMethod",
291 + "Wix4ComPlusRoleForMethod",
292 ComPlusSymbolDefinitions.ComPlusRoleForMethod,
293 new[]
294 {
@@ -301,7 +301,7 @@ namespace WixToolset.ComPlus
301 );
302
303 public static readonly TableDefinition ComPlusSubscription = new TableDefinition(
304 - "ComPlusSubscription",
304 + "Wix4ComPlusSubscription",
305 ComPlusSymbolDefinitions.ComPlusSubscription,
306 new[]
307 {
@@ -317,7 +317,7 @@ namespace WixToolset.ComPlus
317 );
318
319 public static readonly TableDefinition ComPlusSubscriptionProperty = new TableDefinition(
320 - "ComPlusSubscriptionProperty",
320 + "Wix4ComPlusSubscriptionProperty",
321 ComPlusSymbolDefinitions.ComPlusSubscriptionProperty,
322 new[]
323 {
src/ext/ComPlus/wixlib/ComPlusExtension.wxs
+23 -99
@@ -1,6 +1,8 @@
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 + <?include ..\..\caDecor.wxi ?>
6 <?include ..\..\caerr.wxi ?>
7
8 <Fragment>
@@ -31,105 +33,27 @@
33 <Error Id="$(var.msierrComPlusSubscriptionNameConflict)" Message="!(loc.msierrComPlusSubscriptionNameConflict)" />
34 <Error Id="$(var.msierrComPlusFailedLookupNames)" Message="!(loc.msierrComPlusFailedLookupNames)" />
35
34 - <ProgressText Action="ComPlusInstallExecute" Message="!(loc.ComPlusInstallExecute)" />
35 - <ProgressText Action="ComPlusUninstallExecute" Message="!(loc.ComPlusUninstallExecute)" />
36 -
37 - <ProgressText Action="CreateComPlusPartitions" Template="!(loc.CreateComPlusPartitionsTemplate)" Message="!(loc.CreateComPlusPartitions)" />
38 - <ProgressText Action="RemoveComPlusPartitions" Template="!(loc.RemoveComPlusPartitionsTemplate)" Message="!(loc.RemoveComPlusPartitions)" />
39 - <ProgressText Action="AddUsersToComPlusPartitionRoles" Template="!(loc.AddUsersToComPlusPartitionRolesTemplate)" Message="!(loc.AddUsersToComPlusPartitionRoles)" />
40 - <ProgressText Action="RemoveUsersFromComPlusPartRoles" Template="!(loc.RemoveUsersFromComPlusPartitionRolesTemplate)" Message="!(loc.RemoveUsersFromComPlusPartitionRoles)" />
41 - <ProgressText Action="AddComPlusPartitionUsers" Template="!(loc.AddComPlusPartitionUsersTemplate)" Message="!(loc.AddComPlusPartitionUsers)" />
42 - <ProgressText Action="RemoveComPlusPartitionUsers" Template="!(loc.RemoveComPlusPartitionUsersTemplate)" Message="!(loc.RemoveComPlusPartitionUsers)" />
43 - <ProgressText Action="CreateComPlusApplications" Template="!(loc.CreateComPlusApplicationsTemplate)" Message="!(loc.CreateComPlusApplications)" />
44 - <ProgressText Action="RemoveComPlusApplications" Template="!(loc.RemoveComPlusApplicationsTemplate)" Message="!(loc.RemoveComPlusApplications)" />
45 - <ProgressText Action="CreateComPlusApplicationRoles" Template="!(loc.CreateComPlusApplicationRolesTemplate)" Message="!(loc.CreateComPlusApplicationRoles)" />
46 - <ProgressText Action="RemoveComPlusApplicationRoles" Template="!(loc.RemoveComPlusApplicationRolesTemplate)" Message="!(loc.RemoveComPlusApplicationRoles)" />
47 - <ProgressText Action="AddUsersToComPlusApplicationRoles" Template="!(loc.AddUsersToComPlusApplicationRolesTemplate)" Message="!(loc.AddUsersToComPlusApplicationRoles)" />
48 - <ProgressText Action="RemoveUsersFromComPlusAppRoles" Template="!(loc.RemoveUsersFromComPlusApplicationRolesTemplate)" Message="!(loc.RemoveUsersFromComPlusApplicationRoles)" />
49 - <ProgressText Action="RegisterComPlusAssemblies" Template="!(loc.RegisterComPlusAssembliesTemplate)" Message="!(loc.RegisterComPlusAssemblies)" />
50 - <ProgressText Action="UnregisterComPlusAssemblies" Template="!(loc.UnregisterComPlusAssembliesTemplate)" Message="!(loc.UnregisterComPlusAssemblies)" />
51 - <ProgressText Action="AddComPlusRoleAssignments" Template="!(loc.AddComPlusRoleAssignmentsTemplate)" Message="!(loc.AddComPlusRoleAssignments)" />
52 - <ProgressText Action="RemoveComPlusRoleAssignments" Template="!(loc.RemoveComPlusRoleAssignmentsTemplate)" Message="!(loc.RemoveComPlusRoleAssignments)" />
53 - <ProgressText Action="CreateSubscrComPlusComponents" Template="!(loc.CreateSubscriptionsComPlusComponentsTemplate)" Message="!(loc.CreateSubscriptionsComPlusComponents)" />
54 - <ProgressText Action="RemoveSubscrComPlusComponents" Template="!(loc.RemoveSubscriptionsComPlusComponentsTemplate)" Message="!(loc.RemoveSubscriptionsComPlusComponents)" />
36 + <ProgressText Action="$(var.Prefix)ComPlusInstallExecute$(var.Suffix)" Message="!(loc.ComPlusInstallExecute)" />
37 + <ProgressText Action="$(var.Prefix)ComPlusUninstallExecute$(var.Suffix)" Message="!(loc.ComPlusUninstallExecute)" />
38 +
39 + <ProgressText Action="$(var.Prefix)CreateComPlusPartitions$(var.Suffix)" Template="!(loc.CreateComPlusPartitionsTemplate)" Message="!(loc.CreateComPlusPartitions)" />
40 + <ProgressText Action="$(var.Prefix)RemoveComPlusPartitions$(var.Suffix)" Template="!(loc.RemoveComPlusPartitionsTemplate)" Message="!(loc.RemoveComPlusPartitions)" />
41 + <ProgressText Action="$(var.Prefix)AddUsersToComPlusPartitionRoles$(var.Suffix)" Template="!(loc.AddUsersToComPlusPartitionRolesTemplate)" Message="!(loc.AddUsersToComPlusPartitionRoles)" />
42 + <ProgressText Action="$(var.Prefix)RemoveUsersFromComPlusPartRoles$(var.Suffix)" Template="!(loc.RemoveUsersFromComPlusPartitionRolesTemplate)" Message="!(loc.RemoveUsersFromComPlusPartitionRoles)" />
43 + <ProgressText Action="$(var.Prefix)AddComPlusPartitionUsers$(var.Suffix)" Template="!(loc.AddComPlusPartitionUsersTemplate)" Message="!(loc.AddComPlusPartitionUsers)" />
44 + <ProgressText Action="$(var.Prefix)RemoveComPlusPartitionUsers$(var.Suffix)" Template="!(loc.RemoveComPlusPartitionUsersTemplate)" Message="!(loc.RemoveComPlusPartitionUsers)" />
45 + <ProgressText Action="$(var.Prefix)CreateComPlusApplications$(var.Suffix)" Template="!(loc.CreateComPlusApplicationsTemplate)" Message="!(loc.CreateComPlusApplications)" />
46 + <ProgressText Action="$(var.Prefix)RemoveComPlusApplications$(var.Suffix)" Template="!(loc.RemoveComPlusApplicationsTemplate)" Message="!(loc.RemoveComPlusApplications)" />
47 + <ProgressText Action="$(var.Prefix)CreateComPlusApplicationRoles$(var.Suffix)" Template="!(loc.CreateComPlusApplicationRolesTemplate)" Message="!(loc.CreateComPlusApplicationRoles)" />
48 + <ProgressText Action="$(var.Prefix)RemoveComPlusApplicationRoles$(var.Suffix)" Template="!(loc.RemoveComPlusApplicationRolesTemplate)" Message="!(loc.RemoveComPlusApplicationRoles)" />
49 + <ProgressText Action="$(var.Prefix)AddUsersToComPlusApplicationRoles$(var.Suffix)" Template="!(loc.AddUsersToComPlusApplicationRolesTemplate)" Message="!(loc.AddUsersToComPlusApplicationRoles)" />
50 + <ProgressText Action="$(var.Prefix)RemoveUsersFromComPlusAppRoles$(var.Suffix)" Template="!(loc.RemoveUsersFromComPlusApplicationRolesTemplate)" Message="!(loc.RemoveUsersFromComPlusApplicationRoles)" />
51 + <ProgressText Action="$(var.Prefix)RegisterComPlusAssemblies$(var.Suffix)" Template="!(loc.RegisterComPlusAssembliesTemplate)" Message="!(loc.RegisterComPlusAssemblies)" />
52 + <ProgressText Action="$(var.Prefix)UnregisterComPlusAssemblies$(var.Suffix)" Template="!(loc.UnregisterComPlusAssembliesTemplate)" Message="!(loc.UnregisterComPlusAssemblies)" />
53 + <ProgressText Action="$(var.Prefix)AddComPlusRoleAssignments$(var.Suffix)" Template="!(loc.AddComPlusRoleAssignmentsTemplate)" Message="!(loc.AddComPlusRoleAssignments)" />
54 + <ProgressText Action="$(var.Prefix)RemoveComPlusRoleAssignments$(var.Suffix)" Template="!(loc.RemoveComPlusRoleAssignmentsTemplate)" Message="!(loc.RemoveComPlusRoleAssignments)" />
55 + <ProgressText Action="$(var.Prefix)CreateSubscrComPlusComponents$(var.Suffix)" Template="!(loc.CreateSubscriptionsComPlusComponentsTemplate)" Message="!(loc.CreateSubscriptionsComPlusComponents)" />
56 + <ProgressText Action="$(var.Prefix)RemoveSubscrComPlusComponents$(var.Suffix)" Template="!(loc.RemoveSubscriptionsComPlusComponentsTemplate)" Message="!(loc.RemoveSubscriptionsComPlusComponents)" />
57 </UI>
58 </Fragment>
57 -
58 - <Fragment>
59 - <UIRef Id="ComPlusUI" />
60 -
61 - <CustomAction Id="ConfigureComPlusInstall" DllEntry="ConfigureComPlusInstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" />
62 - <CustomAction Id="ConfigureComPlusUninstall" DllEntry="ConfigureComPlusUninstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" />
63 - <CustomAction Id="ComPlusInstallPrepare" DllEntry="ComPlusPrepare" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" />
64 - <CustomAction Id="ComPlusRollbackInstallPrepare" DllEntry="ComPlusCleanup" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" />
65 - <CustomAction Id="ComPlusInstallExecute" DllEntry="ComPlusInstallExecute" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" />
66 - <CustomAction Id="ComPlusInstallExecuteCommit" DllEntry="ComPlusInstallExecuteCommit" Execute="commit" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" />
67 - <CustomAction Id="ComPlusRollbackInstallExecute" DllEntry="ComPlusRollbackInstallExecute" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" />
68 - <CustomAction Id="ComPlusInstallCommit" DllEntry="ComPlusCleanup" Execute="commit" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" />
69 - <CustomAction Id="ComPlusUninstallPrepare" DllEntry="ComPlusPrepare" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" />
70 - <CustomAction Id="ComPlusRollbackUninstallPrepare" DllEntry="ComPlusCleanup" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" />
71 - <CustomAction Id="ComPlusUninstallExecute" DllEntry="ComPlusUninstallExecute" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" />
72 - <CustomAction Id="ComPlusRollbackUninstallExecute" DllEntry="ComPlusInstallExecute" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" />
73 - <CustomAction Id="ComPlusUninstallCommit" DllEntry="ComPlusCleanup" Execute="commit" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" />
74 -
75 - <Property Id="ComPlusInstallPrepare" Hidden="yes" SuppressModularization="yes" />
76 - <Property Id="ComPlusRollbackInstallPrepare" Hidden="yes" SuppressModularization="yes" />
77 - <Property Id="ComPlusInstallExecute" Hidden="yes" SuppressModularization="yes" />
78 - <Property Id="ComPlusInstallExecuteCommit" Hidden="yes" SuppressModularization="yes" />
79 - <Property Id="ComPlusRollbackInstallExecute" Hidden="yes" SuppressModularization="yes" />
80 - <Property Id="ComPlusInstallCommit" Hidden="yes" SuppressModularization="yes" />
81 - <Property Id="ComPlusUninstallPrepare" Hidden="yes" SuppressModularization="yes" />
82 - <Property Id="ComPlusRollbackUninstallPrepare" Hidden="yes" SuppressModularization="yes" />
83 - <Property Id="ComPlusUninstallExecute" Hidden="yes" SuppressModularization="yes" />
84 - <Property Id="ComPlusRollbackUninstallExecute" Hidden="yes" SuppressModularization="yes" />
85 - <Property Id="ComPlusUninstallCommit" Hidden="yes" SuppressModularization="yes" />
86 -
87 - <InstallExecuteSequence>
88 - <Custom Action="ConfigureComPlusUninstall" After="DeleteServices" Overridable="yes" Condition="VersionNT &gt;= 500" />
89 - <Custom Action="ConfigureComPlusInstall" Before="InstallServices" Overridable="yes" Condition="VersionNT &gt;= 500" />
90 - </InstallExecuteSequence>
91 - </Fragment>
92 -
93 - <Fragment>
94 - <UIRef Id="ComPlusUI" />
95 -
96 - <CustomAction Id="ConfigureComPlusInstall_x64" DllEntry="ConfigureComPlusInstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" />
97 - <CustomAction Id="ConfigureComPlusUninstall_x64" DllEntry="ConfigureComPlusUninstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" />
98 - <CustomAction Id="ComPlusInstallPrepare_64" DllEntry="ComPlusPrepare" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" />
99 - <CustomAction Id="ComPlusRollbackInstallPrepare_64" DllEntry="ComPlusCleanup" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" />
100 - <CustomAction Id="ComPlusInstallExecute_64" DllEntry="ComPlusInstallExecute" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" />
101 - <CustomAction Id="ComPlusInstallExecuteCommit_64" DllEntry="ComPlusInstallExecuteCommit" Execute="commit" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" />
102 - <CustomAction Id="ComPlusRollbackInstallExecute_64" DllEntry="ComPlusRollbackInstallExecute" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" />
103 - <CustomAction Id="ComPlusInstallCommit_64" DllEntry="ComPlusCleanup" Execute="commit" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" />
104 - <CustomAction Id="ComPlusUninstallPrepare_64" DllEntry="ComPlusPrepare" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" />
105 - <CustomAction Id="ComPlusRollbackUninstallPrepare_64" DllEntry="ComPlusCleanup" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" />
106 - <CustomAction Id="ComPlusUninstallExecute_64" DllEntry="ComPlusUninstallExecute" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" />
107 - <CustomAction Id="ComPlusRollbackUninstallExecute_64" DllEntry="ComPlusInstallExecute" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" />
108 - <CustomAction Id="ComPlusUninstallCommit_64" DllEntry="ComPlusCleanup" Execute="commit" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" />
109 -
110 - <Property Id="ComPlusInstallPrepare_64" Hidden="yes" SuppressModularization="yes" />
111 - <Property Id="ComPlusRollbackInstallPrepare_64" Hidden="yes" SuppressModularization="yes" />
112 - <Property Id="ComPlusInstallExecute_64" Hidden="yes" SuppressModularization="yes" />
113 - <Property Id="ComPlusInstallExecuteCommit_64" Hidden="yes" SuppressModularization="yes" />
114 - <Property Id="ComPlusRollbackInstallExecute_64" Hidden="yes" SuppressModularization="yes" />
115 - <Property Id="ComPlusInstallCommit_64" Hidden="yes" SuppressModularization="yes" />
116 - <Property Id="ComPlusUninstallPrepare_64" Hidden="yes" SuppressModularization="yes" />
117 - <Property Id="ComPlusRollbackUninstallPrepare_64" Hidden="yes" SuppressModularization="yes" />
118 - <Property Id="ComPlusUninstallExecute_64" Hidden="yes" SuppressModularization="yes" />
119 - <Property Id="ComPlusRollbackUninstallExecute_64" Hidden="yes" SuppressModularization="yes" />
120 - <Property Id="ComPlusUninstallCommit_64" Hidden="yes" SuppressModularization="yes" />
121 -
122 - <InstallExecuteSequence>
123 - <Custom Action="ConfigureComPlusUninstall_x64" After="DeleteServices" Overridable="yes" Condition="VersionNT &gt;= 500" />
124 - <Custom Action="ConfigureComPlusInstall_x64" Before="InstallServices" Overridable="yes" Condition="VersionNT &gt;= 500" />
125 - </InstallExecuteSequence>
126 - </Fragment>
127 -
128 - <Fragment>
129 - <Binary Id="ComPlusCA_x86" SourceFile="!(bindpath.x86)complusca.dll" />
130 - </Fragment>
131 -
132 - <Fragment>
133 - <Binary Id="ComPlusCA_x64" SourceFile="!(bindpath.x64)complusca.dll" />
134 - </Fragment>
59 </Wix>
src/ext/ComPlus/wixlib/ComPlusExtension_Platform.wxi new
+44
@@ -0,0 +1,44 @@
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 +<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 + <?include ..\..\caDecor.wxi ?>
5 +
6 + <Fragment>
7 + <UIRef Id="ComPlusUI" />
8 +
9 + <CustomAction Id="$(var.Prefix)ConfigureComPlusInstall$(var.Suffix)" DllEntry="ConfigureComPlusInstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" />
10 + <CustomAction Id="$(var.Prefix)ConfigureComPlusUninstall$(var.Suffix)" DllEntry="ConfigureComPlusUninstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" />
11 + <CustomAction Id="$(var.Prefix)ComPlusInstallPrepare$(var.Suffix)" DllEntry="ComPlusPrepare" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" />
12 + <CustomAction Id="$(var.Prefix)ComPlusRollbackInstallPrepare$(var.Suffix)" DllEntry="ComPlusCleanup" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" />
13 + <CustomAction Id="$(var.Prefix)ComPlusInstallExecute$(var.Suffix)" DllEntry="ComPlusInstallExecute" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" />
14 + <CustomAction Id="$(var.Prefix)ComPlusInstallExecuteCommit$(var.Suffix)" DllEntry="ComPlusInstallExecuteCommit" Execute="commit" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" />
15 + <CustomAction Id="$(var.Prefix)ComPlusRollbackInstallExecute$(var.Suffix)" DllEntry="ComPlusRollbackInstallExecute" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" />
16 + <CustomAction Id="$(var.Prefix)ComPlusInstallCommit$(var.Suffix)" DllEntry="ComPlusCleanup" Execute="commit" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" />
17 + <CustomAction Id="$(var.Prefix)ComPlusUninstallPrepare$(var.Suffix)" DllEntry="ComPlusPrepare" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" />
18 + <CustomAction Id="$(var.Prefix)ComPlusRollbackUninstallPrepare$(var.Suffix)" DllEntry="ComPlusCleanup" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" />
19 + <CustomAction Id="$(var.Prefix)ComPlusUninstallExecute$(var.Suffix)" DllEntry="ComPlusUninstallExecute" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" />
20 + <CustomAction Id="$(var.Prefix)ComPlusRollbackUninstallExecute$(var.Suffix)" DllEntry="ComPlusInstallExecute" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" />
21 + <CustomAction Id="$(var.Prefix)ComPlusUninstallCommit$(var.Suffix)" DllEntry="ComPlusCleanup" Execute="commit" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" />
22 +
23 + <Property Id="$(var.Prefix)ComPlusInstallPrepare$(var.Suffix)" Hidden="yes" SuppressModularization="yes" />
24 + <Property Id="$(var.Prefix)ComPlusRollbackInstallPrepare$(var.Suffix)" Hidden="yes" SuppressModularization="yes" />
25 + <Property Id="$(var.Prefix)ComPlusInstallExecute$(var.Suffix)" Hidden="yes" SuppressModularization="yes" />
26 + <Property Id="$(var.Prefix)ComPlusInstallExecuteCommit$(var.Suffix)" Hidden="yes" SuppressModularization="yes" />
27 + <Property Id="$(var.Prefix)ComPlusRollbackInstallExecute$(var.Suffix)" Hidden="yes" SuppressModularization="yes" />
28 + <Property Id="$(var.Prefix)ComPlusInstallCommit$(var.Suffix)" Hidden="yes" SuppressModularization="yes" />
29 + <Property Id="$(var.Prefix)ComPlusUninstallPrepare$(var.Suffix)" Hidden="yes" SuppressModularization="yes" />
30 + <Property Id="$(var.Prefix)ComPlusRollbackUninstallPrepare$(var.Suffix)" Hidden="yes" SuppressModularization="yes" />
31 + <Property Id="$(var.Prefix)ComPlusUninstallExecute$(var.Suffix)" Hidden="yes" SuppressModularization="yes" />
32 + <Property Id="$(var.Prefix)ComPlusRollbackUninstallExecute$(var.Suffix)" Hidden="yes" SuppressModularization="yes" />
33 + <Property Id="$(var.Prefix)ComPlusUninstallCommit$(var.Suffix)" Hidden="yes" SuppressModularization="yes" />
34 +
35 + <InstallExecuteSequence>
36 + <Custom Action="$(var.Prefix)ConfigureComPlusUninstall$(var.Suffix)" After="DeleteServices" Overridable="yes" Condition="VersionNT &gt;= 500" />
37 + <Custom Action="$(var.Prefix)ConfigureComPlusInstall$(var.Suffix)" Before="InstallServices" Overridable="yes" Condition="VersionNT &gt;= 500" />
38 + </InstallExecuteSequence>
39 + </Fragment>
40 +
41 + <Fragment>
42 + <Binary Id="$(var.Prefix)cpca$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))complusca.dll" />
43 + </Fragment>
44 +</Include>
src/ext/ComPlus/wixlib/ComPlusExtension_arm64.wxs new
+7
@@ -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 ComPlusExtension_Platform.wxi ?>
7 +</Wix>
src/ext/ComPlus/wixlib/ComPlusExtension_x64.wxs new
+7
@@ -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 ComPlusExtension_Platform.wxi ?>
7 +</Wix>
src/ext/ComPlus/wixlib/ComPlusExtension_x86.wxs new
+7
@@ -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 ComPlusExtension_Platform.wxi ?>
7 +</Wix>
src/ext/ComPlus/wixlib/complus.wixproj
+4 -2
@@ -11,11 +11,13 @@
11 <ItemGroup>
12 <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
13 <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
14 + <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
15 </ItemGroup>
16
17 <ItemGroup>
17 - <ProjectReference Include="..\ca\complusca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
18 - <ProjectReference Include="..\ca\complusca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />
18 + <ProjectReference Include="..\ca\complusca.vcxproj" Properties="Platform=x86" />
19 + <ProjectReference Include="..\ca\complusca.vcxproj" Properties="Platform=x64" />
20 + <ProjectReference Include="..\ca\complusca.vcxproj" Properties="Platform=ARM64" />
21 </ItemGroup>
22
23 <ItemGroup>
src/ext/Msmq/Msmq.wixext.sln
+2 -2
@@ -1,7 +1,7 @@
1 
2 Microsoft Visual Studio Solution File, Format Version 12.00
3 -# Visual Studio 15
4 -VisualStudioVersion = 15.0.28010.2016
3 +# Visual Studio Version 17
4 +VisualStudioVersion = 17.0.32126.317
5 MinimumVisualStudioVersion = 10.0.40219.1
6 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msmqca", "ca\msmqca.vcxproj", "{CAD56A7E-342B-4324-9DCB-BCEB8F3BC80D}"
7 EndProject
src/ext/Msmq/ca/mqqueuesched.cpp
+3 -3
@@ -6,13 +6,13 @@
6 // sql queries
7
8 LPCWSTR vcsMessageQueueQuery =
9 - L"SELECT `MessageQueue`, `Component_`, `BasePriority`, `JournalQuota`, `Label`, `MulticastAddress`, `PathName`, `PrivLevel`, `Quota`, `ServiceTypeGuid`, `Attributes` FROM `MessageQueue`";
9 + L"SELECT `MessageQueue`, `Component_`, `BasePriority`, `JournalQuota`, `Label`, `MulticastAddress`, `PathName`, `PrivLevel`, `Quota`, `ServiceTypeGuid`, `Attributes` FROM `Wix4MessageQueue`";
10 enum eMessageQueueQuery { mqqMessageQueue = 1, mqqComponent, mqqBasePriority, mqqJournalQuota, mqqLabel, mqqMulticastAddress, mqqPathName, mqqPrivLevel, mqqQuota, mqqServiceTypeGuid, mqqAttributes };
11
12 LPCWSTR vcsMessageQueueUserPermissionQuery =
13 - L"SELECT `MessageQueueUserPermission`, `MessageQueue_`, `MessageQueueUserPermission`.`Component_`, `Domain`, `Name`, `Permissions` FROM `MessageQueueUserPermission`, `User` WHERE `User_` = `User`";
13 + L"SELECT `MessageQueueUserPermission`, `MessageQueue_`, `MessageQueueUserPermission`.`Component_`, `Domain`, `Name`, `Permissions` FROM `Wix4MessageQueueUserPermission`, `User` WHERE `User_` = `User`";
14 LPCWSTR vcsMessageQueueGroupPermissionQuery =
15 - L"SELECT `MessageQueueGroupPermission`, `MessageQueue_`, `MessageQueueGroupPermission`.`Component_`, `Domain`, `Name`, `Permissions` FROM `MessageQueueGroupPermission`, `Group` WHERE `Group_` = `Group`";
15 + L"SELECT `MessageQueueGroupPermission`, `MessageQueue_`, `MessageQueueGroupPermission`.`Component_`, `Domain`, `Name`, `Permissions` FROM `Wix4MessageQueueGroupPermission`, `Group` WHERE `Group_` = `Group`";
16 enum eMessageQueuePermissionQuery { mqpqMessageQueuePermission = 1, mqpqMessageQueue, mqpqComponent, mqpqDomain, mqpqName, mqpqPermissions };
17
18
src/ext/Msmq/ca/mqutilexec.cpp
+2 -2
@@ -40,7 +40,7 @@ static HRESULT CreateSidFromDomainRidPair(
40 static HRESULT InitLsaUnicodeString(
41 PLSA_UNICODE_STRING plusStr,
42 LPCWSTR pwzStr,
43 - DWORD dwLen
43 + SIZE_T dwLen
44 );
45 static void FreeLsaUnicodeString(
46 PLSA_UNICODE_STRING plusStr
@@ -351,7 +351,7 @@ LExit:
351 static HRESULT InitLsaUnicodeString(
352 PLSA_UNICODE_STRING plusStr,
353 LPCWSTR pwzStr,
354 - DWORD dwLen
354 + SIZE_T dwLen
355 )
356 {
357 HRESULT hr = S_OK;
src/ext/Msmq/ca/mqutilsched.cpp deleted
-43
@@ -1,43 +0,0 @@
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 -#include "precomp.h"
4 -
5 -
6 -// function definitions
7 -
8 -HRESULT PcaGuidToRegFormat(
9 - LPWSTR pwzGuid,
10 - LPWSTR pwzDest,
11 - SIZE_T cchDest
12 - )
13 -{
14 - HRESULT hr = S_OK;
15 -
16 - GUID guid = GUID_NULL;
17 - int cch = 0;
18 -
19 - WCHAR wz[39];
20 - ::ZeroMemory(wz, sizeof(wz));
21 -
22 - cch = lstrlenW(pwzGuid);
23 -
24 - if (38 == cch && L'{' == pwzGuid[0] && L'}' == pwzGuid[37])
25 - StringCchCopyW(wz, countof(wz), pwzGuid);
26 - else if (36 == cch)
27 - StringCchPrintfW(wz, countof(wz), L"{%s}", pwzGuid);
28 - else
29 - ExitFunction1(hr = E_INVALIDARG);
30 -
31 - // convert string to guid
32 - hr = ::CLSIDFromString(wz, &guid);
33 - ExitOnFailure(hr, "Failed to parse guid string");
34 -
35 - // convert guid to string
36 - if (0 == ::StringFromGUID2(guid, pwzDest, cchDest))
37 - ExitOnFailure(hr = E_FAIL, "Failed to convert guid to string");
38 -
39 - hr = S_OK;
40 -
41 -LExit:
42 - return hr;
43 -}
src/ext/Msmq/ca/mqutilsched.h deleted
-9
@@ -1,9 +0,0 @@
1 -#pragma once
2 -// 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.
3 -
4 -
5 -HRESULT PcaGuidToRegFormat(
6 - LPWSTR pwzGuid,
7 - LPWSTR pwzDest,
8 - SIZE_T cchDest
9 - );
src/ext/Msmq/ca/msmqca.vcxproj
+17 -13
@@ -1,10 +1,8 @@
1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- 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. -->
3 -
3 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4 <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')" />
5 <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" />
7 -
6 <ItemGroup Label="ProjectConfigurations">
7 <ProjectConfiguration Include="Debug|Win32">
8 <Configuration>Debug</Configuration>
@@ -14,8 +12,23 @@
12 <Configuration>Release</Configuration>
13 <Platform>Win32</Platform>
14 </ProjectConfiguration>
15 + <ProjectConfiguration Include="Debug|X64">
16 + <Configuration>Debug</Configuration>
17 + <Platform>X64</Platform>
18 + </ProjectConfiguration>
19 + <ProjectConfiguration Include="Release|X64">
20 + <Configuration>Release</Configuration>
21 + <Platform>X64</Platform>
22 + </ProjectConfiguration>
23 + <ProjectConfiguration Include="Debug|ARM64">
24 + <Configuration>Debug</Configuration>
25 + <Platform>ARM64</Platform>
26 + </ProjectConfiguration>
27 + <ProjectConfiguration Include="Release|ARM64">
28 + <Configuration>Release</Configuration>
29 + <Platform>ARM64</Platform>
30 + </ProjectConfiguration>
31 </ItemGroup>
18 -
32 <PropertyGroup Label="Globals">
33 <ProjectGuid>{CAD56A7E-342B-4324-9DCB-BCEB8F3BC80D}</ProjectGuid>
34 <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -24,14 +37,11 @@
37 <ProjectModuleDefinitionFile>msmqca.def</ProjectModuleDefinitionFile>
38 <Description>WiX Toolset MSMQ CustomAction</Description>
39 </PropertyGroup>
27 -
40 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
41 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
30 -
42 <PropertyGroup>
43 <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries>
44 </PropertyGroup>
34 -
45 <ItemGroup>
46 <ClCompile Include="dllmain.cpp">
47 <PrecompiledHeader>Create</PrecompiledHeader>
@@ -41,28 +51,22 @@
51 <ClCompile Include="mqqueuesched.cpp" />
52 <ClCompile Include="mqsched.cpp" />
53 <ClCompile Include="mqutilexec.cpp" />
44 - <ClCompile Include="mqutilsched.cpp" />
54 </ItemGroup>
46 -
55 <ItemGroup>
56 <ClInclude Include="mqcost.h" />
57 <ClInclude Include="mqqueueexec.h" />
58 <ClInclude Include="mqqueuesched.h" />
59 <ClInclude Include="mqutilexec.h" />
52 - <ClInclude Include="mqutilsched.h" />
60 <ClInclude Include="precomp.h" />
61 </ItemGroup>
55 -
62 <ItemGroup>
63 <None Include="msmqca.def" />
64 </ItemGroup>
59 -
65 <ItemGroup>
66 <PackageReference Include="WixToolset.Dutil" />
67 <PackageReference Include="WixToolset.WcaUtil" />
68 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
69 <PackageReference Include="GitInfo" PrivateAssets="All" />
70 </ItemGroup>
66 -
71 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
68 -</Project>
72 +</Project>
\ No newline at end of file
src/ext/Msmq/ca/precomp.h
-1
@@ -17,7 +17,6 @@
17 #include "CustomMsiErrors.h"
18
19 #include "mqcost.h"
20 -#include "mqutilsched.h"
20 #include "mqqueuesched.h"
21 #include "mqutilexec.h"
22 #include "mqqueueexec.h"
src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs
+12 -4
@@ -16,17 +16,25 @@ namespace WixToolsetTest.Msmq
16 var folder = TestData.Get(@"TestData\UsingMessageQueue");
17 var build = new Builder(folder, typeof(MsmqExtensionFactory), new[] { folder });
18
19 - var results = build.BuildAndQuery(Build, "MessageQueue");
19 + var results = build.BuildAndQuery(Build, "Wix4MessageQueue", "CustomAction");
20 WixAssert.CompareLineByLine(new[]
21 {
22 - "MessageQueue:TestMQ\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\t\t\tMQLabel\t\tMQPath\t\t\t\t0",
22 + "CustomAction:Wix4MessageQueuingExecuteInstall_A64\t3073\tWix4MsmqCA_A64\tMessageQueuingExecuteInstall\t",
23 + "CustomAction:Wix4MessageQueuingExecuteUninstall_A64\t3073\tWix4MsmqCA_A64\tMessageQueuingExecuteUninstall\t",
24 + "CustomAction:Wix4MessageQueuingInstall_A64\t1\tWix4MsmqCA_A64\tMessageQueuingInstall\t",
25 + "CustomAction:Wix4MessageQueuingRollbackInstall_A64\t3329\tWix4MsmqCA_A64\tMessageQueuingRollbackInstall\t",
26 + "CustomAction:Wix4MessageQueuingRollbackUninstall_A64\t3329\tWix4MsmqCA_A64\tMessageQueuingRollbackUninstall\t",
27 + "CustomAction:Wix4MessageQueuingUninstall_A64\t1\tWix4MsmqCA_A64\tMessageQueuingUninstall\t",
28 + "Wix4MessageQueue:TestMQ\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\t\t\tMQLabel\t\tMQPath\t\t\t\t0",
29 }, results);
30 }
31
32 private static void Build(string[] args)
33 {
28 - var result = WixRunner.Execute(args)
29 - .AssertSuccess();
34 + args = args.Concat(new[] { "-arch", "arm64" }).ToArray();
35 +
36 + var result = WixRunner.Execute(args);
37 + result.AssertSuccess();
38 }
39 }
40 }
src/ext/Msmq/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/Package.wxs
+2 -2
@@ -1,5 +1,5 @@
1 -<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 - <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
1 +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 + <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
4
5 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
src/ext/Msmq/wixext/MsmqCompiler.cs
+3 -3
@@ -7,6 +7,7 @@ namespace WixToolset.Msmq
7 using System.Xml.Linq;
8 using WixToolset.Data;
9 using WixToolset.Extensibility;
10 + using WixToolset.Extensibility.Data;
11 using WixToolset.Msmq.Symbols;
12
13 /// <summary>
@@ -71,7 +72,6 @@ namespace WixToolset.Msmq
72 {
73 case "Component":
74 var componentId = context["ComponentId"];
74 - var directoryId = context["DirectoryId"];
75
76 switch (element.Name.LocalName)
77 {
@@ -249,8 +249,8 @@ namespace WixToolset.Msmq
249 symbol.Quota = quota;
250 }
251
252 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "MessageQueuingInstall");
253 - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "MessageQueuingUninstall");
252 + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4MessageQueuingInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
253 + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4MessageQueuingUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
254 }
255
256 /// <summary>
src/ext/Msmq/wixext/MsmqTableDefinitions.cs
+3 -3
@@ -7,7 +7,7 @@ namespace WixToolset.Msmq
7 public static class MsmqTableDefinitions
8 {
9 public static readonly TableDefinition MessageQueue = new TableDefinition(
10 - "MessageQueue",
10 + "Wix4MessageQueue",
11 MsmqSymbolDefinitions.MessageQueue,
12 new[]
13 {
@@ -27,7 +27,7 @@ namespace WixToolset.Msmq
27 );
28
29 public static readonly TableDefinition MessageQueueUserPermission = new TableDefinition(
30 - "MessageQueueUserPermission",
30 + "Wix4MessageQueueUserPermission",
31 MsmqSymbolDefinitions.MessageQueueUserPermission,
32 new[]
33 {
@@ -41,7 +41,7 @@ namespace WixToolset.Msmq
41 );
42
43 public static readonly TableDefinition MessageQueueGroupPermission = new TableDefinition(
44 - "MessageQueueGroupPermission",
44 + "Wix4MessageQueueGroupPermission",
45 MsmqSymbolDefinitions.MessageQueueGroupPermission,
46 new[]
47 {
src/ext/Msmq/wixlib/MsmqExtension.wxs
+9 -24
@@ -2,28 +2,13 @@
2
3
4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?include ..\..\caerr.wxi ?>
6 -
7 - <Fragment>
8 - <UI>
9 - <ProgressText Action="MessageQueuingExecuteInstall" Template="!(loc.MessageQueuingExecuteInstallTemplate)" Message="!(loc.MessageQueuingExecuteInstall)" />
10 - <ProgressText Action="MessageQueuingExecuteUninstall" Template="!(loc.MessageQueuingExecuteUninstallTemplate)" Message="!(loc.MessageQueuingExecuteUninstall)" />
11 - </UI>
12 -
13 - <CustomAction Id="MessageQueuingInstall" DllEntry="MessageQueuingInstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="MsmqCA" />
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 &gt;= 500" />
22 - <Custom Action="MessageQueuingInstall" Before="InstallServices" Overridable="yes" Condition="VersionNT &gt;= 500" />
23 - </InstallExecuteSequence>
24 - </Fragment>
25 -
26 - <Fragment>
27 - <Binary Id="MsmqCA" SourceFile="msmqca.dll" />
28 - </Fragment>
5 + <?include ..\..\caDecor.wxi ?>
6 + <?include ..\..\caerr.wxi ?>
7 +
8 + <Fragment>
9 + <UI Id="MsmqUI">
10 + <ProgressText Action="$(var.Prefix)MessageQueuingExecuteInstall$(var.Suffix)" Template="!(loc.MessageQueuingExecuteInstallTemplate)" Message="!(loc.MessageQueuingExecuteInstall)" />
11 + <ProgressText Action="$(var.Prefix)MessageQueuingExecuteUninstall$(var.Suffix)" Template="!(loc.MessageQueuingExecuteUninstallTemplate)" Message="!(loc.MessageQueuingExecuteUninstall)" />
12 + </UI>
13 + </Fragment>
14 </Wix>
src/ext/Msmq/wixlib/MsmqExtension_Platform.wxi new
+26
@@ -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 &gt;= 500" />
19 + <Custom Action="$(var.Prefix)MessageQueuingInstall$(var.Suffix)" Before="InstallServices" Overridable="yes" Condition="VersionNT &gt;= 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>
src/ext/Msmq/wixlib/MsmqExtension_arm64.wxs new
+7
@@ -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>
src/ext/Msmq/wixlib/MsmqExtension_x64.wxs new
+7
@@ -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>
src/ext/Msmq/wixlib/MsmqExtension_x86.wxs new
+7
@@ -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>
src/ext/Msmq/wixlib/msmq.wixproj
+9 -1
@@ -7,7 +7,15 @@
7 </PropertyGroup>
8
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" />
19 </ItemGroup>
20
21 <ItemGroup>
src/ext/Util/wixlib/UtilExtension.wxs
-1
@@ -2,7 +2,6 @@
2
3
4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?include ..\..\caDecor.wxi ?>
5 <?include ..\..\caerr.wxi ?>
6
7 <Fragment>
src/ext/Util/wixlib/util.wixproj
+6 -6
@@ -12,12 +12,12 @@
12 </ItemGroup>
13
14 <ItemGroup>
15 - <ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />
16 - <ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
17 - <ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />
18 - <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />
19 - <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
20 - <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />
15 + <ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=ARM64" />
16 + <ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=x86" />
17 + <ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=x64" />
18 + <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=ARM64" />
19 + <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x86" />
20 + <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x64" />
21 </ItemGroup>
22
23 <ItemGroup>