[WiX-commits] wix/bin zip.build,1.22,1.23

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

Update of /cvsroot/wix/wix/bin
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14818/bin

Modified Files:
	zip.build 
Log Message:
EricStJ: Fix SFBUG:1827123 Properly escape database identifiers when using
         in a query string.

CAraman: fixes for compiling at /WX /W4, and one fix for static analysis

AaronSte: Adding documentation for WiX MSBuild tasks.

MiCarls: IIS Extension no longer expects certain sibling elements in a
         particular order.

EricStJ: Fix EscapeSqlIdentifier to better handle NULL and empty string

MiCarls: Fix "if[n]def" to support variable names containing a dot

PMarcu: SFBUG:2013549 Improved performance for file diffing.

EricStj: Allow CloseApps to send close messages with elevated privilege.

RobMen: SFBUG:1881856 - fix cert uninstall on Vista.
        SFBUG:1930640 - PFXImportCertStore() delete private key containers.
        SFBUG:1881660 - Certificates should work in MSM.

MiCarls: SFBUG:2034934 - don't modularize binder variable file IDs

RobMen: SFBUG:1550592 - don't include flattened XSD files in binaries.zip.

MiCarls: User-creation custom action code will now remove users from groups
         they were added to on uninstall, if the user is not being deleted.


Index: zip.build
===================================================================
RCS file: /cvsroot/wix/wix/bin/zip.build,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** zip.build	10 Jul 2008 19:37:37 -0000	1.22
--- zip.build	22 Aug 2008 08:17:22 -0000	1.23
***************
*** 146,164 ****
        </fileset>
  
!       <fileset prefix="doc" basedir="${dir.target.wix}">
          <include name="complus.xsd" />
          <include name="difxapp.xsd" />
          <include name="firewall.xsd" />
          <include name="gaming.xsd" />
          <include name="iis.xsd" />
          <include name="msmq.xsd" />
          <include name="netfx.xsd" />
          <include name="ps.xsd" />
          <include name="sql.xsd" />
          <include name="util.xsd" />
          <include name="vs.xsd" />
!         <include name="WiX.chm" />
          <include name="wix.xsd" />
          <include name="wixloc.xsd" />
          <include name="DTF.chm" if="${ship}" />
          <include name="DTFAPI.chm" if="${ship}" />
--- 146,189 ----
        </fileset>
  
!       <fileset prefix="doc" basedir="${dir.target.wix}\src\ext\ComPlusExtension\wixext\Xsd">
          <include name="complus.xsd" />
+       </fileset>
+       <fileset prefix="doc" basedir="${dir.wixroot}\src\ext\DifxAppExtension\wixext\Xsd">
          <include name="difxapp.xsd" />
+       </fileset>
+       <fileset prefix="doc" basedir="${dir.wixroot}\src\ext\FirewallExtension\wixext\Xsd">
          <include name="firewall.xsd" />
+       </fileset>
+       <fileset prefix="doc" basedir="${dir.wixroot}\src\ext\GamingExtension\wixext\Xsd">
          <include name="gaming.xsd" />
+       </fileset>
+       <fileset prefix="doc" basedir="${dir.wixroot}\src\ext\IIsExtension\wixext\xsd">
          <include name="iis.xsd" />
+       </fileset>
+       <fileset prefix="doc" basedir="${dir.wixroot}\src\ext\MsmqExtension\wixext\Xsd">
          <include name="msmq.xsd" />
+       </fileset>
+       <fileset prefix="doc" basedir="${dir.wixroot}\src\ext\NetFxExtension\wixext\Xsd">
          <include name="netfx.xsd" />
+       </fileset>
+       <fileset prefix="doc" basedir="${dir.wixroot}\src\ext\PSExtension\wixext\xsd">
          <include name="ps.xsd" />
+       </fileset>
+       <fileset prefix="doc" basedir="${dir.wixroot}\src\ext\SqlExtension\wixext\Xsd">
          <include name="sql.xsd" />
+       </fileset>
+       <fileset prefix="doc" basedir="${dir.wixroot}\src\ext\UtilExtension\wixext\Xsd">
          <include name="util.xsd" />
+       </fileset>
+       <fileset prefix="doc" basedir="${dir.wixroot}\src\ext\VSExtension\wixext\xsd">
          <include name="vs.xsd" />
!       </fileset>
!       <fileset prefix="doc" basedir="${dir.wixroot}\src\wix\Xsd">
          <include name="wix.xsd" />
          <include name="wixloc.xsd" />
+       </fileset>
+ 
+       <fileset prefix="doc" basedir="${dir.target.wix}">
+         <include name="WiX.chm" />
          <include name="DTF.chm" if="${ship}" />
          <include name="DTFAPI.chm" if="${ship}" />
***************
*** 291,294 ****
--- 316,320 ----
          <include name="**/*.vstemplate" />
          <include name="**/*.xsd" />
+         <include name="**/*.xaml" />
          <include name="bin/publickey_wix.snk" />