bzr commit into connector-net-trunk branch (reggie.burnett:898)

[Reggie Burnett]

#At file:///C:/work/connector-net/trunk/ based on revid:reggie.burnett@stripped

  898 Reggie Burnett	2010-07-21
      fixed installer so that it works if .NET 4.0 is installed without .NET 2.0

    modified:
      CHANGES
      Installer/core.wxs
      Installer/webproviders.wxs
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2010-07-19 19:37:59 +0000
+++ b/CHANGES	2010-07-21 16:39:02 +0000
@@ -28,6 +28,8 @@
   the databasename in our typed datasets.  This allows users to move the dataset to a new
   database/server with no trouble (bug #33870)
 - fixed recognition of char(36) columns to be guids when used in views with entity models (bug #52085)
+- fixed a couple of installer problems (bug #53975)
+- fixed installer so that it will work if .NET 4.0 is installed by itself
 
 Version 6.3.2 (beta 1)
 - added feature where sql queries that are longer than 300 chars are normalized and a new

=== modified file 'Installer/core.wxs'
--- a/Installer/core.wxs	2010-07-20 19:53:09 +0000
+++ b/Installer/core.wxs	2010-07-21 16:39:02 +0000
@@ -117,16 +117,20 @@
     </Feature>
 
     <InstallExecuteSequence>
+      <Custom Action="SetFWVersion_v2" After="CostFinalize">NOT INSTALLED or NETFRAMEWORK20</Custom>
+      <Custom Action="SetFWVersion_v4" After="SetFWVersion_v2">NOT INSTALLED or NETFRAMEWORK40CLIENT or NETFRAMEWORK40FULL</Custom>
       <Custom Action='ManagedDataInstallSetup' After="InstallFiles">NOT Installed</Custom>
       <Custom Action='ManagedDataInstall' After="ManagedDataInstallSetup">NOT Installed</Custom>
       <Custom Action='ManagedDataUnInstallSetup' Before="RemoveFiles">Installed</Custom>
       <Custom Action='ManagedDataUnInstall' After="ManagedDataUnInstallSetup">Installed</Custom>
     </InstallExecuteSequence>
 
+    <CustomAction Id="SetFWVersion_v2" Property="FrameworkVersion" Value="v2.0.50727"/>
+    <CustomAction Id="SetFWVersion_v4" Property="FrameworkVersion" Value="v4.0.30319"/>
     <CustomAction Id="ManagedDataInstallSetup" Property="ManagedDataInstall"
-                  Value='"[WindowsFolder]\Microsoft.NET\Framework\v2.0.50727\installUtil.exe" /LogToConsole=false /LogFile=  "[#MySqlData]"'/>
+                  Value='"[WindowsFolder]\Microsoft.NET\Framework\[FrameworkVersion]\installUtil.exe" /LogToConsole=false /LogFile=  "[#MySqlData]"'/>
     <CustomAction Id='ManagedDataUnInstallSetup' Property="ManagedDataUnInstall"
-                  Value='"[WindowsFolder]\Microsoft.NET\Framework\v2.0.50727\installUtil.exe" /LogToConsole=false /LogFile= /u "[#MySqlData]"'/>
+                  Value='"[WindowsFolder]\Microsoft.NET\Framework\[FrameworkVersion]\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 file 'Installer/webproviders.wxs'
--- a/Installer/webproviders.wxs	2010-05-19 17:56:19 +0000
+++ b/Installer/webproviders.wxs	2010-07-21 16:39:02 +0000
@@ -29,9 +29,9 @@
     </InstallExecuteSequence>
 
     <CustomAction Id="ManagedWebInstallSetup" Property="ManagedWebInstall"
-                  Value='"[WindowsFolder]\Microsoft.NET\Framework\v2.0.50727\installUtil.exe" /LogToConsole=false /LogFile=  "[#MySqlWeb]"'/>
+                  Value='"[WindowsFolder]\Microsoft.NET\Framework\[FrameworkVersion]\installUtil.exe" /LogToConsole=false /LogFile=  "[#MySqlWeb]"'/>
     <CustomAction Id='ManagedWebUnInstallSetup' Property="ManagedWebUnInstall"
-                  Value='"[WindowsFolder]\Microsoft.NET\Framework\v2.0.50727\installUtil.exe" /LogToConsole=false /LogFile= /u "[#MySqlWeb]"'/>
+                  Value='"[WindowsFolder]\Microsoft.NET\Framework\[FrameworkVersion]\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>


Attachment: [text/bzr-bundle] bzr/[e-mail]