Connector/NET commit: r708 - in trunk: . Installer

[rburnett]

Modified:
   trunk/CHANGES
   trunk/Installer/visualstudio.wxs
Log:
Bug #28260 Mysql connector /net 5.1.0 on windows xp home edition

This problem was caused by the installer always attempting to run devenv /setup even when
VS integration was not selected.

Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2007-05-04 19:01:54 UTC (rev 707)
+++ trunk/CHANGES	2007-05-08 14:42:56 UTC (rev 708)
@@ -2,6 +2,8 @@
   - Fixed password property on MySqlConnectionStringBuilder to use PasswordPropertyText 
     attribute.  This causes dots to show instead of actual password text.
   - Fixed problem with pooling on the compact framework.  It should work now.    
+  - Install now calls VS setup only when VS integration is selected. (bug #28260)
+
     
 Version 5.1.0 - 5/1/2007
 

Modified: trunk/Installer/visualstudio.wxs
===================================================================
--- trunk/Installer/visualstudio.wxs	2007-05-04 19:01:54 UTC (rev 707)
+++ trunk/Installer/visualstudio.wxs	2007-05-08 14:42:56 UTC (rev 708)
@@ -98,7 +98,7 @@
                   Execute="deferred" Impersonate="no"/>
 
     <InstallExecuteSequence>
-      <Custom Action='DevenvSetup' After='PublishProduct' />
+      <Custom Action='DevenvSetup' After='PublishProduct'>&amp;VisualStudio=3
OR !VisualStudio=3</Custom>
     </InstallExecuteSequence>
 
   </Fragment>