List:Commits« Previous MessageNext Message »
From:Reggie Burnett Date:November 10 2010 11:14pm
Subject:bzr commit into connector-net-trunk branch (reggie.burnett:943) Bug#57654
View as plain text  
#At file:///C:/Users/Reggie/work/connector-net/6.3/ based on revid:reggie.burnett@stripped

  943 Reggie Burnett	2010-11-10
      - fixed the installer to require .net 2.0 or .net 4.0 "full" profile since system.web is only supplied with
        the full profile (bug #57654)

    modified:
      CHANGES
      Installer/core.wxs
      Installer/main.wxs
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2010-11-09 20:34:26 +0000
+++ b/CHANGES	2010-11-10 23:14:26 +0000
@@ -1,7 +1,11 @@
 Version 6.3.6
-- Fixed TracingDriver so that it normalizes long queries before truncation so we don't get exceptions     when quoted tokens land on the 300th character (bug #57641)
-- added code that will attempt to enumerate procs via mysql.proc the first time. If we get an 1142     error then we mark that we don't have access to that table and use IS from then on. (bug #36694)
+- Fixed TracingDriver so that it normalizes long queries before truncation so we don't get exceptions     
+  when quoted tokens land on the 300th character (bug #57641)
+- added code that will attempt to enumerate procs via mysql.proc the first time. If we get an 1142     
+  error then we mark that we don't have access to that table and use IS from then on. (bug #36694)
 - fixed loading of mono.posix assembly to use the right assembly (bug #56410)
+- fixed the installer to require .net 2.0 or .net 4.0 "full" profile since system.web is only supplied with
+  the full profile (bug #57654)
 
 Version 6.3.5
 - Fix installer bug related to .NET FW 4.0 (bug #56580)

=== modified file 'Installer/core.wxs'
--- a/Installer/core.wxs	2010-09-17 16:07:04 +0000
+++ b/Installer/core.wxs	2010-11-10 23:14:26 +0000
@@ -85,12 +85,12 @@
     <!-- Entity framework 4.0 feature -->
     <DirectoryRef Id='assemblies_v4'>
       <Component Id="EF.v4" Guid="E6B683F6-727A-43c9-B955-6BEE94EF61C7" DiskId="1">
-        <Condition>NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</Condition>
+        <Condition>NETFRAMEWORK40FULL</Condition>
         <File Id="MySql.Data.EF.v4" Name="MySql.Data.Entity.dll"
               Source="..\mysql.data.entity\provider\bin\release-4.0\mysql.data.entity.dll" DiskId="1"/>
       </Component>
       <Component Id="EF.v4.GAC" Guid="A9C03468-5A59-443f-85DC-C0149EBB55C8" DiskId="1">
-        <Condition>NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</Condition>
+        <Condition>NETFRAMEWORK40FULL</Condition>
         <File Id="MySql.Data.EF.v4.GAC" Name="MySql.Data.Entity.dll"
               Source="..\mysql.data.entity\provider\bin\release-4.0\mysql.data.entity.dll" DiskId="1"
               Assembly=".net" KeyPath="yes"/>
@@ -109,7 +109,7 @@
     
     <Feature Id="EntityFramework" Level="1" Title="Entity Framework Support"
              Description="Support for the entity framework">
-      <Condition Level='0'>Not NETFRAMEWORK20 AND Not NETFRAMEWORK40FULL And Not NETFRAMEWORK40CLIENT</Condition>
+      <Condition Level='0'>Not NETFRAMEWORK20 AND Not NETFRAMEWORK40FULL</Condition>
       <ComponentRef Id="EF.v2"/>
       <ComponentRef Id="EF.v2.GAC"/>
       <ComponentRef Id="EF.v4"/>
@@ -119,7 +119,7 @@
 
     <InstallExecuteSequence>
       <Custom Action="SetFWVersion_v2" After="CostFinalize">NETFRAMEWORK20</Custom>
-      <Custom Action="SetFWVersion_v4" After="SetFWVersion_v2">NETFRAMEWORK40CLIENT or NETFRAMEWORK40FULL</Custom>
+      <Custom Action="SetFWVersion_v4" After="SetFWVersion_v2">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>

=== modified file 'Installer/main.wxs'
--- a/Installer/main.wxs	2010-08-30 20:17:30 +0000
+++ b/Installer/main.wxs	2010-11-10 23:14:26 +0000
@@ -17,8 +17,7 @@
     <!-- First make sure that .NET is installed -->
     <PropertyRef Id="NETFRAMEWORK20"/>
     <PropertyRef Id="NETFRAMEWORK40FULL"/>
-    <PropertyRef Id="NETFRAMEWORK40CLIENT"/>
-    <Condition Message="The .NET Framework 2.0 or 4.0 must be installed before installing this package.">Installed OR NETFRAMEWORK20 OR NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</Condition>
+    <Condition Message="The .NET Framework 2.0 or 4.0 must be installed before installing this package.">Installed OR NETFRAMEWORK20 OR NETFRAMEWORK40FULL</Condition>
 
     <!-- now make sure that we don't have an old version still around -->
     <Property Id="OLDVERSION">


Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20101110231426-uu3nr3lp9fdrvnss.bundle
Thread
bzr commit into connector-net-trunk branch (reggie.burnett:943) Bug#57654Reggie Burnett11 Nov