bzr commit into connector-net-trunk branch (reggie.burnett:926)

[Reggie Burnett]

#At file:///C:/work/connector-net/clean-trunk/ based on revid:reggie.burnett@stripped

  926 Reggie Burnett	2010-08-30 [merge]
      merged

    modified:
      CHANGES
      Installer/Installer.wixproj
      Installer/main.wxs
      Installer/ui.wxs
      MySQLClient.sln
      MySql.Data/Tests/Source/PoolingTests.cs
      package.proj
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2010-08-12 15:15:10 +0000
+++ b/CHANGES	2010-08-30 20:17:30 +0000
@@ -1,3 +1,4 @@
+Version 6.2.4
 - Fix authorization popup after modifying stored procedure in VS (Bug #44715)
 - Dispose EventLog after use in MySql.Web.dll provider classes, to avoid wasting resources
   (Bug #55793)

=== modified file 'Installer/Installer.wixproj'
--- a/Installer/Installer.wixproj	2010-05-19 17:56:19 +0000
+++ b/Installer/Installer.wixproj	2010-08-30 20:17:30 +0000
@@ -140,11 +140,6 @@
     </WixExtension>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="registration\loginhdr.jpg" />
-    <Content Include="registration\mysql_ca.dll" />
-    <Content Include="registration\register.htm" />
-    <Content Include="registration\svctag.xml" />
-    <Content Include="registration\webpage.ico" />
     <Content Include="VS2005_Data.wxi" />
     <Content Include="VS2005_Registry.wxi" />
     <Content Include="VS2008_Data.wxi" />
@@ -152,10 +147,7 @@
     <Content Include="VS2010_Data.wxi" />
     <Content Include="VS2010_Registry.wxi" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="registration\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.5\Wix.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets" />
   <PropertyGroup>
     <BuildDependsOn>RetrieveIdentities;$(BuildDependsOn)</BuildDependsOn>
   </PropertyGroup>

=== modified file 'Installer/main.wxs'
--- a/Installer/main.wxs	2010-07-26 01:21:36 +0000
+++ b/Installer/main.wxs	2010-08-30 20:17:30 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?define ProductName="MySQL Connector Net $(var.Version)"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="5FD88490-011C-4df1-B886-F298D955171B" Name="$(var.ProductName)" Manufacturer="MySQL AB"
+  <Product Id="5FD88490-011C-4df1-B886-F298D955171B" Name="$(var.ProductName)" Manufacturer="Oracle"
            Version="$(var.Version)" Language="1033">
     <Package Compressed="yes" InstallerVersion="200"/>
 

=== modified file 'Installer/ui.wxs'
--- a/Installer/ui.wxs	2010-07-26 01:21:36 +0000
+++ b/Installer/ui.wxs	2010-08-30 20:17:30 +0000
@@ -71,8 +71,6 @@
     <UI>
       <Dialog Id="MySQL_ExitDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
         <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="$(loc.WixUIFinish)">
-          <!--<Publish Event="DoAction" Value="PostRegistration.SetProperty">RegisterServer and not Installed and ACTION="INSTALL"</Publish>
-          <Publish Event="DoAction" Value="PostRegistration">RegisterServer and not Installed and ACTION="INSTALL"</Publish>-->
           <Publish Event="EndDialog" Value="Return">1</Publish>
         </Control>
         <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />

=== modified file 'MySQLClient.sln'
--- a/MySQLClient.sln	2010-07-02 18:41:31 +0000
+++ b/MySQLClient.sln	2010-08-30 20:17:30 +0000
@@ -231,6 +231,7 @@
 		{A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Commercial|x64.ActiveCfg = Release|Any CPU
 		{A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Commercial|x86.ActiveCfg = Release|Any CPU
 		{A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -254,6 +255,7 @@
 		{77EC4E20-293A-48BA-8415-D0AD869D91FA}.Commercial|x64.ActiveCfg = Release|Any CPU
 		{77EC4E20-293A-48BA-8415-D0AD869D91FA}.Commercial|x86.ActiveCfg = Release|Any CPU
 		{77EC4E20-293A-48BA-8415-D0AD869D91FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77EC4E20-293A-48BA-8415-D0AD869D91FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{77EC4E20-293A-48BA-8415-D0AD869D91FA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{77EC4E20-293A-48BA-8415-D0AD869D91FA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{77EC4E20-293A-48BA-8415-D0AD869D91FA}.Debug|x64.ActiveCfg = Debug|Any CPU

=== modified file 'MySql.Data/Tests/Source/PoolingTests.cs'
--- a/MySql.Data/Tests/Source/PoolingTests.cs	2010-08-18 19:52:04 +0000
+++ b/MySql.Data/Tests/Source/PoolingTests.cs	2010-08-30 20:17:30 +0000
@@ -182,7 +182,7 @@
             using (MySqlConnection c1 = new MySqlConnection(connStr))
             {
                 c1.Open();
-                Assert.AreNotEqual(c1.ServerThread, threadId);
+                Assert.IsTrue(c1.ServerThread != threadId);
                 KillConnection(c1);
             }
         }

=== modified file 'package.proj'
--- a/package.proj	2010-08-18 18:35:11 +0000
+++ b/package.proj	2010-08-30 20:17:30 +0000
@@ -44,7 +44,7 @@
           **/installer/**;**/documentation/**;**/PackageLoadKey.txt;**/*.cache;
           **/*.proj;**/COPYING;**/*.bak;**/*.user;**/*.SourceAnalysis;
 	  **/MySql.Data.xml;**/*.InstallLog;**/*.bat;**/*.reg;**/thumbs.db;**/.bzr/**;
-	  **/.bzr-mysql/**;**/*.bzrignore;**/*.~??"/>
+	  **/.bzr-mysql/**;**/UpgradeLog*.*;**/*.bzrignore;**/*.~??"/>
     <SourceFiles Include="COPYING" Condition=" '$(Configuration)' == 'GPL' "/>
   </ItemGroup>
 
@@ -52,6 +52,9 @@
     <RemoveDir Directories="tmp" ContinueOnError="true"/>
     <MakeDir Directories ="tmp"/>
     <Copy SourceFiles ="@(SourceFiles)" DestinationFolder="tmp/%(RecursiveDir)"/>
+    <Delete Files="tmp/Readme-commercial" Condition=" '$(Configuration)' == 'GPL' "/>
+    <Delete Files="tmp/Readme" Condition=" '$(Configuration)' == 'Commercial' "/>
+    <Move SourceFiles="tmp/README-Commercial" DestinationFiles="tmp/README" Condition=" '$(Configuration)' == 'Commercial' "/>
 
     <ItemGroup>
       <TmpFiles Include="tmp/**/*.cs"/>
@@ -99,7 +102,7 @@
     <Copy SourceFiles ="@(BinaryFiles)" DestinationFolder="tmp"/>
     <Copy SourceFiles ="@(V2Assemblies)" DestinationFolder="tmp\v2"/>
     <Copy SourceFiles ="@(V4Assemblies)" DestinationFolder="tmp\v4"/>
-    <Move SourceFiles="tmp/README-Commercial" DestinationFiles="tmp/README"/>
+    <Move SourceFiles="tmp/README-Commercial" DestinationFiles="tmp/README" Condition=" '$(Configuration)' == 'Commercial' "/>
     <ItemGroup>
       <ZipFiles Include="tmp/**"/>
     </ItemGroup>


Attachment: [text/bzr-bundle] bzr/[e-mail]