From 9a105bff160e7ab7db82b1f2689e21f4f7b30917 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Tue, 27 Oct 2020 15:54:11 -0400 Subject: Update project for Package/SummaryInformation change (and others). --- src/ca/complusca.vcxproj | 15 +- .../TestData/UsingComPlusPartition/Package.wxs | 11 +- src/wixext/ComPlusCompiler.cs | 13 +- src/wixext/WixToolset.ComPlus.wixext.csproj | 1 - src/wixext/complus.xsd | 944 --------------------- src/wixlib/ComPlusExtension.wxs | 157 ++-- src/wixlib/caerr.wxi | 2 +- 7 files changed, 90 insertions(+), 1053 deletions(-) delete mode 100644 src/wixext/complus.xsd (limited to 'src') diff --git a/src/ca/complusca.vcxproj b/src/ca/complusca.vcxproj index 60c48f6d..0192557a 100644 --- a/src/ca/complusca.vcxproj +++ b/src/ca/complusca.vcxproj @@ -1,10 +1,8 @@ - - Debug @@ -23,24 +21,21 @@ x64 - {BDEF51ED-E242-4FA2-801A-01B127DF851A} DynamicLibrary - v141 + v142 Unicode complusca complusca.def WiX Toolset ComPlus CustomAction + 10.0 - - msi.lib - @@ -62,7 +57,6 @@ Create - @@ -81,14 +75,11 @@ - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. @@ -96,4 +87,4 @@ - + \ No newline at end of file diff --git a/src/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/Package.wxs b/src/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/Package.wxs index 68ff98fd..44820bdd 100644 --- a/src/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/Package.wxs +++ b/src/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/Package.wxs @@ -1,16 +1,15 @@ - - - - + + + - + - + diff --git a/src/wixext/ComPlusCompiler.cs b/src/wixext/ComPlusCompiler.cs index 8df98bdf..4404801e 100644 --- a/src/wixext/ComPlusCompiler.cs +++ b/src/wixext/ComPlusCompiler.cs @@ -94,7 +94,7 @@ namespace WixToolset.ComPlus break; case "Fragment": case "Module": - case "Product": + case "Package": switch (element.Name.LocalName) { case "ComPlusPartition": @@ -2150,15 +2150,8 @@ namespace WixToolset.ComPlus { if (win64) { - if (this.Context.Platform == Platform.IA64) - { - this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, "ia64", elementName)); - } - else - { - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureComPlusInstall_x64"); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureComPlusUninstall_x64"); - } + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureComPlusInstall_x64"); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "ConfigureComPlusUninstall_x64"); } else { diff --git a/src/wixext/WixToolset.ComPlus.wixext.csproj b/src/wixext/WixToolset.ComPlus.wixext.csproj index 86ad1a3d..5e411efb 100644 --- a/src/wixext/WixToolset.ComPlus.wixext.csproj +++ b/src/wixext/WixToolset.ComPlus.wixext.csproj @@ -13,7 +13,6 @@ - diff --git a/src/wixext/complus.xsd b/src/wixext/complus.xsd deleted file mode 100644 index f7ddacc6..00000000 --- a/src/wixext/complus.xsd +++ /dev/null @@ -1,944 +0,0 @@ - - - - - - - - The source code schema for the WiX Toolset COM+ Extension. - - - - - - - - - - - - - - - Defines a COM+ partition. If this element is a child of a - Component element, the partition will be created in association with this - component. If the element is a child of any of the Fragment, Module or Product - elements it is considered to be a locater, referencing an existing partition. - - - - - - - - - - - - - Identifier for the element. - - - - - Id for the partition. This attribute can be omitted, in - which case an id will be generated on install. If the element is a locater, - this attribute can be omitted if a value is provided for the Name attribute. - - - - - Name of the partition. This attribute can be omitted if - the element is a locater, and a value is provided for the PartitionId - attribute. - - - - - - - - - - - - - - - - - - Defines a COM+ partition role. Partition roles can not be - created; this element can only be used as a locater to reference an existing - role. - - - - - - - - - - - - Identifier for the element. - - - - - The id of a ComPlusPartition element representing the partition - the role belongs to. - - - - - Name of the partition role. - - - - - - - - - - - - This element represents a user membership in a partition - role. When the parent component of this element is installed, the user will be - added to the associated partition role. - - - - - - Identifier for the element. - - - - - The id of a ComPlusPartitionRole element representing the - partition the user should be added to. - - - - - Foreign key into the User table. - - - - - - - - - - - - This element represents a security group membership in a - partition role. When the parent component of this element is installed, the - security group will be added to the associated partition role. - - - - - - Identifier for the element. - - - - - The id of a ComPlusPartitionRole element representing the - partition the user should be added to. - - - - - Foreign key into the Group table. - - - - - - - - - - - - Represents a default partition definition for a user. When - the parent component of this element is installed, the default partition of the - user will be set to the referenced partition. - - - - - - Identifier for the element. - - - - - The id of a ComPlusPartition element representing the - partition that will be the default partition for the user. - - - - - Foreign key into the User table. - - - - - - - - - - - - - - - Defines a COM+ application. If this element is a descendent - of a Component element, the application will be created in association with - this component. If the element is a child of any of the Fragment, Module or - Product elements it is considered to be a locater, referencing an existing - application. - - If the element is a child of a ComPlusPartition element, - or have its Partition attribute set, the application will be installed under - the referenced partition. - - - - - - - - - - - - Identifier for the element. - - - - - If the element is not a child of a ComPlusPartition - element, this attribute can be provided with the id of a ComPlusPartition - element representing the partition the application belongs to. - - - - - Id for the application. This attribute can be omitted, in - which case an id will be generated on install. If the element is a locater, - this attribute can be omitted if a value is provided for the Name attribute. - - - - - Name of the application. This attribute can be omitted if - the element is a locater, and a value is provided for the PartitionId - attribute. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Defines an application role. If this element is a descendent - of a Component element, the application role will be created in association - with this component. If the element is a child of any of the Fragment, Module - or Product elements it is considered to be a locater, referencing an existing - application role. - - - - - - - - - - - - Identifier for the element. - - - - - If the element is not a child of a ComPlusApplication - element, this attribute should be provided with the id of a - ComPlusApplication element representing the application the role belongs to. - - - - - Name of the application role. - - - - - - - - - - - - - This element represents a user membership in an - application role. When the parent component of this element is installed, the - user will be added to the associated application role. This element must be a descendent - of a Component element; it can not be a child of a ComPlusApplicationRole - locater element. To reference a locater element use the ApplicationRole - attribute. - - - - - - Identifier for the element. - - - - - If the element is not a child of a ComPlusApplicationRole - element, this attribute should be provided with the id of a - ComPlusApplicationRole element representing the application role the user is - to be added to. - - - - - Foreign key into the User table. - - - - - - - - - - - - This element represents a security group membership in an - application role. When the parent component of this element is installed, the - user will be added to the associated application role. This element must be a - descendent of a Component element; it can not be a child of a - ComPlusApplicationRole locater element. To reference a locater element use the - ApplicationRole attribute. - - - - - - Identifier for the element. - - - - - If the element is not a child of a ComPlusApplicationRole - element, this attribute should be provided with the id of a - ComPlusApplicationRole element representing the application role the user is - to be added to. - - - - - Foreign key into the Group table. - - - - - - - - - Represents a DLL or assembly to be registered with COM+. If - this element is a child of a ComPlusApplication element, the assembly will be - registered in this application. Other ways the Application attribute must be - set to an application. The element must be a descendent of a Component element, - it can not be a child of a ComPlusApplication locator element. - - - - - - When installing a native assembly, all components - contained in the assembly must be represented as ComPlusComponent elements - under this element. Any component not listed will not be removed during - uninstall. - - - - The fields DllPath, TlbPath and PSDllPath are formatted - fields that should contain file paths to there respective file types. A typical - value for DllPath for example, should be something like “[#MyAssembly_dll]”, - where “MyAssembly_dll” is the key of the dll file in the File table. - - - - Warning: The assembly name provided in the AssemblyName - attribute must be a fully specified assembly name, if a partial name is - provided a random assembly matching the partial name will be selected. - - - - - - - - - - - - - - Identifier for the element. - - - - - If the element is not a child of a ComPlusApplication - element, this attribute should be provided with the id of a ComPlusApplication - element representing the application the assembly is to be registered in. - This attribute can be omitted for a .NET assembly even if the application is - not a child of a ComPlusApplication element. - - - - - The name of the assembly used to identify the assembly in - the GAC. This attribute can be provided only if DllPathFromGAC is set to - “yes”. - - - - - The path to locate the assembly DLL during registration. - This attribute should be provided if DllPathFromGAC is not set to “yes”. - - - - - An optional path to an external type lib for the assembly. - This attribute must be provided if the Type attribute is set to “.net”. - - - - - An optional path to an external proxy/stub DLL for the assembly. - - - - - - - - - - - - - - - Indicates that the assembly is to be installed as an event - class DLL. This attribute is only valid for native assemblies. The assembly - will be installed with the COM+ catalog’s InstallEventClass() function. - - - - - Indicates that the DLL path should be extracted from the - GAC instead for being provided in the DllPath attribute. If this attribute is - set to “yes”, the name of the assembly can be provided using the AssemblyName - attribute. Or, if this AssemblyName attribute is missing, the name will be - extracted from the MsiAssemblyName table using the id of the parent Component - element. - - - - - Indicates that the assembly should be installed in the - commit custom action instead of the normal deferred custom action. This is - necessary when installing .NET assemblies to the GAC in the same - installation, as the assemblies are not visible in the GAC until after the - InstallFinalize action has run. - - - - - - - - - Defines a dependency between two assemblies. This element - affects the order in which assembles are registered. Any assemblies referenced - by this element are guarantied to be registered before, and unregistered after, - the assembly referenced by the parent ComPlusAssembly element. - - - - It is only necessary to explicitly specify dependencies between - assemblies contained in the same package (MSI or MSM). Assemblies merged in to a - package from a merge module will always be installed before any assemblies - specified in the base package. Assemblies merged in from different merge - modules are sequenced using the ModuleDependency MSI table. It is not possible - to have cross dependencies between merge modules or have an assembly in a merge - module depend on an assembly in the base package. - - - - - - - Reference to the id of the assembly required by the parent - ComPlusAssembly element. - - - - - - - - Represents a COM+ component in an assembly. - - - - - - - - - - - - Identifier for the element. - - - - - CLSID of the component. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Represents a role assignment to a COM+ component. - - - - - - Identifier for the element. - - - - - If the element is not a child of a ComPlusComponent - element, this attribute should be provided with the id of a ComPlusComponent - element representing the component the role is to be added to. - - - - - Id of the ComPlusApplicationRole element representing the - role that shall be granted access to the component. - - - - - - - - Represents an interface for a COM+ component. - - - - - - - - - - - Identifier for the element. - - - - - IID of the interface. - - - - - - - - - - - - - - Represents a role assignment to an interface. - - - - - - Identifier for the element. - - - - - If the element is not a child of a ComPlusInterface - element, this attribute should be provided with the id of a ComPlusInterface - element representing the interface the role is to be added to. - - - - - Id of the ComPlusApplicationRole element representing the - role that shall be granted access to the interface. - - - - - - - - - Represents a method for an interface. - - - - - - - - - - Identifier for the element. - - - - - - - Dispatch id of the method. If this attribute is not set a - value must be provided for the Name attribute. - - - - - - - Name of the method. If this attribute is not set a value - must be provided for the Index attribute. - - - - - - - - - - - - - - - Represents a role assignment to a COM+ method. - - - - - - Identifier for the element. - - - - - If the element is not a child of a ComPlusMethod element, - this attribute should be provided with the id of a ComPlusMethod element - representing the method the role is to be added to. - - - - - Id of the ComPlusApplicationRole element representing the - role that shall be granted access to the method. - - - - - - - - - - - - Defines an event subscription for a COM+ component. - - - - - - Identifier for the element. - - - - - If the element is not a child of a ComPlusComponent - element, this attribute should be provided with the id of a ComPlusComponent - element representing the component the subscription is to be created for. - - - - - Id of the subscription. If a value is not provided for - this attribute, an id will be generated during installation. - - - - - Name of the subscription. - - - - - CLSID of the event class for the subscription. If a value - for this attribute is not provided, a value for the PublisherID attribute - must be provided. - - - - - Publisher id for the subscription. If a value for this - attribute is not provided, a value for the EventCLSID attribute must be - provided. - - - - - - - - - - - - - - - - - - - Values of this type will either be "yes" or "no". - - - - - - - - - - Values of this type will look like: "01234567-89AB-CDEF-0123-456789ABCDEF". - - - - - - - diff --git a/src/wixlib/ComPlusExtension.wxs b/src/wixlib/ComPlusExtension.wxs index 2a5710c0..d41e327e 100644 --- a/src/wixlib/ComPlusExtension.wxs +++ b/src/wixlib/ComPlusExtension.wxs @@ -1,5 +1,4 @@ - - + @@ -7,72 +6,72 @@ - !(loc.msierrComPlusCannotConnect) - !(loc.msierrComPlusPartitionReadFailed) - !(loc.msierrComPlusPartitionRoleReadFailed) - !(loc.msierrComPlusUserInPartitionRoleReadFailed) - !(loc.msierrComPlusPartitionUserReadFailed) - !(loc.msierrComPlusApplicationReadFailed) - !(loc.msierrComPlusApplicationRoleReadFailed) - !(loc.msierrComPlusUserInApplicationRoleReadFailed) - !(loc.msierrComPlusAssembliesReadFailed) - !(loc.msierrComPlusSubscriptionReadFailed) - !(loc.msierrComPlusPartitionDependency) - !(loc.msierrComPlusPartitionNotFound) - !(loc.msierrComPlusPartitionIdConflict) - !(loc.msierrComPlusPartitionNameConflict) - !(loc.msierrComPlusApplicationDependency) - !(loc.msierrComPlusApplicationNotFound) - !(loc.msierrComPlusApplicationIdConflict) - !(loc.msierrComPlusApplicationNameConflict) - !(loc.msierrComPlusApplicationRoleDependency) - !(loc.msierrComPlusApplicationRoleNotFound) - !(loc.msierrComPlusApplicationRoleConflict) - !(loc.msierrComPlusAssemblyDependency) - !(loc.msierrComPlusSubscriptionIdConflict) - !(loc.msierrComPlusSubscriptionNameConflict) - !(loc.msierrComPlusFailedLookupNames) + + + + + + + + + + + + + + + + + + + + + + + + + - !(loc.ComPlusInstallExecute) - !(loc.ComPlusUninstallExecute) + + - !(loc.CreateComPlusPartitions) - !(loc.RemoveComPlusPartitions) - !(loc.AddUsersToComPlusPartitionRoles) - !(loc.RemoveUsersFromComPlusPartitionRoles) - !(loc.AddComPlusPartitionUsers) - !(loc.RemoveComPlusPartitionUsers) - !(loc.CreateComPlusApplications) - !(loc.RemoveComPlusApplications) - !(loc.CreateComPlusApplicationRoles) - !(loc.RemoveComPlusApplicationRoles) - !(loc.AddUsersToComPlusApplicationRoles) - !(loc.RemoveUsersFromComPlusApplicationRoles) - !(loc.RegisterComPlusAssemblies) - !(loc.UnregisterComPlusAssemblies) - !(loc.AddComPlusRoleAssignments) - !(loc.RemoveComPlusRoleAssignments) - !(loc.CreateSubscriptionsComPlusComponents) - !(loc.RemoveSubscriptionsComPlusComponents) + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + diff --git a/src/wixlib/caerr.wxi b/src/wixlib/caerr.wxi index 141942f2..ff7ec121 100644 --- a/src/wixlib/caerr.wxi +++ b/src/wixlib/caerr.wxi @@ -1,4 +1,4 @@ - + -- cgit v1.2.3-55-g6feb