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

[Reggie Burnett]

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

  902 Reggie Burnett	2010-07-25
      last minute tidying up

    modified:
      CHANGES
      Installer/Installer.VS2010.wixproj
      MySQLClient-VS2010.sln
      Release Notes.txt
      package.proj
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2010-07-21 16:39:02 +0000
+++ b/CHANGES	2010-07-26 01:21:57 +0000
@@ -1,3 +1,5 @@
+Version 6.3.3 (beta 2)
+
 - Fix membership provider creation failure, when default database character set is different from latin1 (Bug #53174)
 - Fix "Connection must be valid and open" exception When UpdateBatchSize > 1 
   and MySqlDataAdapter is not using an open connection (Bug #38411)

=== modified file 'Installer/Installer.VS2010.wixproj'
--- a/Installer/Installer.VS2010.wixproj	2010-05-19 17:56:19 +0000
+++ b/Installer/Installer.VS2010.wixproj	2010-07-26 01:21:57 +0000
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <UsingTask AssemblyFile="Binary\MyTasks.dll" TaskName="GetVersion" />
   <PropertyGroup>
@@ -140,11 +141,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,9 +148,6 @@
     <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" />
   <PropertyGroup>
     <BuildDependsOn>RetrieveIdentities;$(BuildDependsOn)</BuildDependsOn>

=== modified file 'MySQLClient-VS2010.sln'
--- a/MySQLClient-VS2010.sln	2010-05-20 04:15:01 +0000
+++ b/MySQLClient-VS2010.sln	2010-07-26 01:21:57 +0000
@@ -194,6 +194,7 @@
 		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|x86.ActiveCfg = Commercial|x86
 		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|x86.Build.0 = Commercial|x86
 		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Any CPU.ActiveCfg = GPL|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Any CPU.Build.0 = GPL|x86
 		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Mixed Platforms.ActiveCfg = GPL|x86
 		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Mixed Platforms.Build.0 = GPL|x86
 		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|x64.ActiveCfg = GPL|x86

=== modified file 'Release Notes.txt'
--- a/Release Notes.txt	2010-05-20 04:15:01 +0000
+++ b/Release Notes.txt	2010-07-26 01:21:57 +0000
@@ -15,12 +15,8 @@
 What we know is broken
 ----------------------
 - Documentation has not been integrated into VS2010 yet
-- The Generate Database Wizard will work the first time you generate DDL for your database.
-  Every time after that it will throw an exception.  There is an easy workaround however.  Just
-  dismiss the exception dialog, click the Previous button in the wizard, and then click Next.
-  Your DDL will then be generated properly.  We will have this one resolved for beta 2!
 - The Generated Database Wizard will save the file with the extension .sql.  You will need to
-  manually change the extension to .mysql to use the new editor.  We hope to resolve this for beta 2.
+  manually change the extension to .mysql to use the new editor.  We hope to resolve this for GA
 
 
 

=== modified file 'package.proj'
--- a/package.proj	2009-09-08 17:08:39 +0000
+++ b/package.proj	2010-07-26 01:21:57 +0000
@@ -72,12 +72,21 @@
 <!--    <RemoveDir Directories="tmp"/>-->
   </Target>
 
-  <ItemGroup>
-    <BinaryFiles Include="MySql.Data\Provider\bin\release\mysql.data.dll"/>
-    <BinaryFiles Include="MySql.Data\Provider\bin\release\mysql.data.cf.dll"/>
-    <BinaryFiles Include="MySql.Web\Providers\bin\release\mysql.web.dll"/>
-    <BinaryFiles Include="MySql.Data.Entity\Provider\bin\release\mysql.data.entity.dll"/>
-    <BinaryFiles Include="MySql.VisualStudio\bin\release\mysql.visualstudio.dll"/>
+  <Target Name="PackageZip">
+  <ItemGroup>
+    <V2Assemblies Include="MySql.Data\Provider\bin\release\mysql.data.dll"/>
+    <V2Assemblies Include="MySql.Data\Provider\bin\release\mysql.data.cf.dll"/>
+    <V2Assemblies Include="MySql.Web\Providers\bin\release\mysql.web.dll"/>
+    <V2Assemblies Include="MySql.Data.Entity\Provider\bin\release\mysql.data.entity.dll"/>
+    <V2Assemblies Include="MySql.VisualStudio\bin\release\mysql.visualstudio.dll"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <V4Assemblies Include="MySql.Data.Entity\Provider\bin\release-4.0\mysql.data.entity.dll"/>
+    <V4Assemblies Include="MySql.VisualStudio\bin\release-4.0\mysql.visualstudio.dll"/>
+  </ItemGroup>
+
+  <ItemGroup>
     <BinaryFiles Include="Documentation\Output\MySql.Data.chm"/>
     <BinaryFiles Include="COPYING" Condition=" '$(Configuration)' == 'GPL' "/>
     <BinaryFiles Include="EXCEPTIONS" Condition=" '$(Configuration)' == 'GPL' "/>
@@ -87,9 +96,16 @@
     <BinaryFiles Include="CHANGES"/>
   </ItemGroup>
   
-  <Target Name="PackageZip">
-    <Zip Flatten="true" 
-         ZipFileName="bin/$(Configuration)/mysql-connector-net-$(Version)$(Postfix)-noinstall.zip"
-         Files="@(BinaryFiles)"/>
+    <RemoveDir Directories="tmp" ContinueOnError="true"/>
+    <MakeDir Directories ="tmp"/>
+    <Copy SourceFiles ="@(BinaryFiles)" DestinationFolder="tmp"/>
+    <Copy SourceFiles ="@(V2Assemblies)" DestinationFolder="tmp\v2"/>
+    <Copy SourceFiles ="@(V4Assemblies)" DestinationFolder="tmp\v4"/>
+
+    <ItemGroup>
+	<ZipFiles Include="tmp/**"/>
+    </ItemGroup>
+    <Zip ZipFileName="bin/$(Configuration)/mysql-connector-net-$(Version)$(Postfix)-noinstall.zip"
+         Files="@(ZipFiles)" workingDirectory="tmp"/>
   </Target>
 </Project>

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