[WiX-commits] wix/src/light light.cs,1.40,1.41

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

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

Modified Files:
	light.cs 
Log Message:
BobArnso: - Fix zip.build to include PNGs in sources.zip
          - Prevent ProjectAggregator2 launch condition from throwing on uninstall
          - Deliver ProjectAggregator2.msi too (until we get the chainer going)

RobMen: SFBUG:1559339 - add missing wconsole and wui

JRock: SFBug:1559513 - Votive 3.0.2114.0 does not load in VS2005
       Added the new PLK (package load key) so that Votive will load.

RobMen: Move ClickThrough common controls in wui.dll
        Build CLR 2.0 projects using MSBuild
        Minor FxCop fixes

JRock: SFBug:1529711 - no incremental builds using wix.targets
       Tweaked the wix.targets file to only include the wix.targets file itself
       as part of an incremental build.

BobArnso: WixUI_Advanced
          - Draft of a two-click installer that also supports per-user/per-machine
            choice and feature selection
          - This set is still in active development.
          - Future releases are likely to be incompatible.
          - Future releases are likely to be much easier to use.
          - Use at your own risk.

          WiX Setup - Provide a single .msi for all of the WiX toolset

JRock: Added a MsgGen and XsdGen task to our Wix.Common.targets file that supports
       incremental rebuilding and also better Visual Studio integration.

RobMen: Include ClickThrough in WiX3.msi

Index: light.cs
===================================================================
RCS file: /cvsroot/wix/wix/src/light/light.cs,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** light.cs	13 Sep 2006 08:13:28 -0000	1.40
--- light.cs	20 Sep 2006 10:43:18 -0000	1.41
***************
*** 441,445 ****
                          this.outputFile = Path.ChangeExtension(this.outputFile, ".wixout");
                      }
!                     output.Save(this.outputFile, (this.bindFiles ? binder.Extension : null), wixVariableResolver, binder.TempFilesLocation);
                  }
                  else // finish creating the MSI/MSM
--- 441,445 ----
                          this.outputFile = Path.ChangeExtension(this.outputFile, ".wixout");
                      }
!                     output.Save(this.outputFile, (this.bindFiles ? binder.Extension : null), this.wixVariableResolver, binder.TempFilesLocation);
                  }
                  else // finish creating the MSI/MSM