[WiX-commits] wix/src/ext/VSExtension/wixlib VSExtension.wxs, 1.12, 1.13

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

Update of /cvsroot/wix/wix/src/ext/VSExtension/wixlib
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29411/src/ext/VSExtension/wixlib

Modified Files:
	VSExtension.wxs 
Log Message:
HeathS: SFBUG:2542585 - FileSearch returning folder path not working

RobMen: Fix MsiLockPermisionEx.SDDLText column name.

PMarcu: SFBug:2610238 by putting FindRelatedProducts before LaunchConditions

BobArnso: Fix SFBug:2620719 [[MsiRMFilesInUse dialog controls unusable at 120 dpi]]

AaronSte: SFBug:2635017 - adding new VS 2008 Express Edition SP1 detection
          properties to workaround bug in VS 2008 installers

BobArnso: Fix SFBug:2643937 [[sqldatabase table not added to msi from wixlib]]

Index: VSExtension.wxs
===================================================================
RCS file: /cvsroot/wix/wix/src/ext/VSExtension/wixlib/VSExtension.wxs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** VSExtension.wxs	17 Oct 2008 10:33:11 -0000	1.12
--- VSExtension.wxs	27 Feb 2009 12:47:48 -0000	1.13
***************
*** 664,667 ****
--- 664,677 ----
      </Fragment>
  
+     <!-- Indicates whether the Visual Studio 2008 SP1 version of vbexpress.exe is -->
+     <!-- installed on the system.                                                 -->
+     <Fragment>
+         <Property Id="VB90EXPRESS_SP1" Secure="yes">
+             <ComponentSearch Id="SearchForVbExpressIde90Component" Guid="010A50C6-8604-4BA2-8CA1-4EC3A5B861B2" Type="file">
+                 <FileSearch Id="VB90ExpressFileVersionSearch" Name="vbexpress.exe" MinVersion="9.0.30729.0"/>
+             </ComponentSearch>
+         </Property>
+     </Fragment>
+ 
      <!-- Indicates the service pack level for Visual C++ 2008 Express Edition.    -->
      <Fragment>
***************
*** 671,674 ****
--- 681,694 ----
      </Fragment>
  
+     <!-- Indicates whether the Visual Studio 2008 SP1 version of vcexpress.exe is -->
+     <!-- installed on the system.                                                 -->
+     <Fragment>
+         <Property Id="VC90EXPRESS_SP1" Secure="yes">
+             <ComponentSearch Id="SearchForVcExpressIde90Component" Guid="147EB31D-8042-4E8F-A3EC-D32C04ED652A" Type="file">
+                 <FileSearch Id="VC90ExpressFileVersionSearch" Name="vcexpress.exe" MinVersion="9.0.30729.0"/>
+             </ComponentSearch>
+         </Property>
+     </Fragment>
+ 
      <!-- Indicates the service pack level for Visual C# 2008 Express Edition.     -->
      <Fragment>
***************
*** 678,681 ****
--- 698,711 ----
      </Fragment>
  
+     <!-- Indicates whether the Visual Studio 2008 SP1 version of vcsexpress.exe is -->
+     <!-- installed on the system.                                                  -->
+     <Fragment>
+         <Property Id="VCS90EXPRESS_SP1" Secure="yes">
+             <ComponentSearch Id="SearchForVcsExpressIde90Component" Guid="EF0BC34E-6AAE-47C0-8FEC-7E00C2638209" Type="file" >
+                 <FileSearch Id="VCS90ExpressFileVersionSearch" Name="vcsexpress.exe" MinVersion="9.0.30729.0"/>
+             </ComponentSearch>
+         </Property>
+     </Fragment>
+ 
      <!-- Indicates the service pack level for Visual Web Developer 2008 Express   -->
      <!-- Edition.                                                                 -->
***************
*** 686,689 ****
--- 716,729 ----
      </Fragment>
  
+     <!-- Indicates whether the Visual Studio 2008 SP1 version of vcsexpress.exe is -->
+     <!-- installed on the system.                                                  -->
+     <Fragment>
+         <Property Id="VWD90EXPRESS_SP1" Secure="yes">
+             <ComponentSearch Id="SearchForVwdExpressIde90Component" Guid="C7F516CB-CB5C-41B7-9CB4-33927C4DD206" Type="file">
+                 <FileSearch Id="VWD90ExpressFileVersionSearch" Name="vwdexpress.exe" MinVersion="9.0.30729.0"/>
+             </ComponentSearch>
+         </Property>
+     </Fragment>
+ 
      <!-- Indicates the service pack level for Visual Studio 2008 Team Foundation. -->
      <Fragment>