Modified:
branches/5.2/CHANGES
branches/5.2/Installer/visualstudio.wxs
branches/5.2/Installer/vs2008.wxs
Log:
- Fixed installer that did not install the DDEX provider binary if
the Visual Studio 2005 component was not selected. (bug #34674)
The VS 2005 component included the wix code necessary to copy the DDEX binary but the VS 2005 component did not. This patch fixes that.
Modified: branches/5.2/CHANGES
===================================================================
--- branches/5.2/CHANGES 2008-02-22 17:56:02 UTC (rev 1188)
+++ branches/5.2/CHANGES 2008-02-22 19:28:05 UTC (rev 1189)
@@ -6,6 +6,8 @@
server explorer nodes to not function
- Fixed web providers so that they don't attempt to check their schema or cache
their application id if the connection string has not been set. (bug #34451)
+- Fixed installer that did not install the DDEX provider binary if
+ the Visual Studio 2005 component was not selected. (bug #34674)
Version 5.2 - 2/11/2008
. Added ClearPool and ClearAllPools features
Modified: branches/5.2/Installer/visualstudio.wxs
===================================================================
--- branches/5.2/Installer/visualstudio.wxs 2008-02-22 17:56:02 UTC (rev 1188)
+++ branches/5.2/Installer/visualstudio.wxs 2008-02-22 19:28:05 UTC (rev 1189)
@@ -4,12 +4,15 @@
<DirectoryRef Id='INSTALLDIR'>
<Directory Id='VSDir' Name='Visual Studio Integration'>
- <Component Id="VS_2005" Guid="a5240e1b-c5c2-4820-8a1d-776c0017f44b">
+ <!-- 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'
Source='..\VisualStudio\bin\release\MySQL.VisualStudio.dll' />
<File Id='MySql.VisualStudio.dll.config' Name='MySql.VisualStudio.dll.config' DiskId='1'
Source='..\VisualStudio\bin\release\MySql.VisualStudio.dll.config' />
-
+ </Component>
+
+ <Component Id="VS_2005" Guid="a5240e1b-c5c2-4820-8a1d-776c0017f44b">
<!--Datasource registration section-->
<RegistryKey Id='DataSource' Root='HKLM'
Key='Software\Microsoft\VisualStudio\8.0\DataSources\{98FBE4D8-5583-4233-B219-70FF8C7FBBBD}'
@@ -86,6 +89,7 @@
<Feature Id='VS2005Int' Level='1' Title='Visual Studio 2005'>
<Condition Level='0'>Not VS_2005_PATH</Condition>
+ <ComponentRef Id='VS_Common'/>
<ComponentRef Id='VS_2005'/>
</Feature>
Modified: branches/5.2/Installer/vs2008.wxs
===================================================================
--- branches/5.2/Installer/vs2008.wxs 2008-02-22 17:56:02 UTC (rev 1188)
+++ branches/5.2/Installer/vs2008.wxs 2008-02-22 19:28:05 UTC (rev 1189)
@@ -78,6 +78,7 @@
<Feature Id='VS2008Int' Level='1' Title='Visual Studio 2008'>
<Condition Level='0'>Not VS_2008_PATH</Condition>
+ <ComponentRef Id='VS_Common'/>
<ComponentRef Id='VS_2008'/>
</Feature>
| Thread |
|---|
| • Connector/NET commit: r1189 - in branches/5.2: . Installer | rburnett | 22 Feb |
