#At file:///C:/Users/Reggie/work/connector-net/6.4-clean/ based on revid:julio.casal@strippedac3a0kqsd7u2h
1007 Reggie Burnett 2011-06-21 [merge]
merged
removed:
Installer/Installer.wixproj
renamed:
Installer/Installer.VS2010.wixproj => Installer/Installer.wixproj
modified:
Documentation/help.shfbproj
Installer/EntityFramework.wxs
Installer/cf.wxs
Installer/core.wxs
Installer/visualstudio.wxs
Installer/webproviders.wxs
MySQLClient.sln
VS2008/MySQLClient.sln
Installer/Installer.wixproj
=== modified file 'Documentation/help.shfbproj'
=== modified file 'Documentation/help.shfbproj'
--- a/Documentation/help.shfbproj 2010-12-22 21:21:41 +0000
+++ b/Documentation/help.shfbproj 2011-06-22 03:09:40 +0000
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<!-- The configuration and platform will be used to determine which
assemblies to include from solution and project documentation
@@ -7,7 +8,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5c97df05-1229-4b30-9711-789d0d6ff81b}</ProjectGuid>
- <SHFBSchemaVersion>1.9.0.0</SHFBSchemaVersion>
+ <SHFBSchemaVersion>1.9.3.0</SHFBSchemaVersion>
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
Studio adds them anyway -->
<AssemblyName>Documentation</AssemblyName>
@@ -28,8 +29,8 @@
</ProjectSummary>
<MissingTags>None</MissingTags>
<VisibleItems>InheritedMembers, InheritedFrameworkMembers, Protected, SealedProtected</VisibleItems>
- <HtmlHelp1xCompilerPath>..\..\..\..\..\..\Program Files\HTML Help Workshop\</HtmlHelp1xCompilerPath>
- <HtmlHelp2xCompilerPath>..\..\..\..\..\..\Program Files\Common Files\microsoft shared\Help 2.0 Compiler\</HtmlHelp2xCompilerPath>
+ <HtmlHelp1xCompilerPath>..\..\..\..\..\..\Program Files (x86)\HTML Help Workshop\</HtmlHelp1xCompilerPath>
+ <HtmlHelp2xCompilerPath>..\..\..\..\..\..\Program Files (x86)\Common Files\microsoft shared\Help 2.0 Compiler\</HtmlHelp2xCompilerPath>
<SandcastlePath>
</SandcastlePath>
<WorkingPath>
@@ -38,21 +39,20 @@
<BuildLogFile>
</BuildLogFile>
<HelpFileFormat>HtmlHelp1, MSHelp2, MSHelpViewer</HelpFileFormat>
- <FrameworkVersion>2.0.50727</FrameworkVersion>
+ <FrameworkVersion>.NET 2.0.50727</FrameworkVersion>
<RootNamespaceContainer>True</RootNamespaceContainer>
<RootNamespaceTitle>Reference</RootNamespaceTitle>
<HelpTitle>MySQL Connector/Net</HelpTitle>
<CopyrightHref>http://www.mysql.com</CopyrightHref>
- <CopyrightText>Copyright &#169%3b 2004,2010, Oracle and/or its affiliates. All rights reserved.</CopyrightText>
+ <CopyrightText>Copyright &#169%3b 2004,2011, Oracle and/or its affiliates. All rights reserved.</CopyrightText>
<FeedbackEMailAddress>support%40mysql.com</FeedbackEMailAddress>
<PresentationStyle>vs2005</PresentationStyle>
<NamingMethod>MemberName</NamingMethod>
<DocumentationSources>
- <DocumentationSource sourceFile="..\MySql.Data\Provider\bin\Release\MySql.Data.dll" />
- <DocumentationSource sourceFile="..\MySql.Data\Provider\bin\Release\MySql.Data.xml" />
- <DocumentationSource sourceFile="..\MySql.Web\Providers\bin\release\MySql.Web.dll" />
- <DocumentationSource sourceFile="..\MySql.Web\Providers\bin\release\webdocs.xml" />
- </DocumentationSources>
+ <DocumentationSource sourceFile="..\Source\MySql.Data\bin\Release\MySql.Data.dll" />
+<DocumentationSource sourceFile="..\Source\MySql.Data\bin\Release\MySql.Data.xml" />
+<DocumentationSource sourceFile="..\Source\MySql.Web\bin\release\MySql.Web.dll" />
+<DocumentationSource sourceFile="..\Source\MySql.Web\bin\release\webdocs.xml" /></DocumentationSources>
<NamespaceSummaries>
<NamespaceSummaryItem name="(global)" isDocumented="False" xmlns="" />
<NamespaceSummaryItem name="MySql.Data.Common" isDocumented="False" xmlns="" />
=== modified file 'Installer/EntityFramework.wxs'
--- a/Installer/EntityFramework.wxs 2010-11-17 19:25:46 +0000
+++ b/Installer/EntityFramework.wxs 2011-06-22 03:09:40 +0000
@@ -6,12 +6,12 @@
<Component Id="EF.v2" Guid="AB734C75-F5DC-491e-A2BC-52D5061881B7" DiskId="1">
<Condition>NETFRAMEWORK20</Condition>
<File Id="MySql.Data.EF" Name="MySql.Data.Entity.dll"
- Source="..\mysql.data.entity\provider\bin\release\mysql.data.entity.dll" DiskId="1"/>
+ Source="..\VS2008\Source\mysql.data.entity\bin\release\mysql.data.entity.dll" DiskId="1"/>
</Component>
<Component Id="EF.v2.GAC" Guid="12218CCC-B085-46af-AA5F-FB9306FE621E" DiskId="1">
<Condition>NETFRAMEWORK20</Condition>
<File Id="MySql.Data.EF.GAC" Name="MySql.Data.Entity.dll"
- Source="..\mysql.data.entity\provider\bin\release\mysql.data.entity.dll" DiskId="1"
+ Source="..\VS2008\Source\mysql.data.entity\bin\release\mysql.data.entity.dll" DiskId="1"
Assembly=".net" KeyPath="yes"/>
</Component>
</DirectoryRef>
@@ -21,12 +21,12 @@
<Component Id="EF.v4" Guid="E6B683F6-727A-43c9-B955-6BEE94EF61C7" DiskId="1">
<Condition>NETFRAMEWORK40FULL</Condition>
<File Id="MySql.Data.EF.v4" Name="MySql.Data.Entity.dll"
- Source="..\mysql.data.entity\provider\bin\release-4.0\mysql.data.entity.dll" DiskId="1"/>
+ Source="..\Source\mysql.data.entity\bin\release\mysql.data.entity.dll" DiskId="1"/>
</Component>
<Component Id="EF.v4.GAC" Guid="A9C03468-5A59-443f-85DC-C0149EBB55C8" DiskId="1">
<Condition>NETFRAMEWORK40FULL</Condition>
<File Id="MySql.Data.EF.v4.GAC" Name="MySql.Data.Entity.dll"
- Source="..\mysql.data.entity\provider\bin\release-4.0\mysql.data.entity.dll" DiskId="1"
+ Source="..\Source\mysql.data.entity\bin\release\mysql.data.entity.dll" DiskId="1"
Assembly=".net" KeyPath="yes"/>
</Component>
</DirectoryRef>
@@ -35,9 +35,9 @@
<Component Id="EF.T4" Guid="6555D339-120C-4D62-B60C-08764D8CA739">
<Condition>VS_2010_PATH</Condition>
<File Id="SSDLToMySQL" Name="SSDLToMySQL.tt" DiskId="1"
- Source="..\MySql.Data.Entity\T4Templates\SSDLToMySQL.tt"/>
+ Source="..\Source\MySql.Data.Entity\T4Templates\SSDLToMySQL.tt"/>
<File Id="GenerateMySQL.Utility" Name="GenerateMySQL.Utility.ttinclude" DiskId="1"
- Source="..\MySql.Data.Entity\T4Templates\GenerateMySQL.Utility.ttinclude"/>
+ Source="..\Source\MySql.Data.Entity\T4Templates\GenerateMySQL.Utility.ttinclude"/>
</Component>
</DirectoryRef>
=== renamed file 'Installer/Installer.VS2010.wixproj' => 'Installer/Installer.wixproj'
--- a/Installer/Installer.VS2010.wixproj 2010-12-22 21:21:41 +0000
+++ b/Installer/Installer.wixproj 2011-06-22 03:09:40 +0000
@@ -116,7 +116,7 @@
<Compile Include="webproviders.wxs" />
</ItemGroup>
<Target Name="RetrieveIdentities">
- <GetVersion Assembly="..\MySql.Data\Provider\bin\release\mysql.data.dll" Format="{0}.{1}.{2}">
+ <GetVersion Assembly="..\VS2008\Source\MySql.Data\bin\release\mysql.data.dll" Format="{0}.{1}.{2}">
<Output TaskParameter="AsString" PropertyName="CurrentVersion" />
</GetVersion>
<CreateProperty Value="Version=$(CurrentVersion);$(DefineConstants)">
=== removed file 'Installer/Installer.wixproj'
--- a/Installer/Installer.wixproj 2011-03-22 19:11:51 +0000
+++ b/Installer/Installer.wixproj 1970-01-01 00:00:00 +0000
@@ -1,154 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <UsingTask AssemblyFile="Binary\MyTasks.dll" TaskName="GetVersion" />
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <ProductVersion>3.0</ProductVersion>
- <ProjectGuid>{f533fc43-6c05-4a64-8af6-72b690eb06c3}</ProjectGuid>
- <SchemaVersion>2.0</SchemaVersion>
- <OutputName>MySql.Data</OutputName>
- <OutputType>Package</OutputType>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)' == 'GPL' ">
- <IntermediateOutputPath>obj\GPL\</IntermediateOutputPath>
- <OutputPath>bin\GPL\</OutputPath>
- <DefineConstants>IsGPL=1</DefineConstants>
- <IncludeSearchPaths>
- </IncludeSearchPaths>
- <Cultures>en-US</Cultures>
- <Pedantic>False</Pedantic>
- <ShowSourceTrace>False</ShowSourceTrace>
- <SuppressSchemaValidation>False</SuppressSchemaValidation>
- <SuppressSpecificWarnings>
- </SuppressSpecificWarnings>
- <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
- <VerboseOutput>False</VerboseOutput>
- <AllowIdenticalRows>False</AllowIdenticalRows>
- <CabinetCachePath>
- </CabinetCachePath>
- <CabinetCreationThreadCount>-1</CabinetCreationThreadCount>
- <LeaveTemporaryFiles>False</LeaveTemporaryFiles>
- <LinkerPedantic>False</LinkerPedantic>
- <ReuseCabinetCache>False</ReuseCabinetCache>
- <SetMsiAssemblyNameFileVersion>False</SetMsiAssemblyNameFileVersion>
- <SuppressAclReset>False</SuppressAclReset>
- <SuppressAssemblies>False</SuppressAssemblies>
- <SuppressDefaultAdminSequenceActions>False</SuppressDefaultAdminSequenceActions>
- <SuppressDefaultAdvSequenceActions>False</SuppressDefaultAdvSequenceActions>
- <SuppressDefaultUISequenceActions>False</SuppressDefaultUISequenceActions>
- <SuppressDroppingUnrealTables>False</SuppressDroppingUnrealTables>
- <SuppressFileHashAndInfo>False</SuppressFileHashAndInfo>
- <SuppressFiles>False</SuppressFiles>
- <SuppressIces>
- </SuppressIces>
- <LinkerSuppressIntermediateFileVersionMatching>False</LinkerSuppressIntermediateFileVersionMatching>
- <SuppressLayout>False</SuppressLayout>
- <SuppressMsiAssemblyTableProcessing>False</SuppressMsiAssemblyTableProcessing>
- <LinkerSuppressSchemaValidation>False</LinkerSuppressSchemaValidation>
- <LinkerSuppressSpecificWarnings>
- </LinkerSuppressSpecificWarnings>
- <SuppressValidation>True</SuppressValidation>
- <LinkerTreatWarningsAsErrors>False</LinkerTreatWarningsAsErrors>
- <LinkerVerboseOutput>False</LinkerVerboseOutput>
- <WixVariables>
- </WixVariables>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)' == 'Commercial' ">
- <IntermediateOutputPath>obj\Commercial\</IntermediateOutputPath>
- <Cultures>en-US</Cultures>
- <OutputPath>bin\Commercial\</OutputPath>
- <DefineConstants>IsGPL=0</DefineConstants>
- <IncludeSearchPaths>
- </IncludeSearchPaths>
- <Pedantic>False</Pedantic>
- <ShowSourceTrace>False</ShowSourceTrace>
- <SuppressSchemaValidation>False</SuppressSchemaValidation>
- <SuppressSpecificWarnings>
- </SuppressSpecificWarnings>
- <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
- <VerboseOutput>False</VerboseOutput>
- <AllowIdenticalRows>False</AllowIdenticalRows>
- <CabinetCachePath>
- </CabinetCachePath>
- <CabinetCreationThreadCount>-1</CabinetCreationThreadCount>
- <LeaveTemporaryFiles>False</LeaveTemporaryFiles>
- <LinkerPedantic>False</LinkerPedantic>
- <ReuseCabinetCache>False</ReuseCabinetCache>
- <SetMsiAssemblyNameFileVersion>False</SetMsiAssemblyNameFileVersion>
- <SuppressAclReset>False</SuppressAclReset>
- <SuppressAssemblies>False</SuppressAssemblies>
- <SuppressDefaultAdminSequenceActions>False</SuppressDefaultAdminSequenceActions>
- <SuppressDefaultAdvSequenceActions>False</SuppressDefaultAdvSequenceActions>
- <SuppressDefaultUISequenceActions>False</SuppressDefaultUISequenceActions>
- <SuppressDroppingUnrealTables>False</SuppressDroppingUnrealTables>
- <SuppressFileHashAndInfo>False</SuppressFileHashAndInfo>
- <SuppressFiles>False</SuppressFiles>
- <SuppressIces>
- </SuppressIces>
- <LinkerSuppressIntermediateFileVersionMatching>False</LinkerSuppressIntermediateFileVersionMatching>
- <SuppressLayout>False</SuppressLayout>
- <SuppressMsiAssemblyTableProcessing>False</SuppressMsiAssemblyTableProcessing>
- <LinkerSuppressSchemaValidation>False</LinkerSuppressSchemaValidation>
- <LinkerSuppressSpecificWarnings>
- </LinkerSuppressSpecificWarnings>
- <SuppressValidation>True</SuppressValidation>
- <LinkerTreatWarningsAsErrors>False</LinkerTreatWarningsAsErrors>
- <LinkerVerboseOutput>False</LinkerVerboseOutput>
- <WixVariables>
- </WixVariables>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'GPL|x86' ">
- <DefineConstants>IsGPL=1;PackageSuffix=</DefineConstants>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Commercial|x86' ">
- <DefineConstants>IsGPL=0;PackageSuffix=-com</DefineConstants>
- <WixVariables>
- </WixVariables>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="cf.wxs" />
- <Compile Include="core.wxs" />
- <Compile Include="main.wxs" />
- <Compile Include="samples.wxs" />
- <Compile Include="ui.wxs" />
- <Compile Include="visualstudio.wxs" />
- <Compile Include="webproviders.wxs" />
- </ItemGroup>
- <Target Name="RetrieveIdentities">
- <GetVersion Assembly="..\MySql.Data\Provider\bin\release\mysql.data.dll" Format="{0}.{1}.{2}">
- <Output TaskParameter="AsString" PropertyName="CurrentVersion" />
- </GetVersion>
- <CreateProperty Value="Version=$(CurrentVersion);$(DefineConstants)">
- <Output TaskParameter="Value" PropertyName="DefineConstants" />
- </CreateProperty>
- </Target>
- <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="VS2005_Data.wxi" />
- <Content Include="VS2005_Registry.wxi" />
- <Content Include="VS2008_Data.wxi" />
- <Content Include="VS2008_Registry.wxi" />
- <Content Include="VS2010_Data.wxi" />
- <Content Include="VS2010_Registry.wxi" />
- </ItemGroup>
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets" />
- <PropertyGroup>
- <BuildDependsOn>RetrieveIdentities;$(BuildDependsOn)</BuildDependsOn>
- </PropertyGroup>
-</Project>
\ No newline at end of file
=== modified file 'Installer/cf.wxs'
--- a/Installer/cf.wxs 2011-06-02 18:02:31 +0000
+++ b/Installer/cf.wxs 2011-06-22 03:09:40 +0000
@@ -4,7 +4,7 @@
<DirectoryRef Id='assemblies_v2'>
<Component Id="CFBinaries" Guid="5a9c32ad-62f5-4b24-a225-96acf42d88a1">
<File Id="cf1" Name="MySql.Data.CF.dll"
- Source="..\mysql.data\provider\bin\release\mysql.data.CF.dll" DiskId="1" Assembly=".net" KeyPath="yes"/>
+ Source="..\VS2008\Source\mysql.data.cf\bin\release\mysql.data.CF.dll" DiskId="1" Assembly=".net" KeyPath="yes"/>
</Component>
</DirectoryRef>
=== modified file 'Installer/core.wxs'
--- a/Installer/core.wxs 2011-01-07 22:57:06 +0000
+++ b/Installer/core.wxs 2011-06-22 03:09:40 +0000
@@ -27,7 +27,7 @@
<DirectoryRef Id='assemblies_v2'>
<Component Id="C.v2" Guid="0e8af006-273c-49bb-b7c1-ec1737260a5a">
<File Id="MySql.Data.v2" Name="MySql.Data.dll"
- Source="..\mysql.data\provider\bin\release\mysql.data.dll" DiskId="1"/>
+ Source="..\VS2008\Source\MySql.Data\bin\release\mysql.data.dll" DiskId="1"/>
<RemoveFile Id="RemoveStateFile.v2" Name="*.InstallState" On="uninstall"/>
@@ -36,7 +36,7 @@
<Component Id="C.v2.GAC" Guid="58f70e4a-96f7-4b67-bdab-9b77a60f9c09">
<Condition>NETFRAMEWORK20</Condition>
<File Id="MySql.Data.v2.GAC" Name="MySql.Data.dll"
- Source="..\mysql.data\provider\bin\release\mysql.data.dll" DiskId="1" Assembly=".net" KeyPath="yes"/>
+ Source="..\VS2008\Source\MySql.Data\bin\release\mysql.data.dll" DiskId="1" Assembly=".net" KeyPath="yes"/>
</Component>
</Directory>
</DirectoryRef>
@@ -45,7 +45,7 @@
<DirectoryRef Id='assemblies_v4'>
<Component Id="C.v4" Guid="C66D3DF6-A151-4F29-B388-A9803C89131A">
<File Id="MySql.Data.v4" Name="MySql.Data.dll"
- Source="..\mysql.data\provider\bin\release-4.0\mysql.data.dll" DiskId="1"/>
+ Source="..\Source\MySql.Data\bin\release\mysql.data.dll" DiskId="1"/>
<RemoveFile Id="RemoveStateFile.v4" Name="*.InstallState" On="uninstall"/>
@@ -54,7 +54,7 @@
<Component Id="C.v4.GAC" Guid="34B6C828-355D-405F-82BC-F18BBC13871D">
<Condition>NETFRAMEWORK40FULL</Condition>
<File Id="MySql.Data.v4.GAC" Name="MySql.Data.dll"
- Source="..\mysql.data\provider\bin\release-4.0\mysql.data.dll" DiskId="1" Assembly=".net" KeyPath="yes"/>
+ Source="..\Source\MySql.Data\bin\release\mysql.data.dll" DiskId="1" Assembly=".net" KeyPath="yes"/>
</Component>
</Directory>
</DirectoryRef>
=== modified file 'Installer/visualstudio.wxs'
--- a/Installer/visualstudio.wxs 2010-07-26 01:21:36 +0000
+++ b/Installer/visualstudio.wxs 2011-06-22 03:09:40 +0000
@@ -5,9 +5,9 @@
<DirectoryRef Id='VSTemplatesDir'>
<Component Id='VSTemplates' Guid='CB74DD46-A5D0-402f-9413-63A8DEFB3A26'>
<File Id='ScriptTemplate' Name='MySQL Script.mysql' DiskId='1'
- Source='..\MySql.VisualStudio\Templates\MySQL Script.mysql'/>
+ Source='..\Source\MySql.VisualStudio\Templates\MySQL Script.mysql'/>
<File Id='ScriptTemplate.vsdir' Name='MySqlDataProviderPackage.vsdir' DiskId='1'
- Source='..\MySql.VisualStudio\Templates\MySqlDataProviderPackage.vsdir'/>
+ Source='..\Source\MySql.VisualStudio\Templates\MySqlDataProviderPackage.vsdir'/>
</Component>
</DirectoryRef>
@@ -16,7 +16,7 @@
<!-- common DDEX component to be installed if VS2005 or VS2008 is selected -->
<Component Id='VS2008_Common' Guid='75F9BFA2-4D6E-4cb3-97E6-B27C478CDE44'>
<File Id='MySQL.VisualStudio' Name='MySQL.VisualStudio.dll' DiskId='1'
- Source='..\MySql.VisualStudio\bin\release\MySQL.VisualStudio.dll' />
+ Source='..\VS2008\Source\MySql.VisualStudio\bin\release\MySQL.VisualStudio.dll' />
</Component>
<Component Id='VS_2005_Registry' Guid='B99FF3E3-F742-47af-B1FE-BBF2CDC4B95D'>
@@ -41,7 +41,7 @@
<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\release-4.0\MySQL.VisualStudio.dll' />
+ Source='..\Source\MySql.VisualStudio\bin\release\MySQL.VisualStudio.dll' />
</Component>
<Component Id='VS_2010_Registry' Guid='E602F4FD-4D11-4632-8204-C0CFE22F8C7C'>
=== modified file 'Installer/webproviders.wxs'
--- a/Installer/webproviders.wxs 2011-01-07 22:57:06 +0000
+++ b/Installer/webproviders.wxs 2011-06-22 03:09:40 +0000
@@ -7,12 +7,12 @@
<Component Id="C.Web.v2.GAC" Guid="6b95d34b-91e1-41ff-9f3f-dcb5308a00ce">
<Condition>NETFRAMEWORK20</Condition>
<File Id="ProviderAssemblyGAC.v2" Name="MySql.Web.dll" ShortName="MW"
- Source="..\MySql.Web\providers\bin\release\mysql.web.dll" DiskId="1" Assembly=".net" KeyPath="yes"/>
+ Source="..\VS2008\Source\MySql.Web\bin\release\mysql.web.dll" DiskId="1" Assembly=".net" KeyPath="yes"/>
</Component>
</Directory>
<Component Id="C.Web.v2" Guid="8578813e-e123-45ad-9c92-565382a058b6">
<File Id="MySqlWeb.v2" Name="MySql.Web.dll" DiskId="1"
- Source="..\MySql.Web\providers\bin\release\mysql.web.dll"/>
+ Source="..\VS2008\Source\MySql.Web\bin\release\mysql.web.dll"/>
<RemoveFile Id="RemoveWebStateFile.v2" Name="*.InstallState" On="uninstall"/>
</Component>
</DirectoryRef>
@@ -22,12 +22,12 @@
<Component Id="C.Web.v4.GAC" Guid="A30C8C85-C943-4976-8C9C-4ACFBBCD0764">
<Condition>NETFRAMEWORK40FULL</Condition>
<File Id="ProviderAssemblyGAC.v4" Name="MySql.Web.dll" ShortName="MW"
- Source="..\MySql.Web\providers\bin\release-4.0\mysql.web.dll" DiskId="1" Assembly=".net" KeyPath="yes"/>
+ Source="..\Source\MySql.Web\bin\release\mysql.web.dll" DiskId="1" Assembly=".net" KeyPath="yes"/>
</Component>
</Directory>
<Component Id="C.Web.v4" Guid="64B61967-2AB9-4DCC-B82B-23CA348B3CCF">
<File Id="MySqlWeb.v4" Name="MySql.Web.dll" DiskId="1"
- Source="..\MySql.Web\providers\bin\release-4.0\mysql.web.dll"/>
+ Source="..\Source\MySql.Web\bin\release\mysql.web.dll"/>
<RemoveFile Id="RemoveWebStateFile.v4" Name="*.InstallState" On="uninstall"/>
</Component>
</DirectoryRef>
=== modified file 'MySQLClient.sln'
--- a/MySQLClient.sln 2011-06-21 18:51:27 +0000
+++ b/MySQLClient.sln 2011-06-22 03:09:40 +0000
@@ -1,14 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer.VS2010", "Installer\Installer.VS2010.wixproj", "{F533FC43-6C05-4A64-8AF6-72B690EB06C3}"
- ProjectSection(ProjectDependencies) = postProject
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7} = {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}
- {C28B1166-1380-445D-AEC1-8A18B990DD18} = {C28B1166-1380-445D-AEC1-8A18B990DD18}
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D} = {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}
- {DC3517FF-AC26-4755-9B7A-EF658FF69593} = {DC3517FF-AC26-4755-9B7A-EF658FF69593}
- EndProjectSection
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data", "Source\MySql.Data\MySql.Data.csproj", "{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Tests", "Tests\MySql.Data.Tests\MySql.Data.Tests.csproj", "{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}"
@@ -23,6 +15,8 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.VisualStudio", "Source\MySql.VisualStudio\MySql.VisualStudio.csproj", "{DC3517FF-AC26-4755-9B7A-EF658FF69593}"
EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{F533FC43-6C05-4A64-8AF6-72B690EB06C3}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Commercial|Any CPU = Commercial|Any CPU
@@ -43,31 +37,6 @@
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.Build.0 = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Mixed Platforms.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Mixed Platforms.Build.0 = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x64.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x86.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x86.Build.0 = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Any CPU.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Mixed Platforms.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Mixed Platforms.Build.0 = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|x64.ActiveCfg = Commercial|x86
- {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
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|x86.ActiveCfg = GPL|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|x86.Build.0 = GPL|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Any CPU.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Mixed Platforms.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x64.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x86.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x86.Build.0 = Commercial|x86
{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|Any CPU.Build.0 = Release|Any CPU
{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -236,6 +205,31 @@
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x64.ActiveCfg = Release|Any CPU
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x86.ActiveCfg = Release|Any CPU
+ {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.ActiveCfg = Commercial|x86
+ {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Mixed Platforms.ActiveCfg = Commercial|x86
+ {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Mixed Platforms.Build.0 = Commercial|x86
+ {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x64.ActiveCfg = Commercial|x86
+ {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x86.ActiveCfg = Commercial|x86
+ {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x86.Build.0 = Commercial|x86
+ {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Any CPU.ActiveCfg = Commercial|x86
+ {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Mixed Platforms.ActiveCfg = Commercial|x86
+ {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Mixed Platforms.Build.0 = Commercial|x86
+ {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|x64.ActiveCfg = Commercial|x86
+ {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
+ {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|x86.ActiveCfg = GPL|x86
+ {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|x86.Build.0 = GPL|x86
+ {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Any CPU.ActiveCfg = Commercial|x86
+ {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Mixed Platforms.ActiveCfg = Commercial|x86
+ {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Mixed Platforms.Build.0 = Commercial|x86
+ {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x64.ActiveCfg = Commercial|x86
+ {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x86.ActiveCfg = Commercial|x86
+ {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x86.Build.0 = Commercial|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
=== modified file 'VS2008/MySQLClient.sln'
--- a/VS2008/MySQLClient.sln 2011-06-21 19:31:39 +0000
+++ b/VS2008/MySQLClient.sln 2011-06-22 03:09:40 +0000
@@ -22,83 +22,45 @@
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
- Debug-4.0|Any CPU = Debug-4.0|Any CPU
Release|Any CPU = Release|Any CPU
- Release-4.0|Any CPU = Release-4.0|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug-4.0|Any CPU.ActiveCfg = Debug|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug-4.0|Any CPU.Build.0 = Debug|Any CPU
{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|Any CPU.Build.0 = Release|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release-4.0|Any CPU.ActiveCfg = Release|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release-4.0|Any CPU.Build.0 = Release|Any CPU
{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug-4.0|Any CPU.ActiveCfg = Debug|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug-4.0|Any CPU.Build.0 = Debug|Any CPU
{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|Any CPU.Build.0 = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release-4.0|Any CPU.ActiveCfg = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release-4.0|Any CPU.Build.0 = Release|Any CPU
{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug-4.0|Any CPU.ActiveCfg = Debug|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug-4.0|Any CPU.Build.0 = Debug|Any CPU
{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|Any CPU.Build.0 = Release|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Release-4.0|Any CPU.ActiveCfg = Release|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Release-4.0|Any CPU.Build.0 = Release|Any CPU
{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug-4.0|Any CPU.ActiveCfg = Debug|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug-4.0|Any CPU.Build.0 = Debug|Any CPU
{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release|Any CPU.Build.0 = Release|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release-4.0|Any CPU.ActiveCfg = Release|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release-4.0|Any CPU.Build.0 = Release|Any CPU
{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug-4.0|Any CPU.ActiveCfg = Debug|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug-4.0|Any CPU.Build.0 = Debug|Any CPU
{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release|Any CPU.Build.0 = Release|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release-4.0|Any CPU.ActiveCfg = Release|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release-4.0|Any CPU.Build.0 = Release|Any CPU
{D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug-4.0|Any CPU.ActiveCfg = Debug|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug-4.0|Any CPU.Build.0 = Debug|Any CPU
{D37B3572-767F-4622-A835-844B0EBEFD5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D37B3572-767F-4622-A835-844B0EBEFD5B}.Release|Any CPU.Build.0 = Release|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Release-4.0|Any CPU.ActiveCfg = Release|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Release-4.0|Any CPU.Build.0 = Release|Any CPU
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|Any CPU.ActiveCfg = Debug|Any CPU
- {DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|Any CPU.Build.0 = Debug|Any CPU
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.Build.0 = Release|Any CPU
- {DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Any CPU.ActiveCfg = Release|Any CPU
- {DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Any CPU.Build.0 = Release|Any CPU
{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug-4.0|Any CPU.ActiveCfg = Debug|Any CPU
- {587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug-4.0|Any CPU.Build.0 = Debug|Any CPU
{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|Any CPU.Build.0 = Release|Any CPU
- {587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release-4.0|Any CPU.ActiveCfg = Release|Any CPU
- {587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release-4.0|Any CPU.Build.0 = Release|Any CPU
{710D9251-17A3-4429-9A91-63F03267F310}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{710D9251-17A3-4429-9A91-63F03267F310}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {710D9251-17A3-4429-9A91-63F03267F310}.Debug-4.0|Any CPU.ActiveCfg = Debug|Any CPU
- {710D9251-17A3-4429-9A91-63F03267F310}.Debug-4.0|Any CPU.Build.0 = Debug|Any CPU
{710D9251-17A3-4429-9A91-63F03267F310}.Release|Any CPU.ActiveCfg = Release|Any CPU
{710D9251-17A3-4429-9A91-63F03267F310}.Release|Any CPU.Build.0 = Release|Any CPU
- {710D9251-17A3-4429-9A91-63F03267F310}.Release-4.0|Any CPU.ActiveCfg = Release|Any CPU
- {710D9251-17A3-4429-9A91-63F03267F310}.Release-4.0|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20110622031107-hezjs1pizmz2fdkz.bundle
| Thread |
|---|
| • bzr commit into connector-net-6.4 branch (reggie.burnett:1007) | Reggie Burnett | 22 Jun |