#At file:///C:/work/connector-net/6.1/ based on revid:reggie.burnett@stripped
850 Reggie Burnett 2010-08-26 [merge]
merged and updated version #/release notes for release
removed:
Installer/registration/
Installer/registration.wxs
Installer/registration/loginhdr.jpg
Installer/registration/mysql_ca.dll
Installer/registration/register.htm
Installer/registration/svctag.xml
Installer/registration/webpage.ico
modified:
CHANGES
Installer/Installer.wixproj
Installer/core.wxs
Installer/main.wxs
Installer/ui.wxs
MySQLClient.sln
MySql.Data.Entity/Tests/Properties/AssemblyInfo.cs
MySql.Data/Provider/Properties/VersionInfo.cs
Release Notes.txt
package.proj
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES 2010-08-12 15:11:23 +0000
+++ b/CHANGES 2010-08-26 19:00:05 +0000
@@ -1,3 +1,4 @@
+Version 6.1.5
- 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 2009-07-28 20:40:35 +0000
+++ b/Installer/Installer.wixproj 2010-08-26 19:00:05 +0000
@@ -112,7 +112,6 @@
<Compile Include="ui.wxs" />
<Compile Include="visualstudio.wxs" />
<Compile Include="webproviders.wxs" />
- <Compile Include="registration.wxs" />
</ItemGroup>
<Target Name="RetrieveIdentities">
<GetVersion Assembly="..\MySql.Data\Provider\bin\release\mysql.data.dll" Format="{0}.{1}.{2}">
@@ -125,31 +124,27 @@
<ItemGroup>
<WixExtension Include="WixUtilExtension">
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+ <Name>WixUtilExtension</Name>
</WixExtension>
<WixExtension Include="WixNetFxExtension">
<HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+ <Name>WixNetFxExtension</Name>
</WixExtension>
<WixExtension Include="WixUIExtension">
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+ <Name>WixUIExtension</Name>
</WixExtension>
<WixExtension Include="WixVSExtension">
<HintPath>$(WixExtDir)\WixVSExtension.dll</HintPath>
+ <Name>WixVSExtension</Name>
</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" />
<Content Include="VS2008_Registry.wxi" />
</ItemGroup>
- <ItemGroup>
- <Folder Include="registration\" />
- </ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets" />
<PropertyGroup>
<BuildDependsOn>RetrieveIdentities;$(BuildDependsOn)</BuildDependsOn>
=== modified file 'Installer/core.wxs'
--- a/Installer/core.wxs 2010-08-18 18:23:20 +0000
+++ b/Installer/core.wxs 2010-08-26 19:00:05 +0000
@@ -69,7 +69,6 @@
<ComponentRef Id="Net20"/>
<ComponentRef Id="GAC20"/>
<ComponentRef Id="StartMenuComponent"/>
- <ComponentRef Id="Registration"/>
</Feature>
<!-- Entity framework feature -->
=== modified file 'Installer/main.wxs'
--- a/Installer/main.wxs 2009-07-28 20:40:35 +0000
+++ b/Installer/main.wxs 2010-08-26 19:00:05 +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"/>
=== removed directory 'Installer/registration'
=== removed file 'Installer/registration.wxs'
--- a/Installer/registration.wxs 2009-08-03 17:41:43 +0000
+++ b/Installer/registration.wxs 1970-01-01 00:00:00 +0000
@@ -1,118 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
- xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
- <!-- Define the servicetag and offline regirations files. -->
- <Fragment Id="RegistrationFragment">
- <Property Id='STCLIENT'>
- <DirectorySearch Path='[ProgramFilesFolder]\Sun\servicetag' Depth='1' Id='FindSTClient'>
- <FileSearch Name='stclient.exe' />
- </DirectorySearch>
- </Property>
- <Property Id='WindowsVerName' Value='Unk' />
- <Property Id='WindowsVerSP' Value=' '/>
- <Property Id='WMIQuery' Value='Set via CustomActions' />
- <Property Id='NewURN' Value='Set via CustomActions' />
- <Property Id='InstanceUrn' Value=' ' />
- <Property Id='RegistryUrn' Value=' ' />
- <Property Id="RegisterServer">1</Property>
-
- <Icon Id='SunReg.exe' src='./registration/webpage.ico' />
- <!-- WiX Query WMI Custom Action DLL Definition -->
- <Binary Id='mysqlca' SourceFile='./registration/mysql_ca.dll' />
-
- <DirectoryRef Id='INSTALLDIR'>
- <Component Id='Registration' Guid='F3F8CC64-6169-4b23-9972-9C56855AF39A'>
- <File Id='RegisterSVCTag' Name='register.htm' Source='./registration/register.htm' DiskId='1'>
- <Shortcut Id='RegisterSVCTag.Shortcut' Directory='ShortCutDir' Name='Register'
- LongName='SunInventory Registration'
- Description='SunInventory Registration'
- Icon='SunReg.exe' IconIndex='0' />
- </File>
- <File Id='XmlSettings' Name='svctag.xml' Source='./registration/svctag.xml' DiskId='1' />
- <File Id='RegisterLoginHeader' Name='loginhdr.jpg' Source='./registration/loginhdr.jpg' DiskId='1' />
- <util:XmlFile Id='XmlSettings1' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[%COMPUTERNAME]' ElementPath='//registration_data/environment/hostname' Sequence='1' />
- <util:XmlFile Id='XmlSettings2' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[%OS]' ElementPath='//registration_data/environment/osName' Sequence='2' />
- <util:XmlFile Id='XmlSettings3' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[WindowsVerName] [WindowsVerSP] ([VersionNT].[WindowsBuild])' ElementPath='//registration_data/environment/osVersion' Sequence='3' />
- <util:XmlFile Id='XmlSettings4' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[%PROCESSOR_ARCHITECTURE]' ElementPath='//registration_data/environment/osArchitecture' Sequence='4' />
- <util:XmlFile Id='XmlSettings5' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[ComputerSystem_Model]' ElementPath='//registration_data/environment/systemModel' Sequence='5' />
- <util:XmlFile Id='XmlSettings6' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[ComputerSystem_Manufacturer]' ElementPath='//registration_data/environment/systemManufacturer' Sequence='6' />
- <util:XmlFile Id='XmlSettings7' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[Processor_Manufacturer]' ElementPath='//registration_data/environment/cpuManufacturer' Sequence='7' />
- <util:XmlFile Id='XmlSettings8' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[BIOS_SerialNumber]' ElementPath='//registration_data/environment/serialNumber' Sequence='8' />
- <util:XmlFile Id='XmlSettings9' File='[INSTALLDIR]svctag.xml' Action='setValue' Name='urn' Value='[RegistryUrn]' ElementPath='//registration_data/registry' Sequence='9' />
- <util:XmlFile Id='XmlSettings10' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[InstanceUrn]' ElementPath='//registration_data/registry/service_tag/instance_urn' Sequence='10' />
- <util:XmlFile Id='XmlSettings11' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[ProductName]' ElementPath='//registration_data/registry/service_tag/product_name' Sequence='11' />
- <util:XmlFile Id='XmlSettings12' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[ProductVersion]' ElementPath='//registration_data/registry/service_tag/product_version' Sequence='12' />
- <util:XmlFile Id='XmlSettings13' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[ProductURN]' ElementPath='//registration_data/registry/service_tag/product_urn' Sequence='13' />
- <util:XmlFile Id='XmlSettings14' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='N/A' ElementPath='//registration_data/registry/service_tag/product_parent_urn' Sequence='14' />
- <util:XmlFile Id='XmlSettings15' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='license=gpl' ElementPath='//registration_data/registry/service_tag/product_defined_inst_id' Sequence='15' />
- <util:XmlFile Id='XmlSettings16' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[Manufacturer]' ElementPath='//registration_data/registry/service_tag/product_vendor' Sequence='16' />
- <util:XmlFile Id='XmlSettings17' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[SysDateTime]' ElementPath='//registration_data/registry/service_tag/timestamp' Sequence='17' />
- <util:XmlFile Id='XmlSettings18' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[RegistrationPackage].msi' ElementPath='//registration_data/registry/service_tag/source' Sequence='18' />
- </Component>
- </DirectoryRef>
-
- <!-- Now we define our custom actions -->
- <!-- OS String Generation -->
- <CustomAction Id='SetWin2K' Property='WindowsVerName' Value='Microsoft Windows 2000' />
- <CustomAction Id='SetWinXP' Property='WindowsVerName' Value='Microsoft Windows XP' />
- <CustomAction Id='SetWin2K3' Property='WindowsVerName' Value='Microsoft Windows 2003' />
- <CustomAction Id='SetWinVista' Property='WindowsVerName' Value='Microsoft Windows Vista' />
- <CustomAction Id='SetWin2K8' Property='WindowsVerName' Value='Microsoft Windows 2008' />
- <CustomAction Id='SetSP' Property='WindowsVerSP' Value='SP([ServicePackLevel])' />
- <!-- WMI Queries -->
- <CustomAction Id='SetCPUManufactQuery' Property='WMIQuery' Value='SELECT Manufacturer FROM Win32_Processor' />
- <CustomAction Id='QWMICPUMan' BinaryKey='mysqlca' DllEntry='CAQueryWMI' Execute='immediate' Return='ignore' />
- <CustomAction Id='SetSerialNumberQuery' Property='WMIQuery' Value='SELECT SerialNumber FROM Win32_BIOS' />
- <CustomAction Id='QWMISerNum' BinaryKey='mysqlca' DllEntry='CAQueryWMI' Execute='immediate' Return='ignore' />
- <CustomAction Id='SetMakeModelQuery' Property='WMIQuery' Value='SELECT Model, Manufacturer FROM Win32_ComputerSystem' />
- <CustomAction Id='QWMIMakMod' BinaryKey='mysqlca' DllEntry='CAQueryWMI' Execute='immediate' Return='ignore' />
- <!-- Generate URNs -->
- <CustomAction Id='GenInstanceUrn' BinaryKey='mysqlca' DllEntry='CACreateURN' Execute='immediate' Return='ignore' />
- <CustomAction Id='SetInstanceUrn' Property='InstanceUrn' Value='[NewURN]' />
- <CustomAction Id='GenRegistryUrn' BinaryKey='mysqlca' DllEntry='CACreateURN' Execute='immediate' Return='ignore' />
- <CustomAction Id='SetRegistryUrn' Property='RegistryUrn' Value='[NewURN]' />
- <!-- Set registration Date Time -->
- <CustomAction Id='SetDateTime' BinaryKey='mysqlca' DllEntry='CASetRegDateTime' Execute='immediate' Return='ignore' />
- <!-- Update Offline Registration -->
- <CustomAction Id="UpdateRegistration.SetProperty" Return="check" Property="UpdateRegistration" Value="[INSTALLDIR]" />
- <CustomAction Id="UpdateRegistration" BinaryKey="mysqlca" DllEntry="CAUpdateOfflineReg" Execute="deferred" Return="ignore" HideTarget="yes" Impersonate="no"/>
- <!-- POST Registration to RegistrationRelay Service if no STCLIENT -->
- <CustomAction Id="PostRegistration.SetProperty" Return="check" Property="PostRegistration" Value="[INSTALLDIR]" />
- <CustomAction Id="PostRegistration" BinaryKey="mysqlca" DllEntry="CASendServiceTag" Execute="immediate" Return="ignore" HideTarget="yes"/>
- <!-- Use Service Tag Client Registration -->
- <CustomAction Id='STClientRegister.SetProperty' Property='QtExecCmdLine'
- Value='"[STCLIENT]" -a -i [InstanceUrn] -p "[ProductName]" -e [ProductVersion] -t [ProductURN] -S [RegistrationPackage].msi -F N/A -P N/A -m "[Manufacturer]" -A [%PROCESSOR_ARCHITECTURE] -z N/A -I -1' />
- <CustomAction Id='STClientRegister' BinaryKey='WixCA' DllEntry='CAQuietExec' Execute='immediate' Return='check'/>
-
- <InstallExecuteSequence>
- <!-- Formatted ENV variables -->
- <Custom Action='SetWin2K' After='InstallInitialize'>(VersionNT = 500) AND (WindowsBuild = 2195)</Custom>
- <Custom Action='SetWinXP' After='SetWin2K'>(VersionNT = 501) AND (WindowsBuild = 2600)</Custom>
- <Custom Action='SetWin2K3' After='SetWinXP'>(VersionNT = 502) AND (WindowsBuild = 3790)</Custom>
- <Custom Action='SetWinVista' After='SetWin2K3'>(VersionNT = 600) AND (WindowsBuild = 6000)</Custom>
- <Custom Action='SetWin2K8' After='SetWinVista'>(VersionNT = 600) AND (WindowsBuild = 6001)</Custom>
- <Custom Action='SetSP' After='SetWin2K8'>ServicePackLevel</Custom>
- <!-- WMI Queries -->
- <Custom Action='SetCPUManufactQuery' After='SetSP' />
- <Custom Action='QWMICPUMan' After='SetCPUManufactQuery' />
- <Custom Action='SetSerialNumberQuery' After= 'QWMICPUMan' />
- <Custom Action='QWMISerNum' After='SetSerialNumberQuery' />
- <Custom Action='SetMakeModelQuery' After= 'QWMISerNum' />
- <Custom Action='QWMIMakMod' After='SetMakeModelQuery' />
- <!-- Local URNs -->
- <Custom Action='GenInstanceUrn' After='QWMIMakMod' />
- <Custom Action='SetInstanceUrn' After='GenInstanceUrn' />
- <Custom Action='GenRegistryUrn' After='SetInstanceUrn' />
- <Custom Action='SetRegistryUrn' After='GenRegistryUrn' />
- <!-- Date/Time -->
- <Custom Action='SetDateTime' After='SetRegistryUrn' />
- <!-- Update Offline Registration -->
- <Custom Action='UpdateRegistration.SetProperty' After='PublishProduct'>NOT Installed And ACTION="INSTALL"</Custom>
- <Custom Action='UpdateRegistration' After='UpdateRegistration.SetProperty'>NOT Installed And ACTION="INSTALL"</Custom>
- <!-- The POST Registration CustomAction is triggered by the UI's Finish button in ui.wxs. -->
- <!-- Use local servicetag client if available -->
- <Custom Action='STClientRegister.SetProperty' Before='STClientRegister'>STCLIENT And NOT Installed And ACTION="INSTALL"</Custom>
- <Custom Action='STClientRegister' Before='InstallFinalize'>STCLIENT And NOT Installed And ACTION="INSTALL"</Custom>
- </InstallExecuteSequence>
- </Fragment>
-</Wix>
=== removed file 'Installer/registration/loginhdr.jpg'
Binary files a/Installer/registration/loginhdr.jpg 2009-08-03 17:05:05 +0000 and b/Installer/registration/loginhdr.jpg 1970-01-01 00:00:00 +0000 differ
=== removed file 'Installer/registration/mysql_ca.dll'
Binary files a/Installer/registration/mysql_ca.dll 2009-08-03 17:41:43 +0000 and b/Installer/registration/mysql_ca.dll 1970-01-01 00:00:00 +0000 differ
=== removed file 'Installer/registration/register.htm'
--- a/Installer/registration/register.htm 2009-08-03 17:05:05 +0000
+++ b/Installer/registration/register.htm 1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Register your Connector/NET Library</title>
-<style type="text/css">
-<!--
-.style1 {font-family: Arial, Helvetica, sans-serif}
-.style3 {font-family: Arial, Helvetica, sans-serif; font-size: small;}
-input.buttonblue,input.defbutton{ background: #3F6580;
- border-right:1px solid #304C60;
- border-bottom:1px solid #304C60;
- border-left:1px solid #BACDD9;
- border-top:1px solid #BACDD9;
- font-weight:bold;
- color:#FFFFFF;
- font-size:.8em;
- height:1.9em}
-input.buttonblue:hover{color:#fbe249;}
-a:link,a.named:visited{color:#3E6B8A}
-a:hover{text-decoration:underline}
-a{text-decoration:none}
-a:visited,a:visited code{color:#917E9C}
--->
-</style>
-</head>
-
-<body>
-<table width="813" border="0" cellpadding="3" cellspacing="0">
- <tr>
- <td width="7" height="78"> </td>
- <td width="794" align="left" valign="top">
- <img src="loginhdr.jpg" width="655" height="168"></td>
- </tr>
- <tr>
- <td> </td>
- <td><p class="style1">Thank you for installing the
- <strong> MySQL Cliect Connector .NET </strong>
- from Sun Microsystems. </p>
- <p class="style1">
- Registering your product will give you the following benefits:</p>
- <ul class="style1">
- <li>Notification of new versions, patches, and updates</li>
- <li>Special offers on Sun developer products, services and
- training</li>
- <li>Access to early releases and documentation </li>
- </ul>
- <p class="style1">Product registration is FREE, quick and easy!</p>
- <blockquote>
- <p class="style1">All you need is a Sun Developer Network or other
- Sun Online account. If you don't already have one, you will be
- prompted to create one. </p>
- <table width="708" border="0" cellspacing="0" cellpadding="3">
- <tr valign="top">
- <td width="126" height="35">
- <form name="form1" method="post"
-action="https://inventory.sun.com/RegistrationWeb/register/WXYZ?product=mysqlconnectornet&locale=en_US"
- enctype="text/xml">
- <input type="hidden" name="servicetag_payload"
- value="TUVW">
- <input type="submit" name="Submit"border="0" class="buttonblue"
- onmouseover="this.style.color='#fbe249';"
- onmouseout="this.style.color='#FFF';"
- value="Submit">
- </form></td>
- <td width="570">
- <span class="style3">You need to be connected to the Internet
- to register this Sun product. </span>
- </td>
- </tr>
- </table>
- </blockquote>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td bgcolor="#f1f7df">
- <p class="style3">Sun Microsystems, Inc. respects your privacy.
- We will use your personal information for communications
- and management of your Sun Online Account, the services
- and applications you access using your Sun Online Account,
- and the products you register with your Sun Online Account.</p>
- <p class="style3">For more information on the data that will be
- collected as part of the registration process and how it will
- be managed <br>see
- <a href="http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html">
- http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html</a>.
- <br><br>
- For more information on Sun's Privacy Policy see
- <a href="http://www.sun.com/privacy/">http://www.sun.com/privacy/</a>
- or contact <a class="moz-txt-link-rfc2396E" href="mailto:privacy@stripped">
- privacy@stripped.</a></p></td>
- </tr>
- <tr>
- <td> </td>
- <td> </td>
- </tr>
- <tr>
- <td> </td>
- <td> </td>
-
> </tr>
-</table>
-</body>
-</html>
=== removed file 'Installer/registration/svctag.xml'
--- a/Installer/registration/svctag.xml 2009-08-03 17:05:05 +0000
+++ b/Installer/registration/svctag.xml 1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-tion_data version="1.0">
- <environment>
- <hostname></hostname>
- <hostId />
- <osName></osName>
- <osVersion></osVersion>
- <osArchitecture></osArchitecture>
- <systemModel></systemModel>
- <systemManufacturer></systemManufacturer>
- <cpuManufacturer></cpuManufacturer>
- <serialNumber></serialNumber>
- </environment>
- <registry version="1.0">
- <service_tag>
- <instance_urn></instance_urn>
- <product_name></product_name>
- <product_version></product_version>
- <product_urn></product_urn>
- <product_parent_urn></product_parent_urn>
- <product_parent>N/A</product_parent>
- <product_defined_inst_id></product_defined_inst_id>
- <product_vendor></product_vendor>
- <platform_arch>Windows</platform_arch>
- <timestamp></timestamp>
- <container />
- <source></source>
- <installer_uid>-1</installer_uid>
- </service_tag>
- </registry>
-</registration_data>
-
=== removed file 'Installer/registration/webpage.ico'
Binary files a/Installer/registration/webpage.ico 2009-08-03 17:05:05 +0000 and b/Installer/registration/webpage.ico 1970-01-01 00:00:00 +0000 differ
=== modified file 'Installer/ui.wxs'
--- a/Installer/ui.wxs 2009-07-28 20:40:35 +0000
+++ b/Installer/ui.wxs 2010-08-26 19:00:05 +0000
@@ -65,8 +65,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)" />
@@ -75,9 +73,6 @@
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="40" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" />
- <Control Id="LaunchCheckBox" Type="CheckBox" X="10" Y="243" Width="170" Height="17" Hidden="yes" Property="RegisterServer" Integer="yes" CheckBoxValue="1" Text=" Register [ProductName] with Sun.">
- <Condition Action="show">NOT Installed</Condition>
- </Control>
</Dialog>
<InstallUISequence>
=== modified file 'MySQLClient.sln'
--- a/MySQLClient.sln 2010-07-02 18:39:01 +0000
+++ b/MySQLClient.sln 2010-08-26 19:00:05 +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.Entity/Tests/Properties/AssemblyInfo.cs'
--- a/MySql.Data.Entity/Tests/Properties/AssemblyInfo.cs 2010-08-18 19:44:51 +0000
+++ b/MySql.Data.Entity/Tests/Properties/AssemblyInfo.cs 2010-08-26 19:00:05 +0000
@@ -54,4 +54,4 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.0.3")]
+[assembly: AssemblyVersion("6.1.5")]
=== modified file 'MySql.Data/Provider/Properties/VersionInfo.cs'
--- a/MySql.Data/Provider/Properties/VersionInfo.cs 2010-08-18 19:03:33 +0000
+++ b/MySql.Data/Provider/Properties/VersionInfo.cs 2010-08-26 19:00:05 +0000
@@ -37,5 +37,5 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("6.1.4")]
+[assembly: AssemblyVersion("6.1.5")]
=== modified file 'Release Notes.txt'
--- a/Release Notes.txt 2009-11-10 22:37:01 +0000
+++ b/Release Notes.txt 2010-08-26 19:00:05 +0000
@@ -16,8 +16,7 @@
you to store your websites state in a MySql server.
Support for native output parameters -- With this release we now support native output
-parameters when connected to a server that supports them. Currently we know that includes
-6.0.8 and later servers. It also will include 5.4 servers.
+parameters when connected to a server that supports them.
Changed GUID type -- We have changed our backend representation of a guid type to be
CHAR(36). We are doing this because we feel users will want to use the server UUID() function
@@ -32,4 +31,3 @@
was not designed to handle this. In previous versions we have tried to support this but
it is causing more headaches than it is solving.
-Please let us know what else we broke and how we can make it better!
\ No newline at end of file
=== modified file 'package.proj'
--- a/package.proj 2010-08-18 18:23:20 +0000
+++ b/package.proj 2010-08-26 19:00:05 +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"/>
@@ -90,7 +93,7 @@
<RemoveDir Directories="tmp" ContinueOnError="true"/>
<MakeDir Directories ="tmp"/>
<Copy SourceFiles ="@(BinaryFiles)" DestinationFolder="tmp"/>
- <Move SourceFiles="tmp/README-Commercial" DestinationFiles="tmp/README"/>
+ <Move SourceFiles="tmp/README-Commercial" DestinationFiles="tmp/README" Condition=" '$(Configuration)' == 'Commercial' "/>
<ItemGroup>
<ZipFiles Include="tmp/**"/>
Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20100826190005-84txm4b5y72jv7mq.bundle
| Thread |
|---|
| • bzr commit into connector-net-6.1 branch (reggie.burnett:850) | Reggie Burnett | 26 Aug |
