[WiX-commits] wix/src/wix/Xsd wix.xsd,1.54,1.55

[Rob M. <ro...@us...>]

Update of /cvsroot/wix/wix/src/wix/Xsd
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21542/src/wix/Xsd

Modified Files:
	wix.xsd 
Log Message:
RobMen: Initialize FileRow.assemblyType to NotAnAssembly (instead of 
        DotNetAssembly by default).

a-joem: Persist the WixMedia table so the Binder has valid Layout paths.

BobArnso: Add SuppressModularization attribute to Binary element

BobArnso: 
  - Fix sfbug:1586940 - Clarify ProgId/@Icon value when advertised -v- not
  - Fix sfbug:1560158 - Add Permission as legal child of RegistryKey
  - Fix sfbug:1587714 - Add util.xsd to doc directory
  - Re-fix sfbug:1570461; TS-aware CAs must be deferred
  - Fix sfbug:1312988 - Added support for @action attribute in msiref element

RobMen: SFBUG:1544874 - fix ConfigureIIS to correctly handle when there are
                        multiple websites installed on the machine.

BobArnso: Fix sffeature:1566806 and sffeature:1557370 - Install schema files
          for VSExpress SKUs; add feature and dialog to describe when Votive
          can't be installed (lack of Standard Edition++ or 
          ProjectAggregator2.msi).


Index: wix.xsd
===================================================================
RCS file: /cvsroot/wix/wix/src/wix/Xsd/wix.xsd,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** wix.xsd	13 Sep 2006 08:13:37 -0000	1.54
--- wix.xsd	29 Nov 2006 20:55:18 -0000	1.55
***************
*** 2461,2464 ****
--- 2461,2467 ----
                  <xs:element ref="RegistryKey"/>
                  <xs:element ref="RegistryValue"/>
+                 <xs:element ref="Permission" minOccurs="0" maxOccurs="unbounded">
+                     <xs:annotation><xs:documentation>ACL permission</xs:documentation></xs:annotation>
+                 </xs:element>
                  <xs:any namespace="##other" processContents="lax">
                      <xs:annotation>
***************
*** 3412,3416 ****
                  </xs:element>
                  <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded">
!                     <xs:annotation><xs:documentation>extensions that refer to this ProgId</xs:documentation></xs:annotation>
                  </xs:element>
              </xs:sequence>
--- 3415,3419 ----
                  </xs:element>
                  <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded">
!                     <xs:annotation><xs:documentation>Extensions that refer to this ProgId</xs:documentation></xs:annotation>
                  </xs:element>
              </xs:sequence>
***************
*** 3419,3423 ****
              <xs:attribute name="Description" type="xs:string"/>
              <xs:attribute name="Icon" type="xs:string">
!                 <xs:annotation><xs:documentation>reference to Icon element</xs:documentation></xs:annotation>
              </xs:attribute>
              <xs:attribute name="IconIndex" type="xs:integer"/>
--- 3422,3426 ----
              <xs:attribute name="Description" type="xs:string"/>
              <xs:attribute name="Icon" type="xs:string">
!                 <xs:annotation><xs:documentation>For an advertised ProgId, the Id of an Icon element. For a non-advertised ProgId, this is the Id of a file containing an icon resource.</xs:documentation></xs:annotation>
              </xs:attribute>
              <xs:attribute name="IconIndex" type="xs:integer"/>
***************
*** 5440,5444 ****
              <xs:documentation>
                  This element has been deprecated.
!                 Use the CustomAction/@SuppressModularization or Property/@SuppressModularization attributes instead.
              </xs:documentation>
          </xs:annotation>
--- 5443,5447 ----
              <xs:documentation>
                  This element has been deprecated.
!                 Use the Binary/@SuppressModularization, CustomAction/@SuppressModularization, or Property/@SuppressModularization attributes instead.
              </xs:documentation>
          </xs:annotation>
***************
*** 6001,6004 ****
--- 6004,6008 ----
                  <xse:seeAlso ref="IniFileSearch"/>
                  <xse:seeAlso ref="RegistrySearch"/>
+                 <xse:msiRef action="AppSearch" table="AppSearch" />
              </xs:appinfo>
              <xs:documentation>Uses file signatures to search for existing versions of products.  The AppSearch action may use this information to determine where upgrades are to be installed.  The AppSearch action can also be used to set a property to the existing value of an registry or .ini file entry.  AppSearch should be authored into the InstallUISequence table and InstallExecuteSequence table.  The installer prevents The AppSearch action from running in the InstallExecuteSequence sequence if the action has already run in InstallUISequence sequence.  The AppSearch action searches for file signatures using the CompLocator table first, the RegLocator table next, then the IniLocator table, and finally the DrLocator table.  The condition for this action may be specified in the element's inner text.</xs:documentation>
***************
*** 6614,6617 ****
--- 6618,6628 ----
                  </xs:annotation>
              </xs:attribute>
+             <xs:attribute name="SuppressModularization" type="YesNoType">
+                 <xs:annotation>
+                     <xs:documentation>
+                         Use to suppress modularization of this Binary identifier in merge modules.
+                     </xs:documentation>
+                 </xs:annotation>
+             </xs:attribute>
          </xs:complexType>
      </xs:element>