Modified:
branches/5.2/CHANGES
branches/5.2/Installer/VS2005_Registry.wxi
branches/5.2/Installer/VS2008_Registry.wxi
branches/5.2/MySql.Data/Provider/Properties/AssemblyInfo.cs
branches/5.2/MySql.Data/Tests/Properties/AssemblyInfo.cs
branches/5.2/MySql.VisualStudio/Properties/AssemblyInfo.cs
branches/5.2/MySql.Web/Providers/Properties/AssemblyInfo.cs
branches/5.2/MySql.Web/Tests/Properties/AssemblyInfo.cs
branches/5.2/README
Log:
- fixed problem with package registration that kept the DDEX provider from working (bug #40726). Also bumped all version numbers to 5.2.5
Modified: branches/5.2/CHANGES
===================================================================
--- branches/5.2/CHANGES 2008-11-12 16:53:36 UTC (rev 1459)
+++ branches/5.2/CHANGES 2008-11-14 18:40:32 UTC (rev 1460)
@@ -1,3 +1,6 @@
+Version 5.2.5 - 11/14/2008
+- fixed problem with package registration that kept the DDEX provider from working (bug #40726)
+
Version 5.2.4 - 11/11/2008 (Happy Birthday to me!)
- fixed web providers autogenerateschema option where it would fail if no schema is
present at all (bug #39072)
Modified: branches/5.2/Installer/VS2005_Registry.wxi
===================================================================
--- branches/5.2/Installer/VS2005_Registry.wxi 2008-11-12 16:53:36 UTC (rev 1459)
+++ branches/5.2/Installer/VS2005_Registry.wxi 2008-11-14 18:40:32 UTC (rev 1460)
@@ -1,19 +1,20 @@
<Include>
- <RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
- Key="Software\Microsoft\VisualStudio\8.0\InstalledProducts\MySqlDataProviderPackage">
+ <RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
+ Key="Software\Microsoft\VisualStudio\8.0\InstalledProducts\MySQL Connector Net $(var.Version)">
+ <RegistryValue Value="MySQL Connector Net $(var.Version)" Type="string"/>
<RegistryValue Name="Package" Value="{79a115c9-b133-4891-9e7b-242509dad272}" Type="string" />
<RegistryValue Name="UseInterface" Value="1" Type="integer" />
</RegistryKey>
<RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
Key="Software\Microsoft\VisualStudio\8.0\Packages\{79a115c9-b133-4891-9e7b-242509dad272}">
- <RegistryValue Value="MySql.Data.VisualStudio.MySqlDataProviderPackage, MySql.VisualStudio, Version=$(var.Version), Culture=neutral, PublicKeyToken=null" Type="string"/>
+ <RegistryValue Value="MySQL Connector Net $(var.Version)" Type="string"/>
<RegistryValue Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" />
<RegistryValue Name="Class" Value="MySql.Data.VisualStudio.MySqlDataProviderPackage" Type="string" />
<RegistryValue Name="CodeBase" Value="[#MySQL.VisualStudio]" Type="string"/>
<RegistryValue Name="ID" Value="100" Type="integer" />
<RegistryValue Name="MinEdition" Value="Standard" Type="string" />
- <RegistryValue Name="ProductVersion" Value="1.0" Type="string" />
+ <RegistryValue Name="ProductVersion" Value="1.1" Type="string" />
<RegistryValue Name="ProductName" Value="MySQL Tools for Visual Studio" Type="string" />
<RegistryValue Name="CompanyName" Value="MySQL AB c/o MySQL, Inc." Type="string" />
</RegistryKey>
Modified: branches/5.2/Installer/VS2008_Registry.wxi
===================================================================
--- branches/5.2/Installer/VS2008_Registry.wxi 2008-11-12 16:53:36 UTC (rev 1459)
+++ branches/5.2/Installer/VS2008_Registry.wxi 2008-11-14 18:40:32 UTC (rev 1460)
@@ -1,19 +1,20 @@
<Include>
<RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
- Key="Software\Microsoft\VisualStudio\9.0\InstalledProducts\MySqlDataProviderPackage">
+ Key="Software\Microsoft\VisualStudio\9.0\InstalledProducts\MySQL Connector Net $(var.Version)">
+ <RegistryValue Value="MySQL Connector Net $(var.Version)" Type="string"/>
<RegistryValue Name="Package" Value="{79a115c9-b133-4891-9e7b-242509dad272}" Type="string" />
<RegistryValue Name="UseInterface" Value="1" Type="integer" />
</RegistryKey>
<RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
Key="Software\Microsoft\VisualStudio\9.0\Packages\{79a115c9-b133-4891-9e7b-242509dad272}">
- <RegistryValue Value="MySql.Data.VisualStudio.MySqlDataProviderPackage, MySql.VisualStudio, Version=$(var.Version), Culture=neutral, PublicKeyToken=null" Type="string"/>
+ <RegistryValue Value="MySQL Connector Net $(var.Version)" Type="string"/>
<RegistryValue Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" />
<RegistryValue Name="Class" Value="MySql.Data.VisualStudio.MySqlDataProviderPackage" Type="string" />
<RegistryValue Name="CodeBase" Value="[#MySQL.VisualStudio]" Type="string"/>
<RegistryValue Name="ID" Value="100" Type="integer" />
<RegistryValue Name="MinEdition" Value="Standard" Type="string" />
- <RegistryValue Name="ProductVersion" Value="1.0" Type="string" />
+ <RegistryValue Name="ProductVersion" Value="1.1" Type="string" />
<RegistryValue Name="ProductName" Value="MySQL Tools for Visual Studio" Type="string" />
<RegistryValue Name="CompanyName" Value="MySQL AB c/o MySQL, Inc." Type="string" />
</RegistryKey>
Modified: branches/5.2/MySql.Data/Provider/Properties/AssemblyInfo.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Properties/AssemblyInfo.cs 2008-11-12 16:53:36 UTC (rev 1459)
+++ branches/5.2/MySql.Data/Provider/Properties/AssemblyInfo.cs 2008-11-14 18:40:32 UTC (rev 1460)
@@ -53,7 +53,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("5.2.4")]
+[assembly: AssemblyVersion("5.2.5")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: branches/5.2/MySql.Data/Tests/Properties/AssemblyInfo.cs
===================================================================
--- branches/5.2/MySql.Data/Tests/Properties/AssemblyInfo.cs 2008-11-12 16:53:36 UTC (rev 1459)
+++ branches/5.2/MySql.Data/Tests/Properties/AssemblyInfo.cs 2008-11-14 18:40:32 UTC (rev 1460)
@@ -46,7 +46,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("5.2.4")]
+[assembly: AssemblyVersion("5.2.5")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: branches/5.2/MySql.VisualStudio/Properties/AssemblyInfo.cs
===================================================================
--- branches/5.2/MySql.VisualStudio/Properties/AssemblyInfo.cs 2008-11-12 16:53:36 UTC (rev 1459)
+++ branches/5.2/MySql.VisualStudio/Properties/AssemblyInfo.cs 2008-11-14 18:40:32 UTC (rev 1460)
@@ -29,5 +29,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly : AssemblyVersion("5.2.4")]
-//[assembly: AssemblyKeyName("ConnectorNet")]
+[assembly : AssemblyVersion("5.2.5")]
+[assembly: AssemblyKeyName("ConnectorNet")]
Modified: branches/5.2/MySql.Web/Providers/Properties/AssemblyInfo.cs
===================================================================
--- branches/5.2/MySql.Web/Providers/Properties/AssemblyInfo.cs 2008-11-12 16:53:36 UTC (rev 1459)
+++ branches/5.2/MySql.Web/Providers/Properties/AssemblyInfo.cs 2008-11-14 18:40:32 UTC (rev 1460)
@@ -53,5 +53,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("5.2.4")]
+[assembly: AssemblyVersion("5.2.5")]
[assembly: AssemblyKeyName("ConnectorNet")]
Modified: branches/5.2/MySql.Web/Tests/Properties/AssemblyInfo.cs
===================================================================
--- branches/5.2/MySql.Web/Tests/Properties/AssemblyInfo.cs 2008-11-12 16:53:36 UTC (rev 1459)
+++ branches/5.2/MySql.Web/Tests/Properties/AssemblyInfo.cs 2008-11-14 18:40:32 UTC (rev 1460)
@@ -31,4 +31,4 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("5.2.4")]
+[assembly: AssemblyVersion("5.2.5")]
Modified: branches/5.2/README
===================================================================
--- branches/5.2/README 2008-11-12 16:53:36 UTC (rev 1459)
+++ branches/5.2/README 2008-11-14 18:40:32 UTC (rev 1460)
@@ -1,4 +1,4 @@
-MySQL Connector/Net 5.2.4
+MySQL Connector/Net 5.2.5
MySQL AB's ADO.Net Driver for MySQL
Copyright (c) 2004-2007 MySQL AB
| Thread |
|---|
| • Connector/NET commit: r1460 - in branches/5.2: . Installer MySql.Data/Provider/Properties MySql.Data/Tests/Properties MySql.VisualStudio/Properties My... | rburnett | 14 Nov |
