List:Commits« Previous MessageNext Message »
From:Reggie Burnett Date:July 20 2010 7:53pm
Subject:bzr commit into connector-net-trunk branch (reggie.burnett:897) Bug#53975
View as plain text  
#At file:///C:/work/connector-net/trunk/ based on revid:vvaintroub@stripped

  897 Reggie Burnett	2010-07-20
      Fixed an installer problem (bug #53975)

    modified:
      Installer/core.wxs
      Installer/main.wxs
      Installer/visualstudio.wxs
      MySql.Data.Entity/Provider/MySql.Data.Entity.VS2010.csproj
      MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.VS2010.csproj
      MySql.Data/Provider/Source/Installer.cs
      MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj
      MySql.VisualStudio/MySql.VisualStudio.csproj
      MySql.Web/Providers/Source/Install.cs
=== modified file 'Installer/core.wxs'
=== modified file 'Installer/core.wxs'
--- a/Installer/core.wxs	2010-05-20 04:15:01 +0000
+++ b/Installer/core.wxs	2010-07-20 19:53:09 +0000
@@ -91,7 +91,7 @@
       <Component Id="EF.v4.GAC" Guid="A9C03468-5A59-443f-85DC-C0149EBB55C8" DiskId="1">
         <Condition>NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</Condition>
         <File Id="MySql.Data.EF.v4.GAC" Name="MySql.Data.Entity.dll"
-              Source="..\mysql.data.entity\provider\bin-4.0\release\mysql.data.entity.dll" DiskId="1"
+              Source="..\mysql.data.entity\provider\bin\release-4.0\mysql.data.entity.dll" DiskId="1"
               Assembly=".net" KeyPath="yes"/>
       </Component>
     </DirectoryRef>

=== modified file 'Installer/main.wxs'
--- a/Installer/main.wxs	2010-05-20 04:15:01 +0000
+++ b/Installer/main.wxs	2010-07-20 19:53:09 +0000
@@ -109,6 +109,8 @@
     <UIRef Id="WixUI_MySQL"/>
     <WixVariable Id="WixUIBannerBmp" Value="Bitmaps/BannrBmp.bmp"/>
     <WixVariable Id="WixUIDialogBmp" Value="Bitmaps/DlgBmp.bmp"/>
+    <WixVariable Id="WixUICostingPopupOptOut" Value="true"/>
+
 
     <Icon Id="ChangeLogIcon" SourceFile="Bitmaps\document.ico"/>
 

=== modified file 'Installer/visualstudio.wxs'
--- a/Installer/visualstudio.wxs	2010-05-20 04:15:01 +0000
+++ b/Installer/visualstudio.wxs	2010-07-20 19:53:09 +0000
@@ -41,14 +41,18 @@
     <DirectoryRef Id='VS2010Integration'>
       <Component Id='VS2010_Common' Guid='EC2420A0-ADD0-477f-99B5-FFA96EC557F4'>
         <File Id='MySQL.VisualStudio.2010' Name='MySQL.VisualStudio.dll' DiskId='1'
-              Source='..\MySql.VisualStudio\bin-4.0\release\MySQL.VisualStudio.dll' />
+              Source='..\MySql.VisualStudio\bin\release-4.0\MySQL.VisualStudio.dll' />
       </Component>
       
       <Component Id='VS_2010_Registry' Guid='E602F4FD-4D11-4632-8204-C0CFE22F8C7C'>
         <RegistryKey Id="VS_2010_RegistryKey" Root="HKLM" Action="createAndRemoveOnUninstall"
-                     Key="SOFTWARE\Microsoft\.NETFramework\v4.0.30128\AssemblyFoldersEx\MySQL Connector Net $(var.Version)">
+                     Key="SOFTWARE\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\MySQL Connector Net $(var.Version) v4.0">
           <RegistryValue Id="VS_2010_RegistryValue" Value="[assemblies_v4]" Type="string" Action="write"/>
         </RegistryKey>
+        <RegistryKey Id="VS_2010_RegistryKey" Root="HKLM" Action="createAndRemoveOnUninstall"
+                     Key="SOFTWARE\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\MySQL Connector Net $(var.Version) v2.0">
+          <RegistryValue Id="VS_2010_RegistryValue" Value="[assemblies_v2]" Type="string" Action="write"/>
+        </RegistryKey>
         <?include VS2010_Registry.wxi?>
         <?include VS2010_Data.wxi?>
       </Component>

=== modified file 'MySql.Data.Entity/Provider/MySql.Data.Entity.VS2010.csproj'
--- a/MySql.Data.Entity/Provider/MySql.Data.Entity.VS2010.csproj	2010-05-20 04:15:01 +0000
+++ b/MySql.Data.Entity/Provider/MySql.Data.Entity.VS2010.csproj	2010-07-20 19:53:09 +0000
@@ -32,13 +32,13 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkProfile />
-    <BaseIntermediateOutputPath>obj-4.0</BaseIntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin-4.0\Debug\</OutputPath>
+    <BaseIntermediateOutputPath>obj\Debug-4.0</BaseIntermediateOutputPath>
+    <OutputPath>bin\Debug-4.0\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -47,7 +47,8 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin-4.0\Release\</OutputPath>
+    <BaseIntermediateOutputPath>obj\Release-4.0</BaseIntermediateOutputPath>
+    <OutputPath>bin\Release-4.0\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

=== modified file 'MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.VS2010.csproj'
--- a/MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.VS2010.csproj	2010-05-20 04:15:01 +0000
+++ b/MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.VS2010.csproj	2010-07-20 19:53:09 +0000
@@ -32,13 +32,13 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkProfile />
-    <BaseIntermediaOutputPath>obj-4.0</BaseIntermediaOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <BaseIntermediaOutputPath>obj\Debug-4.0</BaseIntermediaOutputPath>
+    <OutputPath>bin\Debug-4.0\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -47,7 +47,8 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <BaseIntermediaOutputPath>obj\Release-4.0</BaseIntermediaOutputPath>
+    <OutputPath>bin\Release-4.0\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

=== modified file 'MySql.Data/Provider/Source/Installer.cs'
--- a/MySql.Data/Provider/Source/Installer.cs	2010-06-25 17:03:30 +0000
+++ b/MySql.Data/Provider/Source/Installer.cs	2010-07-20 19:53:09 +0000
@@ -72,14 +72,12 @@
 
         private static void UpdateMachineConfigs(string rootPath, bool add)
         {
-            string[] dirs = Directory.GetDirectories(rootPath);
+            string[] dirs = new string[2] { "v2.0.50727", "4.0.30319" };
             foreach (string frameworkDir in dirs)
             {
-                string[] pathElements = frameworkDir.Split(Path.DirectorySeparatorChar);
-                if (pathElements[pathElements.Length - 1].StartsWith("v1")) continue;
-                if (pathElements[pathElements.Length - 1].StartsWith("v3")) continue;
+                string path = rootPath + frameworkDir;
 
-                string configPath = String.Format(@"{0}\CONFIG", frameworkDir);
+                string configPath = String.Format(@"{0}\CONFIG", path);
                 if (Directory.Exists(configPath))
                 {
                     if (add)

=== modified file 'MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj'
--- a/MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj	2010-06-25 17:46:30 +0000
+++ b/MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj	2010-07-20 19:53:09 +0000
@@ -35,13 +35,13 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <BaseIntermediateOutputPath>obj-4.0</BaseIntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <BaseIntermediateOutputPath>obj\Debug-4.0</BaseIntermediateOutputPath>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin-4.0\Debug\</OutputPath>
+    <OutputPath>bin\Debug-4.0\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -49,9 +49,10 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <BaseIntermediateOutputPath>obj\Release-4.0</BaseIntermediateOutputPath>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin-4.0\Release\</OutputPath>
+    <OutputPath>bin\Release-4.0\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -135,6 +136,7 @@
     <Compile Include="..\MySql.Data\Provider\Source\common\MySqlTokenizer.cs">
       <Link>LanguageService\MySqlTokenizer.cs</Link>
     </Compile>
+    <Compile Include="DDEX\MySqlDataObjectIdentifierConverter.cs" />
     <Compile Include="Editors\BaseEditorControl.cs">
       <SubType>UserControl</SubType>
     </Compile>

=== modified file 'MySql.VisualStudio/MySql.VisualStudio.csproj'
--- a/MySql.VisualStudio/MySql.VisualStudio.csproj	2010-07-02 18:41:31 +0000
+++ b/MySql.VisualStudio/MySql.VisualStudio.csproj	2010-07-20 19:53:09 +0000
@@ -133,11 +133,13 @@
     <Compile Include="DDEX\MySqlConnectionProperties.cs" />
     <Compile Include="DDEX\MySqlConnectionSupport.cs" />
     <Compile Include="DDEX\MySqlConnectionUIControl.cs">
+      <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="DDEX\MySqlConnectionUIControl.designer.cs">
       <DependentUpon>MySqlConnectionUIControl.cs</DependentUpon>
     </Compile>
     <Compile Include="DDEX\MySqlDataConnectionPromptDialog.cs">
+      <SubType>Form</SubType>
     </Compile>
     <Compile Include="DDEX\MySqlDataConnectionPromptDialog.Designer.cs">
       <DependentUpon>MySqlDataConnectionPromptDialog.cs</DependentUpon>

=== modified file 'MySql.Web/Providers/Source/Install.cs'
--- a/MySql.Web/Providers/Source/Install.cs	2010-03-08 21:29:19 +0000
+++ b/MySql.Web/Providers/Source/Install.cs	2010-07-20 19:53:09 +0000
@@ -90,14 +90,12 @@
 
         private void UpdateMachineConfigs(string rootPath, bool add)
         {
-            string[] dirs = Directory.GetDirectories(rootPath);
+            string[] dirs = new string[2] { "v2.0.50727", "4.0.30319" };
             foreach (string frameworkDir in dirs)
             {
-                string[] pathElements = frameworkDir.Split(Path.DirectorySeparatorChar);
-                if (pathElements[pathElements.Length-1].StartsWith("v1")) continue;
-                if (pathElements[pathElements.Length - 1].StartsWith("v3")) continue;
+                string path = rootPath + frameworkDir;
 
-                string configPath = String.Format(@"{0}\CONFIG", frameworkDir);
+                string configPath = String.Format(@"{0}\CONFIG", path);
                 if (Directory.Exists(configPath))
                 {
                     if (add)
@@ -111,6 +109,7 @@
         private void AddProviderToMachineConfigInDir(string path)
         {
             string configFile = String.Format(@"{0}\machine.config", path);
+            if (!File.Exists(configFile)) return;
 
             // now read the config file into memory
             StreamReader sr = new StreamReader(configFile);
@@ -290,6 +289,7 @@
         private void RemoveProviderFromMachineConfigInDir(string path)
         {
             string configFile = String.Format(@"{0}\machine.config", path);
+            if (!File.Exists(configFile)) return;
 
             // now read the config file into memory
             StreamReader sr = new StreamReader(configFile);


Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20100720195309-pe0i1v4icfnt48vd.bundle
Thread
bzr commit into connector-net-trunk branch (reggie.burnett:897) Bug#53975Reggie Burnett20 Jul