Connector/NET commit: r1358 - in branches/5.2: . Installer

[rburnett]

Modified:
   branches/5.2/CHANGES
   branches/5.2/Installer/core.wxs
   branches/5.2/Installer/webproviders.wxs
Log:
- Fixed problem where the uninstall was not cleaning up the state files (bug #38534)


Modified: branches/5.2/CHANGES
===================================================================
--- branches/5.2/CHANGES	2008-08-12 18:18:31 UTC (rev 1357)
+++ branches/5.2/CHANGES	2008-08-12 18:19:37 UTC (rev 1358)
@@ -25,6 +25,7 @@
   and made it public and static.  (bug #36205)
 - Fixed problem where column metadata was not being read with the correct characterset
   (bug #38721) 
+- Fixed problem where the uninstall was not cleaning up the state files (bug #38534)
   
 Version 5.2.2 - 
 - Fixed profile provider that would throw an exception if you were updating

Modified: branches/5.2/Installer/core.wxs
===================================================================
--- branches/5.2/Installer/core.wxs	2008-08-12 18:18:31 UTC (rev 1357)
+++ branches/5.2/Installer/core.wxs	2008-08-12 18:19:37 UTC (rev 1358)
@@ -31,12 +31,14 @@
           <RegistryValue Id="VSRegistryValue" Value="[BinNet20]" Type="string"
Action="write"/>
         </RegistryKey>
         
-            <util:PerformanceCategory Id="PMDataCategoryId" Name=".NET Data Provider
for MySQL" 
-                                      MultiInstance="no" Help="This category includes a
series of counters for MySQL.">
-                <util:PerformanceCounter Name="HardProcedureQueries"
Type="numberOfItems32" Help="The number of times a procedures metadata had to be queried
from the server." />
-                <util:PerformanceCounter Name="SoftProcedureQueries"
Type="rateOfCountsPerSecond32" Help="The number of times a procedures metadata was
retrieved from the client-side cache." /> 
-            </util:PerformanceCategory>
-           
+        <util:PerformanceCategory Id="PMDataCategoryId" Name=".NET Data Provider for
MySQL" 
+                                  MultiInstance="no" Help="This category includes a
series of counters for MySQL.">
+            <util:PerformanceCounter Name="HardProcedureQueries"
Type="numberOfItems32" Help="The number of times a procedures metadata had to be queried
from the server." />
+            <util:PerformanceCounter Name="SoftProcedureQueries"
Type="rateOfCountsPerSecond32" Help="The number of times a procedures metadata was
retrieved from the client-side cache." /> 
+        </util:PerformanceCategory>
+
+        <RemoveFile Id="RemoveStateFile" Name="*.InstallState" On="uninstall"/>
+        
         </Component>
       <Directory Id="MySql.Data.DummyDir" Name="GAC">
         <Component Id="GAC20" Guid="58f70e4a-96f7-4b67-bdab-9b77a60f9c09">
@@ -75,9 +77,9 @@
     </InstallExecuteSequence>
 
     <CustomAction Id="ManagedDataInstallSetup" Property="ManagedDataInstall"
-                 
Value='"[WindowsFolder]\Microsoft.NET\Framework\v2.0.50727\installUtil.exe"
/LogToConsole=false  "[#MySqlData]"'/>
+                 
Value='"[WindowsFolder]\Microsoft.NET\Framework\v2.0.50727\installUtil.exe"
/LogToConsole=false /LogFile=  "[#MySqlData]"'/>
     <CustomAction Id='ManagedDataUnInstallSetup' Property="ManagedDataUnInstall"
-                 
Value='"[WindowsFolder]\Microsoft.NET\Framework\v2.0.50727\installUtil.exe"
/LogToConsole=false /u "[#MySqlData]"'/>
+                 
Value='"[WindowsFolder]\Microsoft.NET\Framework\v2.0.50727\installUtil.exe"
/LogToConsole=false /LogFile= /u "[#MySqlData]"'/>
     <CustomAction Id="ManagedDataInstall" BinaryKey="WixCA" DllEntry="CAQuietExec"
Return="check" Execute='deferred' Impersonate='no'/>
     <CustomAction Id="ManagedDataUnInstall" BinaryKey="WixCA" DllEntry="CAQuietExec"
Return="check" Execute='deferred' Impersonate='no'/>
   </Fragment>

Modified: branches/5.2/Installer/webproviders.wxs
===================================================================
--- branches/5.2/Installer/webproviders.wxs	2008-08-12 18:18:31 UTC (rev 1357)
+++ branches/5.2/Installer/webproviders.wxs	2008-08-12 18:19:37 UTC (rev 1358)
@@ -12,6 +12,7 @@
         <Component Id="Providers" Guid="8578813e-e123-45ad-9c92-565382a058b6">
           <File Id="MySqlWeb" Name="MySql.Web.dll" DiskId="1"
                 Source="..\MySql.Web\providers\bin\release\mysql.web.dll"/>
+          <RemoveFile Id="RemoveWebStateFile" Name="*.InstallState"
On="uninstall"/>
         </Component>
       </Directory>
     </DirectoryRef>
@@ -30,9 +31,9 @@
     </InstallExecuteSequence>
 
     <CustomAction Id="ManagedWebInstallSetup" Property="ManagedWebInstall"
-                 
Value='"[WindowsFolder]\Microsoft.NET\Framework\v2.0.50727\installUtil.exe"
/LogToConsole=false  "[#MySqlWeb]"'/>
+                 
Value='"[WindowsFolder]\Microsoft.NET\Framework\v2.0.50727\installUtil.exe"
/LogToConsole=false /LogFile=  "[#MySqlWeb]"'/>
     <CustomAction Id='ManagedWebUnInstallSetup' Property="ManagedWebUnInstall"
-                 
Value='"[WindowsFolder]\Microsoft.NET\Framework\v2.0.50727\installUtil.exe"
/LogToConsole=false /u "[#MySqlWeb]"'/>
+                 
Value='"[WindowsFolder]\Microsoft.NET\Framework\v2.0.50727\installUtil.exe"
/LogToConsole=false /LogFile= /u "[#MySqlWeb]"'/>
     <CustomAction Id="ManagedWebInstall" BinaryKey="WixCA" DllEntry="CAQuietExec"
Return="check" Execute='deferred' Impersonate='no'/>
     <CustomAction Id="ManagedWebUnInstall" BinaryKey="WixCA" DllEntry="CAQuietExec"
Return="check" Execute='deferred' Impersonate='no'/>
   </Fragment>