From: Rob M. <ro...@us...> - 2009-01-30 10:56:58
|
Update of /cvsroot/wix/wix/src/wix/Xsd In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22859/src/wix/Xsd Modified Files: wix.xsd Log Message: FGrohn: SFBUG:2540057 - Error installing COM+. NSleigh: SFBUG:2533182 - initialize NAntTasks.exeDir. NSleigh: SFBUG:2535552 - document NAntTasks. EricStJ: SFBug:2155318 Certificate issues on Windows Vista. Set ACL on private key to allow access to Administrators group. HeathS: SFBUG:2378630 - Pyro sets bad File.Attributes for delta-patched files HeathS: Added MoreInfoURL to the list of required propertys for PatchMetadata RobMen: SFBUG:2530926 - PerfCounter help is required for WindowsXP, show warning. v-BRoge: SFBUG:1615167 - Registry rows generated by Class element are not unique. EricStJ: SFBUG:1918961, 1918949 Fix null reference exceptions in heat when harvesting virtual dirs. MiCarls: Fix several IIS issues: - Don't get sourcepath unnecessarily - SFBUG:2543875 - set path for website appropriately again - SFBUG:2543674 - webaddress/@header stopped supporting properties - a rare regression caused by the fix for SFBUG #1894817 Index: wix.xsd =================================================================== RCS file: /cvsroot/wix/wix/src/wix/Xsd/wix.xsd,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** wix.xsd 23 Jan 2009 10:40:17 -0000 1.82 --- wix.xsd 30 Jan 2009 10:56:52 -0000 1.83 *************** *** 972,976 **** </xs:documentation></xs:annotation> </xs:attribute> ! <xs:attribute name="MoreInfoURL" type="xs:string"> <xs:annotation> <xs:documentation>A URL that provides information specific to this patch. In Add/Remove Programs from XP SP2 on.</xs:documentation> --- 972,976 ---- </xs:documentation></xs:annotation> </xs:attribute> ! <xs:attribute name="MoreInfoURL" type="xs:string" use="required"> <xs:annotation> <xs:documentation>A URL that provides information specific to this patch. In Add/Remove Programs from XP SP2 on.</xs:documentation> *************** *** 2596,2603 **** </xs:attribute> <xs:attribute name="Key" type="xs:string" use="required"> ! <xs:annotation><xs:documentation>Sets a default value for the property. The value will be overwritten if the Property is used for a search.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="Value" type="xs:string"> ! <xs:annotation><xs:documentation>Sets a default value for the property. The value will be overwritten if the Property is used for a search.</xs:documentation></xs:annotation> </xs:attribute> </xs:complexType> --- 2596,2603 ---- </xs:attribute> <xs:attribute name="Key" type="xs:string" use="required"> ! <xs:annotation><xs:documentation>A formatted string identifying the property to be set.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="Value" type="xs:string"> ! <xs:annotation><xs:documentation>A formatted string supplying the value of the property.</xs:documentation></xs:annotation> </xs:attribute> </xs:complexType> *************** *** 4348,4351 **** --- 4348,4370 ---- </html:dl> </html:dd> + <html:dt>Id/Context/ForeignServer</html:dt> + <html:dd> + <html:dl> + <html:dt>In General</html:dt> + <html:dd> + [HKCR\CLSID\{<html:b>Id</html:b>}\<html:b>Context1</html:b>]<html:br/> + @="<html:b>ForeignServer</html:b>"<html:br/> + [HKCR\CLSID\{<html:b>Id</html:b>}\<html:b>Context2</html:b>]<html:br/> + @="<html:b>ForeignServer</html:b>" + </html:dd> + <html:dt>Specific Example</html:dt> + <html:dd> + [HKCR\CLSID\{<html:b>01234567-89AB-CDEF-0123-456789ABCDEF</html:b>}\<html:b>LocalServer</html:b>]<html:br/> + @="<html:b>mscoree.dll</html:b>"<html:br/> + [HKCR\CLSID\{<html:b>01234567-89AB-CDEF-0123-456789ABCDEF</html:b>}\<html:b>LocalServer32</html:b>]<html:br/> + @="<html:b>mscoree.dll</html:b>" + </html:dd> + </html:dl> + </html:dd> <html:dt>AppId</html:dt> <html:dd> *************** *** 4690,4696 **** </xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="Server" type="xs:string"> <xs:annotation><xs:documentation> ! May only be specified if the value of the Advertise attribute is "no". 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. --- 4709,4722 ---- </xs:documentation></xs:annotation> </xs:attribute> + <xs:attribute name="ForeignServer" type="xs:string"> + <xs:annotation><xs:documentation> + 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. + </xs:documentation></xs:annotation> + </xs:attribute> <xs:attribute name="Server" type="xs:string"> <xs:annotation><xs:documentation> ! 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. |