Connector/NET commit: r1557 - in trunk: . Installer MySql.Data/Provider/Properties

[rburnett]

Modified:
   trunk/CHANGES
   trunk/Installer/cf.wxs
   trunk/Installer/core.wxs
   trunk/Installer/main.wxs
   trunk/Installer/visualstudio.wxs
   trunk/Installer/webproviders.wxs
   trunk/MySql.Data/Provider/Properties/AssemblyInfo.cs
Log:
- fixed installer that was no longer referencing the right folders for Visual Studio
assemblies [bug #44141]


Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2009-04-08 15:05:56 UTC (rev 1556)
+++ trunk/CHANGES	2009-04-08 19:10:20 UTC (rev 1557)
@@ -1,3 +1,7 @@
+Version 6.0.3
+- fixed broken connection prompting
+- fixed installer that was no longer referencing the right folders for Visual Studio
assemblies [bug #44141]
+
 Version 6.0.2
 - fixed registration problem with Visual studio (bug #44064)
 - fixed problem where stored procedures and functions could not be deleted from server
explorer

Modified: trunk/Installer/cf.wxs
===================================================================
--- trunk/Installer/cf.wxs	2009-04-08 15:05:56 UTC (rev 1556)
+++ trunk/Installer/cf.wxs	2009-04-08 19:10:20 UTC (rev 1557)
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment Id='CFFragment'>
-    <DirectoryRef Id='Assemblies'>
+    <DirectoryRef Id='AssembliesDir'>
       <Component Id="CFBinaries" Guid="5a9c32ad-62f5-4b24-a225-96acf42d88a1">
         <File Id="cf1" Name="MySql.Data.CF.dll"
               Source="..\mysql.data\provider\bin\release\mysql.data.CF.dll"
DiskId="1"/>
-        <File Id="cf2" Name="Mysql.Data.Tests.CF.dll"
-              Source="..\mysql.data\tests\bin\Release\mysql.data.CF.tests.dll"
DiskId="1"/>
       </Component>
     </DirectoryRef>
 

Modified: trunk/Installer/core.wxs
===================================================================
--- trunk/Installer/core.wxs	2009-04-08 15:05:56 UTC (rev 1556)
+++ trunk/Installer/core.wxs	2009-04-08 19:10:20 UTC (rev 1557)
@@ -22,13 +22,13 @@
     </DirectoryRef>
 
     <!-- .Net 2.0 Binaries -->
-    <DirectoryRef Id='Assemblies'>
+    <DirectoryRef Id='AssembliesDir'>
       <Component Id="Net20" Guid="0e8af006-273c-49bb-b7c1-ec1737260a5a">
         <File Id="MySqlData" Name="MySql.Data.dll"
               Source="..\mysql.data\provider\bin\release\mysql.data.dll" DiskId="1"/>
         <RegistryKey Id="VSRegistry" Root="HKLM" Action="createAndRemoveOnUninstall"
                     
Key="SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\MySQL Connector Net
$(var.Version)">
-          <RegistryValue Id="VSRegistryValue" Value="[BinNet20]" Type="string"
Action="write"/>
+          <RegistryValue Id="VSRegistryValue" Value="[AssembliesDir]" Type="string"
Action="write"/>
         </RegistryKey>
 
         <util:PerformanceCategory Id="PMDataCategoryId" Name=".NET Data Provider for
MySQL"
@@ -71,7 +71,7 @@
     </Feature>
 
     <!-- Entity framework feature -->
-    <DirectoryRef Id='Assemblies'>
+    <DirectoryRef Id='AssembliesDir'>
       <Component Id="InstallEF" Guid="AB734C75-F5DC-491e-A2BC-52D5061881B7"
DiskId="1">
         <File Id="MySql.Data.EF" Name="MySql.Data.Entity.dll"
               Source="..\mysql.data.entity\provider\bin\release\mysql.data.entity.dll"
DiskId="1"/>

Modified: trunk/Installer/main.wxs
===================================================================
--- trunk/Installer/main.wxs	2009-04-08 15:05:56 UTC (rev 1556)
+++ trunk/Installer/main.wxs	2009-04-08 19:10:20 UTC (rev 1557)
@@ -37,9 +37,9 @@
       <Directory Id='ProgramFilesFolder' Name='PFiles'>
         <Directory Id='CompanyDir' Name='MySQL'>
           <Directory Id='INSTALLDIR' Name='$(var.ProductName)'>
-            <Directory Id='Assemblies' Name='Assemblies'/>
+            <Directory Id='AssembliesDir' Name='Assemblies'/>
+            <Directory Id='IntegrationDir' Name='Integration'/>
             <Directory Id='DocsDir' Name='Documentation'/>
-            <Directory Id='DriverDir' Name='Driver'/>
             <Directory Id='SampleDir' Name='Samples'/>
           </Directory>
         </Directory>

Modified: trunk/Installer/visualstudio.wxs
===================================================================
--- trunk/Installer/visualstudio.wxs	2009-04-08 15:05:56 UTC (rev 1556)
+++ trunk/Installer/visualstudio.wxs	2009-04-08 19:10:20 UTC (rev 1557)
@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment Id='VSFragment'>
 
-    <DirectoryRef Id='Assemblies'>
+    <DirectoryRef Id='IntegrationDir'>
       <!-- common DDEX component to be installed if VS2005 or VS2008 is selected
-->
       <Component Id='VS_Common' Guid='75F9BFA2-4D6E-4cb3-97E6-B27C478CDE44'>
         <File Id='MySQL.VisualStudio' Name='MySQL.VisualStudio.dll' DiskId='1'

Modified: trunk/Installer/webproviders.wxs
===================================================================
--- trunk/Installer/webproviders.wxs	2009-04-08 15:05:56 UTC (rev 1556)
+++ trunk/Installer/webproviders.wxs	2009-04-08 19:10:20 UTC (rev 1557)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment Id='ProvidersFragment'>
-    <DirectoryRef Id='Assemblies'>
+    <DirectoryRef Id='AssembliesDir'>
       <Directory Id="MySql.Web.DummyDir" Name="GAC">
         <Component Id="ProvidersGAC" Guid="6b95d34b-91e1-41ff-9f3f-dcb5308a00ce">
           <File Id="ProviderAssemblyGAC" Name="MySql.Web.dll" ShortName="MW"

Modified: trunk/MySql.Data/Provider/Properties/AssemblyInfo.cs
===================================================================
--- trunk/MySql.Data/Provider/Properties/AssemblyInfo.cs	2009-04-08 15:05:56 UTC (rev
1556)
+++ trunk/MySql.Data/Provider/Properties/AssemblyInfo.cs	2009-04-08 19:10:20 UTC (rev
1557)
@@ -29,7 +29,6 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 //
-[assembly: AssemblyTitle("MySQL.Data.dll")]
 [assembly: AssemblyDescription("ADO.Net driver for MySQL")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("MySQL AB")]
@@ -40,7 +39,10 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 #if !CF
+[assembly: AssemblyTitle("MySql.Data.dll")]
 [assembly: AllowPartiallyTrustedCallers()]
+#else
+[assembly: AssemblyTitle("MySql.Data.CF.dll")]
 #endif
 //
 // Version information for an assembly consists of the following four values: