Menu
▾
▴
[WiX-commits] wix/src/wix/Xsd wix.xsd,1.69,1.70
|
From: Rob M. <ro...@us...> - 2008-06-27 07:03:40
|
Update of /cvsroot/wix/wix/src/wix/Xsd In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12321/src/wix/Xsd Modified Files: wix.xsd Log Message: WixBuild: Version 3.0.4220.0 MiCarls: Also allow heat to harvest embedded typelibs as non-admin on Vista BobArnso: Change FileVersionFromString to allow "partial" versions (e.g., 1.2 instead of 1.2.3.4). CAraman: Fixes for compiling at /W4 /WX, and annotations for static analysis. AaronSte: SFBUG:1986923 - do not display modal dialogs at the top of the screen in WixUI. SFBUG:2000147 - provide additional Install/Repair/Uninstall control in WixUI to prevent displaying ElevationShield in per-user MSIs. NeilE: Added two new how-to topics to the documentation, one for installing .NET Framework via a bootstrapper, and a second on launching the installed application after setup is complete. AaronSte: Adding more detail to the File element documentation in wix.xsd. Fixing several broken links in wix.xsd. RobMen: SFBUG:1897640 - give the WixVariableResolver a localizer to handle cases where Outputs are being saved with loc variables in file paths. AaronSte: Adding a topic to wix.chm for WixFailWhenDeferred custom action. a-broge: SFBUG:1967749 - Fix light.exe validation failing builds on Vista systems. MiCarls: Fix a number of FXCop issues in various parts of the toolset. BobArnso: - Fixed calling convention of Wow64 functions in xmlutil. - Added XmlReportParseError to provide details about parse errors. Index: wix.xsd =================================================================== RCS file: /cvsroot/wix/wix/src/wix/Xsd/wix.xsd,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** wix.xsd 18 Jun 2008 09:00:02 -0000 1.69 --- wix.xsd 27 Jun 2008 07:03:29 -0000 1.70 *************** *** 2325,2335 **** </xs:attribute> <xs:attribute name="Admin" type="YesNoType"> ! <xs:annotation><xs:documentation>Denotes that the Property is saved during <html:a href='http://msdn.microsoft.com/library/msi/setup/administrative_installation.asp'>admininistrative installation</html:a>. See the <html:a href='http://msdn.microsoft.com/library/msi/setup/adminproperties.asp'>AdminProperties Property</html:a> for more information.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="Secure" type="YesNoType"> ! <xs:annotation><xs:documentation>Denotes that the Property can be passed to the server side when doing a managed installation with elevated privileges. See the <html:a href='http://msdn.microsoft.com/library/msi/setup/securecustomproperties_property.asp'>SecureCustomProperties Property</html:a> for more information.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="Hidden" type="YesNoType"> ! <xs:annotation><xs:documentation>Denotes that the Property is not logged during installation. See the <html:a href='http://msdn.microsoft.com/library/msi/setup/msihiddenproperties_property.asp'>MsiHiddenProperties Property</html:a> for more information.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="SuppressModularization" type="YesNoType"> --- 2325,2335 ---- </xs:attribute> <xs:attribute name="Admin" type="YesNoType"> ! <xs:annotation><xs:documentation>Denotes that the Property is saved during <html:a href='http://msdn.microsoft.com/library/aa367541.aspx' target='_blank'>admininistrative installation</html:a>. See the <html:a href='http://msdn.microsoft.com/library/aa367542.aspx' target='_blank'>AdminProperties Property</html:a> for more information.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="Secure" type="YesNoType"> ! <xs:annotation><xs:documentation>Denotes that the Property can be passed to the server side when doing a managed installation with elevated privileges. See the <html:a href='http://msdn.microsoft.com/library/aa371571.aspx' target='_blank'>SecureCustomProperties Property</html:a> for more information.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="Hidden" type="YesNoType"> ! <xs:annotation><xs:documentation>Denotes that the Property is not logged during installation. See the <html:a href='http://msdn.microsoft.com/library/aa370308.aspx' target='_blank'>MsiHiddenProperties Property</html:a> for more information.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="SuppressModularization" type="YesNoType"> *************** *** 2819,2823 **** </xs:attribute> <xs:attribute name="KeyPath" type="YesNoType"> ! <xs:annotation><xs:documentation>Set yes to force this File to be key path for parent Component.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="ShortName" type="ShortFileNameType"> --- 2819,2823 ---- </xs:attribute> <xs:attribute name="KeyPath" type="YesNoType"> ! <xs:annotation><xs:documentation>Set to yes in order to force this file to be the key path for the parent component.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="ShortName" type="ShortFileNameType"> *************** *** 2862,2875 **** </xs:attribute> <xs:attribute name="BindPath" type="xs:string"> ! <xs:annotation><xs:documentation>generates BindImage table row, value my be empty string</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="SelfRegCost" type="xs:integer"> ! <xs:annotation><xs:documentation>generates SelfReg table row</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="TrueType" type="YesNoType"> ! <xs:annotation><xs:documentation>generates entries in Font table with no FontTitle</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="FontTitle" type="xs:string"> ! <xs:annotation><xs:documentation>generates entries in Font table with the FontTitle</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="DefaultLanguage" type="xs:string"> --- 2862,2875 ---- </xs:attribute> <xs:attribute name="BindPath" type="xs:string"> ! <xs:annotation><xs:documentation>A list of paths, separated by semicolons, that represent the paths to be searched to find the imported DLLs. The list is usually a list of properties, with each property enclosed inside square brackets. The value may be set to an empty string. Including this attribute will cause an entry to be generated for the file in the BindImage table.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="SelfRegCost" type="xs:integer"> ! <xs:annotation><xs:documentation>The cost of registering the file in bytes. This must be a non-negative number. Including this attribute will cause an entry to be generated for the file in the SelfReg table.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="TrueType" type="YesNoType"> ! <xs:annotation><xs:documentation>Causes an entry to be generated for the file in the Font table with no FontTitle specified. This attribute is intended to be used to register the file as a TrueType font.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="FontTitle" type="xs:string"> ! <xs:annotation><xs:documentation>Causes an entry to be generated for the file in the Font table with the specified FontTitle. This attribute is intended to be used to register the file as a non-TrueType font.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="DefaultLanguage" type="xs:string"> *************** *** 3813,3818 **** <xs:documentation> Verb definition for an Extension. When advertised, this element creates a row in the ! <html:a href='http://msdn.microsoft.com/library/msi/setup/verb_table.asp'>Verb table</html:a>. ! When not advertised, this element creates the appropriate rows in <html:a href='http://msdn.microsoft.com/library/msi/setup/registry_table.asp'>Registry table</html:a>. </xs:documentation> <xs:appinfo> --- 3813,3818 ---- <xs:documentation> Verb definition for an Extension. When advertised, this element creates a row in the ! <html:a href='http://msdn.microsoft.com/library/aa372487.aspx' target='_blank'>Verb table</html:a>. ! When not advertised, this element creates the appropriate rows in <html:a href='http://msdn.microsoft.com/library/aa371168.aspx' target='_blank'>Registry table</html:a>. </xs:documentation> <xs:appinfo> *************** *** 4010,4014 **** <xs:attribute name="Advertise" type="YesNoType"/> <xs:attribute name="NoOpen" type="xs:string"> ! <xs:annotation><xs:documentation>Specifies that the associated ProgId should not be opened by users. The value is presented as a warning to users. An empty string is also valid for this attribute. See <html:a href='http://msdn.microsoft.com/library/dnwue/html/ch11c.asp'>the MSDN documentation</html:a> for more information.</xs:documentation></xs:annotation> </xs:attribute> </xs:complexType> --- 4010,4014 ---- <xs:attribute name="Advertise" type="YesNoType"/> <xs:attribute name="NoOpen" type="xs:string"> ! <xs:annotation><xs:documentation>Specifies that the associated ProgId should not be opened by users. The value is presented as a warning to users. An empty string is also valid for this attribute.</xs:documentation></xs:annotation> </xs:attribute> </xs:complexType> *************** *** 4608,4612 **** <xs:annotation><xs:documentation> Set this attribute's value to 'yes' to identify an object as an ActiveX Control. The default value is 'no'. - See <html:a href='http://msdn.microsoft.com/library/default.asp?url=/library/com/htm/reg_2fn0.asp'>http://msdn.microsoft.com/library/default.asp?url=/library/com/htm/reg_2fn0.asp</html:a> for more information. </xs:documentation></xs:annotation> </xs:attribute> --- 4608,4611 ---- *************** *** 5728,5732 **** Do not specify this attribute (or the LongName attribute) if this directory represents the same directory as the parent (see the Windows Installer SDK's ! <html:a href='http://msdn2.microsoft.com/library/Aa368295.aspx'>Directory table</html:a> topic for more information about the "." operator). --- 5727,5731 ---- Do not specify this attribute (or the LongName attribute) if this directory represents the same directory as the parent (see the Windows Installer SDK's ! <html:a href='http://msdn2.microsoft.com/library/Aa368295.aspx' target='_blank'>Directory table</html:a> topic for more information about the "." operator). *************** *** 6404,6411 **** <xs:documentation> Specifies a custom action to be added to the MSI CustomAction table. Various combinations of the attributes for this element ! correspond to different custom action types. For more information about custom actions see the MSDN documentation ! <html:a href="http://msdn.microsoft.com/library/msi/setup/summary_list_of_all_custom_action_types.asp"> ! http://msdn.microsoft.com/library/msi/setup/summary_list_of_all_custom_action_types.asp</html:a> ! for a "Summary List of All Custom Action Types". </xs:documentation> </xs:annotation> --- 6403,6409 ---- <xs:documentation> Specifies a custom action to be added to the MSI CustomAction table. Various combinations of the attributes for this element ! correspond to different custom action types. For more information about custom actions see the ! <html:a href="http://msdn.microsoft.com/library/aa372048.aspx" target="_blank"> ! Custom Action Types</html:a> topic on MSDN. </xs:documentation> </xs:annotation> *************** *** 6456,6461 **** given property to specify the path to the executable. Type 51 custom actions are often useful to pass values to a deferred custom action. ! See <html:a href="http://msdn.microsoft.com/library/msi/setup/obtaining_context_information_for_deferred_execution_custom_actions.asp"> ! http://msdn.microsoft.com/library/msi/setup/obtaining_context_information_for_deferred_execution_custom_actions.asp</html:a> for more information. </xs:documentation> --- 6454,6459 ---- given property to specify the path to the executable. Type 51 custom actions are often useful to pass values to a deferred custom action. ! See <html:a href="http://msdn.microsoft.com/library/aa370543.aspx" target="_blank"> ! http://msdn.microsoft.com/library/aa370543.aspx</html:a> for more information. </xs:documentation> *************** *** 6534,6538 **** type 51 custom action or with the Directory attribute to set a directory path in that table in a type 35 custom action. The value can be a literal value or derived from a ! Property element using the <html:a href='http://msdn.microsoft.com/library/msi/setup/formatted.asp'>Formatted</html:a> syntax. </xs:documentation> --- 6532,6536 ---- type 51 custom action or with the Directory attribute to set a directory path in that table in a type 35 custom action. The value can be a literal value or derived from a ! Property element using the <html:a href='http://msdn.microsoft.com/library/aa368609.aspx' target='_blank'>Formatted</html:a> syntax. </xs:documentation> *************** *** 6790,6794 **** <xs:documentation> This attribute specifies a string value to assign to the Directory. The value can be a literal value or derived from a ! Property element using the <html:a href='http://msdn.microsoft.com/library/msi/setup/formatted.asp'>Formatted</html:a> syntax. </xs:documentation> --- 6788,6792 ---- <xs:documentation> This attribute specifies a string value to assign to the Directory. The value can be a literal value or derived from a ! Property element using the <html:a href='http://msdn.microsoft.com/library/aa368609.aspx' target='_blank'>Formatted</html:a> syntax. </xs:documentation> *************** *** 6876,6880 **** <xs:documentation> This attribute specifies a string value to assign to the Property. The value can be a literal value or derived from a ! Property element using the <html:a href='http://msdn.microsoft.com/library/msi/setup/formatted.asp'>Formatted</html:a> syntax. </xs:documentation> --- 6874,6878 ---- <xs:documentation> This attribute specifies a string value to assign to the Property. The value can be a literal value or derived from a ! Property element using the <html:a href='http://msdn.microsoft.com/library/aa368609.aspx' target='_blank'>Formatted</html:a> syntax. </xs:documentation> |