From 381262f7651b8b0fbf12b2cc6b64caf734b2aa0c Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Sun, 18 Jan 2009 13:30:27 +0000 Subject: [PATCH] Updated to WiX 3.0.4917.0 git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3761 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- data/schemas/firewall.xsd | 6 +- data/schemas/iis.xsd | 27 +++- data/schemas/netfx.xsd | 6 +- data/schemas/util.xsd | 62 +++++++-- data/schemas/wix.xsd | 281 ++++++++++++++++++++++++++++++++++++-- 5 files changed, 353 insertions(+), 29 deletions(-) diff --git a/data/schemas/firewall.xsd b/data/schemas/firewall.xsd index f111dfec20..e9f8b7ae87 100644 --- a/data/schemas/firewall.xsd +++ b/data/schemas/firewall.xsd @@ -82,7 +82,7 @@ - + Port to allow through the firewall for this exception. If you use Port, you @@ -96,15 +96,13 @@ IP protocol used for this firewall exception. If not specified, "tcp" is assumed. If you use Protocol, you must also specify Port and you cannot - also use File or Program. Note that using "any" requires Windows Firewall - with Advanced Security on Windows Vista and will fail on Windows XP. + also use File or Program. - diff --git a/data/schemas/iis.xsd b/data/schemas/iis.xsd index 20ba99b137..cd0911faf9 100644 --- a/data/schemas/iis.xsd +++ b/data/schemas/iis.xsd @@ -431,6 +431,7 @@ Used to install and unintall certificates. + @@ -740,7 +741,22 @@ - For IP address "All Unassigned", do not specify this attribute or specify its value as "*". + + The IP address to locate an existing WebSite or create a new WebSite. When the WebAddress is part of a WebSite element + used to locate an existing web site the following rules are used: + + When this attribute is not specified only the “All Unassigned” IP address will be located. + When this attribute is explicitly specified only the specified IP address will be located. + When this attribute has the value “*” then any IP address including the “All Unassigned” IP address will be located + + When the WebAddress is part of a WebSite element used to create a new web site the following rules are used: + + When this attribute is not specified or the value is "*" the "All Unassigned" IP address will be used. + When this attribute is explicitly specified the IP address will use that value. + + The IP attribute can contain a formatted string that is processed at install time to insert the values of properties using + [PropertyName] syntax. + @@ -918,7 +934,14 @@ - Optional attribute to directly specify the site id of the WebSite. Use this to ensure all web sites in a web garden get the same site id. Be sure the site id is unique. Must be a number or a formatted value that resolves to a number or blank. + + Optional attribute to directly specify the site id of the WebSite. Use this to ensure all web + sites in a web garden get the same site id. If a number is provided, the site id must be unique + on all target machines. If "*" is used, the Description attribute will be hashed to create a unique + value for the site id. This value must be a positive number or a "*" or a formatted value that resolves + to "-1" (for the same behavior as "*") or a positive number or blank. If this attribute is absent then + the web site will be located using the WebAddress element associated with the web site. + diff --git a/data/schemas/netfx.xsd b/data/schemas/netfx.xsd index 01fb3c1d52..405f61cfd9 100644 --- a/data/schemas/netfx.xsd +++ b/data/schemas/netfx.xsd @@ -51,9 +51,9 @@ The identifier of the directory to use for locating dependent assemblies. - For DLL assemblies and assemblies installed to the GAC, this attribute - should be set to the directory of the application which loads this assembly. - For EXE assemblies, this attribute does not need to be set because NGen + For DLL assemblies and assemblies installed to the Global Assembly Cache (GAC), + this attribute should be set to the directory of the application which loads this + assembly. For EXE assemblies, this attribute does not need to be set because NGen will use the directory of the assembly file by default. diff --git a/data/schemas/util.xsd b/data/schemas/util.xsd index 20ae911b68..8b972637a3 100644 --- a/data/schemas/util.xsd +++ b/data/schemas/util.xsd @@ -124,6 +124,13 @@ + + + + Marks the EventSource registry as the key path of the component it belongs to. + + + Name of the event source's log. @@ -291,12 +298,28 @@ - Group for all kinds of things + + Finds user groups on the local machine or specified Active Directory domain. The local machine will be + searched for the group first then fallback to looking in Active Directory. This element is not capable + of creating new groups but can be used to add new or existing users to an existing group. + - - - + + + Unique identifier in your installation package for this group. + + + + + A Formatted string that contains the name of the group to be found. + + + + + An optional Formatted string that specifies the domain for the group. + + @@ -460,6 +483,7 @@ + Used to install Perfmon counters. @@ -657,6 +681,8 @@ Service configuration information for failure actions. + + Nesting a ServiceConfig element under a ServiceInstall element will result in the service being installed to be configured. @@ -751,19 +777,33 @@ + + A Formatted string that contains the name of the user account. + + + A Formatted string that contains the local machine or Active Directory domain for the user. + Usually a Property that is passed in on the command-line to keep it more secure. - - + + + The account's password never expires. Equivalent to UF_DONT_EXPIRE_PASSWD. + + + + + The user cannot change the account's password. Equivalent to UF_PASSWD_CANT_CHANGE. + + - Indicates whether the user account should be left behind on uninstall. + Indicates whether the user account should be removed or left behind on uninstall. @@ -786,7 +826,11 @@ Indicates whether the user must change their password on their first login. - + + + The account is disabled. Equivalent to UF_ACCOUNTDISABLE. + + Indicates whether or not to create the user. User creation can be skipped if all that is desired is to join a user to groups. @@ -812,7 +856,7 @@ - The XPath of the element to be modified. Note that this is a formatted field and therefore, square brackets in the XPath must be escapted. + The XPath of the element to be modified. Note that this is a formatted field and therefore, square brackets in the XPath must be escaped. diff --git a/data/schemas/wix.xsd b/data/schemas/wix.xsd index f6860af577..a7ea0c6c8d 100644 --- a/data/schemas/wix.xsd +++ b/data/schemas/wix.xsd @@ -2415,9 +2415,10 @@ - + - + + Unique identifier for the shortcut. This value will serve as the primary key for the row. @@ -2581,6 +2582,27 @@ + + + + + + + Property values for a shortcut. + + + + Unique identifier for MsiShortcutProperty table. If omitted, a stable identifier will be generated from the parent shortcut identifier and Key value. + + + Sets a default value for the property. The value will be overwritten if the Property is used for a search. + + + Sets a default value for the property. The value will be overwritten if the Property is used for a search. + + + + @@ -2662,6 +2684,41 @@ + + + + Sets ACLs on File, Registry, or CreateFolder. When under a Registry element, this cannot be used + if the Action attribute's value is remove or removeKeyOnInstall. This element is only available + when installing with MSI 5.0. For downlevel support, see the PermissionEx element from the + WixUtilExtension. + + + + + + + + + + Optional condition that controls whether the permissions are applied. + + + + + + + Primary key used to identify this particular entry. If this is not specified the parent element's Id attribute + will be used instead. + + + + + Security descriptor to apply to parent object. + + + + + @@ -2790,6 +2847,9 @@ Used to configure the ACLs for this file. + + Can also configure the ACLs for this file. + Used to create a duplicate of this file elsewhere. @@ -2919,7 +2979,7 @@ Specifies if this File is a Win32 Assembly or .NET Assembly that needs to be installed into the - Global Assembly Cache. If the value is '.net' or 'win32', this file must also be the key path of the Component. + Global Assembly Cache (GAC). If the value is '.net' or 'win32', this file must also be the key path of the Component. @@ -2962,7 +3022,7 @@ Specifies the file identifier of the application file. This assembly will be isolated to the same directory as the application file. - If this attribute is absent, the assembly will be installed to the Global Assembly Cache. + If this attribute is absent, the assembly will be installed to the Global Assembly Cache (GAC). This attribute may only be specified if the Assembly attribute is set to '.net' or 'win32'. @@ -3006,7 +3066,7 @@ Specifies the Media this File should be sourced on. This attribute overrides the default DiskId attribute from the parent Component element. If no DiskId attribute is specifed, the default is "1". - Specifies the path to the File in the build process. This attribute must be set if no source information can be gathered from parent directories. + Specifies the path to the File in the build process. Overrides default source path set by parent directories and Name attribute. This attribute must be set if no source information can be gathered from parent directories. For more information, see Specifying source files. @@ -3072,6 +3132,9 @@ ACL permission + + Can also configure the ACLs for this registry key. + @@ -3158,6 +3221,9 @@ + + Can also configure the ACLs for this registry value. + @@ -3422,6 +3488,9 @@ + + Can also configure the ACLs for this registry key. + @@ -3769,6 +3838,9 @@ ACL permission + + Can also configure the ACLs for this folder. + @@ -4486,8 +4558,12 @@ The Class identifier (CLSID) of a COM server. - - The server context(s) for this server. + + + The server context(s) for this COM server. This attribute is optional for VB6 libraries that are marked "PublicNotCreateable". + Class elements marked Advertised must specify at least one server context. It is most common for there to be a single value + for the Context attribute. + @@ -4659,6 +4735,9 @@ Name for COM Interface. + + Identifies the interface from which the current interface is derived. + GUID CLSID for proxy stub to COM Interface. @@ -4741,6 +4820,8 @@ ordered list of dependencies when installing services + + @@ -4750,8 +4831,11 @@ - - Unique identifier for this service. + + + Unique identifier for this service configuration. This value will default to the Name attribute if not + specified. + This column is the string that gives the service name to install. @@ -5015,6 +5099,177 @@ + + + + Privilege required by service configured by ServiceConfig parent. Valid values are a privilege constant or a + Formatted property that resolves to a privilege constant. + + + + + + + + + + + Configures a service being installed or one that already exists. + + + + + + + + + List of privileges to apply to service. + + + + + + Unique identifier for this service configuration. This value will default to the ServiceName attribute if not + specified. + + + + + This attribute specifies whether an auto-start service should delay its start until after all other auto-start + services. This attribute only affects auto-start services. Allowed values are "yes", "no" or a Formatted property that + resolves to "1" (for "yes") or "0" (for "no"). If this attribute is not present the setting is not configured. + + + + + This attribute specifies when failure actions should be applied. Allowed values are "failedToStop", "failedToStopOrReturnedError" + or a Formatted property that resolves to "1" (for "failedToStopOrReturnedError") or "0" (for "failedToStop"). If this attribute + is not present the setting is not configured. + + + + + This attribute specifies time in milliseconds that the Service Control Manager (SCM) waits after notifying the service of a system + shutdown. If this attribute is not present the default value, 3 minutes, is used. + + + + + Specifies whether to configure the service when the parent Component is installed. This attribute may be combined with OnReinstall + and OnUninstall. + + + + + Specifies whether to configure the service when the parent Component is reinstalled. This attribute may be combined with OnInstall + and OnUninstall. + + + + + Specifies whether to configure the service when the parent Component is uninstalled. This attribute may be combined with OnInstall + and OnReinstall. + + + + + Specifies the name of the service to configure. This value will default to the ServiceInstall/@Name attribute when nested under + a ServiceInstall element. + + + + + Specifies the service SID to apply to the service. Valid values are "none", "restricted", "unrestricted" or a Formatted property + that resolves to "0" (for "none"), "3" (for "restricted") or "1" (for "unrestricted"). If this attribute is not present the + setting is not configured. + + + + + + + Failure action for a ServiceConfigFailureActions element. + + + + Specifies the action to take when the service fails. Valid values are "none", "restartComputer", "restartService", "runCommand" or a Formatted property + that resolves to "0" (for "none"), "1" (for "restartService"), "2" (for "restartComputer") or "3" (for "runCommand"). + + + + + Specifies the time in milliseconds to wait before performing the value from the Action attribute. + + + + + + + + + Configures the failure actions for a service being installed or one that already exists. + + + + + + + + + Ordered list of failure actions to apply to service. + + + + + + Unique identifier for this service configuration. This value will default to the ServiceName attribute if not + specified. + + + + + This attribute specifies command to execute when a "runCommand" failure action hit. If an empty string is provided it clears + the existing command. If this attribute is not present the setting is not changed. + + + + + Specifies whether to configure the service when the parent Component is installed. This attribute may be combined with OnReinstall + and OnUninstall. + + + + + Specifies whether to configure the service when the parent Component is reinstalled. This attribute may be combined with OnInstall + and OnUninstall. + + + + + Specifies whether to configure the service when the parent Component is uninstalled. This attribute may be combined with OnInstall + and OnReinstall. + + + + + Specifies the message to show for a reboot failure action. If an empty string is provided it clears any existing reboot message. If this + attribute is not present the setting is not changed. + + + + + Specifies the time in seconds to reset the failure count. If this attribute is not present the failure count will not be reset. + + + + + Specifies the name of the service to configure. This value will default to the ServiceInstall/@Name attribute when nested under + a ServiceInstall element. + + + + + @@ -5281,6 +5536,8 @@ + + @@ -5736,7 +5993,7 @@ - Used to set the file system source for this directory's child elements. + Used to set the file system source for this directory's child elements. For more information, see Specifying source files. @@ -5855,7 +6112,7 @@ - Used to set the file system source for this DirectoryRef's child elements. + Used to set the file system source for this DirectoryRef's child elements. For more information, see Specifying source files. @@ -8480,6 +8737,7 @@ If the Property attribute is specified, set the value of this attribute to the new value for the property. To set a property to null, do not set this attribute (the ControlEvent Argument column will be set to '{}'). Otherwise, this attribute's value should be the argument for the event specified in the Event attribute. + If the event doesn't take an attribute, a common value to use is "0". @@ -9300,6 +9558,7 @@ +