Connector/NET commit: r1002 - branches/5.1/Installer

[rburnett]

Modified:
   branches/5.1/Installer/visualstudio.wxs
   branches/5.1/Installer/webproviders.wxs
Log:
A couple of tweaks in our Wix code

Modified: branches/5.1/Installer/visualstudio.wxs
===================================================================
--- branches/5.1/Installer/visualstudio.wxs	2007-09-18 15:55:29 UTC (rev 1001)
+++ branches/5.1/Installer/visualstudio.wxs	2007-09-18 15:56:08 UTC (rev 1002)
@@ -104,7 +104,7 @@
                   Execute="deferred" Impersonate="no"/>
 
     <InstallExecuteSequence>
-      <Custom Action='DevenvSetup' After='PublishProduct'>&amp;VisualStudio=3 OR !VisualStudio=3</Custom>
+      <Custom Action='DevenvSetup' After='PublishProduct'>$VStudio >= 2</Custom>
     </InstallExecuteSequence>
 
   </Fragment>

Modified: branches/5.1/Installer/webproviders.wxs
===================================================================
--- branches/5.1/Installer/webproviders.wxs	2007-09-18 15:55:29 UTC (rev 1001)
+++ branches/5.1/Installer/webproviders.wxs	2007-09-18 15:56:08 UTC (rev 1002)
@@ -39,8 +39,8 @@
       <Custom Action="MySqlWeb.Install" After="MySqlWeb.Install.SetProperty">$Providers > 2</Custom>
 
       <!-- Unregister code -->
-      <Custom Action="MySqlWeb.Remove.CheckFX" After="InstallFiles">$Providers = 2</Custom>
-      <Custom Action="MySqlWeb.Remove.SetProperty" After="MySqlWeb.Install.CheckFX">$Providers = 2</Custom>
+      <Custom Action="MySqlWeb.Remove.CheckFX" Before="RemoveFiles">$Providers = 2</Custom>
+      <Custom Action="MySqlWeb.Remove.SetProperty" After="MySqlWeb.Remove.CheckFX">$Providers = 2</Custom>
       <Custom Action="MySqlWeb.Remove" After="MySqlWeb.Remove.SetProperty">$Providers = 2</Custom>
     </InstallExecuteSequence>
   </Fragment>