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

[rburnett]

Modified:
   trunk/CHANGES
   trunk/Installer/visualstudio.wxs
Log:
Changed installer to only give option to install Visual Studio integration if Visual
Studio 8 is installed

Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2007-05-11 16:44:01 UTC (rev 715)
+++ trunk/CHANGES	2007-05-11 19:18:56 UTC (rev 716)
@@ -6,6 +6,7 @@
   - MySqlRoleProvider.GetRolesForUser now works correctly (bug #28251)
   - Installer now adds a default connection string to machine.config.  This will prevent
errors related to a missing 
     connection string.  You will need to override this value in your web.config files.   

+  - Changed installer to only give option to install Visual Studio integration if Visual
Studio 8 is installed
 
 Version 5.1.0 - 5/1/2007
 

Modified: trunk/Installer/visualstudio.wxs
===================================================================
--- trunk/Installer/visualstudio.wxs	2007-05-11 16:44:01 UTC (rev 715)
+++ trunk/Installer/visualstudio.wxs	2007-05-11 19:18:56 UTC (rev 716)
@@ -85,8 +85,14 @@
       </Directory>
     </DirectoryRef>
 
+    <Property Id='VSDIR_2005'>
+      <RegistrySearch Id="RL_EnvironmentDir_2005" Root="HKLM"
Key="SOFTWARE\Microsoft\VisualStudio\8.0\Setup\VS"
+        Name="EnvironmentDirectory" Type="directory" />
+    </Property>
+    
     <Feature Id='VisualStudio' Display='8' Level='1' Title='Visual Studio Integration'
              Description='DDEX and Server Explorer Integration'>
+      <Condition Level='0'>VSDIR_2005 = ""</Condition>
       <ComponentRef Id='VStudio'/>
     </Feature>