Update of /cvsroot/wix/wix
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14818
Modified Files:
history.txt wix.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: history.txt
===================================================================
RCS file: /cvsroot/wix/wix/history.txt,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** history.txt 17 Aug 2008 20:40:14 -0000 1.64
--- history.txt 22 Aug 2008 08:17:22 -0000 1.65
***************
*** 3118,3119 ****
--- 3118,3148 ----
Also cleanup the unmanaged CAB code in dutil (fix rare
multithreading issue, and remove dead code)
+
+ 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: wix.build
===================================================================
RCS file: /cvsroot/wix/wix/wix.build,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** wix.build 1 Aug 2008 06:52:39 -0000 1.26
--- wix.build 22 Aug 2008 08:17:22 -0000 1.27
***************
*** 1,3 ****
! <?xml version="1.0" encoding="utf-8" ?>
<project name="WiX Toolset" default="inc" xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
<description>
--- 1,3 ----
! <?xml version="1.0" encoding="utf-8" ?>
<project name="WiX Toolset" default="inc" xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
<description>
***************
*** 128,134 ****
<property name="framework.sdk.path" value="${framework::get-sdk-directory('net-3.5')}" />
<fail message="Building WiX requires the Windows Server 2008 and .NET Framework 3.5 SDK or Visual Studio 2008" unless="${directory::exists(framework.sdk.path)}" />
</target>
!
! <target name="snskip" depends="prereqcheck">
<property name="wix.snskip.tempname" value="${path::get-temp-file-name()}" />
<exec program="${framework.sdk.path}\sn.exe" commandline="-Vl" output="${wix.snskip.tempname}" />
--- 128,135 ----
<property name="framework.sdk.path" value="${framework::get-sdk-directory('net-3.5')}" />
<fail message="Building WiX requires the Windows Server 2008 and .NET Framework 3.5 SDK or Visual Studio 2008" unless="${directory::exists(framework.sdk.path)}" />
+ <property name="framework.sdk.path.x64" value="${framework::get-sdk-directory('net-3.5')}\x64" />
</target>
!
! <target name="snskip" depends="prereqcheck">
<property name="wix.snskip.tempname" value="${path::get-temp-file-name()}" />
<exec program="${framework.sdk.path}\sn.exe" commandline="-Vl" output="${wix.snskip.tempname}" />
***************
*** 136,139 ****
--- 137,147 ----
<delete file="${wix.snskip.tempname}" failonerror="false" />
<exec program="${framework.sdk.path}\sn.exe" commandline="-Vr *,36e4ce08b8ecfb17" unless="${string::contains(wix.snkip.output, '*,36e4ce08b8ecfb17')}" />
+
+ <if test="${directory::exists(framework.sdk.path.x64)}">
+ <exec program="${framework.sdk.path.x64}\sn.exe" commandline="-Vl" output="${wix.snskip.tempname}" />
+ <loadfile file="${wix.snskip.tempname}" property="wix.snkip.output" />
+ <delete file="${wix.snskip.tempname}" failonerror="false" />
+ <exec program="${framework.sdk.path.x64}\sn.exe" commandline="-Vr *,36e4ce08b8ecfb17" unless="${string::contains(wix.snkip.output, '*,36e4ce08b8ecfb17')}" />
+ </if>
</target>
|
