diff --git a/data/schemas/gaming.xsd b/data/schemas/gaming.xsd index 5773b0ca4e..835209b1df 100644 --- a/data/schemas/gaming.xsd +++ b/data/schemas/gaming.xsd @@ -26,7 +26,7 @@ Registers this extension for the - rich saved games + rich saved games property handler on Windows Vista and later. @@ -40,7 +40,7 @@ Registers a game in Game Explorer on Windows Vista and later. The executable must have an embedded Game Definition File. For more information about Game Explorer and GDFs, see - The Windows Vista Game Explorer. + The Windows Vista Game Explorer. This registration is accomplished via custom action. On Windows XP, this element instead records the same information in the registry so that @@ -53,7 +53,7 @@ - Each game can support multiple play and support tasks that are shown in the Game Explorer context menu. + Each game can support multiple play and support tasks that are shown in the Game Explorer context menu. PlayTask and SupportTask are not needed when using when authoring the tasks in the GDF using ExtendedProperties\GameTasks available in Windows 7. At least one play task should be created using either PlayTask or the ExtendedProperties\GameTasks\Play in the GDF. @@ -81,9 +81,9 @@ Creates a shortcut to the parent File and registers it as a "play task" in Game Explorer. For more information, see - + Game Explorer Tasks - . + . PlayTask should not be used when authoring the tasks in the GDF using ExtendedProperties\GameTasks available in Windows 7. @@ -104,9 +104,9 @@ Creates an Internet shortcut and registers it as a "support task" in Game Explorer. For more information, see - + Game Explorer Tasks - . + . SupportTask should not be used when authoring the tasks in the GDF using ExtendedProperties\GameTasks available in Windows 7. diff --git a/data/schemas/iis.xsd b/data/schemas/iis.xsd index cd0911faf9..5f4a3bd299 100644 --- a/data/schemas/iis.xsd +++ b/data/schemas/iis.xsd @@ -428,7 +428,7 @@ - Used to install and unintall certificates. + Used to install and uninstall certificates. @@ -635,7 +635,7 @@ - Defines properties for a web application. These properties can be used for more than one application defined in a web site, directory, or vroot, by defining this element in a common location and referring to it by setting the WebApplication attribute of the WebSite, WebDir, and WebVirtualDir elements. + Defines properties for a web application. These properties can be used for more than one application defined in a web site or vroot, by defining this element in a common location and referring to it by setting the WebApplication attribute of the WebSite and WebVirtualDir elements. diff --git a/data/schemas/netfx.xsd b/data/schemas/netfx.xsd index 405f61cfd9..1c42388e31 100644 --- a/data/schemas/netfx.xsd +++ b/data/schemas/netfx.xsd @@ -24,7 +24,7 @@ Improves the performance of managed applications by creating native images. - Requires the .NET Framework 2.0 to be installed on the target machine since + Requires the .NET Framework 2.0 or newer to be installed on the target machine since it runs NGen. @@ -109,7 +109,7 @@ Attempt to generate native images only for the 32-bit version of the .NET Framework - on the target machine. If the 32-bit version of the .NET Framework 2.0 is not + on the target machine. If the 32-bit version of the .NET Framework 2.0 or newer is not present on the target machine, native image custom actions will not be scheduled. This is the default value. @@ -119,7 +119,7 @@ Attempt to generate native images only for the 64-bit version of the .NET Framework - on the target machine. If a 64-bit version of the .NET Framework 2.0 is not + on the target machine. If a 64-bit version of the .NET Framework 2.0 or newer is not present on the target machine, native image custom actions will not be scheduled. @@ -128,7 +128,7 @@ Attempt to generate native images for the 32-bit and 64-bit versions of the .NET Framework - on the target machine. If a version of the .NET Framework 2.0 is not present on the + on the target machine. If a version of the .NET Framework 2.0 or newer is not present on the target machine for a processor architecture, native image custom actions will not be scheduled for that processor architecture. diff --git a/data/schemas/sql.xsd b/data/schemas/sql.xsd index eb45169a93..a476dc02be 100644 --- a/data/schemas/sql.xsd +++ b/data/schemas/sql.xsd @@ -72,7 +72,7 @@ - The name of the database. If the name does not follow the SQL server "Rules for Regular Identifiers" (see MSDN) it must be surrounded by quotes or square brackets. Since this value can be formatted text, this means that if you choose to use square brackets you must use the MSI method for escaping square brackets, for example: [\[]blah[\]]. + The name of the database. If the name does not follow the SQL server "Rules for Regular Identifiers" (see MSDN) it must be surrounded by quotes or square brackets. Since this value can be formatted text, this means that if you choose to use square brackets you must use the MSI method for escaping square brackets, for example: [\[]blah[\]]. @@ -232,32 +232,32 @@ - Specifies to execute the script when the associated component is installed. + Specifies to execute the script when the associated component is installed. This attribute is mutually exclusive with the RollbackOnInstall, RollbackOnReinstall and RollbackOnUninstall attributes. - Specifies whether to execute the script when the associated component is reinstalled. Setting ExecuteOnInstall to yes does not imply ExecuteOnReinstall is set to yes. ExecuteOnReinstall must be set in addition to ExecuteOnInstall for it to be executed during both install and reinstall. + Specifies whether to execute the script when the associated component is reinstalled. Setting ExecuteOnInstall to yes does not imply ExecuteOnReinstall is set to yes. ExecuteOnReinstall must be set in addition to ExecuteOnInstall for it to be executed during both install and reinstall. This attribute is mutually exclusive with the RollbackOnInstall, RollbackOnReinstall and RollbackOnUninstall attributes. - Specifies to execute the script when the associated component is uninstalled. + Specifies to execute the script when the associated component is uninstalled. This attribute is mutually exclusive with the RollbackOnInstall, RollbackOnReinstall and RollbackOnUninstall attributes. - Specifies whether to execute the script on rollback if an attempt is made to install the associated component. + Specifies whether to execute the script on rollback if an attempt is made to install the associated component. This attribute is mutually exclusive with the ExecuteOnInstall, ExecuteOnReinstall and ExecuteOnUninstall attributes. - Specifies whether to execute the script on rollback if an attempt is made to reinstall the associated component. + Specifies whether to execute the script on rollback if an attempt is made to reinstall the associated component. This attribute is mutually exclusive with the ExecuteOnInstall, ExecuteOnReinstall and ExecuteOnUninstall attributes. - Specifies whether to execute the script on rollback if an attempt is made to uninstall the associated component. + Specifies whether to execute the script on rollback if an attempt is made to uninstall the associated component. This attribute is mutually exclusive with the ExecuteOnInstall, ExecuteOnReinstall and ExecuteOnUninstall attributes. @@ -291,34 +291,34 @@ - Specifies to execute the string when the associated component is installed. + Specifies to execute the string when the associated component is installed. This attribute is mutually exclusive with the RollbackOnInstall, RollbackOnReinstall and RollbackOnUninstall attributes. - Specifies whether to execute the string when the associated component is reinstalled. Setting ExecuteOnInstall to yes does not imply ExecuteOnReinstall is set to yes. ExecuteOnReinstall must be set in addition to ExecuteOnInstall for it to be executed during both install and reinstall. + Specifies whether to execute the string when the associated component is reinstalled. Setting ExecuteOnInstall to yes does not imply ExecuteOnReinstall is set to yes. ExecuteOnReinstall must be set in addition to ExecuteOnInstall for it to be executed during both install and reinstall. This attribute is mutually exclusive with the RollbackOnInstall, RollbackOnReinstall and RollbackOnUninstall attributes. - Specifies to execute the string when the associated component is uninstalled. + Specifies to execute the string when the associated component is uninstalled. This attribute is mutually exclusive with the RollbackOnInstall, RollbackOnReinstall and RollbackOnUninstall attributes. - Specifies whether to execute the string on rollback if an attempt is made to install the associated component. + Specifies whether to execute the string on rollback if an attempt is made to install the associated component. This attribute is mutually exclusive with the ExecuteOnInstall, ExecuteOnReinstall and ExecuteOnUninstall attributes. - Specifies whether to execute the string on rollback if an attempt is made to reinstall the associated component. + Specifies whether to execute the string on rollback if an attempt is made to reinstall the associated component. This attribute is mutually exclusive with the ExecuteOnInstall, ExecuteOnReinstall and ExecuteOnUninstall attributes. - Specifies whether to execute the string on rollback if an attempt is made to uninstall the associated component. + Specifies whether to execute the string on rollback if an attempt is made to uninstall the associated component. This attribute is mutually exclusive with the ExecuteOnInstall, ExecuteOnReinstall and ExecuteOnUninstall attributes. diff --git a/data/schemas/wix.xsd b/data/schemas/wix.xsd index a7ea0c6c8d..b75a6afdf9 100644 --- a/data/schemas/wix.xsd +++ b/data/schemas/wix.xsd @@ -488,6 +488,7 @@ + Extensibility point in the WiX XML Schema. Schema extensions can register additional @@ -589,21 +590,36 @@ - Sets information on the patch transform that determines to which product the transform applies and what errors should be ignored when applying the patch transform. + + Sets information in the patch transform that determines if the transform applies to an installed product and what errors should be ignored when applying the patch transform. + + + A transform contains the differences between the target product and the upgraded product. When a transform or a patch (which contains transforms) is applied, the following properties of the installed product are validated against the properties of the target product stored in a transform. + + ProductCode + ProductLanguage + ProductVersion + UpgradeCode + + Windows Installer simply validates that the ProductCode, ProductLanguage, and UpgradeCode of an installed product are equivalent to those propeties of the target product used to create the transform; however, the ProductVersion can be validated with a greater range of comparisons. + You can compare up to the first three fields of the ProductVersion. Changes to the fourth field are not validated and are useful for small updates. You can also choose how to compare the target ProductVersion used to create the transform with the installed ProductVersion. For example, while the default value of 'Equals' is recommended, if you wanted a minor upgrade patch to apply to the target ProductVersion and all older products with the same ProductCode, you would use 'LesserOrEqual'. + + + - Requires that the upgrade ProductCode match the target ProductCode. The default is 'yes'. + Requires that the installed ProductCode match the target ProductCode used to create the transform. The default is 'yes'. - Requires that the upgrade ProductLanguage match the target ProductLanguage. The default is 'no'. + Requires that the installed ProductLanguage match the target ProductLanguage used to create the transform. The default is 'no'. - Determines how many fields in the ProductVersion to check. The default is 'Update'. + Determines how many fields of the installed ProductVersion to compare. See remarks for more information. The default is 'Update'. @@ -627,33 +643,33 @@ - Determines how the target and upgrade ProductVersions are compared. The default is 'Equal'. + Determines how the installed ProductVersion is compared to the target ProductVersion used to create the transform. See remarks for more information. The default is 'Equal'. - Upgrade ProductVersion < target ProductVersion. + Installed ProductVersion < target ProductVersion. - Upgrade ProductVersion <= target ProductVersion. + Installed ProductVersion <= target ProductVersion. - Upgrade ProductVersion = target ProductVersion. + Installed ProductVersion = target ProductVersion. - Upgrade ProductVersion >= target ProductVersion. + Installed ProductVersion >= target ProductVersion. - Upgrade ProductVersion > target ProductVersion. + Installed ProductVersion > target ProductVersion. @@ -661,7 +677,7 @@ - Requires that the upgrade UpgradeCode match the target UpgradeCode. The default is 'yes'. + Requires that the installed UpgradeCode match the target UpgradeCode used to create the transform. The default is 'yes'. @@ -971,7 +987,7 @@ with Windows Installer 3.1. - + A URL that provides information specific to this patch. In Add/Remove Programs from XP SP2 on. @@ -1022,17 +1038,41 @@ + + + + The product codes for products that can accept the patch. + + + + + + + + + Whether to replace the product codes that can accept the patch from the target packages with the child elements. + + + + + - A product code for a product that may receive this patch (or '*' for all products). + A product code for a product that can accept the patch. + + + When using the PatchCreation element, if the Id attribute value is '*' or this element is not authored, the product codes of all products referenced by the TargetImages element are used. + When using the Patch element, the Id attribute value must not be '*'. Use the TargetProductCodes/@Replace attribute instead. + + - The product code for a product that can receive this patch (or '*' for all products). + The product code for a product that can accept the patch. This can be '*'. See remarks for more information. @@ -1872,12 +1912,15 @@ How To: Check the version number of a file during installation + + When the parent DirectorySearch/@Depth attribute is greater than 1, the FileSearch/@Id attribute must be absent or the same as the parent DirectorySearch/@Id attribute value, unless the parent DirectorySearch/@AssignToProperty attribute value is 'yes'. + Searches for file and assigns to fullpath value of parent Property - Unique identifier for the file search and external key into the Signature table. If the parent DirectorySearch/@Depth is greater than 1, this must either be set to the parent DirectorySearch/@Id or absent. + Unique identifier for the file search and external key into the Signature table. If this attribute value is not set then the parent element's @Id attribute is used. @@ -1938,7 +1981,7 @@ - If you intend to use a FileSearchRef to reference a FileSearch but they have different parent elements, you must use a FileSearch instead of a FileSearchRef. This is because the DrLocator table in an installer package is keyed on the Id, Parent, and Path. A file is associated with its parent directory in the DrLocator table. When a FileSearch and a FileSearchRef element are under different parent elements, the Parent will automatically be different so a FileSearchRef will not have a FileSearch to reference. + A reference to another FileSearch element must reference the same Id and the same Parent Id. If any of these attribute values are different you must instead use a FileSearch element. References an existing FileSearch element. @@ -1959,6 +2002,12 @@ How To: Check the version number of a file during installation + How To: Reference another DirectorySearch element + How To: Get the parent directory of a file search + + Use the AssignToProperty attribute to search for a file but set the outer property to the directory containing the file. When this attribute is set to 'yes', you may only nest a FileSearch element with a unique Id or define no child element. + When the parent DirectorySearch/@Depth attribute is greater than 1, the FileSearch/@Id attribute must be absent or the same as the parent DirectorySearch/@Id attribute value, unless the parent DirectorySearch/@AssignToProperty attribute value is 'yes'. + Searches for directory and assigns to value of parent Property. @@ -1979,13 +2028,12 @@ - Depth below the path that the installer searches for the file or directory specified by the search. - If this value is not specified, the depth is assumed to be 0. + Depth below the path that the installer searches for the file or directory specified by the search. See remarks for more information. - Set the result of this search to the value of the outer Property. + Set the value of the outer Property to the result of this search. See remarks for more information. @@ -1996,8 +2044,9 @@ + How To: Reference another DirectorySearch element - If you intend to use a DirectorySearchRef to reference a DirectorySearch but they have different parent elements, you must use a DirectorySearch instead of a DirectorySearchRef. This is because the DrLocator table in an installer package is keyed on the Id, Parent, and Path. When a DirectorySearch and a DirectorySearchRef element are under different parent elements, the Parent will automatically be different so a DirectorySearchRef will not have a DirectorySearch to reference. + A reference to another DirectorySearch element must reference the same Id, the same Parent Id, and the same Path. If any of these attribute values are different you must instead use a DirectorySearch element. References an existing DirectorySearch element. @@ -2019,9 +2068,6 @@ Path on the user's system. Either absolute, or relative to containing directories. - - Set the result of this search to the value of the outer Property. - @@ -2159,6 +2205,15 @@ How To: Read a registry entry during installation + + + When the Type attribute value is 'directory' the registry value must specify the path to a directory excluding the file name. + When the Type attribute value is 'file' the registry value must specify the path to a file including the file name; + however, if there is no child FileSearch element the parent directory of the file is returned. The FileSearch element requires + that you author the name of the file you are searching for. If you do not know the file name + you must set the Type attribute to 'raw' to return the full file path including the file name. + + Searches for file, directory or registry key and assigns to value of parent Property @@ -2217,7 +2272,7 @@ - The value must be 'file' if the last child is a FileSearch element and must be 'directory' if last child is a DirectorySearch element. + The value must be 'file' if the child is a FileSearch element, and must be 'directory' if child is a DirectorySearch element. @@ -2225,26 +2280,33 @@ - Sets a directory path from the registry value. + The registry value contains the path to a directory. - Sets a file path from the registry value. + The registry value contains the path to a file. To return the full file path you must add a FileSearch element as a child of this element; otherwise, the parent directory of the file path is returned. - Sets the raw value from the registry value. Please note that this value will contain a prefix as follows: - DWORD: Starts with '#' optionally followed by '+' or '-'. - REG_BINARY: Starts with '#x' and the installer converts and saves each hexadecimal digit (nibble) as an ASCII character prefixed by '#x'. - REG_EXPAND_SZ: Starts with '#%'. - REG_MULTI_SZ: Starts with '[~]' and ends with '[~]'. - REG_SZ: No prefix, but if the first character of the registry value is '#', the installer escapes the character by prefixing it with another '#'. + Sets the raw value from the registry value. Please note that this value will contain a prefix as follows: + + DWORD + Starts with '#' optionally followed by '+' or '-'. + REG_BINARY + Starts with '#x' and the installer converts and saves each hexadecimal digit (nibble) as an ASCII character prefixed by '#x'. + REG_EXPAND_SZ + Starts with '#%'. + REG_MULTI_SZ + Starts with '[~]' and ends with '[~]'. + REG_SZ + No prefix, but if the first character of the registry value is '#', the installer escapes the character by prefixing it with another '#'. + @@ -2588,17 +2650,17 @@ - Property values for a shortcut. + Property values for a shortcut. This element's functionality is available starting with MSI 5.0. 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. + A formatted string identifying the property to be set. - Sets a default value for the property. The value will be overwritten if the Property is used for a search. + A formatted string supplying the value of the property. @@ -3063,7 +3125,16 @@ - 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". + + The value of this attribute should correspond to the Id attribute of a Media + element authored elsewhere. By creating this connection between a file and + its media, you set the packaging options to the values specified in the Media + element (values such as compression level, cab embedding, etc...). Specifying + the DiskId attribute on the File element overrides the default DiskId attribute + from the parent Component element. If no DiskId attribute is specified, + the default is "1". This DiskId attribute is ignored when creating a merge module + because merge modules do not have media. + 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. @@ -4098,8 +4169,8 @@ - - Version-independent ProgId must be child element of actual ProgId. Nesting further ProgId elements within the Version-independent ProgId is disallowed. + + The version-independent ProgId must be the first child element of actual ProgId. Nesting other ProgId elements within the Version-independent ProgId will create COM+ aliases, see http://support.microsoft.com/kb/305745 for more information. Extensions that refer to this ProgId @@ -4347,6 +4418,25 @@ + Id/Context/ForeignServer + + + In General + + [HKCR\CLSID\{Id}\Context1] + @="ForeignServer" + [HKCR\CLSID\{Id}\Context2] + @="ForeignServer" + + Specific Example + + [HKCR\CLSID\{01234567-89AB-CDEF-0123-456789ABCDEF}\LocalServer] + @="mscoree.dll" + [HKCR\CLSID\{01234567-89AB-CDEF-0123-456789ABCDEF}\LocalServer32] + @="mscoree.dll" + + + AppId @@ -4689,9 +4779,16 @@ Specifies the CLSID may be programmable. + + + May only be specified if the value of the Advertise attribute is "no" and Server has not been specified. In addition, it may only + be used when the Class element is directly under the Component element. The value can be + that of an registry type (REG_SZ). This attribute should be used to specify foreign servers, such as mscoree.dll if needed. + + - May only be specified if the value of the Advertise attribute is "no". File Id of the + May only be specified if the value of the Advertise attribute is "no" and the ForeignServer attribute is not specified. File Id of the COM server file. If this element is nested under a File element, this value defaults to the value of the parent File/@Id. @@ -4817,6 +4914,9 @@ + + Configures the ACLs for this service. + ordered list of dependencies when installing services @@ -5114,7 +5214,7 @@ - Configures a service being installed or one that already exists. + Configures a service being installed or one that already exists. This element's functionality is available starting with MSI 5.0. @@ -5207,7 +5307,7 @@ - Configures the failure actions for a service being installed or one that already exists. + Configures the failure actions for a service being installed or one that already exists. This element's functionality is available starting with MSI 5.0. @@ -5584,11 +5684,10 @@ - This attribute must be set either on a Component element or all of its children File - elements. The value of this attribute should correspond to the Id attribute of a - Media element authored elsewhere. By creating this connection between a component (or - particular files), you set the packaging options to the values specified in the Media - element (values such as compression level, cab embedding, etc...). + This attribute provides a default DiskId attribute for all child File elements. Specifying + the DiskId on a Component element will override any DiskId attributes set by parent Directory + or DirectoryRef elements. See the File element's DiskId attribute for more information about + the purpose of the DiskId. @@ -5883,7 +5982,7 @@ The value of this attribute should correspond to the Id attribute of a - Media element authored elsewhere. By creating this connection between the Merge Module and Media + Media element authored elsewhere. By creating this connection between the merge module and Media element, you set the packaging options to the values specified in the Media element (values such as compression level, cab embedding, etc...). @@ -5984,11 +6083,9 @@ Sets the default disk identifier for the files contained in this directory. - This attribute must be set on a Component, Directory, or DirectoryRef element or all of its children File - elements, else the default disk identifier of 1 is assumed. The value of this attribute should correspond to the Id attribute of a - Media element authored elsewhere. By creating this connection between a component (or - particular files), you set the packaging options to the values specified in the Media - element (values such as compression level, cab embedding, etc...). + This attribute's value may be overridden by a child Component, Directory, + Merge or File element. See the File or Merge elements' DiskId attribute for + more information. @@ -6052,7 +6149,7 @@ The name of the directory on the source media. - If this attribute is note specified, the Windows Installer will default to the Name attribute. + If this attribute is not specified, Windows Installer will default to the Name attribute. In prior versions of the WiX toolset, this attribute specified the short source directory name. This attribute's value may now be either a short or long directory name. @@ -6103,11 +6200,9 @@ Sets the default disk identifier for the files contained in this directory. - This attribute must be set on a Component, Directory, or DirectoryRef element or all of its children File - elements, else the default disk identifier of 1 is assumed. The value of this attribute should correspond to the Id attribute of a - Media element authored elsewhere. By creating this connection between a component (or - particular files), you set the packaging options to the values specified in the Media - element (values such as compression level, cab embedding, etc...). + This attribute's value may be overridden by a child Component, Directory, + Merge or File element. See the File or Merge elements' DiskId attribute for + more information. @@ -6282,7 +6377,7 @@ - Prevents this feature from being advertised by settting the msidbFeatureAttributesDisallowAdvertise attribute. + Prevents this feature from being advertised by setting the msidbFeatureAttributesDisallowAdvertise attribute. @@ -8517,9 +8612,12 @@ - + - Unique identifier for embedded UI. + + Unique identifier for embedded UI.If this attribute is not specified the Name attribute or the file name + portion of the SourceFile attribute will be used. + @@ -8602,12 +8700,23 @@ Embedded UI will not recieve any INSTALLLOGMODE_RMFILESINUSE messages. + + + Embedded UI will not recieve any INSTALLLOGMODE_INSTALLSTART messages. + + + + + Embedded UI will not recieve any INSTALLLOGMODE_INSTALLEND messages. + + The name for the embedded UI DLL when it is extracted from the Product and executed. (Windows Installer does not support the typical short filename and long filename combination for embedded UI files as it - does for other kinds of files.) If this attribute is not specified the Id attribute will be used. + does for other kinds of files.) If this attribute is not specified the file name portion of the SourceFile + attribute will be used. @@ -8837,7 +8946,7 @@ Combined with the Dialog Id to make up the primary key of the Control table. - The type of the control. Could be one of the following: Billboard, Bitmap, CheckBox, ComboBox, DirectoryCombo, DirectoryList, Edit, GroupBox, Icon, Line, ListBox, ListView, MaskedEdit, PathEdit, ProgressBar, PushButton, RadioButtonGroup, ScrollableText, SelectionTree, Text, VolumeCostList, VolumeSelectCombo + The type of the control. Could be one of the following: Billboard, Bitmap, CheckBox, ComboBox, DirectoryCombo, DirectoryList, Edit, GroupBox, Hyperlink, Icon, Line, ListBox, ListView, MaskedEdit, PathEdit, ProgressBar, PushButton, RadioButtonGroup, ScrollableText, SelectionTree, Text, VolumeCostList, VolumeSelectCombo Horizontal coordinate of the upper-left corner of the rectangular boundary of the control. This must be a non-negative number. @@ -8866,6 +8975,9 @@ This attribute is only valid for CheckBox Controls. When set, the linked Property will be set to this value when the check box is checked. + + This attribute is only valid for CheckBox controls. The value is the name of a Property that was already used as the Property for another CheckBox control. The Property attribute cannot be specified. The attribute exists to support multiple checkboxes on different dialogs being tied to the same property. + Set this attribute to "yes" to cause this Control to be skipped in the tab sequence. diff --git a/src/Tools/wix/Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll b/src/Tools/wix/Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll index 0a43f79e3c..3a58e28194 100755 Binary files a/src/Tools/wix/Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll and b/src/Tools/wix/Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll differ diff --git a/src/Tools/wix/WixComPlusExtension.dll b/src/Tools/wix/WixComPlusExtension.dll index d45bdfa208..4cde8e652b 100755 Binary files a/src/Tools/wix/WixComPlusExtension.dll and b/src/Tools/wix/WixComPlusExtension.dll differ diff --git a/src/Tools/wix/WixCop.exe b/src/Tools/wix/WixCop.exe index b1c23eec33..b7d2ed0054 100755 Binary files a/src/Tools/wix/WixCop.exe and b/src/Tools/wix/WixCop.exe differ diff --git a/src/Tools/wix/WixDifxAppExtension.dll b/src/Tools/wix/WixDifxAppExtension.dll index baf9d24f8a..aa8b1c8bd9 100755 Binary files a/src/Tools/wix/WixDifxAppExtension.dll and b/src/Tools/wix/WixDifxAppExtension.dll differ diff --git a/src/Tools/wix/WixDirectXExtension.dll b/src/Tools/wix/WixDirectXExtension.dll index df89988258..0cd029b3f9 100755 Binary files a/src/Tools/wix/WixDirectXExtension.dll and b/src/Tools/wix/WixDirectXExtension.dll differ diff --git a/src/Tools/wix/WixFirewallExtension.dll b/src/Tools/wix/WixFirewallExtension.dll index 8e9cb343bc..0785a5fda6 100755 Binary files a/src/Tools/wix/WixFirewallExtension.dll and b/src/Tools/wix/WixFirewallExtension.dll differ diff --git a/src/Tools/wix/WixGamingExtension.dll b/src/Tools/wix/WixGamingExtension.dll index 30f6acad18..dba6bf110b 100755 Binary files a/src/Tools/wix/WixGamingExtension.dll and b/src/Tools/wix/WixGamingExtension.dll differ diff --git a/src/Tools/wix/WixIIsExtension.dll b/src/Tools/wix/WixIIsExtension.dll index 67c0fd11ed..33f2753d64 100755 Binary files a/src/Tools/wix/WixIIsExtension.dll and b/src/Tools/wix/WixIIsExtension.dll differ diff --git a/src/Tools/wix/WixIsolatedAppExtension.dll b/src/Tools/wix/WixIsolatedAppExtension.dll index a1e316ef20..94fdd6de54 100755 Binary files a/src/Tools/wix/WixIsolatedAppExtension.dll and b/src/Tools/wix/WixIsolatedAppExtension.dll differ diff --git a/src/Tools/wix/WixMsmqExtension.dll b/src/Tools/wix/WixMsmqExtension.dll index bb2cdfbb61..ce7bf5cf11 100755 Binary files a/src/Tools/wix/WixMsmqExtension.dll and b/src/Tools/wix/WixMsmqExtension.dll differ diff --git a/src/Tools/wix/WixNetFxExtension.dll b/src/Tools/wix/WixNetFxExtension.dll index e32244c9a6..7727c4b353 100755 Binary files a/src/Tools/wix/WixNetFxExtension.dll and b/src/Tools/wix/WixNetFxExtension.dll differ diff --git a/src/Tools/wix/WixOfficeExtension.dll b/src/Tools/wix/WixOfficeExtension.dll index 838ea52959..90c377e8bc 100755 Binary files a/src/Tools/wix/WixOfficeExtension.dll and b/src/Tools/wix/WixOfficeExtension.dll differ diff --git a/src/Tools/wix/WixPSExtension.dll b/src/Tools/wix/WixPSExtension.dll index 9bd47af192..d5ddfab539 100755 Binary files a/src/Tools/wix/WixPSExtension.dll and b/src/Tools/wix/WixPSExtension.dll differ diff --git a/src/Tools/wix/WixSqlExtension.dll b/src/Tools/wix/WixSqlExtension.dll index 607fe9555b..109a1f7916 100755 Binary files a/src/Tools/wix/WixSqlExtension.dll and b/src/Tools/wix/WixSqlExtension.dll differ diff --git a/src/Tools/wix/WixTasks.dll b/src/Tools/wix/WixTasks.dll index a56c075d5a..6b24a4260c 100755 Binary files a/src/Tools/wix/WixTasks.dll and b/src/Tools/wix/WixTasks.dll differ diff --git a/src/Tools/wix/WixUIExtension.dll b/src/Tools/wix/WixUIExtension.dll index 93b3a60b9e..c87592502f 100755 Binary files a/src/Tools/wix/WixUIExtension.dll and b/src/Tools/wix/WixUIExtension.dll differ diff --git a/src/Tools/wix/WixUtilExtension.dll b/src/Tools/wix/WixUtilExtension.dll index e569c7b894..3a640b1a40 100755 Binary files a/src/Tools/wix/WixUtilExtension.dll and b/src/Tools/wix/WixUtilExtension.dll differ diff --git a/src/Tools/wix/WixVSExtension.dll b/src/Tools/wix/WixVSExtension.dll index 88348f39b9..2582ad1907 100755 Binary files a/src/Tools/wix/WixVSExtension.dll and b/src/Tools/wix/WixVSExtension.dll differ diff --git a/src/Tools/wix/candle.exe b/src/Tools/wix/candle.exe index ecdb4c57e7..4249ea8610 100755 Binary files a/src/Tools/wix/candle.exe and b/src/Tools/wix/candle.exe differ diff --git a/src/Tools/wix/dark.exe b/src/Tools/wix/dark.exe index e2ed293b3b..99ce1c6015 100755 Binary files a/src/Tools/wix/dark.exe and b/src/Tools/wix/dark.exe differ diff --git a/src/Tools/wix/difxapp_x64.wixlib b/src/Tools/wix/difxapp_x64.wixlib index 82121deb7d..9fd9123072 100644 Binary files a/src/Tools/wix/difxapp_x64.wixlib and b/src/Tools/wix/difxapp_x64.wixlib differ diff --git a/src/Tools/wix/difxapp_x86.wixlib b/src/Tools/wix/difxapp_x86.wixlib index 25b5135d89..666510f289 100644 Binary files a/src/Tools/wix/difxapp_x86.wixlib and b/src/Tools/wix/difxapp_x86.wixlib differ diff --git a/src/Tools/wix/heat.exe b/src/Tools/wix/heat.exe index f56bed083d..8c3fb19e32 100755 Binary files a/src/Tools/wix/heat.exe and b/src/Tools/wix/heat.exe differ diff --git a/src/Tools/wix/light.exe b/src/Tools/wix/light.exe index c6a13179b9..43d13addb2 100755 Binary files a/src/Tools/wix/light.exe and b/src/Tools/wix/light.exe differ diff --git a/src/Tools/wix/lit.exe b/src/Tools/wix/lit.exe index ed9c42744e..1077575109 100755 Binary files a/src/Tools/wix/lit.exe and b/src/Tools/wix/lit.exe differ diff --git a/src/Tools/wix/melt.exe b/src/Tools/wix/melt.exe index 56f6f1b90d..e6e84db1ac 100755 Binary files a/src/Tools/wix/melt.exe and b/src/Tools/wix/melt.exe differ diff --git a/src/Tools/wix/pyro.exe b/src/Tools/wix/pyro.exe index d8caa733f1..78c8721af7 100755 Binary files a/src/Tools/wix/pyro.exe and b/src/Tools/wix/pyro.exe differ diff --git a/src/Tools/wix/smoke.exe b/src/Tools/wix/smoke.exe index 88a5a2bcd6..a2a9577d45 100755 Binary files a/src/Tools/wix/smoke.exe and b/src/Tools/wix/smoke.exe differ diff --git a/src/Tools/wix/torch.exe b/src/Tools/wix/torch.exe index 4e7390b97e..817ed57950 100755 Binary files a/src/Tools/wix/torch.exe and b/src/Tools/wix/torch.exe differ diff --git a/src/Tools/wix/wconsole.dll b/src/Tools/wix/wconsole.dll index 2c4139b1c9..cc413482b4 100755 Binary files a/src/Tools/wix/wconsole.dll and b/src/Tools/wix/wconsole.dll differ diff --git a/src/Tools/wix/winterop.dll b/src/Tools/wix/winterop.dll index cca786ee0d..46057e173e 100755 Binary files a/src/Tools/wix/winterop.dll and b/src/Tools/wix/winterop.dll differ diff --git a/src/Tools/wix/wix.dll b/src/Tools/wix/wix.dll index 87d1bca3ad..d2b389d55a 100755 Binary files a/src/Tools/wix/wix.dll and b/src/Tools/wix/wix.dll differ diff --git a/src/Tools/wix/wix.targets b/src/Tools/wix/wix.targets index aefdb483e1..e10d4a5d9b 100644 --- a/src/Tools/wix/wix.targets +++ b/src/Tools/wix/wix.targets @@ -57,6 +57,8 @@ Copyright (c) Microsoft Corporation. All rights reserved. + $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.0\Wix.targets + $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.0\WixTasks.dll $(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\WixTasks.dll @@ -86,9 +88,9 @@ Copyright (c) Microsoft Corporation. All rights reserved. - - - + + + @@ -103,6 +105,7 @@ Copyright (c) Microsoft Corporation. All rights reserved. + - - - - <_PleaseSetThisInProjectFile>Please set this in the project file before the <Import> of the wix.targets file. - <_OutputTypeDescription>The OutputType defines whether a Windows Installer package (.msi), merge module (.msm), or wix library (.wixlib) is being built. $(_PleaseSetThisInProjectFile) Possible values are 'Package', 'Module', and 'Library'. + <_OutputTypeDescription>The OutputType defines whether a Windows Installer package (.msi), PatchCreation (.pcp), merge module (.msm), or wix library (.wixlib) is being built. $(_PleaseSetThisInProjectFile) Possible values are 'Package', 'Module', and 'Library'. @@ -328,7 +327,7 @@ Copyright (c) Microsoft Corporation. All rights reserved. @@ -599,31 +598,28 @@ Copyright (c) Microsoft Corporation. All rights reserved. --> + + + $(ReferencePaths); + {HintPathFromItem}; + {RawFileName}; + $(WixExtDir) + + - - - - - - - - + + + - - - - - - - - - - - - + + + + - + @@ -1105,8 +1101,7 @@ Copyright (c) Microsoft Corporation. All rights reserved. HarvestProjects; Compile; Lib; - LinkUnlocalizedProject; - LinkLocalizedProject; + Link; _TimeStampAfterCompileAndLink; AfterCompileAndLink @@ -1145,6 +1140,10 @@ Copyright (c) Microsoft Corporation. All rights reserved. Name="_TimeStampBeforeCompileAndLink" Condition=" '$(RunPostBuildEvent)' == 'OnOutputUpdated' "> + + + + @@ -1243,6 +1242,7 @@ Copyright (c) Microsoft Corporation. All rights reserved. DefineConstants="$(DefineConstants);$(SolutionDefineConstants);$(ProjectDefineConstants);$(ProjectReferenceDefineConstants)" ExtensionDirectory="$(WixExtDir)" Extensions="@(_ResolvedWixExtensionPaths)" + FipsCompliant="$(FipsCompliant)" SuppressFilesVitalByDefault="$(SuppressFilesVitalByDefault)" PreprocessToStdOut="$(PreprocessToStdOut)" PreprocessToFile="$(PreprocessToFile)" @@ -1252,7 +1252,7 @@ Copyright (c) Microsoft Corporation. All rights reserved. OnlyValidateDocuments="$(OnlyValidateDocuments)" OutputFile="$(IntermediateOutputPath)%(Compile.Filename)$(IntermediateExt)" Pedantic="$(Pedantic)" - ReferencePaths="$(ReferencePath)" + ReferencePaths="$(ReferencePaths)" RunAsSeparateProcess="$(RunWixToolsOutOfProc)" ShowSourceTrace="$(ShowSourceTrace)" SuppressAllWarnings="$(CompilerSuppressAllWarnings)" @@ -1313,7 +1313,7 @@ Copyright (c) Microsoft Corporation. All rights reserved. NoLogo="$(LibNoLogo)" OutputFile="$(TargetPath)" Pedantic="$(LibPedantic)" - ReferencePaths="$(ReferencePath)" + ReferencePaths="$(ReferencePaths)" RunAsSeparateProcess="$(RunWixToolsOutOfProc)" SuppressAllWarnings="$(LibSuppressAllWarnings)" SuppressIntermediateFileVersionMatching="$(LibSuppressIntermediateFileVersionMatching)" @@ -1326,162 +1326,89 @@ Copyright (c) Microsoft Corporation. All rights reserved. - - - PrepareForBuild; - ResolveWixExtensionPaths - - + Determines the final list of culture groups to build based on either the Cultures property or + those specified in .wxl files. + + Culture groups specified in the Cultures property must be specified as a semi-colon + delimited list of groups, with comma-delimited cultures within a group. + For example: + en-US,en;en-GB,en + This will build 2 targets, outputing to en-US and en-GB sub-folders. Light will first look + for strings in the first culture (en-US or en-GB) then the second (en). + + Cultures of .wxl files will be used when the Culture property is not set. The culture of a + .wxl file is determined by the Culture attribute in the WixLocalization element in the file - + Sets the OutputFolder metadata on each culture group. In most cases this is the same as the + first culture in the culture group. When the Culture's property is unspecified and no .wxl + files are provided this is the same as the output directory. When the Culture's property + specifies a single culture group and no .wxl files are provided this is the same as the output + directory. - - - - + > - + - - - - + - - - - - - - - - - - - + Include="$(TargetDir)%(CultureGroup.OutputFolder)$(TargetName)$(TargetExt)"> + + + + + + + - - + Include="$(TargetDir)%(CultureGroup.OutputFolder)$(TargetName)$(TargetPdbExt)"> + - - - - + + + + - + PrepareForBuild; ResolveWixExtensionPaths; AssignCultures; - + + Outputs="$(TargetPath)" + DependsOnTargets="$(LinkDependsOn)" + Condition=" ('$(OutputType)' == 'Package' or '$(OutputType)' == 'PatchCreation' or '$(OutputType)' == 'Module')"> + WixVariables="$(WixVariables)" /> - - - - + @@ -1700,7 +1573,7 @@ Copyright (c) Microsoft Corporation. All rights reserved. DependsOnTargets="_CheckForCompileAndLinkOutputs"> - + @@ -1736,29 +1609,18 @@ Copyright (c) Microsoft Corporation. All rights reserved. - - - - - - - + + - - - - + + + - - - - + + + @@ -1847,7 +1709,7 @@ Copyright (c) Microsoft Corporation. All rights reserved. DependsOnTargets="$(CoreCleanDependsOn)"> - + @@ -1877,10 +1739,10 @@ Copyright (c) Microsoft Corporation. All rights reserved. - + - + @@ -1902,11 +1764,11 @@ Copyright (c) Microsoft Corporation. All rights reserved. - + @@ -2022,11 +1884,9 @@ Copyright (c) Microsoft Corporation. All rights reserved. - + - + Include="$(TargetPath)"> @@ -2052,11 +1912,9 @@ Copyright (c) Microsoft Corporation. All rights reserved. Outputs="@(DebugSymbolsProjectOutputGroupOutput)" DependsOnTargets="$(DebugSymbolsProjectOutputGroupDependsOn)"> - + - + Include="$(TargetPdbPath)"> diff --git a/src/Tools/wix/wui.dll b/src/Tools/wix/wui.dll index 5cf166c5c1..da9365108a 100755 Binary files a/src/Tools/wix/wui.dll and b/src/Tools/wix/wui.dll differ