From 1be6baef099aa75fd45f41e55b8138ac2c7e0da3 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sun, 13 Feb 2022 00:46:54 -0500 Subject: Versioned extension ids: ComPlus, Msmq --- src/ext/ComPlus/ComPlus.wixext.sln | 4 +- src/ext/ComPlus/ca/complusca.vcxproj | 8 ++ src/ext/ComPlus/ca/cpapprolesched.cpp | 8 +- src/ext/ComPlus/ca/cpappsched.cpp | 4 +- src/ext/ComPlus/ca/cpasmsched.cpp | 22 ++-- src/ext/ComPlus/ca/cppartrolesched.cpp | 6 +- src/ext/ComPlus/ca/cppartsched.cpp | 6 +- src/ext/ComPlus/ca/cpsubssched.cpp | 4 +- src/ext/ComPlus/ca/cputilsched.cpp | 2 +- .../ComPlusExtensionFixture.cs | 23 +++- .../TestData/UsingComPlusPartition/Package.wxs | 4 +- src/ext/ComPlus/wixext/ComPlusCompiler.cs | 15 +-- src/ext/ComPlus/wixext/ComPlusTableDefinitions.cs | 50 ++++----- src/ext/ComPlus/wixlib/ComPlusExtension.wxs | 122 ++++----------------- .../ComPlus/wixlib/ComPlusExtension_Platform.wxi | 44 ++++++++ src/ext/ComPlus/wixlib/ComPlusExtension_arm64.wxs | 7 ++ src/ext/ComPlus/wixlib/ComPlusExtension_x64.wxs | 7 ++ src/ext/ComPlus/wixlib/ComPlusExtension_x86.wxs | 7 ++ src/ext/ComPlus/wixlib/complus.wixproj | 6 +- src/ext/Msmq/Msmq.wixext.sln | 4 +- src/ext/Msmq/ca/mqqueuesched.cpp | 6 +- src/ext/Msmq/ca/mqutilexec.cpp | 4 +- src/ext/Msmq/ca/mqutilsched.cpp | 43 -------- src/ext/Msmq/ca/mqutilsched.h | 9 -- src/ext/Msmq/ca/msmqca.vcxproj | 30 ++--- src/ext/Msmq/ca/precomp.h | 1 - .../WixToolsetTest.Msmq/MsmqExtensionFixture.cs | 16 ++- .../TestData/UsingMessageQueue/Package.wxs | 4 +- src/ext/Msmq/wixext/MsmqCompiler.cs | 6 +- src/ext/Msmq/wixext/MsmqTableDefinitions.cs | 6 +- src/ext/Msmq/wixlib/MsmqExtension.wxs | 33 ++---- src/ext/Msmq/wixlib/MsmqExtension_Platform.wxi | 26 +++++ src/ext/Msmq/wixlib/MsmqExtension_arm64.wxs | 7 ++ src/ext/Msmq/wixlib/MsmqExtension_x64.wxs | 7 ++ src/ext/Msmq/wixlib/MsmqExtension_x86.wxs | 7 ++ src/ext/Msmq/wixlib/msmq.wixproj | 10 +- src/ext/Util/wixlib/UtilExtension.wxs | 1 - src/ext/Util/wixlib/util.wixproj | 12 +- 38 files changed, 292 insertions(+), 289 deletions(-) create mode 100644 src/ext/ComPlus/wixlib/ComPlusExtension_Platform.wxi create mode 100644 src/ext/ComPlus/wixlib/ComPlusExtension_arm64.wxs create mode 100644 src/ext/ComPlus/wixlib/ComPlusExtension_x64.wxs create mode 100644 src/ext/ComPlus/wixlib/ComPlusExtension_x86.wxs delete mode 100644 src/ext/Msmq/ca/mqutilsched.cpp delete mode 100644 src/ext/Msmq/ca/mqutilsched.h create mode 100644 src/ext/Msmq/wixlib/MsmqExtension_Platform.wxi create mode 100644 src/ext/Msmq/wixlib/MsmqExtension_arm64.wxs create mode 100644 src/ext/Msmq/wixlib/MsmqExtension_x64.wxs create mode 100644 src/ext/Msmq/wixlib/MsmqExtension_x86.wxs diff --git a/src/ext/ComPlus/ComPlus.wixext.sln b/src/ext/ComPlus/ComPlus.wixext.sln index 06302fa2..6249fef0 100644 --- a/src/ext/ComPlus/ComPlus.wixext.sln +++ b/src/ext/ComPlus/ComPlus.wixext.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30611.23 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "complusca", "ca\complusca.vcxproj", "{BDEF51ED-E242-4FA2-801A-01B127DF851A}" EndProject diff --git a/src/ext/ComPlus/ca/complusca.vcxproj b/src/ext/ComPlus/ca/complusca.vcxproj index 0bd490b1..696f7dd8 100644 --- a/src/ext/ComPlus/ca/complusca.vcxproj +++ b/src/ext/ComPlus/ca/complusca.vcxproj @@ -19,6 +19,14 @@ Release x64 + + Debug + ARM64 + + + Release + ARM64 + diff --git a/src/ext/ComPlus/ca/cpapprolesched.cpp b/src/ext/ComPlus/ca/cpapprolesched.cpp index a268d156..d4f5d2be 100644 --- a/src/ext/ComPlus/ca/cpapprolesched.cpp +++ b/src/ext/ComPlus/ca/cpapprolesched.cpp @@ -6,17 +6,17 @@ // sql queries LPCWSTR vcsApplicationRoleQuery = - L"SELECT `ApplicationRole`, `Application_`, `Component_`, `Name` FROM `ComPlusApplicationRole`"; + L"SELECT `ApplicationRole`, `Application_`, `Component_`, `Name` FROM `Wix4ComPlusApplicationRole`"; enum eApplicationRoleQuery { arqApplicationRole = 1, arqApplication, arqComponent, arqName }; LPCWSTR vcsUserInApplicationRoleQuery = - L"SELECT `UserInApplicationRole`, `ApplicationRole_`, `ComPlusUserInApplicationRole`.`Component_`, `Domain`, `Name` FROM `ComPlusUserInApplicationRole`, `User` WHERE `User_` = `User`"; + L"SELECT `UserInApplicationRole`, `ApplicationRole_`, `ComPlusUserInApplicationRole`.`Component_`, `Domain`, `Name` FROM `Wix4ComPlusUserInApplicationRole`, `Wix4User` WHERE `User_` = `User`"; LPCWSTR vcsGroupInApplicationRoleQuery = - L"SELECT `GroupInApplicationRole`, `ApplicationRole_`, `ComPlusGroupInApplicationRole`.`Component_`, `Domain`, `Name` FROM `ComPlusGroupInApplicationRole`, `Group` WHERE `Group_` = `Group`"; + L"SELECT `GroupInApplicationRole`, `ApplicationRole_`, `ComPlusGroupInApplicationRole`.`Component_`, `Domain`, `Name` FROM `Wix4ComPlusGroupInApplicationRole`, `Group` WHERE `Group_` = `Group`"; enum eTrusteeInApplicationRoleQuery { tiarqUserInApplicationRole = 1, tiarqApplicationRole, tiarqComponent, tiarqDomain, tiarqName }; LPCWSTR vcsApplicationRolePropertyQuery = - L"SELECT `Name`, `Value` FROM `ComPlusApplicationRoleProperty` WHERE `ApplicationRole_` = ?"; + L"SELECT `Name`, `Value` FROM `Wix4ComPlusApplicationRoleProperty` WHERE `ApplicationRole_` = ?"; // property definitions diff --git a/src/ext/ComPlus/ca/cpappsched.cpp b/src/ext/ComPlus/ca/cpappsched.cpp index 1fb2203b..4d867f6b 100644 --- a/src/ext/ComPlus/ca/cpappsched.cpp +++ b/src/ext/ComPlus/ca/cpappsched.cpp @@ -6,11 +6,11 @@ // sql queries LPCWSTR vcsApplicationQuery = - L"SELECT `Application`, `Component_`, `Partition_`, `Id`, `Name` FROM `ComPlusApplication`"; + L"SELECT `Application`, `Component_`, `Partition_`, `Id`, `Name` FROM `Wix4ComPlusApplication`"; enum eApplicationQuery { aqApplication = 1, aqComponent, aqPartition, aqID, aqName }; LPCWSTR vcsApplicationPropertyQuery = - L"SELECT `Name`, `Value` FROM `ComPlusApplicationProperty` WHERE `Application_` = ?"; + L"SELECT `Name`, `Value` FROM `Wix4ComPlusApplicationProperty` WHERE `Application_` = ?"; // property definitions diff --git a/src/ext/ComPlus/ca/cpasmsched.cpp b/src/ext/ComPlus/ca/cpasmsched.cpp index 2d0573a5..325808de 100644 --- a/src/ext/ComPlus/ca/cpasmsched.cpp +++ b/src/ext/ComPlus/ca/cpasmsched.cpp @@ -14,36 +14,36 @@ LPCWSTR vcsModuleQuery = enum eModuleQuery { mqModule = 1 }; LPCWSTR vcsAssemblyQuery = - L"SELECT `Assembly`, `Component_`, `Application_`, `AssemblyName`, `DllPath`, `TlbPath`, `PSDllPath`, `Attributes` FROM `ComPlusAssembly`"; + L"SELECT `Assembly`, `Component_`, `Application_`, `AssemblyName`, `DllPath`, `TlbPath`, `PSDllPath`, `Attributes` FROM `Wix4ComPlusAssembly`"; enum eAssemblyQuery { aqAssembly = 1, aqComponent, aqApplication, aqAssemblyName, aqDllPath, aqTlbPath, aqPSDllPath, aqAttributes }; LPCWSTR vcsComponentQuery = - L"SELECT `ComPlusComponent`, `CLSID` FROM `ComPlusComponent` WHERE `Assembly_` = ?"; + L"SELECT `ComPlusComponent`, `CLSID` FROM `Wix4ComPlusComponent` WHERE `Assembly_` = ?"; enum eComponentQuery { cqComponent = 1, cqCLSID }; LPCWSTR vcsComponentPropertyQuery = - L"SELECT `Name`, `Value` FROM `ComPlusComponentProperty` WHERE `ComPlusComponent_` = ?"; + L"SELECT `Name`, `Value` FROM `Wix4ComPlusComponentProperty` WHERE `ComPlusComponent_` = ?"; LPCWSTR vcsInterfaceQuery = - L"SELECT `Interface`, `IID` FROM `ComPlusInterface` WHERE `ComPlusComponent_` = ?"; + L"SELECT `Interface`, `IID` FROM `Wix4ComPlusInterface` WHERE `ComPlusComponent_` = ?"; enum eInterfaceQuery { iqInterface = 1, iqIID }; LPCWSTR vcsInterfacePropertyQuery = - L"SELECT `Name`, `Value` FROM `ComPlusInterfaceProperty` WHERE `Interface_` = ?"; + L"SELECT `Name`, `Value` FROM `Wix4ComPlusInterfaceProperty` WHERE `Interface_` = ?"; LPCWSTR vcsMethodQuery = - L"SELECT `Method`, `Index`, `Name` FROM `ComPlusMethod` WHERE `Interface_` = ?"; + L"SELECT `Method`, `Index`, `Name` FROM `Wix4ComPlusMethod` WHERE `Interface_` = ?"; enum eMethodQuery { mqMethod = 1, mqIndex, mqName }; LPCWSTR vcsMethodPropertyQuery = - L"SELECT `Name`, `Value` FROM `ComPlusMethodProperty` WHERE `Method_` = ?"; + L"SELECT `Name`, `Value` FROM `Wix4ComPlusMethodProperty` WHERE `Method_` = ?"; LPCWSTR vcsRoleForComponentQuery = - L"SELECT `RoleForComponent`, `ApplicationRole_`, `Component_` FROM `ComPlusRoleForComponent` WHERE `ComPlusComponent_` = ?"; + L"SELECT `RoleForComponent`, `ApplicationRole_`, `Component_` FROM `Wix4ComPlusRoleForComponent` WHERE `ComPlusComponent_` = ?"; LPCWSTR vcsRoleForInterfaceQuery = - L"SELECT `RoleForInterface`, `ApplicationRole_`, `Component_` FROM `ComPlusRoleForInterface` WHERE `Interface_` = ?"; + L"SELECT `RoleForInterface`, `ApplicationRole_`, `Component_` FROM `Wix4ComPlusRoleForInterface` WHERE `Interface_` = ?"; LPCWSTR vcsRoleForMethodQuery = - L"SELECT `RoleForMethod`, `ApplicationRole_`, `Component_` FROM `ComPlusRoleForMethod` WHERE `Method_` = ?"; + L"SELECT `RoleForMethod`, `ApplicationRole_`, `Component_` FROM `Wix4ComPlusRoleForMethod` WHERE `Method_` = ?"; enum eRoleAssignmentQuery { raqKey = 1, raqApplicationRole, raqComponent }; @@ -52,7 +52,7 @@ LPCWSTR vcsModuleComponentsQuery = LPCWSTR vcsModuleDependencyQuery = L"SELECT `ModuleID`, `RequiredID` FROM `ModuleDependency`"; LPCWSTR vcsAssemblyDependencyQuery = - L"SELECT `Assembly_`, `RequiredAssembly_` FROM `ComPlusAssemblyDependency`"; + L"SELECT `Assembly_`, `RequiredAssembly_` FROM `Wix4ComPlusAssemblyDependency`"; enum eKeyPairQuery { kpqFirstKey = 1, kpqSecondKey }; diff --git a/src/ext/ComPlus/ca/cppartrolesched.cpp b/src/ext/ComPlus/ca/cppartrolesched.cpp index a988f8e3..cfaeb905 100644 --- a/src/ext/ComPlus/ca/cppartrolesched.cpp +++ b/src/ext/ComPlus/ca/cppartrolesched.cpp @@ -6,13 +6,13 @@ // sql queries LPCWSTR vcsPartitionRoleQuery = - L"SELECT `PartitionRole`, `Partition_`, `Component_`, `Name` FROM `ComPlusPartitionRole`"; + L"SELECT `PartitionRole`, `Partition_`, `Component_`, `Name` FROM `Wix4ComPlusPartitionRole`"; enum ePartitionRoleQuery { prqPartitionRole = 1, prqPartition, prqComponent, prqName }; LPCWSTR vcsUserInPartitionRoleQuery = - L"SELECT `UserInPartitionRole`, `PartitionRole_`, `ComPlusUserInPartitionRole`.`Component_`, `Domain`, `Name` FROM `ComPlusUserInPartitionRole`, `User` WHERE `User_` = `User`"; + L"SELECT `UserInPartitionRole`, `PartitionRole_`, `ComPlusUserInPartitionRole`.`Component_`, `Domain`, `Name` FROM `Wix4ComPlusUserInPartitionRole`, `Wix4User` WHERE `User_` = `User`"; LPCWSTR vcsGroupInPartitionRoleQuery = - L"SELECT `GroupInPartitionRole`, `PartitionRole_`, `ComPlusGroupInPartitionRole`.`Component_`, `Domain`, `Name` FROM `ComPlusGroupInPartitionRole`, `Group` WHERE `Group_` = `Group`"; + L"SELECT `GroupInPartitionRole`, `PartitionRole_`, `ComPlusGroupInPartitionRole`.`Component_`, `Domain`, `Name` FROM `Wix4ComPlusGroupInPartitionRole`, `Group` WHERE `Group_` = `Group`"; enum eTrusteeInPartitionRoleQuery { tiprqUserInPartitionRole = 1, tiprqPartitionRole, tiprqComponent, tiprqDomain, tiprqName }; diff --git a/src/ext/ComPlus/ca/cppartsched.cpp b/src/ext/ComPlus/ca/cppartsched.cpp index 7cd98791..d4065d34 100644 --- a/src/ext/ComPlus/ca/cppartsched.cpp +++ b/src/ext/ComPlus/ca/cppartsched.cpp @@ -6,14 +6,14 @@ // sql queries LPCWSTR vcsPartitionQuery = - L"SELECT `Partition`, `Component_`, `Id`, `Name` FROM `ComPlusPartition`"; + L"SELECT `Partition`, `Component_`, `Id`, `Name` FROM `Wix4ComPlusPartition`"; enum ePartitionQuery { pqPartition = 1, pqComponent, pqID, pqName }; LPCWSTR vcsPartitionPropertyQuery = - L"SELECT `Name`, `Value` FROM `ComPlusPartitionProperty` WHERE `Partition_` = ?"; + L"SELECT `Name`, `Value` FROM `Wix4ComPlusPartitionProperty` WHERE `Partition_` = ?"; LPCWSTR vcsPartitionUserQuery = - L"SELECT `PartitionUser`, `Partition_`, `ComPlusPartitionUser`.`Component_`, `Domain`, `Name` FROM `ComPlusPartitionUser`, `User` WHERE `User_` = `User`"; + L"SELECT `PartitionUser`, `Partition_`, `ComPlusPartitionUser`.`Component_`, `Domain`, `Name` FROM `Wix4ComPlusPartitionUser`, `Wix4User` WHERE `User_` = `User`"; enum ePartitionUserQuery { puqPartitionUser = 1, puqPartition, puqComponent, puqDomain, puqName }; diff --git a/src/ext/ComPlus/ca/cpsubssched.cpp b/src/ext/ComPlus/ca/cpsubssched.cpp index df15fd03..fbec3a2d 100644 --- a/src/ext/ComPlus/ca/cpsubssched.cpp +++ b/src/ext/ComPlus/ca/cpsubssched.cpp @@ -6,11 +6,11 @@ // sql queries LPCWSTR vcsSubscriptionQuery = - L"SELECT `Subscription`, `ComPlusComponent_`, `Component_`, `Id`, `Name`, `EventCLSID`, `PublisherID` FROM `ComPlusSubscription`"; + L"SELECT `Subscription`, `ComPlusComponent_`, `Component_`, `Id`, `Name`, `EventCLSID`, `PublisherID` FROM `Wix4ComPlusSubscription`"; enum eSubscriptionQuery { sqSubscription = 1, sqComPlusComponent, sqComponent, sqID, sqName, sqEventCLSID, sqPublisherID }; LPCWSTR vcsSubscriptionPropertyQuery = - L"SELECT `Name`, `Value` FROM `ComPlusSubscriptionProperty` WHERE `Subscription_` = ?"; + L"SELECT `Name`, `Value` FROM `Wix4ComPlusSubscriptionProperty` WHERE `Subscription_` = ?"; // property definitions diff --git a/src/ext/ComPlus/ca/cputilsched.cpp b/src/ext/ComPlus/ca/cputilsched.cpp index 1a958c56..4a2fdfc6 100644 --- a/src/ext/ComPlus/ca/cputilsched.cpp +++ b/src/ext/ComPlus/ca/cputilsched.cpp @@ -13,7 +13,7 @@ LPCWSTR vcsComponentAttributesQuery = L"SELECT `Attributes` FROM `Component` WHERE `Component` = ?"; enum eComponentAttributesQuery { caqAttributes = 1 }; -LPCWSTR vcsUserQuery = L"SELECT `Domain`, `Name` FROM `User` WHERE `User` = ?"; +LPCWSTR vcsUserQuery = L"SELECT `Domain`, `Name` FROM `Wix4User` WHERE `User` = ?"; enum eUserQuery { uqDomain = 1, uqName }; enum ePropertyQuery { pqName = 1, pqValue }; diff --git a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs index ace4d6b6..d0b8daba 100644 --- a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs +++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs @@ -16,17 +16,32 @@ namespace WixToolsetTest.ComPlus var folder = TestData.Get(@"TestData\UsingComPlusPartition"); var build = new Builder(folder, typeof(ComPlusExtensionFactory), new[] { folder }); - var results = build.BuildAndQuery(Build, "ComPlusPartition"); + var results = build.BuildAndQuery(Build, "Wix4ComPlusPartition", "CustomAction"); WixAssert.CompareLineByLine(new[] { - "ComPlusPartition:MyPartition\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tMyPartitionId\tMyPartition", + "CustomAction:Wix4ComPlusInstallCommit_A64\t11777\tWix4cpca_A64\tComPlusCleanup\t", + "CustomAction:Wix4ComPlusInstallExecute_A64\t11265\tWix4cpca_A64\tComPlusInstallExecute\t", + "CustomAction:Wix4ComPlusInstallExecuteCommit_A64\t11777\tWix4cpca_A64\tComPlusInstallExecuteCommit\t", + "CustomAction:Wix4ComPlusInstallPrepare_A64\t11265\tWix4cpca_A64\tComPlusPrepare\t", + "CustomAction:Wix4ComPlusRollbackInstallExecute_A64\t11521\tWix4cpca_A64\tComPlusRollbackInstallExecute\t", + "CustomAction:Wix4ComPlusRollbackInstallPrepare_A64\t11521\tWix4cpca_A64\tComPlusCleanup\t", + "CustomAction:Wix4ComPlusRollbackUninstallExecute_A64\t11521\tWix4cpca_A64\tComPlusInstallExecute\t", + "CustomAction:Wix4ComPlusRollbackUninstallPrepare_A64\t11521\tWix4cpca_A64\tComPlusCleanup\t", + "CustomAction:Wix4ComPlusUninstallCommit_A64\t11777\tWix4cpca_A64\tComPlusCleanup\t", + "CustomAction:Wix4ComPlusUninstallExecute_A64\t11265\tWix4cpca_A64\tComPlusUninstallExecute\t", + "CustomAction:Wix4ComPlusUninstallPrepare_A64\t11265\tWix4cpca_A64\tComPlusPrepare\t", + "CustomAction:Wix4ConfigureComPlusInstall_A64\t1\tWix4cpca_A64\tConfigureComPlusInstall\t", + "CustomAction:Wix4ConfigureComPlusUninstall_A64\t1\tWix4cpca_A64\tConfigureComPlusUninstall\t", + "Wix4ComPlusPartition:MyPartition\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tMyPartitionId\tMyPartition", }, 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/ComPlus/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/Package.wxs b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/Package.wxs index bd31e81f..9524f3a4 100644 --- a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/Package.wxs +++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/Package.wxs @@ -1,5 +1,5 @@ - - + + diff --git a/src/ext/ComPlus/wixext/ComPlusCompiler.cs b/src/ext/ComPlus/wixext/ComPlusCompiler.cs index 4404801e..9e00bc3b 100644 --- a/src/ext/ComPlus/wixext/ComPlusCompiler.cs +++ b/src/ext/ComPlus/wixext/ComPlusCompiler.cs @@ -8,6 +8,7 @@ namespace WixToolset.ComPlus using WixToolset.ComPlus.Symbols; using WixToolset.Data; using WixToolset.Extensibility; + using WixToolset.Extensibility.Data; /// /// The compiler for the WiX Toolset COM+ Extension. @@ -40,7 +41,6 @@ namespace WixToolset.ComPlus { case "Component": var componentId = context["ComponentId"]; - var directoryId = context["DirectoryId"]; var win64 = Boolean.Parse(context["Win64"]); switch (element.Name.LocalName) @@ -2148,17 +2148,8 @@ namespace WixToolset.ComPlus private void AddReferenceToConfigureComPlus(IntermediateSection section, SourceLineNumber sourceLineNumbers, string elementName, bool win64) { - if (win64) - { - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureComPlusInstall_x64"); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureComPlusUninstall_x64"); - } - else - { - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureComPlusInstall"); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureComPlusUninstall"); - } - + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureComPlusInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureComPlusUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } } } diff --git a/src/ext/ComPlus/wixext/ComPlusTableDefinitions.cs b/src/ext/ComPlus/wixext/ComPlusTableDefinitions.cs index 565e1d44..52c6ecc5 100644 --- a/src/ext/ComPlus/wixext/ComPlusTableDefinitions.cs +++ b/src/ext/ComPlus/wixext/ComPlusTableDefinitions.cs @@ -7,7 +7,7 @@ namespace WixToolset.ComPlus public static class ComPlusTableDefinitions { public static readonly TableDefinition ComPlusPartition = new TableDefinition( - "ComPlusPartition", + "Wix4ComPlusPartition", ComPlusSymbolDefinitions.ComPlusPartition, new[] { @@ -20,7 +20,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusPartitionProperty = new TableDefinition( - "ComPlusPartitionProperty", + "Wix4ComPlusPartitionProperty", ComPlusSymbolDefinitions.ComPlusPartitionProperty, new[] { @@ -32,7 +32,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusPartitionRole = new TableDefinition( - "ComPlusPartitionRole", + "Wix4ComPlusPartitionRole", ComPlusSymbolDefinitions.ComPlusPartitionRole, new[] { @@ -45,7 +45,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusUserInPartitionRole = new TableDefinition( - "ComPlusUserInPartitionRole", + "Wix4ComPlusUserInPartitionRole", ComPlusSymbolDefinitions.ComPlusUserInPartitionRole, new[] { @@ -58,7 +58,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusGroupInPartitionRole = new TableDefinition( - "ComPlusGroupInPartitionRole", + "Wix4ComPlusGroupInPartitionRole", ComPlusSymbolDefinitions.ComPlusGroupInPartitionRole, new[] { @@ -71,7 +71,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusPartitionUser = new TableDefinition( - "ComPlusPartitionUser", + "Wix4ComPlusPartitionUser", ComPlusSymbolDefinitions.ComPlusPartitionUser, new[] { @@ -84,7 +84,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusApplication = new TableDefinition( - "ComPlusApplication", + "Wix4ComPlusApplication", ComPlusSymbolDefinitions.ComPlusApplication, new[] { @@ -98,7 +98,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusApplicationProperty = new TableDefinition( - "ComPlusApplicationProperty", + "Wix4ComPlusApplicationProperty", ComPlusSymbolDefinitions.ComPlusApplicationProperty, new[] { @@ -110,7 +110,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusApplicationRole = new TableDefinition( - "ComPlusApplicationRole", + "Wix4ComPlusApplicationRole", ComPlusSymbolDefinitions.ComPlusApplicationRole, new[] { @@ -123,7 +123,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusApplicationRoleProperty = new TableDefinition( - "ComPlusApplicationRoleProperty", + "Wix4ComPlusApplicationRoleProperty", ComPlusSymbolDefinitions.ComPlusApplicationRoleProperty, new[] { @@ -135,7 +135,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusUserInApplicationRole = new TableDefinition( - "ComPlusUserInApplicationRole", + "Wix4ComPlusUserInApplicationRole", ComPlusSymbolDefinitions.ComPlusUserInApplicationRole, new[] { @@ -148,7 +148,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusGroupInApplicationRole = new TableDefinition( - "ComPlusGroupInApplicationRole", + "Wix4ComPlusGroupInApplicationRole", ComPlusSymbolDefinitions.ComPlusGroupInApplicationRole, new[] { @@ -161,7 +161,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusAssembly = new TableDefinition( - "ComPlusAssembly", + "Wix4ComPlusAssembly", ComPlusSymbolDefinitions.ComPlusAssembly, new[] { @@ -178,7 +178,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusAssemblyDependency = new TableDefinition( - "ComPlusAssemblyDependency", + "Wix4ComPlusAssemblyDependency", ComPlusSymbolDefinitions.ComPlusAssemblyDependency, new[] { @@ -189,7 +189,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusComponent = new TableDefinition( - "ComPlusComponent", + "Wix4ComPlusComponent", ComPlusSymbolDefinitions.ComPlusComponent, new[] { @@ -201,7 +201,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusComponentProperty = new TableDefinition( - "ComPlusComponentProperty", + "Wix4ComPlusComponentProperty", ComPlusSymbolDefinitions.ComPlusComponentProperty, new[] { @@ -213,7 +213,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusRoleForComponent = new TableDefinition( - "ComPlusRoleForComponent", + "Wix4ComPlusRoleForComponent", ComPlusSymbolDefinitions.ComPlusRoleForComponent, new[] { @@ -226,7 +226,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusInterface = new TableDefinition( - "ComPlusInterface", + "Wix4ComPlusInterface", ComPlusSymbolDefinitions.ComPlusInterface, new[] { @@ -238,7 +238,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusInterfaceProperty = new TableDefinition( - "ComPlusInterfaceProperty", + "Wix4ComPlusInterfaceProperty", ComPlusSymbolDefinitions.ComPlusInterfaceProperty, new[] { @@ -250,7 +250,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusRoleForInterface = new TableDefinition( - "ComPlusRoleForInterface", + "Wix4ComPlusRoleForInterface", ComPlusSymbolDefinitions.ComPlusRoleForInterface, new[] { @@ -263,7 +263,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusMethod = new TableDefinition( - "ComPlusMethod", + "Wix4ComPlusMethod", ComPlusSymbolDefinitions.ComPlusMethod, new[] { @@ -276,7 +276,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusMethodProperty = new TableDefinition( - "ComPlusMethodProperty", + "Wix4ComPlusMethodProperty", ComPlusSymbolDefinitions.ComPlusMethodProperty, new[] { @@ -288,7 +288,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusRoleForMethod = new TableDefinition( - "ComPlusRoleForMethod", + "Wix4ComPlusRoleForMethod", ComPlusSymbolDefinitions.ComPlusRoleForMethod, new[] { @@ -301,7 +301,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusSubscription = new TableDefinition( - "ComPlusSubscription", + "Wix4ComPlusSubscription", ComPlusSymbolDefinitions.ComPlusSubscription, new[] { @@ -317,7 +317,7 @@ namespace WixToolset.ComPlus ); public static readonly TableDefinition ComPlusSubscriptionProperty = new TableDefinition( - "ComPlusSubscriptionProperty", + "Wix4ComPlusSubscriptionProperty", ComPlusSymbolDefinitions.ComPlusSubscriptionProperty, new[] { diff --git a/src/ext/ComPlus/wixlib/ComPlusExtension.wxs b/src/ext/ComPlus/wixlib/ComPlusExtension.wxs index 736fd9b5..d8febf5c 100644 --- a/src/ext/ComPlus/wixlib/ComPlusExtension.wxs +++ b/src/ext/ComPlus/wixlib/ComPlusExtension.wxs @@ -1,6 +1,8 @@  + + @@ -31,105 +33,27 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ext/ComPlus/wixlib/ComPlusExtension_Platform.wxi b/src/ext/ComPlus/wixlib/ComPlusExtension_Platform.wxi new file mode 100644 index 00000000..7edae031 --- /dev/null +++ b/src/ext/ComPlus/wixlib/ComPlusExtension_Platform.wxi @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/ComPlus/wixlib/ComPlusExtension_arm64.wxs b/src/ext/ComPlus/wixlib/ComPlusExtension_arm64.wxs new file mode 100644 index 00000000..cb40cd85 --- /dev/null +++ b/src/ext/ComPlus/wixlib/ComPlusExtension_arm64.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/ext/ComPlus/wixlib/ComPlusExtension_x64.wxs b/src/ext/ComPlus/wixlib/ComPlusExtension_x64.wxs new file mode 100644 index 00000000..67d70d12 --- /dev/null +++ b/src/ext/ComPlus/wixlib/ComPlusExtension_x64.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/ext/ComPlus/wixlib/ComPlusExtension_x86.wxs b/src/ext/ComPlus/wixlib/ComPlusExtension_x86.wxs new file mode 100644 index 00000000..0c2e9cef --- /dev/null +++ b/src/ext/ComPlus/wixlib/ComPlusExtension_x86.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/ext/ComPlus/wixlib/complus.wixproj b/src/ext/ComPlus/wixlib/complus.wixproj index f0eaebee..9a70c17a 100644 --- a/src/ext/ComPlus/wixlib/complus.wixproj +++ b/src/ext/ComPlus/wixlib/complus.wixproj @@ -11,11 +11,13 @@ + - - + + + 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 @@ - - Debug @@ -14,8 +12,23 @@ Release Win32 + + Debug + X64 + + + Release + X64 + + + Debug + ARM64 + + + Release + ARM64 + - {CAD56A7E-342B-4324-9DCB-BCEB8F3BC80D} DynamicLibrary @@ -24,14 +37,11 @@ msmqca.def WiX Toolset MSMQ CustomAction - - msi.lib - Create @@ -41,28 +51,22 @@ - - - - - - - + \ 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 @@ - - + + 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; /// @@ -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); } /// 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + 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 @@ + + + + + + + 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 @@ + + + + + + + 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 @@ - + + + + + + + + + diff --git a/src/ext/Util/wixlib/UtilExtension.wxs b/src/ext/Util/wixlib/UtilExtension.wxs index f2786b25..bc19d89c 100644 --- a/src/ext/Util/wixlib/UtilExtension.wxs +++ b/src/ext/Util/wixlib/UtilExtension.wxs @@ -2,7 +2,6 @@ - diff --git a/src/ext/Util/wixlib/util.wixproj b/src/ext/Util/wixlib/util.wixproj index 56a16ff4..fa82fea2 100644 --- a/src/ext/Util/wixlib/util.wixproj +++ b/src/ext/Util/wixlib/util.wixproj @@ -12,12 +12,12 @@ - - - - - - + + + + + + -- cgit v1.2.3-55-g6feb