#At file:///C:/Users/Reggie/work/connector-net/6.4/ based on revid:julio.casal@strippeda7o6009
1002 Reggie Burnett 2011-06-21 [merge]
merged
removed:
MySql.Data.Entity/Provider/
MySql.Data/Provider/
MySql.Data/Provider/MySql.Data.VS2010.csproj
MySql.Data/Provider/Source/
MySql.Data/Tests/Source/
MySql.Web/Providers/
MySql.Web/Providers/Source/
added:
Source/
Tests/
VS2008/
VS2008/Source/
VS2008/Source/MySql.Data/
VS2008/Source/MySql.Data.Entity/
VS2008/Source/MySql.Data.Entity/Fragments/
VS2008/Source/MySql.Data.Entity/Generators/
VS2008/Source/MySql.Data.Entity/MySql.Data.Entity.csproj
VS2008/Source/MySql.Data.Entity/Properties/
VS2008/Source/MySql.Data.Entity/Statements/
VS2008/Source/MySql.Data/MySql.Data.csproj
VS2008/Source/MySql.Data/Properties/
VS2008/Source/MySql.Data/Types/
VS2008/Source/MySql.Data/base/
VS2008/Source/MySql.Data/cf/
VS2008/Source/MySql.Data/common/
VS2008/Source/MySql.Data/docs/
VS2008/Source/MySql.Data/zlib/
VS2008/Source/MySql.VisualStudio/
VS2008/Source/MySql.VisualStudio/DDEX/
VS2008/Source/MySql.VisualStudio/DbObjects/
VS2008/Source/MySql.VisualStudio/Editors/
VS2008/Source/MySql.VisualStudio/LanguageService/
VS2008/Source/MySql.VisualStudio/Nodes/
VS2008/Source/MySql.VisualStudio/Properties/
VS2008/Source/MySql.VisualStudio/Resources/
VS2008/Source/MySql.VisualStudio/Templates/
VS2008/Source/MySql.VisualStudio/WebConfig/
VS2008/Source/MySql.Web/
VS2008/Source/MySql.Web/MySql.Web.csproj
VS2008/Source/MySql.Web/Properties/
VS2008/Tests/
VS2008/Tests/MySql.Data.CF.Tests/
VS2008/Tests/MySql.Data.Entity.Tests/
VS2008/Tests/MySql.Data.Entity.Tests/MySql.Data.Entity.Tests.csproj
VS2008/Tests/MySql.Data.Entity.Tests/Properties/
VS2008/Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.Designer.cs
VS2008/Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.resx
VS2008/Tests/MySql.Data.Tests/
VS2008/Tests/MySql.Data.Tests/MySql.Data.Tests.csproj
VS2008/Tests/MySql.Data.Tests/Properties/
VS2008/Tests/MySql.Web.Tests/
VS2008/Tests/MySql.Web.Tests/MySql.Web.Tests.csproj
VS2008/Tests/MySql.Web.Tests/Properties/
renamed:
MySQL-VS2005.sln => VS2008/MySQL-VS2005.sln
MySQLClient-VS2010.sln => MySQLClient.sln
MySQLClient.sln => VS2008/MySQLClient.sln
MySql.Data/ => Source/MySql.Data/
MySql.Data.Entity/ => Source/MySql.Data.Entity/
MySql.Data.Entity/Provider/EFMySqlCommand.cs => Source/MySql.Data.Entity/EFMySqlCommand.cs
MySql.Data.Entity/Provider/EFMySqlDataReader.cs => Source/MySql.Data.Entity/EFMySqlDataReader.cs
MySql.Data.Entity/Provider/Fragments/ => Source/MySql.Data.Entity/Fragments/
MySql.Data.Entity/Provider/Generators/ => Source/MySql.Data.Entity/Generators/
MySql.Data.Entity/Provider/Metadata.cs => Source/MySql.Data.Entity/Metadata.cs
MySql.Data.Entity/Provider/MySql.Data.Entity.csproj => Source/MySql.Data.Entity/MySql.Data.Entity.csproj
MySql.Data.Entity/Provider/Properties/ => Source/MySql.Data.Entity/Properties/
MySql.Data.Entity/Provider/ProviderManifest.cs => Source/MySql.Data.Entity/ProviderManifest.cs
MySql.Data.Entity/Provider/ProviderServices.cs => Source/MySql.Data.Entity/ProviderServices.cs
MySql.Data.Entity/Provider/Statements/ => Source/MySql.Data.Entity/Statements/
MySql.Data.Entity/Tests/ => Tests/MySql.Data.Entity.Tests/
MySql.Data/Provider/MySql.Data.CF.csproj => VS2008/Source/MySql.Data/MySql.Data.CF.csproj
MySql.Data/Provider/MySql.Data.csproj => Source/MySql.Data/MySql.Data.csproj
MySql.Data/Provider/Properties/ => Source/MySql.Data/Properties/
MySql.Data/Provider/Source/BulkLoader.cs => Source/MySql.Data/BulkLoader.cs
MySql.Data/Provider/Source/CharSetMap.cs => Source/MySql.Data/CharSetMap.cs
MySql.Data/Provider/Source/CommandBuilder.cs => Source/MySql.Data/CommandBuilder.cs
MySql.Data/Provider/Source/CompressedStream.cs => Source/MySql.Data/CompressedStream.cs
MySql.Data/Provider/Source/Connection.cs => Source/MySql.Data/Connection.cs
MySql.Data/Provider/Source/Crypt.cs => Source/MySql.Data/Crypt.cs
MySql.Data/Provider/Source/Driver.cs => Source/MySql.Data/Driver.cs
MySql.Data/Provider/Source/Exception.cs => Source/MySql.Data/Exception.cs
MySql.Data/Provider/Source/Field.cs => Source/MySql.Data/Field.cs
MySql.Data/Provider/Source/ISSchemaProvider.cs => Source/MySql.Data/ISSchemaProvider.cs
MySql.Data/Provider/Source/Installer.cs => Source/MySql.Data/Installer.cs
MySql.Data/Provider/Source/MySqlClientFactory.cs => Source/MySql.Data/MySqlClientFactory.cs
MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs => Source/MySql.Data/MySqlConnectionStringBuilder.cs
MySql.Data/Provider/Source/MySqlError.cs => Source/MySql.Data/MySqlError.cs
MySql.Data/Provider/Source/MySqlHelper.cs => Source/MySql.Data/MySqlHelper.cs
MySql.Data/Provider/Source/MySqlPacket.cs => Source/MySql.Data/MySqlPacket.cs
MySql.Data/Provider/Source/MySqlPool.cs => Source/MySql.Data/MySqlPool.cs
MySql.Data/Provider/Source/MySqlPoolManager.cs => Source/MySql.Data/MySqlPoolManager.cs
MySql.Data/Provider/Source/MySqlPromotableTransaction.cs => Source/MySql.Data/MySqlPromotableTransaction.cs
MySql.Data/Provider/Source/MySqlScript.cs => Source/MySql.Data/MySqlScript.cs
MySql.Data/Provider/Source/MySqlStream.cs => Source/MySql.Data/MySqlStream.cs
MySql.Data/Provider/Source/MySqlTrace.cs => Source/MySql.Data/MySqlTrace.cs
MySql.Data/Provider/Source/MysqlDefs.cs => Source/MySql.Data/MysqlDefs.cs
MySql.Data/Provider/Source/NativeDriver.cs => Source/MySql.Data/NativeDriver.cs
MySql.Data/Provider/Source/PerformanceMonitor.cs => Source/MySql.Data/PerformanceMonitor.cs
MySql.Data/Provider/Source/PreparableStatement.cs => Source/MySql.Data/PreparableStatement.cs
MySql.Data/Provider/Source/ProcedureCache.cs => Source/MySql.Data/ProcedureCache.cs
MySql.Data/Provider/Source/ResultSet.cs => Source/MySql.Data/ResultSet.cs
MySql.Data/Provider/Source/Runtime.cs => Source/MySql.Data/Runtime.cs
MySql.Data/Provider/Source/SSPI.cs => Source/MySql.Data/SSPI.cs
MySql.Data/Provider/Source/SchemaProvider.cs => Source/MySql.Data/SchemaProvider.cs
MySql.Data/Provider/Source/Statement.cs => Source/MySql.Data/Statement.cs
MySql.Data/Provider/Source/StoredProcedure.cs => Source/MySql.Data/StoredProcedure.cs
MySql.Data/Provider/Source/TableCache.cs => Source/MySql.Data/TableCache.cs
MySql.Data/Provider/Source/TimedStream.cs => Source/MySql.Data/TimedStream.cs
MySql.Data/Provider/Source/TracingDriver.cs => Source/MySql.Data/TracingDriver.cs
MySql.Data/Provider/Source/Types/ => Source/MySql.Data/Types/
MySql.Data/Provider/Source/base/ => Source/MySql.Data/base/
MySql.Data/Provider/Source/cf/ => Source/MySql.Data/cf/
MySql.Data/Provider/Source/command.cs => Source/MySql.Data/command.cs
MySql.Data/Provider/Source/common/ => Source/MySql.Data/common/
MySql.Data/Provider/Source/dataadapter.cs => Source/MySql.Data/dataadapter.cs
MySql.Data/Provider/Source/datareader.cs => Source/MySql.Data/datareader.cs
MySql.Data/Provider/Source/docs/ => Source/MySql.Data/docs/
MySql.Data/Provider/Source/parameter.cs => Source/MySql.Data/parameter.cs
MySql.Data/Provider/Source/parameter_collection.cs => Source/MySql.Data/parameter_collection.cs
MySql.Data/Provider/Source/transaction.cs => Source/MySql.Data/transaction.cs
MySql.Data/Provider/Source/zlib/ => Source/MySql.Data/zlib/
MySql.Data/Tests/ => Tests/MySql.Data.Tests/
MySql.Data/Tests/MySql.Data.CF.Tests.csproj => VS2008/Tests/MySql.Data.CF.Tests/MySql.Data.CF.Tests.csproj
MySql.Data/Tests/Source/AsyncTests.cs => Tests/MySql.Data.Tests/AsyncTests.cs
MySql.Data/Tests/Source/BaseTest.cs => Tests/MySql.Data.Tests/BaseTest.cs
MySql.Data/Tests/Source/BlobTests.cs => Tests/MySql.Data.Tests/BlobTests.cs
MySql.Data/Tests/Source/BulkLoading.cs => Tests/MySql.Data.Tests/BulkLoading.cs
MySql.Data/Tests/Source/CharacterSetTests.cs => Tests/MySql.Data.Tests/CharacterSetTests.cs
MySql.Data/Tests/Source/CommandBuilderTests.cs => Tests/MySql.Data.Tests/CommandBuilderTests.cs
MySql.Data/Tests/Source/CommandTests.cs => Tests/MySql.Data.Tests/CommandTests.cs
MySql.Data/Tests/Source/ConnectionStringBuilder.cs => Tests/MySql.Data.Tests/ConnectionStringBuilder.cs
MySql.Data/Tests/Source/ConnectionTests.cs => Tests/MySql.Data.Tests/ConnectionTests.cs
MySql.Data/Tests/Source/CultureTests.cs => Tests/MySql.Data.Tests/CultureTests.cs
MySql.Data/Tests/Source/CursorTests.cs => Tests/MySql.Data.Tests/CursorTests.cs
MySql.Data/Tests/Source/DataAdapterTests.cs => Tests/MySql.Data.Tests/DataAdapterTests.cs
MySql.Data/Tests/Source/DataReaderTests.cs => Tests/MySql.Data.Tests/DataReaderTests.cs
MySql.Data/Tests/Source/DataTypeTests.cs => Tests/MySql.Data.Tests/DataTypeTests.cs
MySql.Data/Tests/Source/DateTimeTests.cs => Tests/MySql.Data.Tests/DateTimeTests.cs
MySql.Data/Tests/Source/EventTests.cs => Tests/MySql.Data.Tests/EventTests.cs
MySql.Data/Tests/Source/ExceptionTests.cs => Tests/MySql.Data.Tests/ExceptionTests.cs
MySql.Data/Tests/Source/GetSchemaTests.cs => Tests/MySql.Data.Tests/GetSchemaTests.cs
MySql.Data/Tests/Source/InterfaceTests.cs => Tests/MySql.Data.Tests/InterfaceTests.cs
MySql.Data/Tests/Source/LanguageTests.cs => Tests/MySql.Data.Tests/LanguageTests.cs
MySql.Data/Tests/Source/Logging.cs => Tests/MySql.Data.Tests/Logging.cs
MySql.Data/Tests/Source/OutputParameters.cs => Tests/MySql.Data.Tests/OutputParameters.cs
MySql.Data/Tests/Source/ParameterTests.cs => Tests/MySql.Data.Tests/ParameterTests.cs
MySql.Data/Tests/Source/PartialTrustSandbox.cs => Tests/MySql.Data.Tests/PartialTrustSandbox.cs
MySql.Data/Tests/Source/PerfMonTests.cs => Tests/MySql.Data.Tests/PerfMonTests.cs
MySql.Data/Tests/Source/PoolingTests.cs => Tests/MySql.Data.Tests/PoolingTests.cs
MySql.Data/Tests/Source/PreparedStatements.cs => Tests/MySql.Data.Tests/PreparedStatements.cs
MySql.Data/Tests/Source/ProcedureParameters.cs => Tests/MySql.Data.Tests/ProcedureParameters.cs
MySql.Data/Tests/Source/ReplicationTests.cs => Tests/MySql.Data.Tests/ReplicationTests.cs
MySql.Data/Tests/Source/ScriptExecution.cs => Tests/MySql.Data.Tests/ScriptExecution.cs
MySql.Data/Tests/Source/SimpleTransactions.cs => Tests/MySql.Data.Tests/SimpleTransactions.cs
MySql.Data/Tests/Source/SqlServerMode.cs => Tests/MySql.Data.Tests/SqlServerMode.cs
MySql.Data/Tests/Source/SqlTokenizer.cs => Tests/MySql.Data.Tests/SqlTokenizer.cs
MySql.Data/Tests/Source/StoredProcedure.cs => Tests/MySql.Data.Tests/StoredProcedure.cs
MySql.Data/Tests/Source/StoredProcedureWithAccess.cs => Tests/MySql.Data.Tests/StoredProcedureWithAccess.cs
MySql.Data/Tests/Source/StressTests.cs => Tests/MySql.Data.Tests/StressTests.cs
MySql.Data/Tests/Source/Syntax.cs => Tests/MySql.Data.Tests/Syntax.cs
MySql.Data/Tests/Source/Syntax2.cs => Tests/MySql.Data.Tests/Syntax2.cs
MySql.Data/Tests/Source/TableCaching.cs => Tests/MySql.Data.Tests/TableCaching.cs
MySql.Data/Tests/Source/Threading.cs => Tests/MySql.Data.Tests/Threading.cs
MySql.Data/Tests/Source/TimeoutAndCancel.cs => Tests/MySql.Data.Tests/TimeoutAndCancel.cs
MySql.Data/Tests/Source/Tokenizer.cs => Tests/MySql.Data.Tests/Tokenizer.cs
MySql.Data/Tests/Source/Transactions.cs => Tests/MySql.Data.Tests/Transactions.cs
MySql.Data/Tests/Source/UsageAdvisor.cs => Tests/MySql.Data.Tests/UsageAdvisor.cs
MySql.Data/Tests/Source/Utils.cs => Tests/MySql.Data.Tests/Utils.cs
MySql.VisualStudio/ => Source/MySql.VisualStudio/
MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj => Source/MySql.VisualStudio/MySql.VisualStudio.csproj
MySql.VisualStudio/MySql.VisualStudio.csproj => VS2008/Source/MySql.VisualStudio/MySql.VisualStudio.csproj
MySql.Web/ => Source/MySql.Web/
MySql.Web/Providers/MySql.Web.csproj => Source/MySql.Web/MySql.Web.csproj
MySql.Web/Providers/Properties/ => Source/MySql.Web/Properties/
MySql.Web/Providers/Source/Application.cs => Source/MySql.Web/Application.cs
MySql.Web/Providers/Source/Install.cs => Source/MySql.Web/Install.cs
MySql.Web/Providers/Source/MembershipProvider.cs => Source/MySql.Web/MembershipProvider.cs
MySql.Web/Providers/Source/ProfileProvider.cs => Source/MySql.Web/ProfileProvider.cs
MySql.Web/Providers/Source/RoleProvider.cs => Source/MySql.Web/RoleProvider.cs
MySql.Web/Providers/Source/Runtime.cs => Source/MySql.Web/Runtime.cs
MySql.Web/Providers/Source/SchemaManager.cs => Source/MySql.Web/SchemaManager.cs
MySql.Web/Providers/Source/SessionProvider.cs => Source/MySql.Web/SessionProvider.cs
MySql.Web/Tests/ => Tests/MySql.Web.Tests/
modified:
Source/MySql.Data.Entity/Properties/Resources.Designer.cs
Source/MySql.Data/Properties/Resources.Designer.cs
Source/MySql.Data/Properties/Resources.resx
Source/MySql.Data/base/DbConnectionStringBuilder.cs
Source/MySql.Data/common/StreamCreator.cs
Source/MySql.VisualStudio/Properties/Resources.Designer.cs
Source/MySql.Web/Properties/Resources.Designer.cs
Tests/MySql.Data.Entity.Tests/AggregateOperators.cs
Tests/MySql.Data.Entity.Tests/BaseEdmTest.cs
Tests/MySql.Data.Entity.Tests/CanonicalFunctions.cs
Tests/MySql.Data.Entity.Tests/DataTypeTests.cs
Tests/MySql.Data.Entity.Tests/DeleteTests.cs
Tests/MySql.Data.Entity.Tests/JoinTests.cs
Tests/MySql.Data.Entity.Tests/MySql.Data.Entity.Tests.csproj
Tests/MySql.Data.Entity.Tests/Paging.cs
Tests/MySql.Data.Entity.Tests/ProceduresAndFunctions.cs
Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.Designer.cs
Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.resx
Tests/MySql.Data.Entity.Tests/ProviderServicesTests.cs
Tests/MySql.Data.Entity.Tests/RelationalOperators.cs
Tests/MySql.Data.Entity.Tests/SetOperators.cs
Tests/MySql.Data.Entity.Tests/UpdateTests.cs
Tests/MySql.Data.Entity.Tests/Wizard.cs
Tests/MySql.Data.Tests/MySql.Data.Tests.csproj
Tests/MySql.Web.Tests/MySql.Web.Tests.csproj
MySQLClient.sln
VS2008/MySQLClient.sln
Source/MySql.Data.Entity/MySql.Data.Entity.csproj
VS2008/Source/MySql.Data/MySql.Data.CF.csproj
Source/MySql.Data/MySql.Data.csproj
Source/MySql.Data/MySqlConnectionStringBuilder.cs
Source/MySql.Data/NativeDriver.cs
VS2008/Tests/MySql.Data.CF.Tests/MySql.Data.CF.Tests.csproj
Tests/MySql.Data.Tests/ConnectionStringBuilder.cs
Tests/MySql.Data.Tests/ConnectionTests.cs
Tests/MySql.Data.Tests/TimeoutAndCancel.cs
Tests/MySql.Data.Tests/Transactions.cs
Source/MySql.VisualStudio/MySql.VisualStudio.csproj
VS2008/Source/MySql.VisualStudio/MySql.VisualStudio.csproj
Source/MySql.Web/MySql.Web.csproj
=== renamed file 'MySQLClient-VS2010.sln' => 'MySQLClient.sln'
=== renamed file 'MySQLClient-VS2010.sln' => 'MySQLClient.sln'
--- a/MySQLClient-VS2010.sln 2011-05-17 17:43:40 +0000
+++ b/MySQLClient.sln 2011-06-21 18:51:27 +0000
@@ -9,19 +9,19 @@
{DC3517FF-AC26-4755-9B7A-EF658FF69593} = {DC3517FF-AC26-4755-9B7A-EF658FF69593}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Web", "MySql.Web\Providers\MySql.Web.csproj", "{C28B1166-1380-445D-AEC1-8A18B990DD18}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data", "MySql.Data\Provider\MySql.Data.csproj", "{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Web.Tests", "MySql.Web\Tests\MySql.Web.Tests.csproj", "{83462D15-E576-4079-BBC9-9EE1CF0B24DD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Tests", "MySql.Data\Tests\MySql.Data.Tests.csproj", "{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity", "MySql.Data.Entity\Provider\MySql.Data.Entity.csproj", "{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity.Tests", "MySql.Data.Entity\Tests\MySql.Data.Entity.Tests.csproj", "{D37B3572-767F-4622-A835-844B0EBEFD5B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.VisualStudio.VS2010", "MySql.VisualStudio\MySql.VisualStudio.VS2010.csproj", "{DC3517FF-AC26-4755-9B7A-EF658FF69593}"
+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}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Web", "Source\MySql.Web\MySql.Web.csproj", "{C28B1166-1380-445D-AEC1-8A18B990DD18}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Web.Tests", "Tests\MySql.Web.Tests\MySql.Web.Tests.csproj", "{83462D15-E576-4079-BBC9-9EE1CF0B24DD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity", "Source\MySql.Data.Entity\MySql.Data.Entity.csproj", "{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity.Tests", "Tests\MySql.Data.Entity.Tests\MySql.Data.Entity.Tests.csproj", "{D37B3572-767F-4622-A835-844B0EBEFD5B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.VisualStudio", "Source\MySql.VisualStudio\MySql.VisualStudio.csproj", "{DC3517FF-AC26-4755-9B7A-EF658FF69593}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -33,10 +33,6 @@
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
- Debug-4.0|Any CPU = Debug-4.0|Any CPU
- Debug-4.0|Mixed Platforms = Debug-4.0|Mixed Platforms
- Debug-4.0|x64 = Debug-4.0|x64
- Debug-4.0|x86 = Debug-4.0|x86
GPL|Any CPU = GPL|Any CPU
GPL|Mixed Platforms = GPL|Mixed Platforms
GPL|x64 = GPL|x64
@@ -45,10 +41,6 @@
Release|Mixed Platforms = Release|Mixed Platforms
Release|x64 = Release|x64
Release|x86 = Release|x86
- Release-4.0|Any CPU = Release-4.0|Any CPU
- Release-4.0|Mixed Platforms = Release-4.0|Mixed Platforms
- Release-4.0|x64 = Release-4.0|x64
- Release-4.0|x86 = Release-4.0|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.ActiveCfg = Commercial|x86
@@ -64,11 +56,6 @@
{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}.Debug-4.0|Any CPU.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug-4.0|Mixed Platforms.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug-4.0|x64.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug-4.0|x86.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug-4.0|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
@@ -81,12 +68,54 @@
{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
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release-4.0|Any CPU.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release-4.0|Mixed Platforms.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release-4.0|Mixed Platforms.Build.0 = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release-4.0|x64.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release-4.0|x86.ActiveCfg = Commercial|x86
- {F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release-4.0|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
+ {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
+ {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|x64.ActiveCfg = Release|Any CPU
+ {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|x86.ActiveCfg = Release|Any CPU
+ {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|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|Any CPU.ActiveCfg = Release|Any CPU
+ {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|Any CPU.Build.0 = Release|Any CPU
+ {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
+ {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|x64.ActiveCfg = Release|Any CPU
+ {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|x86.ActiveCfg = Release|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|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|x64.ActiveCfg = Release|Any CPU
+ {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|x86.ActiveCfg = Release|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|Any CPU.Build.0 = Release|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|x64.ActiveCfg = Release|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|x86.ActiveCfg = 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|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|Any CPU.ActiveCfg = Release|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|Any CPU.Build.0 = Release|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|x64.ActiveCfg = Release|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|x86.ActiveCfg = Release|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|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|x64.ActiveCfg = Release|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|x86.ActiveCfg = Release|Any CPU
{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|Any CPU.Build.0 = Release|Any CPU
{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -99,12 +128,6 @@
{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|x64.ActiveCfg = Debug|Any CPU
{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|x86.ActiveCfg = Debug|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug-4.0|Any CPU.ActiveCfg = Debug-4.0|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug-4.0|Any CPU.Build.0 = Debug-4.0|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug-4.0|Mixed Platforms.ActiveCfg = Debug-4.0|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug-4.0|Mixed Platforms.Build.0 = Debug-4.0|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug-4.0|x64.ActiveCfg = Debug-4.0|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug-4.0|x86.ActiveCfg = Debug-4.0|Any CPU
{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|Any CPU.ActiveCfg = Release|Any CPU
{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|Any CPU.Build.0 = Release|Any CPU
{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -117,48 +140,6 @@
{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|x64.ActiveCfg = Release|Any CPU
{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|x86.ActiveCfg = Release|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Release-4.0|Any CPU.ActiveCfg = Release-4.0|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Release-4.0|Any CPU.Build.0 = Release-4.0|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Release-4.0|Mixed Platforms.ActiveCfg = Release-4.0|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Release-4.0|Mixed Platforms.Build.0 = Release-4.0|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Release-4.0|x64.ActiveCfg = Release-4.0|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Release-4.0|x86.ActiveCfg = Release-4.0|Any CPU
- {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
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|x64.ActiveCfg = Release|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|x86.ActiveCfg = Release|Any CPU
- {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|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|x64.ActiveCfg = Debug|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|x86.ActiveCfg = Debug|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug-4.0|Any CPU.ActiveCfg = Debug-4.0|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug-4.0|Any CPU.Build.0 = Debug-4.0|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug-4.0|Mixed Platforms.ActiveCfg = Debug-4.0|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug-4.0|Mixed Platforms.Build.0 = Debug-4.0|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug-4.0|x64.ActiveCfg = Debug|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug-4.0|x86.ActiveCfg = Debug|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|Any CPU.ActiveCfg = Release|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|Any CPU.Build.0 = Release|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|x64.ActiveCfg = Release|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|x86.ActiveCfg = Release|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|Mixed Platforms.ActiveCfg = Release|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|x64.ActiveCfg = Release|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|x86.ActiveCfg = Release|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release-4.0|Any CPU.ActiveCfg = Release-4.0|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release-4.0|Any CPU.Build.0 = Release-4.0|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release-4.0|Mixed Platforms.ActiveCfg = Release-4.0|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release-4.0|Mixed Platforms.Build.0 = Release-4.0|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release-4.0|x64.ActiveCfg = Release|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release-4.0|x86.ActiveCfg = Release|Any CPU
{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Commercial|Any CPU.Build.0 = Release|Any CPU
{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -171,12 +152,6 @@
{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug|x64.ActiveCfg = Debug|Any CPU
{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug|x86.ActiveCfg = Debug|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug-4.0|Any CPU.ActiveCfg = Debug-4.0|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug-4.0|Any CPU.Build.0 = Debug-4.0|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug-4.0|Mixed Platforms.ActiveCfg = Debug-4.0|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug-4.0|Mixed Platforms.Build.0 = Debug-4.0|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug-4.0|x64.ActiveCfg = Debug|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug-4.0|x86.ActiveCfg = Debug|Any CPU
{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.GPL|Any CPU.ActiveCfg = Release|Any CPU
{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.GPL|Any CPU.Build.0 = Release|Any CPU
{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -189,48 +164,6 @@
{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release|x64.ActiveCfg = Release|Any CPU
{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release|x86.ActiveCfg = Release|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release-4.0|Any CPU.ActiveCfg = Release-4.0|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release-4.0|Any CPU.Build.0 = Release-4.0|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release-4.0|Mixed Platforms.ActiveCfg = Release-4.0|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release-4.0|Mixed Platforms.Build.0 = Release-4.0|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release-4.0|x64.ActiveCfg = Release|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release-4.0|x86.ActiveCfg = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|Any CPU.Build.0 = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|x64.ActiveCfg = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|x86.ActiveCfg = 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|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|x64.ActiveCfg = Debug|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|x86.ActiveCfg = Debug|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug-4.0|Any CPU.ActiveCfg = Debug-4.0|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug-4.0|Any CPU.Build.0 = Debug-4.0|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug-4.0|Mixed Platforms.ActiveCfg = Debug-4.0|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug-4.0|Mixed Platforms.Build.0 = Debug-4.0|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug-4.0|x64.ActiveCfg = Debug|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug-4.0|x86.ActiveCfg = Debug|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|Any CPU.ActiveCfg = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|Any CPU.Build.0 = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|x64.ActiveCfg = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|x86.ActiveCfg = Release|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|Mixed Platforms.ActiveCfg = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|x64.ActiveCfg = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|x86.ActiveCfg = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release-4.0|Any CPU.ActiveCfg = Release-4.0|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release-4.0|Any CPU.Build.0 = Release-4.0|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release-4.0|Mixed Platforms.ActiveCfg = Release-4.0|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release-4.0|Mixed Platforms.Build.0 = Release-4.0|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release-4.0|x64.ActiveCfg = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release-4.0|x86.ActiveCfg = Release|Any CPU
{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Commercial|Any CPU.Build.0 = Release|Any CPU
{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -243,12 +176,6 @@
{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug|x64.ActiveCfg = Debug|Any CPU
{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug|x86.ActiveCfg = Debug|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug-4.0|Any CPU.ActiveCfg = Debug-4.0|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug-4.0|Any CPU.Build.0 = Debug-4.0|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug-4.0|Mixed Platforms.ActiveCfg = Debug-4.0|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug-4.0|Mixed Platforms.Build.0 = Debug-4.0|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug-4.0|x64.ActiveCfg = Debug|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug-4.0|x86.ActiveCfg = Debug|Any CPU
{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.GPL|Any CPU.ActiveCfg = Release|Any CPU
{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.GPL|Any CPU.Build.0 = Release|Any CPU
{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -261,12 +188,6 @@
{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release|x64.ActiveCfg = Release|Any CPU
{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release|x86.ActiveCfg = Release|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release-4.0|Any CPU.ActiveCfg = Release-4.0|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release-4.0|Any CPU.Build.0 = Release-4.0|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release-4.0|Mixed Platforms.ActiveCfg = Release-4.0|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release-4.0|Mixed Platforms.Build.0 = Release-4.0|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release-4.0|x64.ActiveCfg = Release|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release-4.0|x86.ActiveCfg = Release|Any CPU
{D37B3572-767F-4622-A835-844B0EBEFD5B}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
{D37B3572-767F-4622-A835-844B0EBEFD5B}.Commercial|Any CPU.Build.0 = Release|Any CPU
{D37B3572-767F-4622-A835-844B0EBEFD5B}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -279,12 +200,6 @@
{D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug|x64.ActiveCfg = Debug|Any CPU
{D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug|x86.ActiveCfg = Debug|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug-4.0|Any CPU.ActiveCfg = Debug-4.0|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug-4.0|Any CPU.Build.0 = Debug-4.0|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug-4.0|Mixed Platforms.ActiveCfg = Debug-4.0|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug-4.0|Mixed Platforms.Build.0 = Debug-4.0|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug-4.0|x64.ActiveCfg = Debug|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug-4.0|x86.ActiveCfg = Debug|Any CPU
{D37B3572-767F-4622-A835-844B0EBEFD5B}.GPL|Any CPU.ActiveCfg = Release|Any CPU
{D37B3572-767F-4622-A835-844B0EBEFD5B}.GPL|Any CPU.Build.0 = Release|Any CPU
{D37B3572-767F-4622-A835-844B0EBEFD5B}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -297,12 +212,6 @@
{D37B3572-767F-4622-A835-844B0EBEFD5B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D37B3572-767F-4622-A835-844B0EBEFD5B}.Release|x64.ActiveCfg = Release|Any CPU
{D37B3572-767F-4622-A835-844B0EBEFD5B}.Release|x86.ActiveCfg = Release|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Release-4.0|Any CPU.ActiveCfg = Release-4.0|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Release-4.0|Any CPU.Build.0 = Release-4.0|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Release-4.0|Mixed Platforms.ActiveCfg = Release-4.0|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Release-4.0|Mixed Platforms.Build.0 = Release-4.0|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Release-4.0|x64.ActiveCfg = Release|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Release-4.0|x86.ActiveCfg = Release|Any CPU
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Any CPU.Build.0 = Release|Any CPU
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -315,12 +224,6 @@
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x64.ActiveCfg = Debug|Any CPU
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x86.ActiveCfg = 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}.Debug-4.0|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|Mixed Platforms.Build.0 = Debug|Any CPU
- {DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|x64.ActiveCfg = Debug|Any CPU
- {DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|x86.ActiveCfg = Debug|Any CPU
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Any CPU.ActiveCfg = Release|Any CPU
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Any CPU.Build.0 = Release|Any CPU
{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -333,12 +236,6 @@
{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
- {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
- {DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Mixed Platforms.ActiveCfg = Release|Any CPU
- {DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Mixed Platforms.Build.0 = Release|Any CPU
- {DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|x64.ActiveCfg = Release|Any CPU
- {DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
=== removed directory 'MySql.Data.Entity/Provider'
=== removed directory 'MySql.Data/Provider'
=== removed file 'MySql.Data/Provider/MySql.Data.VS2010.csproj'
--- a/MySql.Data/Provider/MySql.Data.VS2010.csproj 2010-11-17 19:25:46 +0000
+++ b/MySql.Data/Provider/MySql.Data.VS2010.csproj 1970-01-01 00:00:00 +0000
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>MySql.Data.MySqlClient</RootNamespace>
- <AssemblyName>MySql.Data</AssemblyName>
- <FileAlignment>512</FileAlignment>
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>2.0</OldToolsVersion>
- <UpgradeBackupLocation />
- <TargetFrameworkProfile />
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug-4.0\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release-4.0\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Configuration.Install" />
- <Reference Include="System.Data" />
- <Reference Include="System.Design" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Management" />
- <Reference Include="System.Security" />
- <Reference Include="System.Transactions" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Source\CharSetMap.cs" />
- <Compile Include="Source\command.cs">
- </Compile>
- <Compile Include="Source\CommandBuilder.cs">
- </Compile>
- <Compile Include="Source\common\ContextString.cs" />
- <Compile Include="Source\common\NamedPipeStream.cs" />
- <Compile Include="Source\common\NativeMethods.cs" />
- <Compile Include="Source\common\Platform.cs" />
- <Compile Include="Source\common\SHA1.cs" />
- <Compile Include="Source\common\SharedMemoryStream.cs" />
- <Compile Include="Source\common\StreamCreator.cs" />
- <Compile Include="Source\common\Version.cs" />
- <Compile Include="Source\CompressedStream.cs" />
- <Compile Include="Source\Connection.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="Source\Crypt.cs" />
- <Compile Include="Source\dataadapter.cs">
- </Compile>
- <Compile Include="Source\datareader.cs" />
- <Compile Include="Source\Driver.cs" />
- <Compile Include="Source\Exception.cs" />
- <Compile Include="Source\Field.cs" />
- <Compile Include="Source\Installer.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="Source\ISSchemaProvider.cs" />
- <Compile Include="Source\MySqlClientFactory.cs" />
- <Compile Include="Source\MySqlConnectionStringBuilder.cs" />
- <Compile Include="Source\MysqlDefs.cs" />
- <Compile Include="Source\MySqlError.cs" />
- <Compile Include="Source\MySqlHelper.cs" />
- <Compile Include="Source\MySqlPool.cs" />
- <Compile Include="Source\MySqlPoolManager.cs" />
- <Compile Include="Source\MySqlPromotableTransaction.cs" />
- <Compile Include="Source\MySqlStream.cs" />
- <Compile Include="Source\NativeDriver.cs" />
- <Compile Include="Source\parameter.cs" />
- <Compile Include="Source\parameter_collection.cs" />
- <Compile Include="Source\PerformanceMonitor.cs" />
- <Compile Include="Source\PreparableStatement.cs" />
- <Compile Include="Source\ProcedureCache.cs" />
- <Compile Include="Source\SchemaProvider.cs" />
- <Compile Include="Source\Statement.cs" />
- <Compile Include="Source\StoredProcedure.cs" />
- <Compile Include="Source\transaction.cs" />
- <Compile Include="Source\Types\MetaData.cs" />
- <Compile Include="Source\Types\MySqlBinary.cs" />
- <Compile Include="Source\Types\MySqlBit.cs" />
- <Compile Include="Source\Types\MySqlByte.cs" />
- <Compile Include="Source\Types\MySqlConversionException.cs" />
- <Compile Include="Source\Types\MySqlDateTime.cs" />
- <Compile Include="Source\Types\MySqlDecimal.cs" />
- <Compile Include="Source\Types\MySqlDouble.cs" />
- <Compile Include="Source\Types\MySqlInt16.cs" />
- <Compile Include="Source\Types\MySqlInt32.cs" />
- <Compile Include="Source\Types\MySqlInt64.cs" />
- <Compile Include="Source\Types\MySqlSingle.cs" />
- <Compile Include="Source\Types\MySqlString.cs" />
- <Compile Include="Source\Types\MySqlTime.cs" />
- <Compile Include="Source\Types\MySqlUByte.cs" />
- <Compile Include="Source\Types\MySqlUInt16.cs" />
- <Compile Include="Source\Types\MySqlUInt32.cs" />
- <Compile Include="Source\Types\MySqlUInt64.cs" />
- <Compile Include="Source\Types\MySqlValue.cs" />
- <Compile Include="Source\zlib\Adler32.cs" />
- <Compile Include="Source\zlib\Deflate.cs" />
- <Compile Include="Source\zlib\InfBlocks.cs" />
- <Compile Include="Source\zlib\InfCodes.cs" />
- <Compile Include="Source\zlib\Inflate.cs" />
- <Compile Include="Source\zlib\InfTree.cs" />
- <Compile Include="Source\zlib\StaticTree.cs" />
- <Compile Include="Source\zlib\SupportClass.cs" />
- <Compile Include="Source\zlib\Tree.cs" />
- <Compile Include="Source\zlib\ZInputStream.cs" />
- <Compile Include="Source\zlib\Zlib.cs" />
- <Compile Include="Source\zlib\ZOutputStream.cs" />
- <Compile Include="Source\zlib\ZStream.cs" />
- <Compile Include="Source\zlib\ZStreamException.cs" />
- <Compile Include="Properties\VersionInfo.cs" />
- <Compile Include="Source\common\Cache.cs" />
- <Compile Include="Source\common\MySqlTokenizer.cs" />
- <Compile Include="Source\common\MyNetworkStream.cs" />
- <Compile Include="Source\BulkLoader.cs" />
- <Compile Include="Source\MySqlPacket.cs" />
- <Compile Include="Source\MySqlScript.cs" />
- <Compile Include="Source\Types\MySqlGuid.cs" />
- <Compile Include="Source\ResultSet.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Properties\ReservedWords.txt" />
- <EmbeddedResource Include="Properties\Resources.resx">
- <SubType>Designer</SubType>
- <Generator>PublicResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- </EmbeddedResource>
- <None Include="Properties\keywords.txt" />
- <Content Include="Source\docs\MySqlCommand.xml" />
- <Content Include="Source\docs\MySqlCommandBuilder.xml" />
- <Content Include="Source\docs\MySqlConnection.xml" />
- <Content Include="Source\docs\MySqlConnectionStringBuilder.xml" />
- <Content Include="Source\docs\MySqlDataAdapter.xml" />
- <Content Include="Source\docs\MySqlDataReader.xml" />
- <Content Include="Source\docs\MySqlException.xml" />
- <Content Include="Source\docs\MySqlHelper.xml" />
- <Content Include="Source\docs\MySqlParameter.xml" />
- <Content Include="Source\docs\MySqlParameterCollection.xml" />
- <Content Include="Source\docs\MySqlTransaction.xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Properties\Resources.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Resources.resx</DependentUpon>
- </Compile>
- <Compile Include="Source\common\LowResolutionStopwatch.cs" />
- <Compile Include="Source\common\QueryNormalizer.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Source\MySqlTrace.cs" />
- <Compile Include="Source\TimedStream.cs" />
- <Compile Include="Source\TracingDriver.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="..\..\CHANGES">
- <Link>CHANGES</Link>
- </None>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
- <Visible>False</Visible>
- <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
- <Visible>False</Visible>
- <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <PropertyGroup>
- <PreBuildEvent>
- </PreBuildEvent>
- <PostBuildEvent>
- </PostBuildEvent>
- </PropertyGroup>
-</Project>
\ No newline at end of file
=== removed directory 'MySql.Data/Provider/Source'
=== removed directory 'MySql.Data/Tests/Source'
=== removed directory 'MySql.Web/Providers'
=== removed directory 'MySql.Web/Providers/Source'
=== added directory 'Source'
=== renamed directory 'MySql.Data' => 'Source/MySql.Data'
=== renamed directory 'MySql.Data.Entity' => 'Source/MySql.Data.Entity'
=== renamed file 'MySql.Data.Entity/Provider/EFMySqlCommand.cs' => 'Source/MySql.Data.Entity/EFMySqlCommand.cs'
=== renamed file 'MySql.Data.Entity/Provider/EFMySqlDataReader.cs' => 'Source/MySql.Data.Entity/EFMySqlDataReader.cs'
=== renamed directory 'MySql.Data.Entity/Provider/Fragments' => 'Source/MySql.Data.Entity/Fragments'
=== renamed directory 'MySql.Data.Entity/Provider/Generators' => 'Source/MySql.Data.Entity/Generators'
=== renamed file 'MySql.Data.Entity/Provider/Metadata.cs' => 'Source/MySql.Data.Entity/Metadata.cs'
=== renamed file 'MySql.Data.Entity/Provider/MySql.Data.Entity.csproj' => 'Source/MySql.Data.Entity/MySql.Data.Entity.csproj'
--- a/MySql.Data.Entity/Provider/MySql.Data.Entity.csproj 2011-06-01 13:47:16 +0000
+++ b/Source/MySql.Data.Entity/MySql.Data.Entity.csproj 2011-06-21 18:51:27 +0000
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MySql.Data.Entity</RootNamespace>
<AssemblyName>MySql.Data.Entity</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -51,31 +51,6 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-4.0|AnyCPU'">
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <DebugSymbols>true</DebugSymbols>
- <IntermediateOutputPath>obj\Debug-4.0\</IntermediateOutputPath>
- <OutputPath>bin\Debug-4.0\</OutputPath>
- <DefineConstants>TRACE;DEBUG;CLR4</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
- <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
- <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-4.0|AnyCPU'">
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <IntermediateOutputPath>obj\Release-4.0\</IntermediateOutputPath>
- <OutputPath>bin\Release-4.0\</OutputPath>
- <DefineConstants>TRACE;CLR4</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -86,7 +61,7 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\SchemaMapping.msl" />
- <Compile Include="..\..\MySql.Data\Provider\Properties\VersionInfo.cs">
+ <Compile Include="..\MySql.Data\Properties\VersionInfo.cs">
<Link>Properties\VersionInfo.cs</Link>
</Compile>
<Compile Include="EFMySqlCommand.cs">
@@ -130,33 +105,11 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\MySql.Data\Provider\MySql.Data.csproj">
+ <ProjectReference Include="..\MySql.Data\MySql.Data.csproj">
<Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
<Name>MySql.Data</Name>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
- <Visible>False</Visible>
- <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
=== renamed directory 'MySql.Data.Entity/Provider/Properties' => 'Source/MySql.Data.Entity/Properties'
=== modified file 'Source/MySql.Data.Entity/Properties/Resources.Designer.cs'
--- a/MySql.Data.Entity/Provider/Properties/Resources.Designer.cs 2010-10-04 18:08:24 +0000
+++ b/Source/MySql.Data.Entity/Properties/Resources.Designer.cs 2011-06-21 18:51:27 +0000
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.1
+// Runtime Version:2.0.50727.5444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
=== renamed file 'MySql.Data.Entity/Provider/ProviderManifest.cs' => 'Source/MySql.Data.Entity/ProviderManifest.cs'
=== renamed file 'MySql.Data.Entity/Provider/ProviderServices.cs' => 'Source/MySql.Data.Entity/ProviderServices.cs'
=== renamed directory 'MySql.Data.Entity/Provider/Statements' => 'Source/MySql.Data.Entity/Statements'
=== renamed file 'MySql.Data/Provider/Source/BulkLoader.cs' => 'Source/MySql.Data/BulkLoader.cs'
=== renamed file 'MySql.Data/Provider/Source/CharSetMap.cs' => 'Source/MySql.Data/CharSetMap.cs'
=== renamed file 'MySql.Data/Provider/Source/CommandBuilder.cs' => 'Source/MySql.Data/CommandBuilder.cs'
=== renamed file 'MySql.Data/Provider/Source/CompressedStream.cs' => 'Source/MySql.Data/CompressedStream.cs'
=== renamed file 'MySql.Data/Provider/Source/Connection.cs' => 'Source/MySql.Data/Connection.cs'
=== renamed file 'MySql.Data/Provider/Source/Crypt.cs' => 'Source/MySql.Data/Crypt.cs'
=== renamed file 'MySql.Data/Provider/Source/Driver.cs' => 'Source/MySql.Data/Driver.cs'
=== renamed file 'MySql.Data/Provider/Source/Exception.cs' => 'Source/MySql.Data/Exception.cs'
=== renamed file 'MySql.Data/Provider/Source/Field.cs' => 'Source/MySql.Data/Field.cs'
=== renamed file 'MySql.Data/Provider/Source/ISSchemaProvider.cs' => 'Source/MySql.Data/ISSchemaProvider.cs'
=== renamed file 'MySql.Data/Provider/Source/Installer.cs' => 'Source/MySql.Data/Installer.cs'
=== renamed file 'MySql.Data/Provider/MySql.Data.csproj' => 'Source/MySql.Data/MySql.Data.csproj'
--- a/MySql.Data/Provider/MySql.Data.csproj 2011-04-08 17:04:15 +0000
+++ b/Source/MySql.Data/MySql.Data.csproj 2011-06-21 19:16:59 +0000
@@ -11,7 +11,7 @@
<RootNamespace>MySql.Data.MySqlClient</RootNamespace>
<AssemblyName>MySql.Data</AssemblyName>
<FileAlignment>512</FileAlignment>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -47,30 +47,6 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-4.0|AnyCPU'">
- <DebugSymbols>true</DebugSymbols>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <IntermediateOutputPath>obj\Debug-4.0\</IntermediateOutputPath>
- <OutputPath>bin\Debug-4.0\</OutputPath>
- <DefineConstants>TRACE;DEBUG;CLR4</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-4.0|AnyCPU'">
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <IntermediateOutputPath>obj\Release-4.0\</IntermediateOutputPath>
- <OutputPath>bin\Release-4.0\</OutputPath>
- <DefineConstants>TRACE;CLR4</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
- <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
- </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Configuration.Install" />
@@ -83,97 +59,98 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="BulkLoader.cs" />
+ <Compile Include="CharSetMap.cs" />
+ <Compile Include="command.cs" />
+ <Compile Include="CommandBuilder.cs" />
+ <Compile Include="common\Cache.cs" />
+ <Compile Include="common\ContextString.cs" />
+ <Compile Include="common\LowResolutionStopwatch.cs" />
+ <Compile Include="common\MyNetworkStream.cs" />
+ <Compile Include="common\MySqlTokenizer.cs" />
+ <Compile Include="common\NamedPipeStream.cs" />
+ <Compile Include="common\NativeMethods.cs" />
+ <Compile Include="common\Platform.cs" />
+ <Compile Include="common\QueryNormalizer.cs" />
+ <Compile Include="common\SHA1.cs" />
+ <Compile Include="common\SharedMemoryStream.cs" />
+ <Compile Include="common\StreamCreator.cs" />
+ <Compile Include="common\Version.cs" />
+ <Compile Include="CompressedStream.cs" />
+ <Compile Include="Connection.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="Crypt.cs" />
+ <Compile Include="dataadapter.cs" />
+ <Compile Include="datareader.cs" />
+ <Compile Include="Driver.cs" />
+ <Compile Include="Exception.cs" />
+ <Compile Include="Field.cs" />
+ <Compile Include="Installer.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="ISSchemaProvider.cs" />
+ <Compile Include="MySqlClientFactory.cs" />
+ <Compile Include="MySqlConnectionStringBuilder.cs" />
+ <Compile Include="MysqlDefs.cs" />
+ <Compile Include="MySqlError.cs" />
+ <Compile Include="MySqlHelper.cs" />
+ <Compile Include="MySqlPacket.cs" />
+ <Compile Include="MySqlPool.cs" />
+ <Compile Include="MySqlPoolManager.cs" />
+ <Compile Include="MySqlPromotableTransaction.cs" />
+ <Compile Include="MySqlScript.cs" />
+ <Compile Include="MySqlStream.cs" />
+ <Compile Include="MySqlTrace.cs" />
+ <Compile Include="NativeDriver.cs" />
+ <Compile Include="parameter.cs" />
+ <Compile Include="parameter_collection.cs" />
+ <Compile Include="PerformanceMonitor.cs" />
+ <Compile Include="PreparableStatement.cs" />
+ <Compile Include="ProcedureCache.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Source\CharSetMap.cs" />
- <Compile Include="Source\command.cs">
- </Compile>
- <Compile Include="Source\CommandBuilder.cs">
- </Compile>
- <Compile Include="Source\common\ContextString.cs" />
- <Compile Include="Source\common\NamedPipeStream.cs" />
- <Compile Include="Source\common\NativeMethods.cs" />
- <Compile Include="Source\common\Platform.cs" />
- <Compile Include="Source\common\SHA1.cs" />
- <Compile Include="Source\common\SharedMemoryStream.cs" />
- <Compile Include="Source\common\StreamCreator.cs" />
- <Compile Include="Source\common\Version.cs" />
- <Compile Include="Source\CompressedStream.cs" />
- <Compile Include="Source\Connection.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="Source\Crypt.cs" />
- <Compile Include="Source\dataadapter.cs">
- </Compile>
- <Compile Include="Source\datareader.cs" />
- <Compile Include="Source\Driver.cs" />
- <Compile Include="Source\Exception.cs" />
- <Compile Include="Source\Field.cs" />
- <Compile Include="Source\Installer.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="Source\ISSchemaProvider.cs" />
- <Compile Include="Source\MySqlClientFactory.cs" />
- <Compile Include="Source\MySqlConnectionStringBuilder.cs" />
- <Compile Include="Source\MysqlDefs.cs" />
- <Compile Include="Source\MySqlError.cs" />
- <Compile Include="Source\MySqlHelper.cs" />
- <Compile Include="Source\MySqlPool.cs" />
- <Compile Include="Source\MySqlPoolManager.cs" />
- <Compile Include="Source\MySqlPromotableTransaction.cs" />
- <Compile Include="Source\MySqlStream.cs" />
- <Compile Include="Source\NativeDriver.cs" />
- <Compile Include="Source\parameter.cs" />
- <Compile Include="Source\parameter_collection.cs" />
- <Compile Include="Source\PerformanceMonitor.cs" />
- <Compile Include="Source\PreparableStatement.cs" />
- <Compile Include="Source\ProcedureCache.cs" />
- <Compile Include="Source\SchemaProvider.cs" />
- <Compile Include="Source\Statement.cs" />
- <Compile Include="Source\StoredProcedure.cs" />
- <Compile Include="Source\transaction.cs" />
- <Compile Include="Source\Types\MetaData.cs" />
- <Compile Include="Source\Types\MySqlBinary.cs" />
- <Compile Include="Source\Types\MySqlBit.cs" />
- <Compile Include="Source\Types\MySqlByte.cs" />
- <Compile Include="Source\Types\MySqlConversionException.cs" />
- <Compile Include="Source\Types\MySqlDateTime.cs" />
- <Compile Include="Source\Types\MySqlDecimal.cs" />
- <Compile Include="Source\Types\MySqlDouble.cs" />
- <Compile Include="Source\Types\MySqlInt16.cs" />
- <Compile Include="Source\Types\MySqlInt32.cs" />
- <Compile Include="Source\Types\MySqlInt64.cs" />
- <Compile Include="Source\Types\MySqlSingle.cs" />
- <Compile Include="Source\Types\MySqlString.cs" />
- <Compile Include="Source\Types\MySqlTime.cs" />
- <Compile Include="Source\Types\MySqlUByte.cs" />
- <Compile Include="Source\Types\MySqlUInt16.cs" />
- <Compile Include="Source\Types\MySqlUInt32.cs" />
- <Compile Include="Source\Types\MySqlUInt64.cs" />
- <Compile Include="Source\Types\MySqlValue.cs" />
- <Compile Include="Source\zlib\Adler32.cs" />
- <Compile Include="Source\zlib\Deflate.cs" />
- <Compile Include="Source\zlib\InfBlocks.cs" />
- <Compile Include="Source\zlib\InfCodes.cs" />
- <Compile Include="Source\zlib\Inflate.cs" />
- <Compile Include="Source\zlib\InfTree.cs" />
- <Compile Include="Source\zlib\StaticTree.cs" />
- <Compile Include="Source\zlib\SupportClass.cs" />
- <Compile Include="Source\zlib\Tree.cs" />
- <Compile Include="Source\zlib\ZInputStream.cs" />
- <Compile Include="Source\zlib\Zlib.cs" />
- <Compile Include="Source\zlib\ZOutputStream.cs" />
- <Compile Include="Source\zlib\ZStream.cs" />
- <Compile Include="Source\zlib\ZStreamException.cs" />
<Compile Include="Properties\VersionInfo.cs" />
- <Compile Include="Source\common\Cache.cs" />
- <Compile Include="Source\common\MySqlTokenizer.cs" />
- <Compile Include="Source\common\MyNetworkStream.cs" />
- <Compile Include="Source\BulkLoader.cs" />
- <Compile Include="Source\MySqlPacket.cs" />
- <Compile Include="Source\MySqlScript.cs" />
- <Compile Include="Source\Types\MySqlGuid.cs" />
- <Compile Include="Source\ResultSet.cs" />
- <Compile Include="Source\SSPI.cs" />
+ <Compile Include="ResultSet.cs" />
+ <Compile Include="SchemaProvider.cs" />
+ <Compile Include="Statement.cs" />
+ <Compile Include="StoredProcedure.cs" />
+ <Compile Include="TimedStream.cs" />
+ <Compile Include="TracingDriver.cs" />
+ <Compile Include="transaction.cs" />
+ <Compile Include="Types\MetaData.cs" />
+ <Compile Include="Types\MySqlBinary.cs" />
+ <Compile Include="Types\MySqlBit.cs" />
+ <Compile Include="Types\MySqlByte.cs" />
+ <Compile Include="Types\MySqlConversionException.cs" />
+ <Compile Include="Types\MySqlDateTime.cs" />
+ <Compile Include="Types\MySqlDecimal.cs" />
+ <Compile Include="Types\MySqlDouble.cs" />
+ <Compile Include="Types\MySqlGuid.cs" />
+ <Compile Include="Types\MySqlInt16.cs" />
+ <Compile Include="Types\MySqlInt32.cs" />
+ <Compile Include="Types\MySqlInt64.cs" />
+ <Compile Include="Types\MySqlSingle.cs" />
+ <Compile Include="Types\MySqlString.cs" />
+ <Compile Include="Types\MySqlTime.cs" />
+ <Compile Include="Types\MySqlUByte.cs" />
+ <Compile Include="Types\MySqlUInt16.cs" />
+ <Compile Include="Types\MySqlUInt32.cs" />
+ <Compile Include="Types\MySqlUInt64.cs" />
+ <Compile Include="Types\MySqlValue.cs" />
+ <Compile Include="zlib\Adler32.cs" />
+ <Compile Include="zlib\Deflate.cs" />
+ <Compile Include="zlib\InfBlocks.cs" />
+ <Compile Include="zlib\InfCodes.cs" />
+ <Compile Include="zlib\Inflate.cs" />
+ <Compile Include="zlib\InfTree.cs" />
+ <Compile Include="zlib\StaticTree.cs" />
+ <Compile Include="zlib\SupportClass.cs" />
+ <Compile Include="zlib\Tree.cs" />
+ <Compile Include="zlib\ZInputStream.cs" />
+ <Compile Include="zlib\Zlib.cs" />
+ <Compile Include="zlib\ZOutputStream.cs" />
+ <Compile Include="zlib\ZStream.cs" />
+ <Compile Include="zlib\ZStreamException.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\ReservedWords.txt" />
@@ -183,17 +160,6 @@
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="Properties\keywords.txt" />
- <Content Include="Source\docs\MySqlCommand.xml" />
- <Content Include="Source\docs\MySqlCommandBuilder.xml" />
- <Content Include="Source\docs\MySqlConnection.xml" />
- <Content Include="Source\docs\MySqlConnectionStringBuilder.xml" />
- <Content Include="Source\docs\MySqlDataAdapter.xml" />
- <Content Include="Source\docs\MySqlDataReader.xml" />
- <Content Include="Source\docs\MySqlException.xml" />
- <Content Include="Source\docs\MySqlHelper.xml" />
- <Content Include="Source\docs\MySqlParameter.xml" />
- <Content Include="Source\docs\MySqlParameterCollection.xml" />
- <Content Include="Source\docs\MySqlTransaction.xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\Resources.Designer.cs">
@@ -201,14 +167,6 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
- <Compile Include="Source\common\LowResolutionStopwatch.cs" />
- <Compile Include="Source\common\QueryNormalizer.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Source\TableCache.cs" />
- <Compile Include="Source\MySqlTrace.cs" />
- <Compile Include="Source\TimedStream.cs" />
- <Compile Include="Source\TracingDriver.cs" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\CHANGES">
@@ -216,41 +174,17 @@
</None>
</ItemGroup>
<ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
- <Visible>False</Visible>
- <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
- <Visible>False</Visible>
- <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
+ <Content Include="docs\MySqlCommand.xml" />
+ <Content Include="docs\MySqlCommandBuilder.xml" />
+ <Content Include="docs\MySqlConnection.xml" />
+ <Content Include="docs\MySqlConnectionStringBuilder.xml" />
+ <Content Include="docs\MySqlDataAdapter.xml" />
+ <Content Include="docs\MySqlDataReader.xml" />
+ <Content Include="docs\MySqlException.xml" />
+ <Content Include="docs\MySqlHelper.xml" />
+ <Content Include="docs\MySqlParameter.xml" />
+ <Content Include="docs\MySqlParameterCollection.xml" />
+ <Content Include="docs\MySqlTransaction.xml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
=== renamed file 'MySql.Data/Provider/Source/MySqlClientFactory.cs' => 'Source/MySql.Data/MySqlClientFactory.cs'
=== renamed file 'MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs' => 'Source/MySql.Data/MySqlConnectionStringBuilder.cs'
--- a/MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs 2011-06-06 14:33:41 +0000
+++ b/Source/MySql.Data/MySqlConnectionStringBuilder.cs 2011-06-21 19:16:59 +0000
@@ -931,6 +931,8 @@
object val = null;
if (value is string && defaultValues[keyword].DefaultValue is Enum)
val = ParseEnum(defaultValues[keyword].Type, (string)value, keyword);
+ else if (value is string && string.IsNullOrEmpty(value.ToString()))
+ val = defaultValues[keyword].DefaultValue;
else
val = ChangeType(value, defaultValues[keyword].Type);
HandleObsolete(keyword, val);
=== renamed file 'MySql.Data/Provider/Source/MySqlError.cs' => 'Source/MySql.Data/MySqlError.cs'
=== renamed file 'MySql.Data/Provider/Source/MySqlHelper.cs' => 'Source/MySql.Data/MySqlHelper.cs'
=== renamed file 'MySql.Data/Provider/Source/MySqlPacket.cs' => 'Source/MySql.Data/MySqlPacket.cs'
=== renamed file 'MySql.Data/Provider/Source/MySqlPool.cs' => 'Source/MySql.Data/MySqlPool.cs'
=== renamed file 'MySql.Data/Provider/Source/MySqlPoolManager.cs' => 'Source/MySql.Data/MySqlPoolManager.cs'
=== renamed file 'MySql.Data/Provider/Source/MySqlPromotableTransaction.cs' => 'Source/MySql.Data/MySqlPromotableTransaction.cs'
=== renamed file 'MySql.Data/Provider/Source/MySqlScript.cs' => 'Source/MySql.Data/MySqlScript.cs'
=== renamed file 'MySql.Data/Provider/Source/MySqlStream.cs' => 'Source/MySql.Data/MySqlStream.cs'
=== renamed file 'MySql.Data/Provider/Source/MySqlTrace.cs' => 'Source/MySql.Data/MySqlTrace.cs'
=== renamed file 'MySql.Data/Provider/Source/MysqlDefs.cs' => 'Source/MySql.Data/MysqlDefs.cs'
=== renamed file 'MySql.Data/Provider/Source/NativeDriver.cs' => 'Source/MySql.Data/NativeDriver.cs'
--- a/MySql.Data/Provider/Source/NativeDriver.cs 2011-05-19 20:05:47 +0000
+++ b/Source/MySql.Data/NativeDriver.cs 2011-06-21 19:16:59 +0000
@@ -303,6 +303,9 @@
// Check for file-based certificate
if (Settings.CertificateFile != null)
{
+ if (!Version.isAtLeast(5, 1, 0))
+ throw new MySqlException(Properties.Resources.FileBasedCertificateNotSupported);
+
X509Certificate2 clientCert = new X509Certificate2(Settings.CertificateFile,
Settings.CertificatePassword);
certs.Add(clientCert);
=== renamed file 'MySql.Data/Provider/Source/PerformanceMonitor.cs' => 'Source/MySql.Data/PerformanceMonitor.cs'
=== renamed file 'MySql.Data/Provider/Source/PreparableStatement.cs' => 'Source/MySql.Data/PreparableStatement.cs'
=== renamed file 'MySql.Data/Provider/Source/ProcedureCache.cs' => 'Source/MySql.Data/ProcedureCache.cs'
=== renamed directory 'MySql.Data/Provider/Properties' => 'Source/MySql.Data/Properties'
=== modified file 'Source/MySql.Data/Properties/Resources.Designer.cs'
--- a/MySql.Data/Provider/Properties/Resources.Designer.cs 2011-06-06 15:39:30 +0000
+++ b/Source/MySql.Data/Properties/Resources.Designer.cs 2011-06-21 19:16:59 +0000
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.225
+// Runtime Version:2.0.50727.5444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -20,7 +20,7 @@
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
#if !CF
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
#endif
@@ -324,6 +324,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to File based certificates are only supported when connecting to MySQL Server 5.1 or greater..
+ /// </summary>
+ public static string FileBasedCertificateNotSupported {
+ get {
+ return ResourceManager.GetString("FileBasedCertificateNotSupported", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to From index and length use more bytes than from contains.
/// </summary>
public static string FromAndLengthTooBig {
=== modified file 'Source/MySql.Data/Properties/Resources.resx'
--- a/MySql.Data/Provider/Properties/Resources.resx 2011-06-06 14:33:41 +0000
+++ b/Source/MySql.Data/Properties/Resources.resx 2011-06-21 19:16:59 +0000
@@ -469,4 +469,7 @@
<data name="ReplicatedConnectionsAllowOnlyReadonlyStatements" xml:space="preserve">
<value>Replicated connections allow only readonly statements.</value>
</data>
+ <data name="FileBasedCertificateNotSupported" xml:space="preserve">
+ <value>File based certificates are only supported when connecting to MySQL Server 5.1 or greater.</value>
+ </data>
</root>
\ No newline at end of file
=== renamed file 'MySql.Data/Provider/Source/ResultSet.cs' => 'Source/MySql.Data/ResultSet.cs'
=== renamed file 'MySql.Data/Provider/Source/Runtime.cs' => 'Source/MySql.Data/Runtime.cs'
=== renamed file 'MySql.Data/Provider/Source/SSPI.cs' => 'Source/MySql.Data/SSPI.cs'
=== renamed file 'MySql.Data/Provider/Source/SchemaProvider.cs' => 'Source/MySql.Data/SchemaProvider.cs'
=== renamed file 'MySql.Data/Provider/Source/Statement.cs' => 'Source/MySql.Data/Statement.cs'
=== renamed file 'MySql.Data/Provider/Source/StoredProcedure.cs' => 'Source/MySql.Data/StoredProcedure.cs'
=== renamed file 'MySql.Data/Provider/Source/TableCache.cs' => 'Source/MySql.Data/TableCache.cs'
=== renamed file 'MySql.Data/Provider/Source/TimedStream.cs' => 'Source/MySql.Data/TimedStream.cs'
=== renamed file 'MySql.Data/Provider/Source/TracingDriver.cs' => 'Source/MySql.Data/TracingDriver.cs'
=== renamed directory 'MySql.Data/Provider/Source/Types' => 'Source/MySql.Data/Types'
=== renamed directory 'MySql.Data/Provider/Source/base' => 'Source/MySql.Data/base'
=== modified file 'Source/MySql.Data/base/DbConnectionStringBuilder.cs'
--- a/MySql.Data/Provider/Source/base/DbConnectionStringBuilder.cs 2010-08-18 19:48:34 +0000
+++ b/Source/MySql.Data/base/DbConnectionStringBuilder.cs 2011-06-20 13:37:58 +0000
@@ -24,12 +24,12 @@
using System.Collections;
using System.ComponentModel;
using System.Text;
+using System.Globalization;
namespace MySql.Data.MySqlClient
{
public class DbConnectionStringBuilder : IDictionary, ICollection, IEnumerable, ICustomTypeDescriptor
{
- private string connectionString;
private Hashtable hash;
private bool browsable;
@@ -49,12 +49,11 @@
public string ConnectionString
{
- get { return connectionString; }
+ get { return GetConnectionString(); }
set
{
Clear();
ParseConnectionString(value);
- connectionString = value;
}
}
@@ -71,12 +70,10 @@
public void Add(object key, object value)
{
hash[key] = value;
- //TODO: update connection string
}
public virtual void Clear()
{
- connectionString = null;
hash.Clear();
}
@@ -108,7 +105,6 @@
public void Remove(object key)
{
hash.Remove(key);
- //TODO: update connection string
}
public ICollection Values
@@ -282,6 +278,19 @@
return value;
}
+ private string GetConnectionString()
+ {
+ StringBuilder builder = new StringBuilder();
+ string delimiter = "";
+ foreach (string key in this.Keys)
+ {
+ builder.AppendFormat(CultureInfo.CurrentCulture, "{0}{1}={2}",
+ delimiter, key, this[key]);
+ delimiter = ";";
+ }
+ return builder.ToString();
+ }
+
/* private void ParseConnectionString(string value)
{
String[] keyvalues = src.Split(';');
=== renamed directory 'MySql.Data/Provider/Source/cf' => 'Source/MySql.Data/cf'
=== renamed file 'MySql.Data/Provider/Source/command.cs' => 'Source/MySql.Data/command.cs'
=== renamed directory 'MySql.Data/Provider/Source/common' => 'Source/MySql.Data/common'
=== modified file 'Source/MySql.Data/common/StreamCreator.cs'
--- a/MySql.Data/Provider/Source/common/StreamCreator.cs 2011-06-06 14:33:41 +0000
+++ b/Source/MySql.Data/common/StreamCreator.cs 2011-06-21 19:16:59 +0000
@@ -263,7 +263,7 @@
// Fallback if Socket.IOControl is not available ( Compact Framework )
// or not implemented ( Mono ). Keepalive option will still be set, but
// with timeout is kept default.
- s.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true);
+ s.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, 1);
}
}
}
=== renamed file 'MySql.Data/Provider/Source/dataadapter.cs' => 'Source/MySql.Data/dataadapter.cs'
=== renamed file 'MySql.Data/Provider/Source/datareader.cs' => 'Source/MySql.Data/datareader.cs'
=== renamed directory 'MySql.Data/Provider/Source/docs' => 'Source/MySql.Data/docs'
=== renamed file 'MySql.Data/Provider/Source/parameter.cs' => 'Source/MySql.Data/parameter.cs'
=== renamed file 'MySql.Data/Provider/Source/parameter_collection.cs' => 'Source/MySql.Data/parameter_collection.cs'
=== renamed file 'MySql.Data/Provider/Source/transaction.cs' => 'Source/MySql.Data/transaction.cs'
=== renamed directory 'MySql.Data/Provider/Source/zlib' => 'Source/MySql.Data/zlib'
=== renamed directory 'MySql.VisualStudio' => 'Source/MySql.VisualStudio'
=== renamed file 'MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj' => 'Source/MySql.VisualStudio/MySql.VisualStudio.csproj'
--- a/MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj 2011-05-18 02:06:50 +0000
+++ b/Source/MySql.VisualStudio/MySql.VisualStudio.csproj 2011-06-21 19:16:59 +0000
@@ -37,11 +37,10 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <BaseIntermediateOutputPath>obj\Debug-4.0</BaseIntermediateOutputPath>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug-4.0\</OutputPath>
+ <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -49,10 +48,9 @@
<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\Release-4.0\</OutputPath>
+ <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -128,12 +126,12 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="..\MySql.Data\Provider\Properties\VersionInfo.cs">
+ <Compile Include="..\MySql.Data\common\MySqlTokenizer.cs">
+ <Link>LanguageService\MySqlTokenizer.cs</Link>
+ </Compile>
+ <Compile Include="..\MySql.Data\Properties\VersionInfo.cs">
<Link>Properties\VersionInfo.cs</Link>
</Compile>
- <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>
@@ -416,7 +414,7 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\MySql.Data\Provider\MySql.Data.csproj">
+ <ProjectReference Include="..\MySql.Data\MySql.Data.csproj">
<Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
<Name>MySql.Data</Name>
</ProjectReference>
=== modified file 'Source/MySql.VisualStudio/Properties/Resources.Designer.cs'
--- a/MySql.VisualStudio/Properties/Resources.Designer.cs 2010-05-19 17:41:25 +0000
+++ b/Source/MySql.VisualStudio/Properties/Resources.Designer.cs 2011-06-21 18:51:27 +0000
@@ -1,7 +1,7 @@
------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.1
+// Runtime Version:2.0.50727.5444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Resources {
=== renamed directory 'MySql.Web' => 'Source/MySql.Web'
=== renamed file 'MySql.Web/Providers/Source/Application.cs' => 'Source/MySql.Web/Application.cs'
=== renamed file 'MySql.Web/Providers/Source/Install.cs' => 'Source/MySql.Web/Install.cs'
=== renamed file 'MySql.Web/Providers/Source/MembershipProvider.cs' => 'Source/MySql.Web/MembershipProvider.cs'
=== renamed file 'MySql.Web/Providers/MySql.Web.csproj' => 'Source/MySql.Web/MySql.Web.csproj'
--- a/MySql.Web/Providers/MySql.Web.csproj 2010-12-22 21:21:41 +0000
+++ b/Source/MySql.Web/MySql.Web.csproj 2011-06-21 18:51:27 +0000
@@ -18,7 +18,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
@@ -60,36 +60,6 @@
<DocumentationFile>bin\release\webdocs.xml</DocumentationFile>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-4.0|AnyCPU'">
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <DebugSymbols>true</DebugSymbols>
- <IntermediateOutputPath>obj\Debug-4.0\</IntermediateOutputPath>
- <OutputPath>bin\Debug-4.0\</OutputPath>
- <DefineConstants>TRACE;DEBUG;CLR4</DefineConstants>
- <NoWarn>1699</NoWarn>
- <DebugType>full</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
- <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-4.0|AnyCPU'">
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <IntermediateOutputPath>obj\Release-4.0\</IntermediateOutputPath>
- <OutputPath>bin\Release-4.0\</OutputPath>
- <DefineConstants>TRACE;CLR4</DefineConstants>
- <DocumentationFile>bin\release\webdocs.xml</DocumentationFile>
- <Optimize>true</Optimize>
- <NoWarn>1699</NoWarn>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
- <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
- <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
- </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.configuration" />
@@ -97,15 +67,19 @@
<Reference Include="System.Data" />
<Reference Include="System.Management" />
<Reference Include="System.Web" />
+ <Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Xml" />
</ItemGroup>
- <ItemGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-4.0|AnyCPU' or '$(Configuration)|$(Platform)' == 'Release-4.0|AnyCPU'">
- <Reference Include="System.Web.ApplicationServices" />
- </ItemGroup>
<ItemGroup>
- <Compile Include="..\..\MySql.Data\Provider\Properties\VersionInfo.cs">
+ <Compile Include="..\MySql.Data\Properties\VersionInfo.cs">
<Link>Properties\VersionInfo.cs</Link>
</Compile>
+ <Compile Include="Application.cs" />
+ <Compile Include="Install.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="MembershipProvider.cs" />
+ <Compile Include="ProfileProvider.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
@@ -114,16 +88,10 @@
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
- <Compile Include="Source\Application.cs" />
- <Compile Include="Source\Install.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="Source\ProfileProvider.cs" />
- <Compile Include="Source\MembershipProvider.cs" />
- <Compile Include="Source\RoleProvider.cs" />
- <Compile Include="Source\Runtime.cs" />
- <Compile Include="Source\SchemaManager.cs" />
- <Compile Include="Source\SessionProvider.cs" />
+ <Compile Include="RoleProvider.cs" />
+ <Compile Include="Runtime.cs" />
+ <Compile Include="SchemaManager.cs" />
+ <Compile Include="SessionProvider.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
@@ -141,29 +109,7 @@
<None Include="Properties\schema5.sql" />
</ItemGroup>
<ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
- <Visible>False</Visible>
- <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\MySql.Data\Provider\MySql.Data.csproj">
+ <ProjectReference Include="..\MySql.Data\MySql.Data.csproj">
<Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
<Name>MySql.Data</Name>
</ProjectReference>
=== renamed file 'MySql.Web/Providers/Source/ProfileProvider.cs' => 'Source/MySql.Web/ProfileProvider.cs'
=== renamed directory 'MySql.Web/Providers/Properties' => 'Source/MySql.Web/Properties'
=== modified file 'Source/MySql.Web/Properties/Resources.Designer.cs'
--- a/MySql.Web/Providers/Properties/Resources.Designer.cs 2010-12-06 21:35:13 +0000
+++ b/Source/MySql.Web/Properties/Resources.Designer.cs 2011-06-21 18:51:27 +0000
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.1
+// Runtime Version:2.0.50727.5444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Resources {
=== renamed file 'MySql.Web/Providers/Source/RoleProvider.cs' => 'Source/MySql.Web/RoleProvider.cs'
=== renamed file 'MySql.Web/Providers/Source/Runtime.cs' => 'Source/MySql.Web/Runtime.cs'
=== renamed file 'MySql.Web/Providers/Source/SchemaManager.cs' => 'Source/MySql.Web/SchemaManager.cs'
=== renamed file 'MySql.Web/Providers/Source/SessionProvider.cs' => 'Source/MySql.Web/SessionProvider.cs'
=== added directory 'Tests'
=== renamed directory 'MySql.Data.Entity/Tests' => 'Tests/MySql.Data.Entity.Tests'
=== modified file 'Tests/MySql.Data.Entity.Tests/AggregateOperators.cs'
--- a/MySql.Data.Entity/Tests/AggregateOperators.cs 2011-03-03 18:01:04 +0000
+++ b/Tests/MySql.Data.Entity.Tests/AggregateOperators.cs 2011-06-21 18:51:27 +0000
@@ -33,9 +33,9 @@
namespace MySql.Data.Entity.Tests
{
- [TestFixture]
- public class AggregateOperators : BaseEdmTest
- {
+ [TestFixture]
+ public class AggregateOperators : BaseEdmTest
+ {
[Test]
public void CountSimple()
{
@@ -48,7 +48,7 @@
ObjectQuery<Int32> q = context.CreateQuery<Int32>(eSql);
string sql = q.ToTraceString();
- CheckSql(sql, SQLSyntax.CountSimple);
+ CheckSql(sql, "CountSimple");
foreach (int count in q)
Assert.AreEqual(trueCount, count);
@@ -67,7 +67,7 @@
ObjectQuery<Int32> q = context.CreateQuery<Int32>(eSql);
string sql = q.ToTraceString();
- CheckSql(sql, SQLSyntax.BigCountSimple);
+ CheckSql(sql, "BigCountSimple");
foreach (int count in q)
Assert.AreEqual(trueCount, count);
@@ -86,7 +86,7 @@
ObjectQuery<Int32> q = context.CreateQuery<Int32>(eSql);
string sql = q.ToTraceString();
- CheckSql(sql, SQLSyntax.CountWithPredicate);
+ CheckSql(sql, "CountWithPredicate");
foreach (int count in q)
Assert.AreEqual(trueCount, count);
@@ -105,7 +105,7 @@
ObjectQuery<Int32> q = context.CreateQuery<Int32>(eSql);
string sql = q.ToTraceString();
- CheckSql(sql, SQLSyntax.MinSimple);
+ CheckSql(sql, "MinSimple");
foreach (int age in q)
Assert.AreEqual(trueMin, age);
@@ -124,7 +124,7 @@
ObjectQuery<DbDataRecord> q = context.CreateQuery<DbDataRecord>(eSql);
string sql = q.ToTraceString();
- CheckSql(sql, SQLSyntax.MinWithPredicate);
+ CheckSql(sql, "MinWithPredicate");
foreach (DbDataRecord r in q)
{
@@ -147,7 +147,7 @@
ObjectQuery<Double> q = context.CreateQuery<Double>(eSql);
string sql = q.ToTraceString();
- CheckSql(sql, SQLSyntax.MinWithGrouping);
+ CheckSql(sql, "MinWithGrouping");
int i = 0;
foreach (double freight in q)
@@ -167,7 +167,7 @@
ObjectQuery<Int32> q = context.CreateQuery<Int32>(eSql);
string sql = q.ToTraceString();
- CheckSql(sql, SQLSyntax.MaxSimple);
+ CheckSql(sql, "MaxSimple");
foreach (int max in q)
Assert.AreEqual(trueMax, max);
@@ -186,7 +186,7 @@
ObjectQuery<DbDataRecord> q = context.CreateQuery<DbDataRecord>(eSql);
string sql = q.ToTraceString();
- CheckSql(sql, SQLSyntax.MaxWithPredicate);
+ CheckSql(sql, "MaxWithPredicate");
foreach (DbDataRecord r in q)
Assert.AreEqual(freight, r.GetDouble(0));
@@ -207,7 +207,7 @@
ObjectQuery<Double> q = context.CreateQuery<Double>(eSql);
string sql = q.ToTraceString();
- CheckSql(sql, SQLSyntax.MaxWithGrouping);
+ CheckSql(sql, "MaxWithGrouping");
int i = 0;
foreach (double freight in q)
@@ -227,7 +227,7 @@
ObjectQuery<Decimal> q = context.CreateQuery<Decimal>(eSql);
string sql = q.ToTraceString();
- CheckSql(sql, SQLSyntax.AverageSimple);
+ CheckSql(sql, "AverageSimple");
foreach (Decimal r in q)
Assert.AreEqual(avgAge, r);
@@ -246,7 +246,7 @@
ObjectQuery<Double> q = context.CreateQuery<Double>(eSql);
string sql = q.ToTraceString();
- CheckSql(sql, SQLSyntax.AverageWithPredicate);
+ CheckSql(sql, "AverageWithPredicate");
foreach (Double r in q)
Assert.AreEqual(Convert.ToInt32(freight), Convert.ToInt32(r));
@@ -263,15 +263,21 @@
using (testEntities context = new testEntities())
{
- string eSql = "SELECT VALUE AVG(o.Freight) FROM Orders AS o GROUP BY o.Store.Id";
- ObjectQuery<Double> q = context.CreateQuery<Double>(eSql);
+ string eSql = "SELECT AVG(o.Freight) FROM Orders AS o GROUP BY o.Store.Id";
+ ObjectQuery<DbDataRecord> q = context.CreateQuery<DbDataRecord>(eSql);
string sql = q.ToTraceString();
- CheckSql(sql, SQLSyntax.AverageWithGrouping);
+ CheckSql(sql, "AverageWithGrouping");
+ foreach (object x in q)
+ {
+ string s = x.GetType().ToString();
+ }
int i = 0;
- foreach (double freight in q)
- Assert.AreEqual(Convert.ToInt32(dt.Rows[i++][0]), Convert.ToInt32(freight));
+ foreach (var freight in q)
+ {
+ // Assert.AreEqual(Convert.ToInt32(dt.Rows[i++][0]), Convert.ToInt32(freight));
+ }
}
}
@@ -287,7 +293,7 @@
ObjectQuery<Int32> q = context.CreateQuery<Int32>(eSql);
string sql = q.ToTraceString();
- CheckSql(sql, SQLSyntax.SumSimple);
+ CheckSql(sql, "SumSimple");
foreach (int r in q)
Assert.AreEqual(sumAge, r);
@@ -306,7 +312,7 @@
ObjectQuery<Double> q = context.CreateQuery<Double>(eSql);
string sql = q.ToTraceString();
- CheckSql(sql, SQLSyntax.SumWithPredicate);
+ CheckSql(sql, "SumWithPredicate");
foreach (Double r in q)
Assert.AreEqual(freight, r);
@@ -327,7 +333,7 @@
ObjectQuery<Double> q = context.CreateQuery<Double>(eSql);
string sql = q.ToTraceString();
- CheckSql(sql, SQLSyntax.SumWithGrouping);
+ CheckSql(sql, "SumWithGrouping");
int i = 0;
foreach (double freight in q)
@@ -350,7 +356,7 @@
ObjectQuery<Store> q = context.CreateQuery<Store>(eSql);
string sql = q.ToTraceString();
- CheckSql(sql, SQLSyntax.MaxInSubQuery1);
+ CheckSql(sql, "MaxInSubQuery1");
int i = 0;
foreach (Store s in q)
@@ -373,7 +379,7 @@
ObjectQuery<Store> q = context.CreateQuery<Store>(eSql);
string sql = q.ToTraceString();
- CheckSql(sql, SQLSyntax.MaxInSubQuery2);
+ CheckSql(sql, "MaxInSubQuery2");
int i = 0;
foreach (Store s in q)
=== modified file 'Tests/MySql.Data.Entity.Tests/BaseEdmTest.cs'
--- a/MySql.Data.Entity/Tests/BaseEdmTest.cs 2011-03-03 18:02:14 +0000
+++ b/Tests/MySql.Data.Entity.Tests/BaseEdmTest.cs 2011-06-21 18:51:27 +0000
@@ -38,16 +38,17 @@
using NUnit.Framework;
using System.Text;
using System.Data.EntityClient;
+using MySql.Data.Entity.Tests.Properties;
namespace MySql.Data.Entity.Tests
{
public class BaseEdmTest : BaseTest
{
- protected override void LoadStaticConfiguration()
- {
- base.LoadStaticConfiguration();
+ protected override void LoadStaticConfiguration()
+ {
+ base.LoadStaticConfiguration();
- Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+ Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
string filename = config.FilePath;
database0 = database1 = "test";
@@ -74,8 +75,8 @@
configNode.AppendChild(systemData);
configDoc.Save(filename);
- ConfigurationManager.RefreshSection("system.data");
- }
+ ConfigurationManager.RefreshSection("system.data");
+ }
[SetUp]
public override void Setup()
@@ -118,12 +119,16 @@
protected void CheckSql(string sql, string refSql)
{
+ string checkSql = SQLSyntax.ResourceManager.GetString(refSql);
+#if CLR4
+ checkSql = SQLSyntaxEF4.ResourceManager.GetString(refSql);
+#endif
StringBuilder str1 = new StringBuilder();
StringBuilder str2 = new StringBuilder();
foreach (char c in sql)
if (!Char.IsWhiteSpace(c))
str1.Append(c);
- foreach (char c in refSql)
+ foreach (char c in checkSql)
if (!Char.IsWhiteSpace(c))
str2.Append(c);
Assert.AreEqual(0, String.Compare(str1.ToString(), str2.ToString(), true));
=== modified file 'Tests/MySql.Data.Entity.Tests/CanonicalFunctions.cs'
--- a/MySql.Data.Entity/Tests/CanonicalFunctions.cs 2011-05-18 20:55:46 +0000
+++ b/Tests/MySql.Data.Entity.Tests/CanonicalFunctions.cs 2011-06-21 18:51:27 +0000
@@ -33,9 +33,9 @@
namespace MySql.Data.Entity.Tests
{
- [TestFixture]
- public class CanonicalFunctions : BaseEdmTest
- {
+ [TestFixture]
+ public class CanonicalFunctions : BaseEdmTest
+ {
private EntityConnection GetEntityConnection()
{
string connectionString = String.Format(
=== modified file 'Tests/MySql.Data.Entity.Tests/DataTypeTests.cs'
--- a/MySql.Data.Entity/Tests/DataTypeTests.cs 2011-06-15 12:56:32 +0000
+++ b/Tests/MySql.Data.Entity.Tests/DataTypeTests.cs 2011-06-21 18:51:27 +0000
@@ -34,8 +34,8 @@
namespace MySql.Data.Entity.Tests
{
- [TestFixture]
- public class DataTypeTests : BaseEdmTest
+ [TestFixture]
+ public class DataTypeTests : BaseEdmTest
{
/// <summary>
/// Bug #45457 DbType Time is not supported in entity framework
=== modified file 'Tests/MySql.Data.Entity.Tests/DeleteTests.cs'
--- a/MySql.Data.Entity/Tests/DeleteTests.cs 2010-08-18 19:48:34 +0000
+++ b/Tests/MySql.Data.Entity.Tests/DeleteTests.cs 2011-06-21 18:51:27 +0000
@@ -32,8 +32,8 @@
namespace MySql.Data.Entity.Tests
{
- [TestFixture]
- public class DeleteTests : BaseEdmTest
+ [TestFixture]
+ public class DeleteTests : BaseEdmTest
{
[Test]
public void SimpleDeleteAllRows()
=== modified file 'Tests/MySql.Data.Entity.Tests/JoinTests.cs'
--- a/MySql.Data.Entity/Tests/JoinTests.cs 2011-05-25 03:39:25 +0000
+++ b/Tests/MySql.Data.Entity.Tests/JoinTests.cs 2011-06-21 18:51:27 +0000
@@ -34,8 +34,8 @@
namespace MySql.Data.Entity.Tests
{
- [TestFixture]
- public class JoinTests : BaseEdmTest
+ [TestFixture]
+ public class JoinTests : BaseEdmTest
{
[Test]
public void SimpleJoin()
=== modified file 'Tests/MySql.Data.Entity.Tests/MySql.Data.Entity.Tests.csproj'
--- a/MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.csproj 2011-06-01 13:47:16 +0000
+++ b/Tests/MySql.Data.Entity.Tests/MySql.Data.Entity.Tests.csproj 2011-06-21 18:51:27 +0000
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MySql.Data.Entity.Tests</RootNamespace>
<AssemblyName>MySql.Data.Entity.Tests</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -51,78 +51,39 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-4.0|AnyCPU'">
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <IntermediateOutputPath>obj\Release-4.0\</IntermediateOutputPath>
- <OutputPath>bin\Release-4.0\</OutputPath>
- <DefineConstants>TRACE;CLR4</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
- <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-4.0|AnyCPU'">
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <DebugSymbols>true</DebugSymbols>
- <IntermediateOutputPath>obj\Debug-4.0\</IntermediateOutputPath>
- <OutputPath>bin\Debug-4.0\</OutputPath>
- <DefineConstants>TRACE;DEBUG;CLR4</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
- <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
- <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
- </PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework" />
<Reference Include="System" />
<Reference Include="System.Configuration" />
- <Reference Include="System.Core">
- <RequiredTargetFramework>3.5</RequiredTargetFramework>
- </Reference>
- <Reference Include="System.Data.Entity">
- <RequiredTargetFramework>3.5</RequiredTargetFramework>
- </Reference>
<Reference Include="System.Data" />
- <Reference Include="System.Data.Entity.Design">
- <RequiredTargetFramework>3.5</RequiredTargetFramework>
- </Reference>
- <Reference Include="System.Data.Linq">
- <RequiredTargetFramework>3.5</RequiredTargetFramework>
- </Reference>
- <Reference Include="System.Runtime.Serialization">
- <RequiredTargetFramework>3.0</RequiredTargetFramework>
- </Reference>
+ <Reference Include="System.Data.Entity" />
+ <Reference Include="System.Data.Entity.Design" />
+ <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="..\..\MySql.Data\Provider\Properties\VersionInfo.cs">
+ <Compile Include="..\..\Source\MySql.Data\Properties\VersionInfo.cs">
<Link>Properties\VersionInfo.cs</Link>
</Compile>
<Compile Include="BaseEdmTest.cs" />
<Compile Include="AggregateOperators.cs" />
<Compile Include="CanonicalFunctions.cs" />
<Compile Include="DataTypeTests.cs" />
- <Compile Include="Model1.Designer.cs" >
+ <Compile Include="Model1.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Model1.edmx</DependentUpon>
</Compile>
+ <Compile Include="Properties\SQLSyntax.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>SQLSyntax.resx</DependentUpon>
+ </Compile>
<Compile Include="ProviderServicesTests.cs" />
<Compile Include="ProceduresAndFunctions.cs" />
<Compile Include="JoinTests.cs" />
<Compile Include="SchemaInformation.cs" />
- <Compile Include="Properties\SQLSyntax.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>SQLSyntax.resx</DependentUpon>
- </Compile>
<Compile Include="TestModel.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -140,20 +101,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\MySql.Data\Provider\MySql.Data.csproj">
- <Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
- <Name>MySql.Data</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\MySql.Data\Tests\MySql.Data.Tests.csproj">
- <Project>{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}</Project>
- <Name>MySql.Data.Tests</Name>
- </ProjectReference>
- <ProjectReference Include="..\Provider\MySql.Data.Entity.csproj">
- <Project>{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}</Project>
- <Name>MySql.Data.Entity</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
<None Include="App.Config" />
<EmbeddedResource Include="Properties\procs.sql" />
<EmbeddedResource Include="Properties\schema.sql" />
@@ -178,6 +125,20 @@
<LastGenOutput>TestModel.Designer.cs</LastGenOutput>
</EntityDeploy>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Source\MySql.Data.Entity\MySql.Data.Entity.csproj">
+ <Project>{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}</Project>
+ <Name>MySql.Data.Entity</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Source\MySql.Data\MySql.Data.csproj">
+ <Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
+ <Name>MySql.Data</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\MySql.Data.Tests\MySql.Data.Tests.csproj">
+ <Project>{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}</Project>
+ <Name>MySql.Data.Tests</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
=== modified file 'Tests/MySql.Data.Entity.Tests/Paging.cs'
--- a/MySql.Data.Entity/Tests/Paging.cs 2011-03-03 18:01:04 +0000
+++ b/Tests/MySql.Data.Entity.Tests/Paging.cs 2011-06-21 18:51:27 +0000
@@ -34,9 +34,9 @@
namespace MySql.Data.Entity.Tests
{
- [TestFixture]
- public class Paging : BaseEdmTest
- {
+ [TestFixture]
+ public class Paging : BaseEdmTest
+ {
[Test]
public void Top()
{
=== modified file 'Tests/MySql.Data.Entity.Tests/ProceduresAndFunctions.cs'
--- a/MySql.Data.Entity/Tests/ProceduresAndFunctions.cs 2010-10-07 21:11:55 +0000
+++ b/Tests/MySql.Data.Entity.Tests/ProceduresAndFunctions.cs 2011-06-21 18:51:27 +0000
@@ -33,9 +33,9 @@
namespace MySql.Data.Entity.Tests
{
- [TestFixture]
- public class ProceduresAndFunctions : BaseEdmTest
- {
+ [TestFixture]
+ public class ProceduresAndFunctions : BaseEdmTest
+ {
public ProceduresAndFunctions()
: base()
{
@@ -119,9 +119,9 @@
WHERE testModel.Store.spFunc(e.Id, '') = 6";
using (EntityCommand cmd = new EntityCommand(query, conn))
{
- EntityDataReader reader = cmd.ExecuteReader();
+ EntityDataReader reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess);
Assert.IsTrue(reader.Read());
- Assert.AreEqual(6, reader[0]);
+ Assert.AreEqual("Scooby", reader[0]);
}
}
}
=== modified file 'Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.Designer.cs'
--- a/MySql.Data.Entity/Tests/Properties/SQLSyntax.Designer.cs 2011-06-15 12:56:32 +0000
+++ b/Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.Designer.cs 2011-06-21 18:51:27 +0000
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4959
+// Runtime Version:4.0.30319.225
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class SQLSyntax {
@@ -92,13 +92,14 @@
/// <summary>
/// Looks up a localized string similar to SELECT
- ///GroupBy1.A1 AS C1
+ ///1 AS C1,
+ ///GroupBy1.A1 AS C2
///FROM (SELECT
- ///Extent2.Id AS K1,
+ ///Extent1.StoreId AS K1,
///AVG(Extent1.Freight) AS A1
- ///FROM Orders AS Extent1 LEFT OUTER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ ///FROM Orders AS Extent1
/// GROUP BY
- ///Extent2.Id) AS GroupBy1.
+ ///Extent1.StoreId) AS GroupBy1.
/// </summary>
internal static string AverageWithGrouping {
get {
@@ -110,9 +111,9 @@
/// Looks up a localized string similar to SELECT
///GroupBy1.A1 AS C1
///FROM (SELECT
- ///Avg(Extent1.Freight) AS A1
- ///FROM Orders AS Extent1 INNER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
- /// WHERE Extent2.Id = 3) AS GroupBy1.
+ ///AVG(Extent1.Freight) AS A1
+ ///FROM Orders AS Extent1
+ /// WHERE Extent1.StoreId = 3) AS GroupBy1.
/// </summary>
internal static string AverageWithPredicate {
get {
@@ -325,8 +326,8 @@
///Extent1.State,
///Extent1.ZipCode
///FROM Stores AS Extent1 INNER JOIN (SELECT
- ///MAX(Extent3.Id) AS A1
- ///FROM Orders AS Extent2 LEFT OUTER JOIN Stores AS Extent3 ON Extent2.StoreId = Extent3.Id) AS GroupBy1 ON Extent1.Id = GroupBy1.A1.
+ ///MAX(Extent2.StoreId) AS A1
+ ///FROM Orders AS Extent2) AS GroupBy1 ON Extent1.Id = GroupBy1.A1.
/// </summary>
internal static string MaxInSubQuery1 {
get {
@@ -343,8 +344,8 @@
///Extent1.State,
///Extent1.ZipCode
///FROM Stores AS Extent1 INNER JOIN (SELECT
- ///MAX(Extent3.Id) AS A1
- ///FROM Orders AS Extent2 LEFT OUTER JOIN Stores AS Extent3 ON Extent2.StoreId = Extent3.Id) AS GroupBy1 ON Extent1.Id = GroupBy1.A1.
+ ///MAX(Extent2.StoreId) AS A1
+ ///FROM Orders AS Extent2) AS GroupBy1 ON Extent1.Id = GroupBy1.A1.
/// </summary>
internal static string MaxInSubQuery2 {
get {
@@ -369,11 +370,11 @@
/// Looks up a localized string similar to SELECT
///GroupBy1.A1 AS C1
///FROM (SELECT
- ///Extent2.Id AS K1,
+ ///Extent1.StoreId AS K1,
///MAX(Extent1.Freight) AS A1
- ///FROM Orders AS Extent1 LEFT OUTER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ ///FROM Orders AS Extent1
/// GROUP BY
- ///Extent2.Id) AS GroupBy1.
+ ///Extent1.StoreId) AS GroupBy1.
/// </summary>
internal static string MaxWithGrouping {
get {
@@ -386,9 +387,9 @@
///1 AS C1,
///GroupBy1.A1 AS C2
///FROM (SELECT
- ///Max(Extent1.Freight) AS A1
- ///FROM Orders AS Extent1 INNER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
- /// WHERE Extent2.Id = 1) AS GroupBy1.
+ ///MAX(Extent1.Freight) AS A1
+ ///FROM Orders AS Extent1
+ /// WHERE Extent1.StoreId = 1) AS GroupBy1.
/// </summary>
internal static string MaxWithPredicate {
get {
@@ -413,11 +414,11 @@
/// Looks up a localized string similar to SELECT
///GroupBy1.A1 AS C1
///FROM (SELECT
- ///Extent2.Id AS K1,
+ ///Extent1.StoreId AS K1,
///MIN(Extent1.Freight) AS A1
- ///FROM Orders AS Extent1 LEFT OUTER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ ///FROM Orders AS Extent1
/// GROUP BY
- ///Extent2.Id) AS GroupBy1.
+ ///Extent1.StoreId) AS GroupBy1.
/// </summary>
internal static string MinWithGrouping {
get {
@@ -430,9 +431,9 @@
///1 AS C1,
///GroupBy1.A1 AS C2
///FROM (SELECT
- ///Min(Extent1.Freight) AS A1
- ///FROM Orders AS Extent1 INNER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
- /// WHERE Extent2.Id = 2) AS GroupBy1.
+ ///MIN(Extent1.Freight) AS A1
+ ///FROM Orders AS Extent1
+ /// WHERE Extent1.StoreId = 2) AS GroupBy1.
/// </summary>
internal static string MinWithPredicate {
get {
@@ -711,11 +712,11 @@
/// Looks up a localized string similar to SELECT
///GroupBy1.A1 AS C1
///FROM (SELECT
- ///Extent2.Id AS K1,
+ ///Extent1.StoreId AS K1,
///SUM(Extent1.Freight) AS A1
- ///FROM Orders AS Extent1 LEFT OUTER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ ///FROM Orders AS Extent1
/// GROUP BY
- ///Extent2.Id) AS GroupBy1.
+ ///Extent1.StoreId) AS GroupBy1.
/// </summary>
internal static string SumWithGrouping {
get {
@@ -727,9 +728,9 @@
/// Looks up a localized string similar to SELECT
///GroupBy1.A1 AS C1
///FROM (SELECT
- ///Sum(Extent1.Freight) AS A1
- ///FROM Orders AS Extent1 INNER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
- /// WHERE Extent2.Id = 2) AS GroupBy1.
+ ///SUM(Extent1.Freight) AS A1
+ ///FROM Orders AS Extent1
+ /// WHERE Extent1.StoreId = 2) AS GroupBy1.
/// </summary>
internal static string SumWithPredicate {
get {
=== modified file 'Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.resx'
--- a/MySql.Data.Entity/Tests/Properties/SQLSyntax.resx 2011-06-15 12:56:32 +0000
+++ b/Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.resx 2011-06-21 18:51:27 +0000
@@ -112,10 +112,10 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Any" xml:space="preserve">
<value>SELECT
@@ -137,21 +137,22 @@
</data>
<data name="AverageWithGrouping" xml:space="preserve">
<value>SELECT
-GroupBy1.A1 AS C1
+1 AS C1,
+GroupBy1.A1 AS C2
FROM (SELECT
-Extent2.Id AS K1,
+Extent1.StoreId AS K1,
AVG(Extent1.Freight) AS A1
-FROM Orders AS Extent1 LEFT OUTER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+FROM Orders AS Extent1
GROUP BY
-Extent2.Id) AS GroupBy1</value>
+Extent1.StoreId) AS GroupBy1</value>
</data>
<data name="AverageWithPredicate" xml:space="preserve">
<value>SELECT
GroupBy1.A1 AS C1
FROM (SELECT
-Avg(Extent1.Freight) AS A1
-FROM Orders AS Extent1 INNER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
- WHERE Extent2.Id = 3) AS GroupBy1</value>
+AVG(Extent1.Freight) AS A1
+FROM Orders AS Extent1
+ WHERE Extent1.StoreId = 3) AS GroupBy1</value>
</data>
<data name="BigCountSimple" xml:space="preserve">
<value>SELECT
@@ -306,8 +307,8 @@
Extent1.State,
Extent1.ZipCode
FROM Stores AS Extent1 INNER JOIN (SELECT
-MAX(Extent3.Id) AS A1
-FROM Orders AS Extent2 LEFT OUTER JOIN Stores AS Extent3 ON Extent2.StoreId = Extent3.Id) AS GroupBy1 ON Extent1.Id = GroupBy1.A1</value>
+MAX(Extent2.StoreId) AS A1
+FROM Orders AS Extent2) AS GroupBy1 ON Extent1.Id = GroupBy1.A1</value>
</data>
<data name="MaxInSubQuery2" xml:space="preserve">
<value>SELECT
@@ -318,8 +319,8 @@
Extent1.State,
Extent1.ZipCode
FROM Stores AS Extent1 INNER JOIN (SELECT
-MAX(Extent3.Id) AS A1
-FROM Orders AS Extent2 LEFT OUTER JOIN Stores AS Extent3 ON Extent2.StoreId = Extent3.Id) AS GroupBy1 ON Extent1.Id = GroupBy1.A1</value>
+MAX(Extent2.StoreId) AS A1
+FROM Orders AS Extent2) AS GroupBy1 ON Extent1.Id = GroupBy1.A1</value>
</data>
<data name="MaxSimple" xml:space="preserve">
<value>SELECT
@@ -332,20 +333,20 @@
<value>SELECT
GroupBy1.A1 AS C1
FROM (SELECT
-Extent2.Id AS K1,
+Extent1.StoreId AS K1,
MAX(Extent1.Freight) AS A1
-FROM Orders AS Extent1 LEFT OUTER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+FROM Orders AS Extent1
GROUP BY
-Extent2.Id) AS GroupBy1</value>
+Extent1.StoreId) AS GroupBy1</value>
</data>
<data name="MaxWithPredicate" xml:space="preserve">
<value>SELECT
1 AS C1,
GroupBy1.A1 AS C2
FROM (SELECT
-Max(Extent1.Freight) AS A1
-FROM Orders AS Extent1 INNER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
- WHERE Extent2.Id = 1) AS GroupBy1</value>
+MAX(Extent1.Freight) AS A1
+FROM Orders AS Extent1
+ WHERE Extent1.StoreId = 1) AS GroupBy1</value>
</data>
<data name="MinSimple" xml:space="preserve">
<value>SELECT
@@ -358,20 +359,20 @@
<value>SELECT
GroupBy1.A1 AS C1
FROM (SELECT
-Extent2.Id AS K1,
+Extent1.StoreId AS K1,
MIN(Extent1.Freight) AS A1
-FROM Orders AS Extent1 LEFT OUTER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+FROM Orders AS Extent1
GROUP BY
-Extent2.Id) AS GroupBy1</value>
+Extent1.StoreId) AS GroupBy1</value>
</data>
<data name="MinWithPredicate" xml:space="preserve">
<value>SELECT
1 AS C1,
GroupBy1.A1 AS C2
FROM (SELECT
-Min(Extent1.Freight) AS A1
-FROM Orders AS Extent1 INNER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
- WHERE Extent2.Id = 2) AS GroupBy1</value>
+MIN(Extent1.Freight) AS A1
+FROM Orders AS Extent1
+ WHERE Extent1.StoreId = 2) AS GroupBy1</value>
</data>
<data name="OrderBySimple" xml:space="preserve">
<value>SELECT
@@ -566,19 +567,19 @@
<value>SELECT
GroupBy1.A1 AS C1
FROM (SELECT
-Extent2.Id AS K1,
+Extent1.StoreId AS K1,
SUM(Extent1.Freight) AS A1
-FROM Orders AS Extent1 LEFT OUTER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+FROM Orders AS Extent1
GROUP BY
-Extent2.Id) AS GroupBy1</value>
+Extent1.StoreId) AS GroupBy1</value>
</data>
<data name="SumWithPredicate" xml:space="preserve">
<value>SELECT
GroupBy1.A1 AS C1
FROM (SELECT
-Sum(Extent1.Freight) AS A1
-FROM Orders AS Extent1 INNER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
- WHERE Extent2.Id = 2) AS GroupBy1</value>
+SUM(Extent1.Freight) AS A1
+FROM Orders AS Extent1
+ WHERE Extent1.StoreId = 2) AS GroupBy1</value>
</data>
<data name="Top" xml:space="preserve">
<value>SELECT
=== modified file 'Tests/MySql.Data.Entity.Tests/ProviderServicesTests.cs'
--- a/MySql.Data.Entity/Tests/ProviderServicesTests.cs 2011-06-01 13:47:16 +0000
+++ b/Tests/MySql.Data.Entity.Tests/ProviderServicesTests.cs 2011-06-21 18:51:27 +0000
@@ -32,9 +32,9 @@
namespace MySql.Data.Entity.Tests
{
- [TestFixture]
+ [TestFixture]
public class ProviderServicesTests : BaseEdmTest
- {
+ {
#if CLR4
[Test]
public void CreateDatabase()
=== modified file 'Tests/MySql.Data.Entity.Tests/RelationalOperators.cs'
--- a/MySql.Data.Entity/Tests/RelationalOperators.cs 2011-06-02 17:55:01 +0000
+++ b/Tests/MySql.Data.Entity.Tests/RelationalOperators.cs 2011-06-21 18:51:27 +0000
@@ -34,9 +34,9 @@
namespace MySql.Data.Entity.Tests
{
- [TestFixture]
- public class RelationalOperators : BaseEdmTest
- {
+ [TestFixture]
+ public class RelationalOperators : BaseEdmTest
+ {
[Test]
public void Except()
{
=== modified file 'Tests/MySql.Data.Entity.Tests/SetOperators.cs'
--- a/MySql.Data.Entity/Tests/SetOperators.cs 2011-03-03 18:01:04 +0000
+++ b/Tests/MySql.Data.Entity.Tests/SetOperators.cs 2011-06-21 18:51:27 +0000
@@ -34,9 +34,9 @@
namespace MySql.Data.Entity.Tests
{
- [TestFixture]
- public class SetOperators : BaseEdmTest
- {
+ [TestFixture]
+ public class SetOperators : BaseEdmTest
+ {
[Test]
public void Any()
{
=== modified file 'Tests/MySql.Data.Entity.Tests/UpdateTests.cs'
--- a/MySql.Data.Entity/Tests/UpdateTests.cs 2010-08-18 19:48:34 +0000
+++ b/Tests/MySql.Data.Entity.Tests/UpdateTests.cs 2011-06-21 18:51:27 +0000
@@ -32,9 +32,9 @@
namespace MySql.Data.Entity.Tests
{
- [TestFixture]
- public class UpdateTests : BaseEdmTest
- {
+ [TestFixture]
+ public class UpdateTests : BaseEdmTest
+ {
[Test]
public void UpdateAllRows()
{
=== modified file 'Tests/MySql.Data.Entity.Tests/Wizard.cs'
--- a/MySql.Data.Entity/Tests/Wizard.cs 2011-05-11 20:09:02 +0000
+++ b/Tests/MySql.Data.Entity.Tests/Wizard.cs 2011-06-21 18:51:27 +0000
@@ -40,8 +40,8 @@
// This test unit covers the tests that the wizard runs when generating a model
// from an existing database
[TestFixture]
- public class WizardTests : BaseEdmTest
- {
+ public class WizardTests : BaseEdmTest
+ {
private EntityConnection GetConnection()
{
return EntityStoreSchemaGenerator.CreateStoreSchemaConnection(
=== renamed directory 'MySql.Data/Tests' => 'Tests/MySql.Data.Tests'
=== renamed file 'MySql.Data/Tests/Source/AsyncTests.cs' => 'Tests/MySql.Data.Tests/AsyncTests.cs'
=== renamed file 'MySql.Data/Tests/Source/BaseTest.cs' => 'Tests/MySql.Data.Tests/BaseTest.cs'
=== renamed file 'MySql.Data/Tests/Source/BlobTests.cs' => 'Tests/MySql.Data.Tests/BlobTests.cs'
=== renamed file 'MySql.Data/Tests/Source/BulkLoading.cs' => 'Tests/MySql.Data.Tests/BulkLoading.cs'
=== renamed file 'MySql.Data/Tests/Source/CharacterSetTests.cs' => 'Tests/MySql.Data.Tests/CharacterSetTests.cs'
=== renamed file 'MySql.Data/Tests/Source/CommandBuilderTests.cs' => 'Tests/MySql.Data.Tests/CommandBuilderTests.cs'
=== renamed file 'MySql.Data/Tests/Source/CommandTests.cs' => 'Tests/MySql.Data.Tests/CommandTests.cs'
=== renamed file 'MySql.Data/Tests/Source/ConnectionStringBuilder.cs' => 'Tests/MySql.Data.Tests/ConnectionStringBuilder.cs'
--- a/MySql.Data/Tests/Source/ConnectionStringBuilder.cs 2011-05-19 19:59:55 +0000
+++ b/Tests/MySql.Data.Tests/ConnectionStringBuilder.cs 2011-06-21 18:51:27 +0000
@@ -98,12 +98,14 @@
Assert.AreEqual("database=test2", s.ConnectionString);
}
+#if !CF
[Test]
public void EncryptKeyword()
{
string connStr = "database=test;uid=root;server=localhost;encrypt=yes";
MySqlConnectionStringBuilder sb = new MySqlConnectionStringBuilder(connStr);
}
+#endif
/// <summary>
/// Bug #51209 error on parameter without value on connectionstring
=== renamed file 'MySql.Data/Tests/Source/ConnectionTests.cs' => 'Tests/MySql.Data.Tests/ConnectionTests.cs'
--- a/MySql.Data/Tests/Source/ConnectionTests.cs 2011-06-06 15:39:30 +0000
+++ b/Tests/MySql.Data.Tests/ConnectionTests.cs 2011-06-21 19:16:59 +0000
@@ -707,6 +707,8 @@
[Test]
public void CanConnectUsingFileBasedCertificate()
{
+ if (Version < new Version(5, 1)) return;
+
string connstr = GetConnectionString(true);
connstr += ";CertificateFile=client.pfx;CertificatePassword=pass;SSL Mode=Required;";
using (MySqlConnection c = new MySqlConnection(connstr))
@@ -735,23 +737,6 @@
MySqlConnection c = new MySqlConnection(connstr);
}
-
- public override void Teardown()
- {
- conn.Close();
-
- // wait up to 10 seconds for our connection to close
- int procs = 0;
- for (int x = 0; x < 15; x++)
- {
- procs = CountProcesses();
- if (procs == 1) break;
- System.Threading.Thread.Sleep(1000);
- }
- Assert.AreEqual(1, procs, "Too many processes still running");
-
- base.Teardown();
- }
#endif
[Test]
=== renamed file 'MySql.Data/Tests/Source/CultureTests.cs' => 'Tests/MySql.Data.Tests/CultureTests.cs'
=== renamed file 'MySql.Data/Tests/Source/CursorTests.cs' => 'Tests/MySql.Data.Tests/CursorTests.cs'
=== renamed file 'MySql.Data/Tests/Source/DataAdapterTests.cs' => 'Tests/MySql.Data.Tests/DataAdapterTests.cs'
=== renamed file 'MySql.Data/Tests/Source/DataReaderTests.cs' => 'Tests/MySql.Data.Tests/DataReaderTests.cs'
=== renamed file 'MySql.Data/Tests/Source/DataTypeTests.cs' => 'Tests/MySql.Data.Tests/DataTypeTests.cs'
=== renamed file 'MySql.Data/Tests/Source/DateTimeTests.cs' => 'Tests/MySql.Data.Tests/DateTimeTests.cs'
=== renamed file 'MySql.Data/Tests/Source/EventTests.cs' => 'Tests/MySql.Data.Tests/EventTests.cs'
=== renamed file 'MySql.Data/Tests/Source/ExceptionTests.cs' => 'Tests/MySql.Data.Tests/ExceptionTests.cs'
=== renamed file 'MySql.Data/Tests/Source/GetSchemaTests.cs' => 'Tests/MySql.Data.Tests/GetSchemaTests.cs'
=== renamed file 'MySql.Data/Tests/Source/InterfaceTests.cs' => 'Tests/MySql.Data.Tests/InterfaceTests.cs'
=== renamed file 'MySql.Data/Tests/Source/LanguageTests.cs' => 'Tests/MySql.Data.Tests/LanguageTests.cs'
=== renamed file 'MySql.Data/Tests/Source/Logging.cs' => 'Tests/MySql.Data.Tests/Logging.cs'
=== modified file 'Tests/MySql.Data.Tests/MySql.Data.Tests.csproj'
--- a/MySql.Data/Tests/MySql.Data.Tests.csproj 2011-06-06 14:33:41 +0000
+++ b/Tests/MySql.Data.Tests/MySql.Data.Tests.csproj 2011-06-21 19:16:59 +0000
@@ -15,7 +15,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
@@ -55,34 +55,6 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-4.0|AnyCPU'">
- <DebugSymbols>true</DebugSymbols>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <IntermediateOutputPath>obj\Debug-4.0\</IntermediateOutputPath>
- <OutputPath>bin\Debug-4.0\</OutputPath>
- <DefineConstants>TRACE;DEBUG;NUNIT</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
- <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
- <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-4.0|AnyCPU'">
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <IntermediateOutputPath>obj\Release-4.0\</IntermediateOutputPath>
- <OutputPath>bin\Release-4.0\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
- <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
- <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
- </PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework" />
<Reference Include="System" />
@@ -92,90 +64,67 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="..\Provider\Properties\VersionInfo.cs">
+ <Compile Include="..\..\Source\MySql.Data\Properties\VersionInfo.cs">
<Link>Properties\VersionInfo.cs</Link>
</Compile>
+ <Compile Include="AsyncTests.cs" />
+ <Compile Include="BaseTest.cs" />
+ <Compile Include="BlobTests.cs" />
+ <Compile Include="BulkLoading.cs" />
+ <Compile Include="CharacterSetTests.cs" />
+ <Compile Include="CommandBuilderTests.cs" />
+ <Compile Include="CommandTests.cs" />
+ <Compile Include="ConnectionStringBuilder.cs" />
+ <Compile Include="ConnectionTests.cs" />
+ <Compile Include="CultureTests.cs" />
+ <Compile Include="DataAdapterTests.cs" />
+ <Compile Include="DataReaderTests.cs" />
+ <Compile Include="DataTypeTests.cs" />
+ <Compile Include="DateTimeTests.cs" />
+ <Compile Include="EventTests.cs" />
+ <Compile Include="ExceptionTests.cs" />
+ <Compile Include="GetSchemaTests.cs" />
+ <Compile Include="InterfaceTests.cs" />
+ <Compile Include="LanguageTests.cs" />
+ <Compile Include="Logging.cs" />
+ <Compile Include="OutputParameters.cs" />
+ <Compile Include="ParameterTests.cs" />
+ <Compile Include="PartialTrustSandbox.cs" />
+ <Compile Include="PerfMonTests.cs" />
+ <Compile Include="PoolingTests.cs" />
+ <Compile Include="PreparedStatements.cs" />
+ <Compile Include="ProcedureParameters.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Source\AsyncTests.cs" />
- <Compile Include="Source\BaseTest.cs" />
- <Compile Include="Source\BlobTests.cs" />
- <Compile Include="Source\CharacterSetTests.cs" />
- <Compile Include="Source\CommandBuilderTests.cs" />
- <Compile Include="Source\CommandTests.cs" />
- <Compile Include="Source\ConnectionStringBuilder.cs" />
- <Compile Include="Source\ConnectionTests.cs" />
- <Compile Include="Source\BulkLoading.cs" />
- <Compile Include="Source\ReplicationTests.cs" />
- <Compile Include="Source\TableCaching.cs" />
- <Compile Include="Source\OutputParameters.cs" />
- <Compile Include="Source\PartialTrustSandbox.cs" />
- <Compile Include="Source\SqlServerMode.cs" />
- <Compile Include="Source\Logging.cs" />
- <Compile Include="Source\ScriptExecution.cs" />
- <Compile Include="Source\SqlTokenizer.cs" />
- <Compile Include="Source\Tokenizer.cs" />
- <Compile Include="Source\CultureTests.cs" />
- <Compile Include="Source\DataAdapterTests.cs" />
- <Compile Include="Source\DataReaderTests.cs" />
- <Compile Include="Source\DataTypeTests.cs" />
- <Compile Include="Source\DateTimeTests.cs" />
- <Compile Include="Source\EventTests.cs" />
- <Compile Include="Source\ExceptionTests.cs" />
- <Compile Include="Source\GetSchemaTests.cs" />
- <Compile Include="Source\InterfaceTests.cs" />
- <Compile Include="Source\LanguageTests.cs" />
- <Compile Include="Source\ParameterTests.cs" />
- <Compile Include="Source\PerfMonTests.cs" />
- <Compile Include="Source\PoolingTests.cs" />
- <Compile Include="Source\PreparedStatements.cs" />
- <Compile Include="Source\ProcedureParameters.cs" />
- <Compile Include="Source\SimpleTransactions.cs" />
- <Compile Include="Source\StoredProcedure.cs" />
- <Compile Include="Source\StressTests.cs" />
- <Compile Include="Source\Syntax.cs" />
- <Compile Include="Source\Syntax2.cs" />
- <Compile Include="Source\Threading.cs" />
- <Compile Include="Source\TimeoutAndCancel.cs" />
- <Compile Include="Source\Transactions.cs" />
- <Compile Include="Source\UsageAdvisor.cs" />
- <Compile Include="Source\Utils.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Provider\MySql.Data.csproj">
- <Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
- <Name>MySql.Data</Name>
- </ProjectReference>
+ <Compile Include="ScriptExecution.cs" />
+ <Compile Include="SimpleTransactions.cs" />
+ <Compile Include="SqlServerMode.cs" />
+ <Compile Include="SqlTokenizer.cs" />
+ <Compile Include="StoredProcedure.cs" />
+ <Compile Include="StoredProcedureWithAccess.cs" />
+ <Compile Include="StressTests.cs" />
+ <Compile Include="Syntax.cs" />
+ <Compile Include="Syntax2.cs" />
+ <Compile Include="Threading.cs" />
+ <Compile Include="TimeoutAndCancel.cs" />
+ <Compile Include="Tokenizer.cs" />
+ <Compile Include="Transactions.cs" />
+ <Compile Include="UsageAdvisor.cs" />
+ <Compile Include="Utils.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Setup.sql" />
</ItemGroup>
<ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
- <Visible>False</Visible>
- <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <ItemGroup>
<None Include="client.pfx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Source\MySql.Data\MySql.Data.csproj">
+ <Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
+ <Name>MySql.Data</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
=== renamed file 'MySql.Data/Tests/Source/OutputParameters.cs' => 'Tests/MySql.Data.Tests/OutputParameters.cs'
=== renamed file 'MySql.Data/Tests/Source/ParameterTests.cs' => 'Tests/MySql.Data.Tests/ParameterTests.cs'
=== renamed file 'MySql.Data/Tests/Source/PartialTrustSandbox.cs' => 'Tests/MySql.Data.Tests/PartialTrustSandbox.cs'
=== renamed file 'MySql.Data/Tests/Source/PerfMonTests.cs' => 'Tests/MySql.Data.Tests/PerfMonTests.cs'
=== renamed file 'MySql.Data/Tests/Source/PoolingTests.cs' => 'Tests/MySql.Data.Tests/PoolingTests.cs'
=== renamed file 'MySql.Data/Tests/Source/PreparedStatements.cs' => 'Tests/MySql.Data.Tests/PreparedStatements.cs'
=== renamed file 'MySql.Data/Tests/Source/ProcedureParameters.cs' => 'Tests/MySql.Data.Tests/ProcedureParameters.cs'
=== renamed file 'MySql.Data/Tests/Source/ReplicationTests.cs' => 'Tests/MySql.Data.Tests/ReplicationTests.cs'
=== renamed file 'MySql.Data/Tests/Source/ScriptExecution.cs' => 'Tests/MySql.Data.Tests/ScriptExecution.cs'
=== renamed file 'MySql.Data/Tests/Source/SimpleTransactions.cs' => 'Tests/MySql.Data.Tests/SimpleTransactions.cs'
=== renamed file 'MySql.Data/Tests/Source/SqlServerMode.cs' => 'Tests/MySql.Data.Tests/SqlServerMode.cs'
=== renamed file 'MySql.Data/Tests/Source/SqlTokenizer.cs' => 'Tests/MySql.Data.Tests/SqlTokenizer.cs'
=== renamed file 'MySql.Data/Tests/Source/StoredProcedure.cs' => 'Tests/MySql.Data.Tests/StoredProcedure.cs'
=== renamed file 'MySql.Data/Tests/Source/StoredProcedureWithAccess.cs' => 'Tests/MySql.Data.Tests/StoredProcedureWithAccess.cs'
=== renamed file 'MySql.Data/Tests/Source/StressTests.cs' => 'Tests/MySql.Data.Tests/StressTests.cs'
=== renamed file 'MySql.Data/Tests/Source/Syntax.cs' => 'Tests/MySql.Data.Tests/Syntax.cs'
=== renamed file 'MySql.Data/Tests/Source/Syntax2.cs' => 'Tests/MySql.Data.Tests/Syntax2.cs'
=== renamed file 'MySql.Data/Tests/Source/TableCaching.cs' => 'Tests/MySql.Data.Tests/TableCaching.cs'
=== renamed file 'MySql.Data/Tests/Source/Threading.cs' => 'Tests/MySql.Data.Tests/Threading.cs'
=== renamed file 'MySql.Data/Tests/Source/TimeoutAndCancel.cs' => 'Tests/MySql.Data.Tests/TimeoutAndCancel.cs'
--- a/MySql.Data/Tests/Source/TimeoutAndCancel.cs 2011-06-15 12:56:32 +0000
+++ b/Tests/MySql.Data.Tests/TimeoutAndCancel.cs 2011-06-21 18:51:27 +0000
@@ -204,7 +204,7 @@
if (Version < new Version(5, 0)) return;
execSQL("CREATE TABLE Test (id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(20))");
- for (int i=0; i < 10000; i++)
+ for (int i=0; i < 1000; i++)
execSQL("INSERT INTO Test VALUES (NULL, 'my string')");
MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", conn);
@@ -228,7 +228,7 @@
catch (MySqlException ex)
{
Assert.IsTrue(ex.Number == (int)MySqlErrorCode.QueryInterrupted);
- if (rows < 10000)
+ if (rows < 1000)
{
bool readOK = reader.Read();
Assert.IsFalse(readOK);
@@ -237,7 +237,7 @@
}
}
- Assert.IsTrue(rows < 10000);
+ Assert.IsTrue(rows < 1000);
}
/// <summary>
@@ -292,7 +292,7 @@
public void NetWriteTimeoutExpiring()
{
execSQL("CREATE TABLE Test(id int, blob1 longblob)");
- int rows = 10000;
+ int rows = 1000;
byte[] b1 = Utils.CreateBlob(5000);
MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES (@id, @b1)", conn);
cmd.Parameters.Add("@id", MySqlDbType.Int32);
=== renamed file 'MySql.Data/Tests/Source/Tokenizer.cs' => 'Tests/MySql.Data.Tests/Tokenizer.cs'
=== renamed file 'MySql.Data/Tests/Source/Transactions.cs' => 'Tests/MySql.Data.Tests/Transactions.cs'
--- a/MySql.Data/Tests/Source/Transactions.cs 2011-06-15 12:56:32 +0000
+++ b/Tests/MySql.Data.Tests/Transactions.cs 2011-06-21 18:51:27 +0000
@@ -236,6 +236,8 @@
scope.Complete();
}
+
+ MySqlPoolManager.ClearAllPools();
}
=== renamed file 'MySql.Data/Tests/Source/UsageAdvisor.cs' => 'Tests/MySql.Data.Tests/UsageAdvisor.cs'
=== renamed file 'MySql.Data/Tests/Source/Utils.cs' => 'Tests/MySql.Data.Tests/Utils.cs'
=== renamed directory 'MySql.Web/Tests' => 'Tests/MySql.Web.Tests'
=== modified file 'Tests/MySql.Web.Tests/MySql.Web.Tests.csproj'
--- a/MySql.Web/Tests/MySql.Web.Tests.csproj 2010-12-06 21:35:13 +0000
+++ b/Tests/MySql.Web.Tests/MySql.Web.Tests.csproj 2011-06-21 18:51:27 +0000
@@ -15,7 +15,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
@@ -52,46 +52,17 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-4.0|AnyCPU'">
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <IntermediateOutputPath>obj\Release-4.0\</IntermediateOutputPath>
- <OutputPath>bin\Release-4.0\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
- <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-4.0|AnyCPU'">
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <DebugSymbols>true</DebugSymbols>
- <IntermediateOutputPath>obj\Debug-4.0\</IntermediateOutputPath>
- <OutputPath>bin\Debug-4.0\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
- <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
- <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
- </PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework" />
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Web" />
+ <Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Xml" />
</ItemGroup>
- <ItemGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-4.0|AnyCPU' or '$(Configuration)|$(Platform)' == 'Release-4.0|AnyCPU'">
- <Reference Include="System.Web.ApplicationServices" />
- </ItemGroup>
<ItemGroup>
- <Compile Include="..\..\MySql.Data\Provider\Properties\VersionInfo.cs">
+ <Compile Include="..\..\Source\MySql.Data\Properties\VersionInfo.cs">
<Link>Properties\VersionInfo.cs</Link>
</Compile>
<Compile Include="BaseTest.cs" />
@@ -103,15 +74,15 @@
<Compile Include="UserManagement.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\MySql.Data\Provider\MySql.Data.csproj">
+ <ProjectReference Include="..\..\Source\MySql.Data\MySql.Data.csproj">
<Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
<Name>MySql.Data</Name>
</ProjectReference>
- <ProjectReference Include="..\..\MySql.Data\Tests\MySql.Data.Tests.csproj">
+ <ProjectReference Include="..\MySql.Data.Tests\MySql.Data.Tests.csproj">
<Project>{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}</Project>
<Name>MySql.Data.Tests</Name>
</ProjectReference>
- <ProjectReference Include="..\Providers\MySql.Web.csproj">
+ <ProjectReference Include="..\..\Source\MySql.Web\MySql.Web.csproj">
<Project>{C28B1166-1380-445D-AEC1-8A18B990DD18}</Project>
<Name>MySql.Web</Name>
</ProjectReference>
@@ -119,28 +90,6 @@
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
- <Visible>False</Visible>
- <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
=== added directory 'VS2008'
=== renamed file 'MySQL-VS2005.sln' => 'VS2008/MySQL-VS2005.sln'
=== renamed file 'MySQLClient.sln' => 'VS2008/MySQLClient.sln'
--- a/MySQLClient.sln 2011-01-06 16:04:23 +0000
+++ b/VS2008/MySQLClient.sln 2011-06-21 18:51:27 +0000
@@ -1,146 +1,104 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Web", "MySql.Web\Providers\MySql.Web.csproj", "{C28B1166-1380-445D-AEC1-8A18B990DD18}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Web.Tests", "MySql.Web\Tests\MySql.Web.Tests.csproj", "{83462D15-E576-4079-BBC9-9EE1CF0B24DD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data", "MySql.Data\Provider\MySql.Data.csproj", "{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.CF", "MySql.Data\Provider\MySql.Data.CF.csproj", "{587A47FB-C1CC-459D-93B6-179D95E41EFB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Tests", "MySql.Data\Tests\MySql.Data.Tests.csproj", "{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.CF.Tests", "MySql.Data\Tests\MySql.Data.CF.Tests.csproj", "{710D9251-17A3-4429-9A91-63F03267F310}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity", "MySql.Data.Entity\Provider\MySql.Data.Entity.csproj", "{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity.Tests", "MySql.Data.Entity\Tests\MySql.Data.Entity.Tests.csproj", "{D37B3572-767F-4622-A835-844B0EBEFD5B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.VisualStudio", "MySql.VisualStudio\MySql.VisualStudio.csproj", "{DC3517FF-AC26-4755-9B7A-EF658FF69593}"
+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}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Web", "Source\MySql.Web\MySql.Web.csproj", "{C28B1166-1380-445D-AEC1-8A18B990DD18}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Web.Tests", "Tests\MySql.Web.Tests\MySql.Web.Tests.csproj", "{83462D15-E576-4079-BBC9-9EE1CF0B24DD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity", "Source\MySql.Data.Entity\MySql.Data.Entity.csproj", "{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity.Tests", "Tests\MySql.Data.Entity.Tests\MySql.Data.Entity.Tests.csproj", "{D37B3572-767F-4622-A835-844B0EBEFD5B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.CF", "Source\MySql.Data\MySql.Data.CF.csproj", "{587A47FB-C1CC-459D-93B6-179D95E41EFB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.CF.Tests", "Tests\MySql.Data.Tests\MySql.Data.CF.Tests.csproj", "{710D9251-17A3-4429-9A91-63F03267F310}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.VisualStudio", "Source\MySql.VisualStudio\MySql.VisualStudio.csproj", "{DC3517FF-AC26-4755-9B7A-EF658FF69593}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
- Debug|Mixed Platforms = Debug|Mixed Platforms
- Debug|x64 = Debug|x64
- Debug|x86 = Debug|x86
+ Debug-4.0|Any CPU = Debug-4.0|Any CPU
Release|Any CPU = Release|Any CPU
- Release|Mixed Platforms = Release|Mixed Platforms
- Release|x64 = Release|x64
- Release|x86 = Release|x86
+ 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|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|x64.ActiveCfg = Debug|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|x86.ActiveCfg = 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|Mixed Platforms.ActiveCfg = Release|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|x64.ActiveCfg = Release|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|x86.ActiveCfg = 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|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug|x64.ActiveCfg = Debug|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug|x86.ActiveCfg = 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|Mixed Platforms.ActiveCfg = Release|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release|x64.ActiveCfg = Release|Any CPU
- {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release|x86.ActiveCfg = Release|Any CPU
- {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|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|x64.ActiveCfg = Debug|x86
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|x86.ActiveCfg = Debug|x86
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|x86.Build.0 = Debug|x86
- {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|Mixed Platforms.ActiveCfg = Release|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|x64.ActiveCfg = Release|x86
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|x86.ActiveCfg = Release|x86
- {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|x86.Build.0 = Release|x86
+ {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
{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|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|x64.ActiveCfg = Debug|Any CPU
- {587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|x86.ActiveCfg = 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|Mixed Platforms.ActiveCfg = Release|Any CPU
- {587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|x64.ActiveCfg = Release|Any CPU
- {587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|x86.ActiveCfg = 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|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|x64.ActiveCfg = Debug|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|x86.ActiveCfg = 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|Mixed Platforms.ActiveCfg = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|x64.ActiveCfg = Release|Any CPU
- {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|x86.ActiveCfg = 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|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {710D9251-17A3-4429-9A91-63F03267F310}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {710D9251-17A3-4429-9A91-63F03267F310}.Debug|x64.ActiveCfg = Debug|Any CPU
- {710D9251-17A3-4429-9A91-63F03267F310}.Debug|x86.ActiveCfg = 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|Mixed Platforms.ActiveCfg = Release|Any CPU
- {710D9251-17A3-4429-9A91-63F03267F310}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {710D9251-17A3-4429-9A91-63F03267F310}.Release|x64.ActiveCfg = Release|Any CPU
- {710D9251-17A3-4429-9A91-63F03267F310}.Release|x86.ActiveCfg = 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|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug|x64.ActiveCfg = Debug|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug|x86.ActiveCfg = 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|Mixed Platforms.ActiveCfg = Release|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release|x64.ActiveCfg = Release|Any CPU
- {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release|x86.ActiveCfg = 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|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug|x64.ActiveCfg = Debug|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug|x86.ActiveCfg = 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|Mixed Platforms.ActiveCfg = Release|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Release|x64.ActiveCfg = Release|Any CPU
- {D37B3572-767F-4622-A835-844B0EBEFD5B}.Release|x86.ActiveCfg = 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
{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|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x64.ActiveCfg = Debug|Any CPU
- {DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x86.ActiveCfg = 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|Mixed Platforms.ActiveCfg = Release|Any CPU
- {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
+ {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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
=== added directory 'VS2008/Source'
=== added directory 'VS2008/Source/MySql.Data'
=== added directory 'VS2008/Source/MySql.Data.Entity'
=== added directory 'VS2008/Source/MySql.Data.Entity/Fragments'
=== added directory 'VS2008/Source/MySql.Data.Entity/Generators'
=== added file 'VS2008/Source/MySql.Data.Entity/MySql.Data.Entity.csproj'
--- a/VS2008/Source/MySql.Data.Entity/MySql.Data.Entity.csproj 1970-01-01 00:00:00 +0000
+++ b/VS2008/Source/MySql.Data.Entity/MySql.Data.Entity.csproj 2011-06-21 18:51:27 +0000
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>MySql.Data.Entity</RootNamespace>
+ <AssemblyName>MySql.Data.Entity</AssemblyName>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Data.Entity" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="..\..\..\Source\MySql.Data.Entity\Properties\SchemaMapping.msl" />
+ <Compile Include="..\..\..\Source\MySql.Data\Properties\VersionInfo.cs">
+ <Link>Properties\VersionInfo.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\EFMySqlDataReader.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\EFMySqlCommand.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Fragments\TableFragment.cs">
+ <Link>Fragments\TableFragment.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Fragments\InputFragment.cs">
+ <Link>Fragments\InputFragment.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Fragments\JoinFragment.cs">
+ <Link>Fragments\JoinFragment.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Fragments\SqlFragment.cs">
+ <Link>Fragments\SqlFragment.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Generators\DeleteGenerator.cs">
+ <Link>Generators\DeleteGenerator.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Generators\FunctionGenerator.cs">
+ <SubType>Code</SubType>
+ <Link>Generators\FunctionGenerator.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Generators\FunctionProcessor.cs">
+ <Link>Generators\FunctionProcessor.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Generators\InsertGenerator.cs">
+ <Link>Generators\InsertGenerator.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Generators\Scope.cs">
+ <Link>Generators\Scope.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Generators\SelectGenerator.cs">
+ <Link>Generators\SelectGenerator.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Generators\SqlGenerator.cs">
+ <Link>Generators\SqlGenerator.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Generators\UpdateGenerator.cs">
+ <Link>Generators\UpdateGenerator.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Resources.resx</DependentUpon>
+ <Link>Properties\Resources.Designer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Statements\DeleteStatement.cs">
+ <Link>Statements\DeleteStatement.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Statements\InsertStatement.cs">
+ <Link>Statements\InsertStatement.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Metadata.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\ProviderManifest.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Properties\AssemblyInfo.cs">
+ <Link>Properties\AssemblyInfo.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\ProviderServices.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Statements\SelectStatement.cs">
+ <Link>Statements\SelectStatement.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data.Entity\Statements\UpdateStatement.cs">
+ <Link>Statements\UpdateStatement.cs</Link>
+ </Compile>
+ <EmbeddedResource Include="..\..\..\Source\MySql.Data.Entity\Properties\ProviderManifest.xml">
+ <Link>Properties\ProviderManifest.xml</Link>
+ </EmbeddedResource>
+ <EmbeddedResource Include="..\..\..\Source\MySql.Data.Entity\Properties\SchemaDefinition-5.0.ssdl">
+ <Link>Properties\SchemaDefinition-5.0.ssdl</Link>
+ </EmbeddedResource>
+ <EmbeddedResource Include="..\..\..\Source\MySql.Data.Entity\Properties\SchemaDefinition-5.5.ssdl">
+ <Link>Properties\SchemaDefinition-5.5.ssdl</Link>
+ </EmbeddedResource>
+ <EmbeddedResource Include="..\..\..\Source\MySql.Data.Entity\Properties\SchemaDefinition-5.1.ssdl">
+ <Link>Properties\SchemaDefinition-5.1.ssdl</Link>
+ </EmbeddedResource>
+ <EmbeddedResource Include="..\..\..\Source\MySql.Data.Entity\Properties\Resources.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <Link>Properties\Resources.resx</Link>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\MySql.Data\MySql.Data.csproj">
+ <Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
+ <Name>MySql.Data</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+ <PropertyGroup>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
=== added directory 'VS2008/Source/MySql.Data.Entity/Properties'
=== added directory 'VS2008/Source/MySql.Data.Entity/Statements'
=== renamed file 'MySql.Data/Provider/MySql.Data.CF.csproj' => 'VS2008/Source/MySql.Data/MySql.Data.CF.csproj'
--- a/MySql.Data/Provider/MySql.Data.CF.csproj 2011-05-10 21:08:56 +0000
+++ b/VS2008/Source/MySql.Data/MySql.Data.CF.csproj 2011-06-21 19:16:59 +0000
@@ -59,105 +59,213 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Properties\Resources.Designer.cs" />
- <Compile Include="Properties\VersionInfo.cs" />
- <Compile Include="Source\base\DbConnectionStringBuilder.cs" />
- <Compile Include="Source\base\DbException.cs" />
- <Compile Include="Source\cf\BufferedStream.cs" />
- <Compile Include="Source\cf\MissingAttributes.cs" />
- <Compile Include="Source\cf\WinCE.cs" />
- <Compile Include="Source\CharSetMap.cs" />
- <Compile Include="Source\command.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="Source\CommandBuilder.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="Source\common\Cache.cs" />
- <Compile Include="Source\common\ContextString.cs" />
- <Compile Include="Source\common\LowResolutionStopwatch.cs" />
- <Compile Include="Source\common\MyNetworkStream.cs" />
- <Compile Include="Source\common\MySqlTokenizer.cs" />
- <Compile Include="Source\common\NativeMethods.cs" />
- <Compile Include="Source\common\Platform.cs" />
- <Compile Include="Source\common\SHA1.cs" />
- <Compile Include="Source\common\StreamCreator.cs" />
- <Compile Include="Source\common\Version.cs" />
- <Compile Include="Source\CompressedStream.cs" />
- <Compile Include="Source\Connection.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="Source\Crypt.cs" />
- <Compile Include="Source\dataadapter.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="Source\datareader.cs" />
- <Compile Include="Source\Driver.cs" />
- <Compile Include="Source\Exception.cs" />
- <Compile Include="Source\Field.cs" />
- <Compile Include="Source\ISSchemaProvider.cs" />
- <Compile Include="Source\MySqlConnectionStringBuilder.cs" />
- <Compile Include="Source\MysqlDefs.cs" />
- <Compile Include="Source\MySqlError.cs" />
- <Compile Include="Source\MySqlHelper.cs" />
- <Compile Include="Source\MySqlPacket.cs" />
- <Compile Include="Source\MySqlPool.cs" />
- <Compile Include="Source\MySqlPoolManager.cs" />
- <Compile Include="Source\MySqlScript.cs" />
- <Compile Include="Source\MySqlStream.cs" />
- <Compile Include="Source\MySqlTrace.cs" />
- <Compile Include="Source\NativeDriver.cs" />
- <Compile Include="Source\parameter.cs" />
- <Compile Include="Source\parameter_collection.cs" />
- <Compile Include="Source\PreparableStatement.cs" />
- <Compile Include="Source\ProcedureCache.cs" />
- <Compile Include="Source\ResultSet.cs" />
- <Compile Include="Source\SchemaProvider.cs" />
- <Compile Include="Source\SSPI.cs" />
- <Compile Include="Source\Statement.cs" />
- <Compile Include="Source\StoredProcedure.cs" />
- <Compile Include="Source\TableCache.cs" />
- <Compile Include="Source\TimedStream.cs" />
- <Compile Include="Source\transaction.cs" />
- <Compile Include="Source\Types\MetaData.cs" />
- <Compile Include="Source\Types\MySqlBinary.cs" />
- <Compile Include="Source\Types\MySqlBit.cs" />
- <Compile Include="Source\Types\MySqlByte.cs" />
- <Compile Include="Source\Types\MySqlConversionException.cs" />
- <Compile Include="Source\Types\MySqlDateTime.cs" />
- <Compile Include="Source\Types\MySqlDecimal.cs" />
- <Compile Include="Source\Types\MySqlDouble.cs" />
- <Compile Include="Source\Types\MySqlGuid.cs" />
- <Compile Include="Source\Types\MySqlInt16.cs" />
- <Compile Include="Source\Types\MySqlInt32.cs" />
- <Compile Include="Source\Types\MySqlInt64.cs" />
- <Compile Include="Source\Types\MySqlSingle.cs" />
- <Compile Include="Source\Types\MySqlString.cs" />
- <Compile Include="Source\Types\MySqlTime.cs" />
- <Compile Include="Source\Types\MySqlUByte.cs" />
- <Compile Include="Source\Types\MySqlUInt16.cs" />
- <Compile Include="Source\Types\MySqlUInt32.cs" />
- <Compile Include="Source\Types\MySqlUInt64.cs" />
- <Compile Include="Source\Types\MySqlValue.cs" />
- <Compile Include="Source\zlib\Adler32.cs" />
- <Compile Include="Source\zlib\Deflate.cs" />
- <Compile Include="Source\zlib\InfBlocks.cs" />
- <Compile Include="Source\zlib\InfCodes.cs" />
- <Compile Include="Source\zlib\Inflate.cs" />
- <Compile Include="Source\zlib\InfTree.cs" />
- <Compile Include="Source\zlib\StaticTree.cs" />
- <Compile Include="Source\zlib\SupportClass.cs" />
- <Compile Include="Source\zlib\Tree.cs" />
- <Compile Include="Source\zlib\ZInputStream.cs" />
- <Compile Include="Source\zlib\Zlib.cs" />
- <Compile Include="Source\zlib\ZOutputStream.cs" />
- <Compile Include="Source\zlib\ZStream.cs" />
- <Compile Include="Source\zlib\ZStreamException.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\Properties\AssemblyInfo.cs">
+ <Link>Properties\AssemblyInfo.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Properties\Resources.Designer.cs">
+ <Link>Properties\Resources.Designer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Properties\VersionInfo.cs">
+ <Link>Properties\VersionInfo.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\base\DbConnectionStringBuilder.cs">
+ <Link>base\DbConnectionStringBuilder.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\base\DbException.cs">
+ <Link>base\DbException.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\cf\BufferedStream.cs">
+ <Link>cf\BufferedStream.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\cf\MissingAttributes.cs">
+ <Link>cf\MissingAttributes.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\cf\WinCE.cs">
+ <Link>cf\WinCE.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\CharSetMap.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\command.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\CommandBuilder.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\Cache.cs">
+ <Link>common\Cache.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\ContextString.cs">
+ <Link>common\ContextString.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\LowResolutionStopwatch.cs">
+ <Link>common\LowResolutionStopwatch.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\MyNetworkStream.cs">
+ <Link>common\MyNetworkStream.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\MySqlTokenizer.cs">
+ <Link>common\MySqlTokenizer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\NativeMethods.cs">
+ <Link>common\NativeMethods.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\Platform.cs">
+ <Link>common\Platform.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\SHA1.cs">
+ <Link>common\SHA1.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\StreamCreator.cs">
+ <Link>common\StreamCreator.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\Version.cs">
+ <Link>common\Version.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\CompressedStream.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\Connection.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Crypt.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\dataadapter.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\datareader.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\Driver.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\Exception.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\Field.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\ISSchemaProvider.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlConnectionStringBuilder.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MysqlDefs.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlError.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlHelper.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlPacket.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlPool.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlPoolManager.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlScript.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlStream.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlTrace.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\NativeDriver.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\parameter.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\parameter_collection.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\PreparableStatement.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\ProcedureCache.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\ResultSet.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\SchemaProvider.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\Statement.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\StoredProcedure.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\TimedStream.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\transaction.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MetaData.cs">
+ <Link>Types\MetaData.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlBinary.cs">
+ <Link>Types\MySqlBinary.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlBit.cs">
+ <Link>Types\MySqlBit.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlByte.cs">
+ <Link>Types\MySqlByte.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlConversionException.cs">
+ <Link>Types\MySqlConversionException.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlDateTime.cs">
+ <Link>Types\MySqlDateTime.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlDecimal.cs">
+ <Link>Types\MySqlDecimal.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlDouble.cs">
+ <Link>Types\MySqlDouble.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlGuid.cs">
+ <Link>Types\MySqlGuid.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlInt16.cs">
+ <Link>Types\MySqlInt16.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlInt32.cs">
+ <Link>Types\MySqlInt32.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlInt64.cs">
+ <Link>Types\MySqlInt64.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlSingle.cs">
+ <Link>Types\MySqlSingle.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlString.cs">
+ <Link>Types\MySqlString.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlTime.cs">
+ <Link>Types\MySqlTime.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlUByte.cs">
+ <Link>Types\MySqlUByte.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlUInt16.cs">
+ <Link>Types\MySqlUInt16.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlUInt32.cs">
+ <Link>Types\MySqlUInt32.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlUInt64.cs">
+ <Link>Types\MySqlUInt64.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlValue.cs">
+ <Link>Types\MySqlValue.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\Adler32.cs">
+ <Link>zlib\Adler32.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\Deflate.cs">
+ <Link>zlib\Deflate.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\InfBlocks.cs">
+ <Link>zlib\InfBlocks.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\InfCodes.cs">
+ <Link>zlib\InfCodes.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\Inflate.cs">
+ <Link>zlib\Inflate.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\InfTree.cs">
+ <Link>zlib\InfTree.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\StaticTree.cs">
+ <Link>zlib\StaticTree.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\SupportClass.cs">
+ <Link>zlib\SupportClass.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\Tree.cs">
+ <Link>zlib\Tree.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\ZInputStream.cs">
+ <Link>zlib\ZInputStream.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\Zlib.cs">
+ <Link>zlib\Zlib.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\ZOutputStream.cs">
+ <Link>zlib\ZOutputStream.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\ZStream.cs">
+ <Link>zlib\ZStream.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\ZStreamException.cs">
+ <Link>zlib\ZStreamException.cs</Link>
+ </Compile>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="Properties\Resources.resx">
+ <EmbeddedResource Include="..\..\..\Source\MySql.Data\Properties\Resources.resx">
<SubType>Designer</SubType>
+ <Link>Properties\Resources.resx</Link>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="..\..\..\Source\MySql.Data\Properties\ReservedWords.txt">
+ <Link>Properties\ReservedWords.txt</Link>
</EmbeddedResource>
</ItemGroup>
<Import Condition="'$(TargetFrameworkVersion)' == 'v1.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.v1.targets" />
=== added file 'VS2008/Source/MySql.Data/MySql.Data.csproj'
--- a/VS2008/Source/MySql.Data/MySql.Data.csproj 1970-01-01 00:00:00 +0000
+++ b/VS2008/Source/MySql.Data/MySql.Data.csproj 2011-06-21 18:51:27 +0000
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>MySql.Data.MySqlClient</RootNamespace>
+ <AssemblyName>MySql.Data</AssemblyName>
+ <FileAlignment>512</FileAlignment>
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Configuration.Install" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Design" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Management" />
+ <Reference Include="System.Security" />
+ <Reference Include="System.Transactions" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\..\..\Source\MySql.Data\Properties\AssemblyInfo.cs">
+ <Link>Properties\AssemblyInfo.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\CharSetMap.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\command.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\CommandBuilder.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\common\ContextString.cs">
+ <Link>common\ContextString.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\NamedPipeStream.cs">
+ <Link>common\NamedPipeStream.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\NativeMethods.cs">
+ <Link>common\NativeMethods.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\Platform.cs">
+ <Link>common\Platform.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\SHA1.cs">
+ <Link>common\SHA1.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\SharedMemoryStream.cs">
+ <Link>common\SharedMemoryStream.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\StreamCreator.cs">
+ <Link>common\StreamCreator.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\Version.cs">
+ <Link>common\Version.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\CompressedStream.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\Connection.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Crypt.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\dataadapter.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\datareader.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\Driver.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\Exception.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\Field.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\Installer.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\ISSchemaProvider.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlClientFactory.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlConnectionStringBuilder.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MysqlDefs.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlError.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlHelper.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlPool.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlPoolManager.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlPromotableTransaction.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlStream.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\NativeDriver.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\parameter.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\parameter_collection.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\PerformanceMonitor.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\PreparableStatement.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\ProcedureCache.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\SchemaProvider.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\Statement.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\StoredProcedure.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\transaction.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MetaData.cs">
+ <Link>Types\MetaData.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlBinary.cs">
+ <Link>Types\MySqlBinary.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlBit.cs">
+ <Link>Types\MySqlBit.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlByte.cs">
+ <Link>Types\MySqlByte.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlConversionException.cs">
+ <Link>Types\MySqlConversionException.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlDateTime.cs">
+ <Link>Types\MySqlDateTime.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlDecimal.cs">
+ <Link>Types\MySqlDecimal.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlDouble.cs">
+ <Link>Types\MySqlDouble.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlInt16.cs">
+ <Link>Types\MySqlInt16.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlInt32.cs">
+ <Link>Types\MySqlInt32.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlInt64.cs">
+ <Link>Types\MySqlInt64.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlSingle.cs">
+ <Link>Types\MySqlSingle.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlString.cs">
+ <Link>Types\MySqlString.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlTime.cs">
+ <Link>Types\MySqlTime.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlUByte.cs">
+ <Link>Types\MySqlUByte.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlUInt16.cs">
+ <Link>Types\MySqlUInt16.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlUInt32.cs">
+ <Link>Types\MySqlUInt32.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlUInt64.cs">
+ <Link>Types\MySqlUInt64.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlValue.cs">
+ <Link>Types\MySqlValue.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\Adler32.cs">
+ <Link>zlib\Adler32.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\Deflate.cs">
+ <Link>zlib\Deflate.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\InfBlocks.cs">
+ <Link>zlib\InfBlocks.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\InfCodes.cs">
+ <Link>zlib\InfCodes.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\Inflate.cs">
+ <Link>zlib\Inflate.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\InfTree.cs">
+ <Link>zlib\InfTree.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\StaticTree.cs">
+ <Link>zlib\StaticTree.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\SupportClass.cs">
+ <Link>zlib\SupportClass.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\Tree.cs">
+ <Link>zlib\Tree.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\ZInputStream.cs">
+ <Link>zlib\ZInputStream.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\Zlib.cs">
+ <Link>zlib\Zlib.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\ZOutputStream.cs">
+ <Link>zlib\ZOutputStream.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\ZStream.cs">
+ <Link>zlib\ZStream.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\zlib\ZStreamException.cs">
+ <Link>zlib\ZStreamException.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Properties\VersionInfo.cs">
+ <Link>Properties\VersionInfo.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\Cache.cs">
+ <Link>common\Cache.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\MySqlTokenizer.cs">
+ <Link>common\MySqlTokenizer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\MyNetworkStream.cs">
+ <Link>common\MyNetworkStream.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\BulkLoader.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlPacket.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlScript.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\Types\MySqlGuid.cs">
+ <Link>Types\MySqlGuid.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\ResultSet.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="..\..\..\Source\MySql.Data\Properties\ReservedWords.txt">
+ <Link>Properties\ReservedWords.txt</Link>
+ </EmbeddedResource>
+ <EmbeddedResource Include="..\..\..\Source\MySql.Data\Properties\Resources.resx">
+ <SubType>Designer</SubType>
+ <Generator>PublicResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <Link>Properties\Resources.resx</Link>
+ </EmbeddedResource>
+ <None Include="..\..\..\CHANGES">
+ <Link>CHANGES</Link>
+ </None>
+ <None Include="..\..\..\Source\MySql.Data\Properties\keywords.txt">
+ <Link>Properties\keywords.txt</Link>
+ </None>
+ <Content Include="..\..\..\Source\MySql.Data\docs\MySqlCommand.xml">
+ <Link>docs\MySqlCommand.xml</Link>
+ </Content>
+ <Content Include="..\..\..\Source\MySql.Data\docs\MySqlCommandBuilder.xml">
+ <Link>docs\MySqlCommandBuilder.xml</Link>
+ </Content>
+ <Content Include="..\..\..\Source\MySql.Data\docs\MySqlConnection.xml">
+ <Link>docs\MySqlConnection.xml</Link>
+ </Content>
+ <Content Include="..\..\..\Source\MySql.Data\docs\MySqlConnectionStringBuilder.xml">
+ <Link>docs\MySqlConnectionStringBuilder.xml</Link>
+ </Content>
+ <Content Include="..\..\..\Source\MySql.Data\docs\MySqlDataAdapter.xml">
+ <Link>docs\MySqlDataAdapter.xml</Link>
+ </Content>
+ <Content Include="..\..\..\Source\MySql.Data\docs\MySqlDataReader.xml">
+ <Link>docs\MySqlDataReader.xml</Link>
+ </Content>
+ <Content Include="..\..\..\Source\MySql.Data\docs\MySqlException.xml">
+ <Link>docs\MySqlException.xml</Link>
+ </Content>
+ <Content Include="..\..\..\Source\MySql.Data\docs\MySqlHelper.xml">
+ <Link>docs\MySqlHelper.xml</Link>
+ </Content>
+ <Content Include="..\..\..\Source\MySql.Data\docs\MySqlParameter.xml">
+ <Link>docs\MySqlParameter.xml</Link>
+ </Content>
+ <Content Include="..\..\..\Source\MySql.Data\docs\MySqlParameterCollection.xml">
+ <Link>docs\MySqlParameterCollection.xml</Link>
+ </Content>
+ <Content Include="..\..\..\Source\MySql.Data\docs\MySqlTransaction.xml">
+ <Link>docs\MySqlTransaction.xml</Link>
+ </Content>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\..\..\Source\MySql.Data\Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Resources.resx</DependentUpon>
+ <Link>Properties\Resources.Designer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\LowResolutionStopwatch.cs">
+ <Link>common\LowResolutionStopwatch.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\common\QueryNormalizer.cs">
+ <Link>common\QueryNormalizer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\MySqlTrace.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\TimedStream.cs" />
+ <Compile Include="..\..\..\Source\MySql.Data\TracingDriver.cs" />
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
=== added directory 'VS2008/Source/MySql.Data/Properties'
=== added directory 'VS2008/Source/MySql.Data/Types'
=== added directory 'VS2008/Source/MySql.Data/base'
=== added directory 'VS2008/Source/MySql.Data/cf'
=== added directory 'VS2008/Source/MySql.Data/common'
=== added directory 'VS2008/Source/MySql.Data/docs'
=== added directory 'VS2008/Source/MySql.Data/zlib'
=== added directory 'VS2008/Source/MySql.VisualStudio'
=== added directory 'VS2008/Source/MySql.VisualStudio/DDEX'
=== added directory 'VS2008/Source/MySql.VisualStudio/DbObjects'
=== added directory 'VS2008/Source/MySql.VisualStudio/Editors'
=== added directory 'VS2008/Source/MySql.VisualStudio/LanguageService'
=== renamed file 'MySql.VisualStudio/MySql.VisualStudio.csproj' => 'VS2008/Source/MySql.VisualStudio/MySql.VisualStudio.csproj'
--- a/MySql.VisualStudio/MySql.VisualStudio.csproj 2011-05-19 20:05:47 +0000
+++ b/VS2008/Source/MySql.VisualStudio/MySql.VisualStudio.csproj 2011-06-21 19:16:59 +0000
@@ -107,289 +107,448 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="..\MySql.Data\Provider\Properties\VersionInfo.cs">
+ <Compile Include="..\..\..\Source\MySql.Data\common\MySqlTokenizer.cs">
+ <Link>LanguageService\MySqlTokenizer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Data\Properties\VersionInfo.cs">
<Link>Properties\VersionInfo.cs</Link>
</Compile>
- <Compile Include="..\MySql.Data\Provider\Source\common\MySqlTokenizer.cs">
- <Link>LanguageService\MySqlTokenizer.cs</Link>
- </Compile>
- <Compile Include="Editors\BaseEditorControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="DbObjects\CollationTypeConverter.cs" />
- <Compile Include="DbObjects\CharacterSetTypeConverter.cs" />
- <Compile Include="DbObjects\DataRowHelpers.cs" />
- <Compile Include="DbObjects\DataTypeConverter.cs" />
- <Compile Include="DbObjects\ForeignKey.cs" />
- <Compile Include="DbObjects\Index.cs" />
- <Compile Include="DbObjects\IndexColumnTypeConverter.cs" />
- <Compile Include="DbObjects\Metadata.cs" />
- <Compile Include="DbObjects\NumericTypeConverter.cs" />
- <Compile Include="DbObjects\ObjectComparer.cs" />
- <Compile Include="DbObjects\TableEngineTypeConverters.cs" />
- <Compile Include="DbObjects\Enums.cs" />
- <Compile Include="DbObjects\Table.cs" />
- <Compile Include="DbObjects\TablePartCollection.cs" />
- <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">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\BaseEditorControl.cs">
+ <SubType>UserControl</SubType>
+ <Link>Editors\BaseEditorControl.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DbObjects\CollationTypeConverter.cs">
+ <Link>DbObjects\CollationTypeConverter.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DbObjects\CharacterSetTypeConverter.cs">
+ <Link>DbObjects\CharacterSetTypeConverter.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DbObjects\DataRowHelpers.cs">
+ <Link>DbObjects\DataRowHelpers.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DbObjects\DataTypeConverter.cs">
+ <Link>DbObjects\DataTypeConverter.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DbObjects\ForeignKey.cs">
+ <Link>DbObjects\ForeignKey.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DbObjects\Index.cs">
+ <Link>DbObjects\Index.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DbObjects\IndexColumnTypeConverter.cs">
+ <Link>DbObjects\IndexColumnTypeConverter.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DbObjects\Metadata.cs">
+ <Link>DbObjects\Metadata.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DbObjects\NumericTypeConverter.cs">
+ <Link>DbObjects\NumericTypeConverter.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DbObjects\ObjectComparer.cs">
+ <Link>DbObjects\ObjectComparer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DbObjects\TableEngineTypeConverters.cs">
+ <Link>DbObjects\TableEngineTypeConverters.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DbObjects\Enums.cs">
+ <Link>DbObjects\Enums.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DbObjects\Table.cs">
+ <Link>DbObjects\Table.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DbObjects\TablePartCollection.cs">
+ <Link>DbObjects\TablePartCollection.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DDEX\MySqlConnectionProperties.cs">
+ <Link>DDEX\MySqlConnectionProperties.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DDEX\MySqlConnectionSupport.cs">
+ <Link>DDEX\MySqlConnectionSupport.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DDEX\MySqlConnectionUIControl.cs">
+ <SubType>UserControl</SubType>
+ <Link>DDEX\MySqlConnectionUIControl.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DDEX\MySqlConnectionUIControl.designer.cs">
<DependentUpon>MySqlConnectionUIControl.cs</DependentUpon>
+ <Link>DDEX\MySqlConnectionUIControl.designer.cs</Link>
</Compile>
- <Compile Include="DDEX\MySqlDataConnectionPromptDialog.cs">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DDEX\MySqlDataConnectionPromptDialog.cs">
<SubType>Form</SubType>
+ <Link>DDEX\MySqlDataConnectionPromptDialog.cs</Link>
</Compile>
- <Compile Include="DDEX\MySqlDataConnectionPromptDialog.Designer.cs">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DDEX\MySqlDataConnectionPromptDialog.Designer.cs">
<DependentUpon>MySqlDataConnectionPromptDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="DDEX\MySqlDataObjectEnumerator.cs" />
- <Compile Include="DDEX\MySqlDataObjectIdentifierConverter.cs" />
- <Compile Include="DDEX\MySqlDataObjectSupport.cs" />
- <Compile Include="DDEX\MySqlDataSourceInformation.cs" />
- <Compile Include="DDEX\MySqlDataSourceSpecializer.cs" />
- <Compile Include="DDEX\MySqlDataViewCommandHandler.cs" />
- <Compile Include="DDEX\MySqlDataViewSupport.cs" />
- <Compile Include="DbObjects\ColumnWithTypeDescriptor.cs" />
- <Compile Include="DDEX\StoredProcedureColumnEnumerator.cs" />
- <Compile Include="Editors\VSCodeEditorUserControl.cs">
+ <Link>DDEX\MySqlDataConnectionPromptDialog.Designer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DDEX\MySqlDataObjectEnumerator.cs">
+ <Link>DDEX\MySqlDataObjectEnumerator.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DDEX\MySqlDataObjectIdentifierConverter.cs">
+ <Link>DDEX\MySqlDataObjectIdentifierConverter.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DDEX\MySqlDataObjectSupport.cs">
+ <Link>DDEX\MySqlDataObjectSupport.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DDEX\MySqlDataSourceInformation.cs">
+ <Link>DDEX\MySqlDataSourceInformation.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DDEX\MySqlDataSourceSpecializer.cs">
+ <Link>DDEX\MySqlDataSourceSpecializer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DDEX\MySqlDataViewCommandHandler.cs">
+ <Link>DDEX\MySqlDataViewCommandHandler.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DDEX\MySqlDataViewSupport.cs">
+ <Link>DDEX\MySqlDataViewSupport.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DbObjects\ColumnWithTypeDescriptor.cs">
+ <Link>DbObjects\ColumnWithTypeDescriptor.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DDEX\StoredProcedureColumnEnumerator.cs">
+ <Link>DDEX\StoredProcedureColumnEnumerator.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\VSCodeEditorUserControl.cs">
<SubType>UserControl</SubType>
+ <Link>Editors\VSCodeEditorUserControl.cs</Link>
</Compile>
- <Compile Include="Editors\ConnectDialog.cs">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\ConnectDialog.cs">
<SubType>Form</SubType>
+ <Link>Editors\ConnectDialog.cs</Link>
</Compile>
- <Compile Include="Editors\ConnectDialog.Designer.cs">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\ConnectDialog.Designer.cs">
<DependentUpon>ConnectDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="Editors\CustomPropertyDescriptor.cs" />
- <Compile Include="Editors\ForeignKeyDialog.cs">
+ <Link>Editors\ConnectDialog.Designer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\CustomPropertyDescriptor.cs">
+ <Link>Editors\CustomPropertyDescriptor.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\ForeignKeyDialog.cs">
<SubType>Form</SubType>
+ <Link>Editors\ForeignKeyDialog.cs</Link>
</Compile>
- <Compile Include="Editors\ForeignKeyDialog.Designer.cs">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\ForeignKeyDialog.Designer.cs">
<DependentUpon>ForeignKeyDialog.cs</DependentUpon>
+ <Link>Editors\ForeignKeyDialog.Designer.cs</Link>
</Compile>
- <Compile Include="Editors\GenerateChangeScriptDialog.cs">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\GenerateChangeScriptDialog.cs">
<SubType>Form</SubType>
+ <Link>Editors\GenerateChangeScriptDialog.cs</Link>
</Compile>
- <Compile Include="Editors\GenerateChangeScriptDialog.Designer.cs">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\GenerateChangeScriptDialog.Designer.cs">
<DependentUpon>GenerateChangeScriptDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="Editors\IEditor.cs" />
- <Compile Include="Editors\IndexColumnEditorDialog.cs">
+ <Link>Editors\GenerateChangeScriptDialog.Designer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\IEditor.cs">
+ <Link>Editors\IEditor.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\IndexColumnEditorDialog.cs">
<SubType>Form</SubType>
+ <Link>Editors\IndexColumnEditorDialog.cs</Link>
</Compile>
- <Compile Include="Editors\IndexColumnEditorDialog.Designer.cs">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\IndexColumnEditorDialog.Designer.cs">
<DependentUpon>IndexColumnEditorDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="Editors\MyComboBox.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="Editors\MyDataGridViewRowHeaderCell.cs" />
- <Compile Include="Editors\MyDescriptionAttribute.cs" />
- <Compile Include="Editors\MySplitter.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="Editors\ServiceBroker.cs" />
- <Compile Include="Editors\SqlEditor.cs">
+ <Link>Editors\IndexColumnEditorDialog.Designer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\MyComboBox.cs">
+ <SubType>Component</SubType>
+ <Link>Editors\MyComboBox.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\MyDataGridViewRowHeaderCell.cs">
+ <Link>Editors\MyDataGridViewRowHeaderCell.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\MyDescriptionAttribute.cs">
+ <Link>Editors\MyDescriptionAttribute.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\MySplitter.cs">
+ <SubType>Component</SubType>
+ <Link>Editors\MySplitter.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\ServiceBroker.cs">
+ <Link>Editors\ServiceBroker.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\SqlEditor.cs">
<SubType>UserControl</SubType>
+ <Link>Editors\SqlEditor.cs</Link>
</Compile>
- <Compile Include="Editors\SqlEditor.Designer.cs">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\SqlEditor.Designer.cs">
<DependentUpon>SqlEditor.cs</DependentUpon>
- </Compile>
- <Compile Include="Editors\SqlEditorFactory.cs" />
- <Compile Include="Editors\SqlEditorPane.cs" />
- <Compile Include="Editors\TableEditorPane.cs" />
- <Compile Include="Editors\TableIndexDialog.cs">
+ <Link>Editors\SqlEditor.Designer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\SqlEditorFactory.cs">
+ <Link>Editors\SqlEditorFactory.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\SqlEditorPane.cs">
+ <Link>Editors\SqlEditorPane.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\TableEditorPane.cs">
+ <Link>Editors\TableEditorPane.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\TableIndexDialog.cs">
<SubType>Form</SubType>
+ <Link>Editors\TableIndexDialog.cs</Link>
</Compile>
- <Compile Include="Editors\TableIndexDialog.Designer.cs">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\TableIndexDialog.Designer.cs">
<DependentUpon>TableIndexDialog.cs</DependentUpon>
+ <Link>Editors\TableIndexDialog.Designer.cs</Link>
</Compile>
- <Compile Include="Editors\TableNamePromptDialog.cs">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\TableNamePromptDialog.cs">
<SubType>Form</SubType>
+ <Link>Editors\TableNamePromptDialog.cs</Link>
</Compile>
- <Compile Include="Editors\TableNamePromptDialog.Designer.cs">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\TableNamePromptDialog.Designer.cs">
<DependentUpon>TableNamePromptDialog.cs</DependentUpon>
+ <Link>Editors\TableNamePromptDialog.Designer.cs</Link>
</Compile>
- <Compile Include="Editors\UDFEditor.cs">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\UDFEditor.cs">
<SubType>Form</SubType>
+ <Link>Editors\UDFEditor.cs</Link>
</Compile>
- <Compile Include="Editors\UDFEditor.Designer.cs">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\UDFEditor.Designer.cs">
<DependentUpon>UDFEditor.cs</DependentUpon>
- </Compile>
- <Compile Include="Editors\VS2005ColorTable.cs" />
- <Compile Include="Editors\VS2005PropertyGrid.cs">
+ <Link>Editors\UDFEditor.Designer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\VS2005ColorTable.cs">
+ <Link>Editors\VS2005ColorTable.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\VS2005PropertyGrid.cs">
<SubType>Component</SubType>
- </Compile>
- <Compile Include="Editors\VSCodeEditor.cs" />
- <Compile Include="Editors\VSCodeEditorWindow.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Editors\YesNoTypeConverter.cs" />
- <Compile Include="LanguageService\MySqlLanguageService.cs" />
- <Compile Include="Editors\TableEditor.cs">
+ <Link>Editors\VS2005PropertyGrid.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\VSCodeEditor.cs">
+ <Link>Editors\VSCodeEditor.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\VSCodeEditorWindow.cs">
+ <Link>Editors\VSCodeEditorWindow.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\YesNoTypeConverter.cs">
+ <Link>Editors\YesNoTypeConverter.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\LanguageService\MySqlLanguageService.cs">
+ <Link>LanguageService\MySqlLanguageService.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Editors\TableEditor.cs">
<SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Guids.cs" />
- <Compile Include="LanguageService\MySqlScanner.cs" />
- <Compile Include="LanguageService\Tokenizer.cs" />
- <Compile Include="MyInstaller.cs">
+ <Link>Editors\TableEditor.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Guids.cs" />
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\LanguageService\MySqlScanner.cs">
+ <Link>LanguageService\MySqlScanner.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\LanguageService\Tokenizer.cs">
+ <Link>LanguageService\Tokenizer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\MyInstaller.cs">
<SubType>Component</SubType>
</Compile>
- <Compile Include="MySqlProviderObjectFactory.cs" />
- <Compile Include="Nodes\BaseNode.cs" />
- <Compile Include="DbObjects\Column.cs" />
- <Compile Include="Nodes\TriggerNode.cs" />
- <Compile Include="Nodes\UDFNode.cs" />
- <Compile Include="Nodes\DocumentNode.cs" />
- <Compile Include="Nodes\ViewNode.cs" />
- <Compile Include="Nodes\StoredProcedureNode.cs" />
- <Compile Include="Nodes\TableNode.cs" />
- <Compile Include="PkgCmdID.cs" />
- <Compile Include="Properties\Resources.Designer.cs">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\MySqlProviderObjectFactory.cs" />
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Nodes\BaseNode.cs">
+ <Link>Nodes\BaseNode.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\DbObjects\Column.cs">
+ <Link>DbObjects\Column.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Nodes\TriggerNode.cs">
+ <Link>Nodes\TriggerNode.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Nodes\UDFNode.cs">
+ <Link>Nodes\UDFNode.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Nodes\DocumentNode.cs">
+ <Link>Nodes\DocumentNode.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Nodes\ViewNode.cs">
+ <Link>Nodes\ViewNode.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Nodes\StoredProcedureNode.cs">
+ <Link>Nodes\StoredProcedureNode.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Nodes\TableNode.cs">
+ <Link>Nodes\TableNode.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\PkgCmdID.cs" />
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
- </Compile>
- <Compile Include="VsPkg.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="WebConfig\ConnectionStringEditorDlg.cs">
+ <Link>Properties\Resources.Designer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\VsPkg.cs" />
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\Properties\AssemblyInfo.cs">
+ <Link>Properties\AssemblyInfo.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\WebConfig\ConnectionStringEditorDlg.cs">
<SubType>Form</SubType>
+ <Link>WebConfig\ConnectionStringEditorDlg.cs</Link>
</Compile>
- <Compile Include="WebConfig\ConnectionStringEditorDlg.Designer.cs">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\WebConfig\ConnectionStringEditorDlg.Designer.cs">
<DependentUpon>ConnectionStringEditorDlg.cs</DependentUpon>
- </Compile>
- <Compile Include="WebConfig\GenericConfig.cs" />
- <Compile Include="WebConfig\MembershipConfig.cs" />
- <Compile Include="WebConfig\MembershipOptionsDlg.cs">
+ <Link>WebConfig\ConnectionStringEditorDlg.Designer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\WebConfig\GenericConfig.cs">
+ <Link>WebConfig\GenericConfig.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\WebConfig\MembershipConfig.cs">
+ <Link>WebConfig\MembershipConfig.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\WebConfig\MembershipOptionsDlg.cs">
<SubType>Form</SubType>
+ <Link>WebConfig\MembershipOptionsDlg.cs</Link>
</Compile>
- <Compile Include="WebConfig\MembershipOptionsDlg.Designer.cs">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\WebConfig\MembershipOptionsDlg.Designer.cs">
<DependentUpon>MembershipOptionsDlg.cs</DependentUpon>
- </Compile>
- <Compile Include="WebConfig\ProfileConfig.cs" />
- <Compile Include="WebConfig\RoleConfig.cs" />
- <Compile Include="WebConfig\SessionStateConfig.cs" />
- <Compile Include="WebConfig\WebConfig.cs" />
- <Compile Include="WebConfig\WebConfigDlg.cs">
+ <Link>WebConfig\MembershipOptionsDlg.Designer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\WebConfig\ProfileConfig.cs">
+ <Link>WebConfig\ProfileConfig.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\WebConfig\RoleConfig.cs">
+ <Link>WebConfig\RoleConfig.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\WebConfig\SessionStateConfig.cs">
+ <Link>WebConfig\SessionStateConfig.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\WebConfig\WebConfig.cs">
+ <Link>WebConfig\WebConfig.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\WebConfig\WebConfigDlg.cs">
<SubType>Form</SubType>
+ <Link>WebConfig\WebConfigDlg.cs</Link>
</Compile>
- <Compile Include="WebConfig\WebConfigDlg.Designer.cs">
+ <Compile Include="..\..\..\Source\MySql.VisualStudio\WebConfig\WebConfigDlg.Designer.cs">
<DependentUpon>WebConfigDlg.cs</DependentUpon>
+ <Link>WebConfig\WebConfigDlg.Designer.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="Properties\Resources.resx">
+ <EmbeddedResource Include="..\..\..\Source\MySql.VisualStudio\Properties\Resources.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
<MergeWithCTO>true</MergeWithCTO>
+ <Link>Properties\Resources.resx</Link>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="DDEX\MySqlConnectionUIControl.resx">
+ <EmbeddedResource Include="..\..\..\Source\MySql.VisualStudio\DDEX\MySqlConnectionUIControl.resx">
<DependentUpon>MySqlConnectionUIControl.cs</DependentUpon>
<SubType>Designer</SubType>
+ <Link>DDEX\MySqlConnectionUIControl.resx</Link>
</EmbeddedResource>
- <EmbeddedResource Include="DDEX\MySqlDataConnectionPromptDialog.resx">
+ <EmbeddedResource Include="..\..\..\Source\MySql.VisualStudio\DDEX\MySqlDataConnectionPromptDialog.resx">
<DependentUpon>MySqlDataConnectionPromptDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DDEX\MySqlDataObjectSupport.xml" />
- <EmbeddedResource Include="DDEX\MySqlDataViewSupport.xml" />
- <EmbeddedResource Include="Editors\ConnectDialog.resx">
+ <Link>DDEX\MySqlDataConnectionPromptDialog.resx</Link>
+ </EmbeddedResource>
+ <EmbeddedResource Include="..\..\..\Source\MySql.VisualStudio\DDEX\MySqlDataObjectSupport.xml">
+ <Link>DDEX\MySqlDataObjectSupport.xml</Link>
+ </EmbeddedResource>
+ <EmbeddedResource Include="..\..\..\Source\MySql.VisualStudio\DDEX\MySqlDataViewSupport.xml">
+ <Link>DDEX\MySqlDataViewSupport.xml</Link>
+ </EmbeddedResource>
+ <EmbeddedResource Include="..\..\..\Source\MySql.VisualStudio\Editors\ConnectDialog.resx">
<DependentUpon>ConnectDialog.cs</DependentUpon>
+ <Link>Editors\ConnectDialog.resx</Link>
</EmbeddedResource>
- <EmbeddedResource Include="Editors\ForeignKeyDialog.resx">
+ <EmbeddedResource Include="..\..\..\Source\MySql.VisualStudio\Editors\ForeignKeyDialog.resx">
<DependentUpon>ForeignKeyDialog.cs</DependentUpon>
+ <Link>Editors\ForeignKeyDialog.resx</Link>
</EmbeddedResource>
- <EmbeddedResource Include="Editors\GenerateChangeScriptDialog.resx">
+ <EmbeddedResource Include="..\..\..\Source\MySql.VisualStudio\Editors\GenerateChangeScriptDialog.resx">
<DependentUpon>GenerateChangeScriptDialog.cs</DependentUpon>
<SubType>Designer</SubType>
+ <Link>Editors\GenerateChangeScriptDialog.resx</Link>
</EmbeddedResource>
- <EmbeddedResource Include="Editors\IndexColumnEditorDialog.resx">
+ <EmbeddedResource Include="..\..\..\Source\MySql.VisualStudio\Editors\IndexColumnEditorDialog.resx">
<DependentUpon>IndexColumnEditorDialog.cs</DependentUpon>
+ <Link>Editors\IndexColumnEditorDialog.resx</Link>
</EmbeddedResource>
- <EmbeddedResource Include="Editors\SqlEditor.resx">
+ <EmbeddedResource Include="..\..\..\Source\MySql.VisualStudio\Editors\SqlEditor.resx">
<DependentUpon>SqlEditor.cs</DependentUpon>
+ <Link>Editors\SqlEditor.resx</Link>
</EmbeddedResource>
- <EmbeddedResource Include="Editors\TableEditor.resx">
+ <EmbeddedResource Include="..\..\..\Source\MySql.VisualStudio\Editors\TableEditor.resx">
<SubType>Designer</SubType>
<DependentUpon>TableEditor.cs</DependentUpon>
+ <Link>Editors\TableEditor.resx</Link>
</EmbeddedResource>
- <EmbeddedResource Include="Editors\TableIndexDialog.resx">
+ <EmbeddedResource Include="..\..\..\Source\MySql.VisualStudio\Editors\TableIndexDialog.resx">
<DependentUpon>TableIndexDialog.cs</DependentUpon>
<SubType>Designer</SubType>
+ <Link>Editors\TableIndexDialog.resx</Link>
</EmbeddedResource>
- <EmbeddedResource Include="Editors\TableNamePromptDialog.resx">
+ <EmbeddedResource Include="..\..\..\Source\MySql.VisualStudio\Editors\TableNamePromptDialog.resx">
<DependentUpon>TableNamePromptDialog.cs</DependentUpon>
+ <Link>Editors\TableNamePromptDialog.resx</Link>
</EmbeddedResource>
- <EmbeddedResource Include="Editors\UDFEditor.resx">
+ <EmbeddedResource Include="..\..\..\Source\MySql.VisualStudio\Editors\UDFEditor.resx">
<DependentUpon>UDFEditor.cs</DependentUpon>
<SubType>Designer</SubType>
+ <Link>Editors\UDFEditor.resx</Link>
</EmbeddedResource>
- <EmbeddedResource Include="WebConfig\ConnectionStringEditorDlg.resx">
+ <EmbeddedResource Include="..\..\..\Source\MySql.VisualStudio\WebConfig\ConnectionStringEditorDlg.resx">
<DependentUpon>ConnectionStringEditorDlg.cs</DependentUpon>
+ <Link>WebConfig\ConnectionStringEditorDlg.resx</Link>
</EmbeddedResource>
- <EmbeddedResource Include="WebConfig\MembershipOptionsDlg.resx">
+ <EmbeddedResource Include="..\..\..\Source\MySql.VisualStudio\WebConfig\MembershipOptionsDlg.resx">
<DependentUpon>MembershipOptionsDlg.cs</DependentUpon>
+ <Link>WebConfig\MembershipOptionsDlg.resx</Link>
</EmbeddedResource>
- <EmbeddedResource Include="WebConfig\WebConfigDlg.resx">
+ <EmbeddedResource Include="..\..\..\Source\MySql.VisualStudio\WebConfig\WebConfigDlg.resx">
<DependentUpon>WebConfigDlg.cs</DependentUpon>
+ <Link>WebConfig\WebConfigDlg.resx</Link>
</EmbeddedResource>
- <None Include="Resources\ArrowKey.bmp" />
- <None Include="Resources\Key.bmp" />
- <None Include="Resources\bannrbmp.bmp" />
- <None Include="Resources\sql_editor_connect.bmp" />
- <None Include="Resources\sql_editor_runsql.bmp" />
- <None Include="Resources\sql_editor_validatesql.bmp" />
- <None Include="Resources\sql_editor_executionplan.bmp" />
- <None Include="Resources\sql_editor_banner.bmp" />
- <None Include="Resources\sql_editor_disconnect.bmp" />
- <Content Include="Templates\MySQL Script.mysql">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
- <Content Include="Templates\MySqlDataProviderPackage.vsdir">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
- <None Include="Resources\401.ico" />
- <Content Include="Resources\icon.bmp" />
- <Content Include="Resources\Package.ico" />
+ <None Include="..\..\..\Source\MySql.VisualStudio\Resources\ArrowKey.bmp">
+ <Link>Resources\ArrowKey.bmp</Link>
+ </None>
+ <None Include="..\..\..\Source\MySql.VisualStudio\Resources\Key.bmp">
+ <Link>Resources\Key.bmp</Link>
+ </None>
+ <None Include="..\..\..\Source\MySql.VisualStudio\Resources\bannrbmp.bmp">
+ <Link>Resources\bannrbmp.bmp</Link>
+ </None>
+ <None Include="..\..\..\Source\MySql.VisualStudio\Resources\sql_editor_connect.bmp">
+ <Link>Resources\sql_editor_connect.bmp</Link>
+ </None>
+ <None Include="..\..\..\Source\MySql.VisualStudio\Resources\sql_editor_runsql.bmp">
+ <Link>Resources\sql_editor_runsql.bmp</Link>
+ </None>
+ <None Include="..\..\..\Source\MySql.VisualStudio\Resources\sql_editor_validatesql.bmp">
+ <Link>Resources\sql_editor_validatesql.bmp</Link>
+ </None>
+ <None Include="..\..\..\Source\MySql.VisualStudio\Resources\sql_editor_executionplan.bmp">
+ <Link>Resources\sql_editor_executionplan.bmp</Link>
+ </None>
+ <None Include="..\..\..\Source\MySql.VisualStudio\Resources\sql_editor_banner.bmp">
+ <Link>Resources\sql_editor_banner.bmp</Link>
+ </None>
+ <None Include="..\..\..\Source\MySql.VisualStudio\Resources\sql_editor_disconnect.bmp">
+ <Link>Resources\sql_editor_disconnect.bmp</Link>
+ </None>
+ <Content Include="..\..\..\Source\MySql.VisualStudio\Templates\MySQL Script.mysql">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ <Link>Templates\MySQL Script.mysql</Link>
+ </Content>
+ <Content Include="..\..\..\Source\MySql.VisualStudio\Templates\MySqlDataProviderPackage.vsdir">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ <Link>Templates\MySqlDataProviderPackage.vsdir</Link>
+ </Content>
+ <None Include="..\..\..\Source\MySql.VisualStudio\Resources\401.ico">
+ <Link>Resources\401.ico</Link>
+ </None>
+ <Content Include="..\..\..\Source\MySql.VisualStudio\Resources\icon.bmp">
+ <Link>Resources\icon.bmp</Link>
+ </Content>
+ <Content Include="..\..\..\Source\MySql.VisualStudio\Resources\Package.ico">
+ <Link>Resources\Package.ico</Link>
+ </Content>
</ItemGroup>
<ItemGroup>
- <VSCTCompile Include="PkgCmd.vsct">
+ <VSCTCompile Include="..\..\..\Source\MySql.VisualStudio\PkgCmd.vsct">
<ResourceName>1000</ResourceName>
</VSCTCompile>
</ItemGroup>
<ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
- <Visible>False</Visible>
- <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\MySql.Data\Provider\MySql.Data.csproj">
+ <ProjectReference Include="..\MySql.Data\MySql.Data.csproj">
<Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
<Name>MySql.Data</Name>
</ProjectReference>
=== added directory 'VS2008/Source/MySql.VisualStudio/Nodes'
=== added directory 'VS2008/Source/MySql.VisualStudio/Properties'
=== added directory 'VS2008/Source/MySql.VisualStudio/Resources'
=== added directory 'VS2008/Source/MySql.VisualStudio/Templates'
=== added directory 'VS2008/Source/MySql.VisualStudio/WebConfig'
=== added directory 'VS2008/Source/MySql.Web'
=== added file 'VS2008/Source/MySql.Web/MySql.Web.csproj'
--- a/VS2008/Source/MySql.Web/MySql.Web.csproj 1970-01-01 00:00:00 +0000
+++ b/VS2008/Source/MySql.Web/MySql.Web.csproj 2011-06-21 18:51:27 +0000
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{C28B1166-1380-445D-AEC1-8A18B990DD18}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>MySql.Web</RootNamespace>
+ <AssemblyName>MySql.Web</AssemblyName>
+ <SignAssembly>false</SignAssembly>
+ <AssemblyOriginatorKeyFile>
+ </AssemblyOriginatorKeyFile>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <TargetFrameworkProfile />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <NoWarn>1699</NoWarn>
+ <DocumentationFile>
+ </DocumentationFile>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <NoWarn>1699</NoWarn>
+ <DocumentationFile>bin\release\webdocs.xml</DocumentationFile>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.configuration" />
+ <Reference Include="System.Configuration.Install" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Management" />
+ <Reference Include="System.Web" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\..\..\Source\MySql.Data\Properties\VersionInfo.cs">
+ <Link>Properties\VersionInfo.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Web\Properties\AssemblyInfo.cs">
+ <Link>Properties\AssemblyInfo.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Web\Properties\Resources.Designer.cs">
+ <DependentUpon>Resources.resx</DependentUpon>
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <Link>Properties\Resources.Designer.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Web\Application.cs" />
+ <Compile Include="..\..\..\Source\MySql.Web\Install.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="..\..\..\Source\MySql.Web\ProfileProvider.cs" />
+ <Compile Include="..\..\..\Source\MySql.Web\MembershipProvider.cs" />
+ <Compile Include="..\..\..\Source\MySql.Web\RoleProvider.cs" />
+ <Compile Include="..\..\..\Source\MySql.Web\Runtime.cs" />
+ <Compile Include="..\..\..\Source\MySql.Web\SchemaManager.cs" />
+ <Compile Include="..\..\..\Source\MySql.Web\SessionProvider.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="..\..\..\Source\MySql.Web\Properties\Resources.resx">
+ <SubType>Designer</SubType>
+ <Generator>PublicResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <Link>Properties\Resources.resx</Link>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\Source\MySql.Web\Properties\schema6.sql">
+ <Link>Properties\schema6.sql</Link>
+ </None>
+ <None Include="..\..\..\Source\MySql.Web\Properties\schema1.sql">
+ <Link>Properties\schema1.sql</Link>
+ </None>
+ <None Include="..\..\..\Source\MySql.Web\Properties\schema4.sql">
+ <Link>Properties\schema4.sql</Link>
+ </None>
+ <None Include="..\..\..\Source\MySql.Web\Properties\schema2.sql">
+ <Link>Properties\schema2.sql</Link>
+ </None>
+ <None Include="..\..\..\Source\MySql.Web\Properties\schema3.sql">
+ <Link>Properties\schema3.sql</Link>
+ </None>
+ <None Include="..\..\..\Source\MySql.Web\Properties\schema5.sql">
+ <Link>Properties\schema5.sql</Link>
+ </None>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\MySql.Data\MySql.Data.csproj">
+ <Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
+ <Name>MySql.Data</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
=== added directory 'VS2008/Source/MySql.Web/Properties'
=== added directory 'VS2008/Tests'
=== added directory 'VS2008/Tests/MySql.Data.CF.Tests'
=== renamed file 'MySql.Data/Tests/MySql.Data.CF.Tests.csproj' => 'VS2008/Tests/MySql.Data.CF.Tests/MySql.Data.CF.Tests.csproj'
--- a/MySql.Data/Tests/MySql.Data.CF.Tests.csproj 2011-05-11 13:22:29 +0000
+++ b/VS2008/Tests/MySql.Data.CF.Tests/MySql.Data.CF.Tests.csproj 2011-06-21 18:51:27 +0000
@@ -60,48 +60,50 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Source\AsyncTests.cs" />
- <Compile Include="Source\BaseTest.cs" />
- <Compile Include="Source\BlobTests.cs" />
- <Compile Include="Source\CharacterSetTests.cs" />
- <Compile Include="Source\CommandBuilderTests.cs" />
- <Compile Include="Source\CommandTests.cs" />
- <Compile Include="Source\ConnectionStringBuilder.cs" />
- <Compile Include="Source\ConnectionTests.cs">
- <SubType>Code</SubType>
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\Properties\AssemblyInfo.cs">
+ <Link>Properties\AssemblyInfo.cs</Link>
</Compile>
- <Compile Include="Source\CultureTests.cs" />
- <Compile Include="Source\DataAdapterTests.cs" />
- <Compile Include="Source\DataReaderTests.cs" />
- <Compile Include="Source\DataTypeTests.cs" />
- <Compile Include="Source\DateTimeTests.cs" />
- <Compile Include="Source\EventTests.cs" />
- <Compile Include="Source\ExceptionTests.cs" />
- <Compile Include="Source\GetSchemaTests.cs" />
- <Compile Include="Source\InterfaceTests.cs" />
- <Compile Include="Source\LanguageTests.cs" />
- <Compile Include="Source\ParameterTests.cs" />
- <Compile Include="Source\PoolingTests.cs" />
- <Compile Include="Source\PreparedStatements.cs" />
- <Compile Include="Source\ProcedureParameters.cs" />
- <Compile Include="Source\SimpleTransactions.cs" />
- <Compile Include="Source\StoredProcedure.cs" />
- <Compile Include="Source\StressTests.cs" />
- <Compile Include="Source\Syntax.cs" />
- <Compile Include="Source\Syntax2.cs" />
- <Compile Include="Source\TimeoutAndCancel.cs" />
- <Compile Include="Source\Utils.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Provider\MySql.Data.CF.csproj">
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\AsyncTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\BaseTest.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\BlobTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\CharacterSetTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\CommandBuilderTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\CommandTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\ConnectionStringBuilder.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\ConnectionTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\CultureTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\DataAdapterTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\DataReaderTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\DataTypeTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\DateTimeTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\EventTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\ExceptionTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\GetSchemaTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\InterfaceTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\LanguageTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\ParameterTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\PoolingTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\PreparedStatements.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\ProcedureParameters.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\SimpleTransactions.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\StoredProcedure.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\StressTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\Syntax.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\Syntax2.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\TimeoutAndCancel.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\Utils.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="..\..\..\Tests\MySql.Data.Tests\Properties\Setup.sql">
+ <Link>Properties\Setup.sql</Link>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Source\MySql.Data\MySql.Data.CF.csproj">
<Project>{587A47FB-C1CC-459D-93B6-179D95E41EFB}</Project>
<Name>MySql.Data.CF</Name>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Properties\Setup.sql" />
- </ItemGroup>
<Import Condition="'$(TargetFrameworkVersion)' == 'v1.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.v1.targets" />
<Import Condition="'$(TargetFrameworkVersion)' == 'v2.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
<ProjectExtensions>
=== added directory 'VS2008/Tests/MySql.Data.Entity.Tests'
=== added file 'VS2008/Tests/MySql.Data.Entity.Tests/MySql.Data.Entity.Tests.csproj'
--- a/VS2008/Tests/MySql.Data.Entity.Tests/MySql.Data.Entity.Tests.csproj 1970-01-01 00:00:00 +0000
+++ b/VS2008/Tests/MySql.Data.Entity.Tests/MySql.Data.Entity.Tests.csproj 2011-06-21 18:51:27 +0000
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{D37B3572-767F-4622-A835-844B0EBEFD5B}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>MySql.Data.Entity.Tests</RootNamespace>
+ <AssemblyName>MySql.Data.Entity.Tests</AssemblyName>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="nunit.framework" />
+ <Reference Include="System" />
+ <Reference Include="System.Configuration" />
+ <Reference Include="System.Core">
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
+ <Reference Include="System.Data.Entity">
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
+ <Reference Include="System.Data" />
+ <Reference Include="System.Data.Entity.Design">
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
+ <Reference Include="System.Data.Linq">
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
+ <Reference Include="System.Runtime.Serialization">
+ <RequiredTargetFramework>3.0</RequiredTargetFramework>
+ </Reference>
+ <Reference Include="System.Security" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\..\..\Source\MySql.Data\Properties\VersionInfo.cs">
+ <Link>Properties\VersionInfo.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\BaseEdmTest.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\AggregateOperators.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\CanonicalFunctions.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\DataTypeTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\Model1.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Model1.edmx</DependentUpon>
+ </Compile>
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\ProviderServicesTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\ProceduresAndFunctions.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\JoinTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\SchemaInformation.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\TestModel.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>TestModel.edmx</DependentUpon>
+ </Compile>
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\Wizard.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\RelationalOperators.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\SetOperators.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\Paging.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\OrderingAndGrouping.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\InsertTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\UpdateTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\DeleteTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\RestrictionOperators.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Entity.Tests\Properties\AssemblyInfo.cs">
+ <Link>Properties\AssemblyInfo.cs</Link>
+ </Compile>
+ <Compile Include="Properties\SQLSyntax.Designer.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\Tests\MySql.Data.Entity.Tests\App.Config" />
+ <EmbeddedResource Include="..\..\..\Tests\MySql.Data.Entity.Tests\Properties\procs.sql">
+ <Link>Properties\procs.sql</Link>
+ </EmbeddedResource>
+ <EmbeddedResource Include="..\..\..\Tests\MySql.Data.Entity.Tests\Properties\schema.sql">
+ <Link>Properties\schema.sql</Link>
+ </EmbeddedResource>
+ <EmbeddedResource Include="..\..\..\Tests\MySql.Data.Entity.Tests\Properties\Resources.resx">
+ <SubType>Designer</SubType>
+ <Link>Properties\Resources.resx</Link>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Properties\SQLSyntax.resx" />
+ <EntityDeploy Include="..\..\..\Tests\MySql.Data.Entity.Tests\Model1.edmx">
+ <Generator>EntityModelCodeGenerator</Generator>
+ <LastGenOutput>Model1.Designer.cs</LastGenOutput>
+ </EntityDeploy>
+ </ItemGroup>
+ <ItemGroup>
+ <EntityDeploy Include="..\..\..\Tests\MySql.Data.Entity.Tests\TestModel.edmx">
+ <Generator>EntityModelCodeGenerator</Generator>
+ <LastGenOutput>TestModel.Designer.cs</LastGenOutput>
+ </EntityDeploy>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Source\MySql.Data.Entity\MySql.Data.Entity.csproj">
+ <Project>{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}</Project>
+ <Name>MySql.Data.Entity</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Source\MySql.Data\MySql.Data.csproj">
+ <Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
+ <Name>MySql.Data</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\MySql.Data.Tests\MySql.Data.Tests.csproj">
+ <Project>{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}</Project>
+ <Name>MySql.Data.Tests</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
=== added directory 'VS2008/Tests/MySql.Data.Entity.Tests/Properties'
=== added file 'VS2008/Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.Designer.cs'
--- a/VS2008/Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.Designer.cs 1970-01-01 00:00:00 +0000
+++ b/VS2008/Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.Designer.cs 2011-06-21 18:51:27 +0000
@@ -0,0 +1,855 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:2.0.50727.5444
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MySql.Data.Entity.Tests.Properties {
+ using System;
+
+
+ /// <summary>
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ /// </summary>
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class SQLSyntax {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal SQLSyntax() {
+ }
+
+ /// <summary>
+ /// Returns the cached ResourceManager instance used by this class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MySql.Data.Entity.Tests.Properties.SQLSyntax", typeof(SQLSyntax).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ /// <summary>
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Extent1.Age
+ ///FROM Authors AS Extent1
+ /// WHERE NOT EXISTS(SELECT
+ ///1 AS C1
+ ///FROM Books AS Extent2
+ /// WHERE Extent1.Id = Extent2.Author_id).
+ /// </summary>
+ internal static string Any {
+ get {
+ return ResourceManager.GetString("Any", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///GroupBy1.A1 AS C1
+ ///FROM (SELECT
+ ///Avg(Extent1.MinAge) AS A1
+ ///FROM Toys AS Extent1) AS GroupBy1.
+ /// </summary>
+ internal static string AverageSimple {
+ get {
+ return ResourceManager.GetString("AverageSimple", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///GroupBy1.A1 AS C1
+ ///FROM (SELECT
+ ///Extent2.Id AS K1,
+ ///AVG(Extent1.Freight) AS A1
+ ///FROM Orders AS Extent1 LEFT OUTER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ /// GROUP BY
+ ///Extent2.Id) AS GroupBy1.
+ /// </summary>
+ internal static string AverageWithGrouping {
+ get {
+ return ResourceManager.GetString("AverageWithGrouping", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///GroupBy1.A1 AS C1
+ ///FROM (SELECT
+ ///Avg(Extent1.Freight) AS A1
+ ///FROM Orders AS Extent1 INNER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ /// WHERE Extent2.Id = 3) AS GroupBy1.
+ /// </summary>
+ internal static string AverageWithPredicate {
+ get {
+ return ResourceManager.GetString("AverageWithPredicate", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///GroupBy1.A1 AS C1
+ ///FROM (SELECT
+ ///Count(Extent1.Id) AS A1
+ ///FROM Toys AS Extent1) AS GroupBy1.
+ /// </summary>
+ internal static string BigCountSimple {
+ get {
+ return ResourceManager.GetString("BigCountSimple", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///1 AS C1,
+ ///GroupBy1.K1 AS Name,
+ ///GroupBy1.A1 AS C2
+ ///FROM (SELECT
+ ///Extent1.Name AS K1,
+ ///Extent1.DateBegan AS K2,
+ ///Extent1.NumEmployees AS K3,
+ ///COUNT(1) AS A1
+ ///FROM Companies AS Extent1
+ /// GROUP BY
+ ///Extent1.Name,
+ ///Extent1.DateBegan,
+ ///Extent1.NumEmployees) AS GroupBy1.
+ /// </summary>
+ internal static string CanGroupByMultipleColumns {
+ get {
+ return ResourceManager.GetString("CanGroupByMultipleColumns", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///1 AS C1,
+ ///GroupBy1.K1 AS Name,
+ ///GroupBy1.A1 AS C2
+ ///FROM (SELECT
+ ///Extent1.Name AS K1,
+ ///COUNT(1) AS A1
+ ///FROM Companies AS Extent1
+ /// GROUP BY
+ ///Extent1.Name) AS GroupBy1.
+ /// </summary>
+ internal static string CanGroupBySingleColumn {
+ get {
+ return ResourceManager.GetString("CanGroupBySingleColumn", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///GroupBy1.A1 AS C1
+ ///FROM (SELECT
+ ///Count(Extent1.Id) AS A1
+ ///FROM Toys AS Extent1) AS GroupBy1.
+ /// </summary>
+ internal static string CountSimple {
+ get {
+ return ResourceManager.GetString("CountSimple", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///GroupBy1.A1 AS C1
+ ///FROM (SELECT
+ ///Count(Extent1.Id) AS A1
+ ///FROM Toys AS Extent1
+ /// WHERE Extent1.MinAge > 3) AS GroupBy1.
+ /// </summary>
+ internal static string CountWithPredicate {
+ get {
+ return ResourceManager.GetString("CountWithPredicate", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///Project1.Id,
+ ///Project1.Name,
+ ///Project1.DateBegan,
+ ///Project1.NumEmployees,
+ ///Project1.C1,
+ ///Project1.Address,
+ ///Project1.City,
+ ///Project1.State,
+ ///Project1.ZipCode
+ ///FROM (SELECT
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Extent1.DateBegan,
+ ///Extent1.NumEmployees,
+ ///Extent1.Address,
+ ///Extent1.City,
+ ///Extent1.State,
+ ///Extent1.ZipCode,
+ ///1 AS C1
+ ///FROM Companies AS Extent1) AS Project1
+ /// WHERE EXISTS(SELECT
+ ///1 AS C1
+ ///FROM Toys AS Extent2
+ /// WHERE (Project1.Id = Extent2.SupplierId) AND (Extent2.MinAge < 4)).
+ /// </summary>
+ internal static string Exists {
+ get {
+ return ResourceManager.GetString("Exists", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///1 AS C1,
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Join1.Id AS C2,
+ ///Join1.Name AS C3,
+ ///Join1.Id1 AS C4,
+ ///Join1.Name1 AS C5
+ ///FROM Companies AS Extent1 INNER JOIN (SELECT
+ ///UnionAll1.Id,
+ ///UnionAll1.Name,
+ ///UnionAll2.Id AS Id1,
+ ///UnionAll2.Name AS Name1
+ ///FROM (SELECT
+ ///Extent2.Id,
+ ///Extent2.Name
+ ///FROM Toys AS Extent2 UNION ALL SELECT
+ ///Extent3.Id,
+ ///Extent3.Name
+ ///FROM Stores AS Extent3) AS UnionAll1 INNER JOIN (SELECT
+ ///Extent4.Id,
+ ///Extent4.Name
+ ///FROM Authors AS Extent4 UNION ALL SELECT
+ ///Extent5.Id,
+ ///Extent5.N [rest of string was truncated]";.
+ /// </summary>
+ internal static string JoinOfUnionsOnRightSideOfJoin {
+ get {
+ return ResourceManager.GetString("JoinOfUnionsOnRightSideOfJoin", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///Extent1.Id,
+ ///Extent1.EmployeeID,
+ ///Extent1.LastName,
+ ///Extent1.FirstName,
+ ///Extent1.BirthTime,
+ ///Extent1.Weight,
+ ///Extent1.LastModified
+ ///FROM EmployeeChildren AS Extent1 INNER JOIN (SELECT
+ ///Extent2.Id,
+ ///Extent2.LastName,
+ ///Extent2.FirstName,
+ ///Extent2.Age,
+ ///Extent3.EmployeeId,
+ ///Extent3.Salary
+ ///FROM Employees AS Extent2 LEFT OUTER JOIN SalariedEmployees AS Extent3 ON Extent2.Id = Extent3.EmployeeId) AS Join1 ON (Extent1.EmployeeID = Join1.Id) OR ((Extent1.EmployeeID IS NULL) AND (Join1.Id IS NU [rest of string was truncated]";.
+ /// </summary>
+ internal static string JoinOnRightSideAsDerivedTable {
+ get {
+ return ResourceManager.GetString("JoinOnRightSideAsDerivedTable", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///1 AS C1,
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Join1.Id AS Id1,
+ ///Join1.Name AS Name1,
+ ///Join1.Id1 AS Id2,
+ ///Join1.Name1 AS Name2
+ ///FROM Companies AS Extent1 INNER JOIN (SELECT
+ ///Extent2.Id,
+ ///Extent2.Name,
+ ///Extent2.Age,
+ ///Extent3.Id AS Id1,
+ ///Extent3.Name AS Name1,
+ ///Extent3.Pages,
+ ///Extent3.Author_id,
+ ///Extent3.Publisher_id
+ ///FROM Authors AS Extent2 INNER JOIN Books AS Extent3 ON Extent2.Id = Extent3.Id) AS Join1 ON Extent1.Id = Join1.Id.
+ /// </summary>
+ internal static string JoinOnRightSideNameClash {
+ get {
+ return ResourceManager.GetString("JoinOnRightSideNameClash", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Extent1.Address,
+ ///Extent1.City,
+ ///Extent1.State,
+ ///Extent1.ZipCode
+ ///FROM Stores AS Extent1 INNER JOIN (SELECT
+ ///MAX(Extent3.Id) AS A1
+ ///FROM Orders AS Extent2 LEFT OUTER JOIN Stores AS Extent3 ON Extent2.StoreId = Extent3.Id) AS GroupBy1 ON Extent1.Id = GroupBy1.A1.
+ /// </summary>
+ internal static string MaxInSubQuery1 {
+ get {
+ return ResourceManager.GetString("MaxInSubQuery1", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Extent1.Address,
+ ///Extent1.City,
+ ///Extent1.State,
+ ///Extent1.ZipCode
+ ///FROM Stores AS Extent1 INNER JOIN (SELECT
+ ///MAX(Extent3.Id) AS A1
+ ///FROM Orders AS Extent2 LEFT OUTER JOIN Stores AS Extent3 ON Extent2.StoreId = Extent3.Id) AS GroupBy1 ON Extent1.Id = GroupBy1.A1.
+ /// </summary>
+ internal static string MaxInSubQuery2 {
+ get {
+ return ResourceManager.GetString("MaxInSubQuery2", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///GroupBy1.A1 AS C1
+ ///FROM (SELECT
+ ///Max(Extent1.MinAge) AS A1
+ ///FROM Toys AS Extent1) AS GroupBy1.
+ /// </summary>
+ internal static string MaxSimple {
+ get {
+ return ResourceManager.GetString("MaxSimple", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///GroupBy1.A1 AS C1
+ ///FROM (SELECT
+ ///Extent2.Id AS K1,
+ ///MAX(Extent1.Freight) AS A1
+ ///FROM Orders AS Extent1 LEFT OUTER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ /// GROUP BY
+ ///Extent2.Id) AS GroupBy1.
+ /// </summary>
+ internal static string MaxWithGrouping {
+ get {
+ return ResourceManager.GetString("MaxWithGrouping", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///1 AS C1,
+ ///GroupBy1.A1 AS C2
+ ///FROM (SELECT
+ ///Max(Extent1.Freight) AS A1
+ ///FROM Orders AS Extent1 INNER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ /// WHERE Extent2.Id = 1) AS GroupBy1.
+ /// </summary>
+ internal static string MaxWithPredicate {
+ get {
+ return ResourceManager.GetString("MaxWithPredicate", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///GroupBy1.A1 AS C1
+ ///FROM (SELECT
+ ///Min(Extent1.MinAge) AS A1
+ ///FROM Toys AS Extent1) AS GroupBy1.
+ /// </summary>
+ internal static string MinSimple {
+ get {
+ return ResourceManager.GetString("MinSimple", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///GroupBy1.A1 AS C1
+ ///FROM (SELECT
+ ///Extent2.Id AS K1,
+ ///MIN(Extent1.Freight) AS A1
+ ///FROM Orders AS Extent1 LEFT OUTER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ /// GROUP BY
+ ///Extent2.Id) AS GroupBy1.
+ /// </summary>
+ internal static string MinWithGrouping {
+ get {
+ return ResourceManager.GetString("MinWithGrouping", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///1 AS C1,
+ ///GroupBy1.A1 AS C2
+ ///FROM (SELECT
+ ///Min(Extent1.Freight) AS A1
+ ///FROM Orders AS Extent1 INNER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ /// WHERE Extent2.Id = 2) AS GroupBy1.
+ /// </summary>
+ internal static string MinWithPredicate {
+ get {
+ return ResourceManager.GetString("MinWithPredicate", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///Project1.Id,
+ ///Project1.Name,
+ ///Project1.DateBegan,
+ ///Project1.NumEmployees,
+ ///Project1.C1,
+ ///Project1.Address,
+ ///Project1.City,
+ ///Project1.State,
+ ///Project1.ZipCode
+ ///FROM (SELECT
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Extent1.DateBegan,
+ ///Extent1.NumEmployees,
+ ///Extent1.Address,
+ ///Extent1.City,
+ ///Extent1.State,
+ ///Extent1.ZipCode,
+ ///1 AS C1
+ ///FROM Companies AS Extent1) AS Project1
+ /// ORDER BY
+ ///Project1.Name ASC.
+ /// </summary>
+ internal static string OrderBySimple {
+ get {
+ return ResourceManager.GetString("OrderBySimple", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///Project1.Id,
+ ///Project1.Name,
+ ///Project1.DateBegan,
+ ///Project1.NumEmployees,
+ ///Project1.C1,
+ ///Project1.Address,
+ ///Project1.City,
+ ///Project1.State,
+ ///Project1.ZipCode
+ ///FROM (SELECT
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Extent1.DateBegan,
+ ///Extent1.NumEmployees,
+ ///Extent1.Address,
+ ///Extent1.City,
+ ///Extent1.State,
+ ///Extent1.ZipCode,
+ ///1 AS C1
+ ///FROM Companies AS Extent1
+ /// WHERE Extent1.NumEmployees > 100) AS Project1
+ /// ORDER BY
+ ///Project1.Name ASC.
+ /// </summary>
+ internal static string OrderByWithPredicate {
+ get {
+ return ResourceManager.GetString("OrderByWithPredicate", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///1 AS C1,
+ ///Extent1.LastName
+ ///FROM Employees AS Extent1 LEFT OUTER JOIN SalariedEmployees AS Extent2 ON Extent1.Id = Extent2.EmployeeId
+ /// WHERE Extent1.Age > 20.
+ /// </summary>
+ internal static string SelectWithComplexType {
+ get {
+ return ResourceManager.GetString("SelectWithComplexType", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///1 AS C1,
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Extent2.Name AS Name1
+ ///FROM Books AS Extent1 INNER JOIN Authors AS Extent2 ON (Extent1.Author_id = Extent2.Id) OR ((Extent1.Author_id IS NULL) AND (Extent2.Id IS NULL)).
+ /// </summary>
+ internal static string SimpleJoin {
+ get {
+ return ResourceManager.GetString("SimpleJoin", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///1 AS C1,
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Extent2.Name AS Name1
+ ///FROM Books AS Extent1 INNER JOIN Authors AS Extent2 ON (Extent1.Author_id = Extent2.Id) OR ((Extent1.Author_id IS NULL) AND (Extent2.Id IS NULL))
+ /// WHERE Extent1.Pages > 300.
+ /// </summary>
+ internal static string SimpleJoinWithPredicate {
+ get {
+ return ResourceManager.GetString("SimpleJoinWithPredicate", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///1 AS C1,
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Extent1.MinAge,
+ ///Extent1.SupplierId
+ ///FROM Toys AS Extent1.
+ /// </summary>
+ internal static string SimpleSelect {
+ get {
+ return ResourceManager.GetString("SimpleSelect", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///1 AS C1,
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Extent1.MinAge,
+ ///Extent1.SupplierId
+ ///FROM Toys AS Extent1
+ /// WHERE Extent1.MinAge = 4.
+ /// </summary>
+ internal static string SimpleSelectWithFilter {
+ get {
+ return ResourceManager.GetString("SimpleSelectWithFilter", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///1 AS C1,
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Extent1.MinAge,
+ ///Extent1.SupplierId
+ ///FROM Toys AS Extent1
+ /// WHERE Extent1.MinAge > @age.
+ /// </summary>
+ internal static string SimpleSelectWithParam {
+ get {
+ return ResourceManager.GetString("SimpleSelectWithParam", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///Project1.Id,
+ ///Project1.Name,
+ ///Project1.DateBegan,
+ ///Project1.NumEmployees,
+ ///Project1.C1,
+ ///Project1.Address,
+ ///Project1.City,
+ ///Project1.State,
+ ///Project1.ZipCode
+ ///FROM (SELECT
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Extent1.DateBegan,
+ ///Extent1.NumEmployees,
+ ///Extent1.Address,
+ ///Extent1.City,
+ ///Extent1.State,
+ ///Extent1.ZipCode,
+ ///1 AS C1
+ ///FROM Companies AS Extent1) AS Project1
+ /// ORDER BY
+ ///Project1.Id ASC LIMIT 3,18446744073709551615.
+ /// </summary>
+ internal static string Skip {
+ get {
+ return ResourceManager.GetString("Skip", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///Project1.Id,
+ ///Project1.Name,
+ ///Project1.DateBegan,
+ ///Project1.NumEmployees,
+ ///Project1.C1,
+ ///Project1.Address,
+ ///Project1.City,
+ ///Project1.State,
+ ///Project1.ZipCode
+ ///FROM (SELECT
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Extent1.DateBegan,
+ ///Extent1.NumEmployees,
+ ///Extent1.Address,
+ ///Extent1.City,
+ ///Extent1.State,
+ ///Extent1.ZipCode,
+ ///1 AS C1
+ ///FROM Companies AS Extent1) AS Project1
+ /// ORDER BY
+ ///Project1.Id ASC LIMIT 2,2.
+ /// </summary>
+ internal static string SkipAndTakeSimple {
+ get {
+ return ResourceManager.GetString("SkipAndTakeSimple", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///Project1.Id,
+ ///Project1.Name,
+ ///Project1.DateBegan,
+ ///Project1.NumEmployees,
+ ///Project1.C1,
+ ///Project1.Address,
+ ///Project1.City,
+ ///Project1.State,
+ ///Project1.ZipCode
+ ///FROM (SELECT
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Extent1.DateBegan,
+ ///Extent1.NumEmployees,
+ ///Extent1.Address,
+ ///Extent1.City,
+ ///Extent1.State,
+ ///Extent1.ZipCode,
+ ///1 AS C1
+ ///FROM Companies AS Extent1) AS Project1
+ /// ORDER BY
+ ///Project1.Name DESC LIMIT 2,2.
+ /// </summary>
+ internal static string SkipAndTakeWithOrdering {
+ get {
+ return ResourceManager.GetString("SkipAndTakeWithOrdering", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to .
+ /// </summary>
+ internal static string String1 {
+ get {
+ return ResourceManager.GetString("String1", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///GroupBy1.A1 AS C1
+ ///FROM (SELECT
+ ///Sum(Extent1.MinAge) AS A1
+ ///FROM Toys AS Extent1) AS GroupBy1.
+ /// </summary>
+ internal static string SumSimple {
+ get {
+ return ResourceManager.GetString("SumSimple", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///GroupBy1.A1 AS C1
+ ///FROM (SELECT
+ ///Extent2.Id AS K1,
+ ///SUM(Extent1.Freight) AS A1
+ ///FROM Orders AS Extent1 LEFT OUTER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ /// GROUP BY
+ ///Extent2.Id) AS GroupBy1.
+ /// </summary>
+ internal static string SumWithGrouping {
+ get {
+ return ResourceManager.GetString("SumWithGrouping", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///GroupBy1.A1 AS C1
+ ///FROM (SELECT
+ ///Sum(Extent1.Freight) AS A1
+ ///FROM Orders AS Extent1 INNER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ /// WHERE Extent2.Id = 2) AS GroupBy1.
+ /// </summary>
+ internal static string SumWithPredicate {
+ get {
+ return ResourceManager.GetString("SumWithPredicate", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///Limit1.Id,
+ ///Limit1.Name,
+ ///Limit1.DateBegan,
+ ///Limit1.NumEmployees,
+ ///Limit1.C1,
+ ///Limit1.Address,
+ ///Limit1.City,
+ ///Limit1.State,
+ ///Limit1.ZipCode
+ ///FROM (SELECT
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Extent1.DateBegan,
+ ///Extent1.NumEmployees,
+ ///Extent1.Address,
+ ///Extent1.City,
+ ///Extent1.State,
+ ///Extent1.ZipCode,
+ ///1 AS C1
+ ///FROM Companies AS Extent1 LIMIT 2) AS Limit1.
+ /// </summary>
+ internal static string Top {
+ get {
+ return ResourceManager.GetString("Top", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///UnionAll1.C1,
+ ///UnionAll1.Id AS C2,
+ ///UnionAll1.Name AS C3
+ ///FROM (SELECT
+ ///1 AS C1,
+ ///Extent1.Id,
+ ///Extent1.Name
+ ///FROM Toys AS Extent1 UNION ALL SELECT
+ ///1 AS C1,
+ ///Extent2.Id,
+ ///Extent2.Name
+ ///FROM Companies AS Extent2) AS UnionAll1.
+ /// </summary>
+ internal static string UnionAll {
+ get {
+ return ResourceManager.GetString("UnionAll", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Extent1.DateBegan,
+ ///Extent1.NumEmployees,
+ ///1 AS C1,
+ ///Extent1.Address,
+ ///Extent1.City,
+ ///Extent1.State,
+ ///Extent1.ZipCode
+ ///FROM Companies AS Extent1
+ /// WHERE Extent1.City = @gp1.
+ /// </summary>
+ internal static string WhereLiteralOnRelation {
+ get {
+ return ResourceManager.GetString("WhereLiteralOnRelation", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///1 AS C1,
+ ///Extent1.Id,
+ ///Extent1.Name,
+ ///Extent1.MinAge,
+ ///Extent1.SupplierId
+ ///FROM Toys AS Extent1 INNER JOIN Companies AS Extent2 ON Extent1.SupplierId = Extent2.Id
+ /// WHERE Extent2.State = @gp1.
+ /// </summary>
+ internal static string WhereWithRelatedEntities1 {
+ get {
+ return ResourceManager.GetString("WhereWithRelatedEntities1", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SELECT
+ ///1 AS C1,
+ ///Filter1.Id,
+ ///Filter1.Name,
+ ///Filter1.MinAge,
+ ///Filter1.SupplierId
+ ///FROM (SELECT
+ ///Extent1.Id,
+ ///Extent1.SupplierId,
+ ///Extent1.Name,
+ ///Extent1.MinAge,
+ ///Extent2.Id AS Id1,
+ ///Extent2.Name AS Name1,
+ ///Extent2.DateBegan,
+ ///Extent2.NumEmployees,
+ ///Extent2.Address,
+ ///Extent2.City,
+ ///Extent2.State,
+ ///Extent2.ZipCode
+ ///FROM Toys AS Extent1 LEFT OUTER JOIN Companies AS Extent2 ON Extent1.SupplierId = Extent2.Id
+ /// WHERE Extent2.State != @gp1) AS Filter1 LEFT OUTER JOIN Companies AS Extent3 ON Filter [rest of string was truncated]";.
+ /// </summary>
+ internal static string WhereWithRelatedEntities2 {
+ get {
+ return ResourceManager.GetString("WhereWithRelatedEntities2", resourceCulture);
+ }
+ }
+ }
+}
=== added file 'VS2008/Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.resx'
--- a/VS2008/Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.resx 1970-01-01 00:00:00 +0000
+++ b/VS2008/Tests/MySql.Data.Entity.Tests/Properties/SQLSyntax.resx 2011-06-21 18:51:27 +0000
@@ -0,0 +1,669 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="Any" xml:space="preserve">
+ <value>SELECT
+Extent1.Id,
+Extent1.Name,
+Extent1.Age
+FROM Authors AS Extent1
+ WHERE NOT EXISTS(SELECT
+1 AS C1
+FROM Books AS Extent2
+ WHERE Extent1.Id = Extent2.Author_id)</value>
+ </data>
+ <data name="AverageSimple" xml:space="preserve">
+ <value>SELECT
+GroupBy1.A1 AS C1
+FROM (SELECT
+Avg(Extent1.MinAge) AS A1
+FROM Toys AS Extent1) AS GroupBy1</value>
+ </data>
+ <data name="AverageWithGrouping" xml:space="preserve">
+ <value>SELECT
+GroupBy1.A1 AS C1
+FROM (SELECT
+Extent2.Id AS K1,
+AVG(Extent1.Freight) AS A1
+FROM Orders AS Extent1 LEFT OUTER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ GROUP BY
+Extent2.Id) AS GroupBy1</value>
+ </data>
+ <data name="AverageWithPredicate" xml:space="preserve">
+ <value>SELECT
+GroupBy1.A1 AS C1
+FROM (SELECT
+Avg(Extent1.Freight) AS A1
+FROM Orders AS Extent1 INNER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ WHERE Extent2.Id = 3) AS GroupBy1</value>
+ </data>
+ <data name="BigCountSimple" xml:space="preserve">
+ <value>SELECT
+GroupBy1.A1 AS C1
+FROM (SELECT
+Count(Extent1.Id) AS A1
+FROM Toys AS Extent1) AS GroupBy1</value>
+ </data>
+ <data name="CanGroupByMultipleColumns" xml:space="preserve">
+ <value>SELECT
+1 AS C1,
+GroupBy1.K1 AS Name,
+GroupBy1.A1 AS C2
+FROM (SELECT
+Extent1.Name AS K1,
+Extent1.DateBegan AS K2,
+Extent1.NumEmployees AS K3,
+COUNT(1) AS A1
+FROM Companies AS Extent1
+ GROUP BY
+Extent1.Name,
+Extent1.DateBegan,
+Extent1.NumEmployees) AS GroupBy1</value>
+ </data>
+ <data name="CanGroupBySingleColumn" xml:space="preserve">
+ <value>SELECT
+1 AS C1,
+GroupBy1.K1 AS Name,
+GroupBy1.A1 AS C2
+FROM (SELECT
+Extent1.Name AS K1,
+COUNT(1) AS A1
+FROM Companies AS Extent1
+ GROUP BY
+Extent1.Name) AS GroupBy1</value>
+ </data>
+ <data name="CountSimple" xml:space="preserve">
+ <value>SELECT
+GroupBy1.A1 AS C1
+FROM (SELECT
+Count(Extent1.Id) AS A1
+FROM Toys AS Extent1) AS GroupBy1</value>
+ </data>
+ <data name="CountWithPredicate" xml:space="preserve">
+ <value>SELECT
+GroupBy1.A1 AS C1
+FROM (SELECT
+Count(Extent1.Id) AS A1
+FROM Toys AS Extent1
+ WHERE Extent1.MinAge > 3) AS GroupBy1</value>
+ </data>
+ <data name="Exists" xml:space="preserve">
+ <value>SELECT
+Project1.Id,
+Project1.Name,
+Project1.DateBegan,
+Project1.NumEmployees,
+Project1.C1,
+Project1.Address,
+Project1.City,
+Project1.State,
+Project1.ZipCode
+FROM (SELECT
+Extent1.Id,
+Extent1.Name,
+Extent1.DateBegan,
+Extent1.NumEmployees,
+Extent1.Address,
+Extent1.City,
+Extent1.State,
+Extent1.ZipCode,
+1 AS C1
+FROM Companies AS Extent1) AS Project1
+ WHERE EXISTS(SELECT
+1 AS C1
+FROM Toys AS Extent2
+ WHERE (Project1.Id = Extent2.SupplierId) AND (Extent2.MinAge < 4))</value>
+ </data>
+ <data name="JoinOfUnionsOnRightSideOfJoin" xml:space="preserve">
+ <value>SELECT
+1 AS C1,
+Extent1.Id,
+Extent1.Name,
+Join1.Id AS C2,
+Join1.Name AS C3,
+Join1.Id1 AS C4,
+Join1.Name1 AS C5
+FROM Companies AS Extent1 INNER JOIN (SELECT
+UnionAll1.Id,
+UnionAll1.Name,
+UnionAll2.Id AS Id1,
+UnionAll2.Name AS Name1
+FROM (SELECT
+Extent2.Id,
+Extent2.Name
+FROM Toys AS Extent2 UNION ALL SELECT
+Extent3.Id,
+Extent3.Name
+FROM Stores AS Extent3) AS UnionAll1 INNER JOIN (SELECT
+Extent4.Id,
+Extent4.Name
+FROM Authors AS Extent4 UNION ALL SELECT
+Extent5.Id,
+Extent5.Name
+FROM Books AS Extent5) AS UnionAll2 ON UnionAll1.Id = UnionAll2.Id) AS Join1 ON Extent1.Id = Join1.Id</value>
+ </data>
+ <data name="JoinOnRightSideAsDerivedTable" xml:space="preserve">
+ <value>SELECT
+Extent1.Id,
+Extent1.EmployeeID,
+Extent1.LastName,
+Extent1.FirstName,
+Extent1.BirthTime,
+Extent1.Weight,
+Extent1.LastModified
+FROM EmployeeChildren AS Extent1 INNER JOIN (SELECT
+Extent2.Id,
+Extent2.LastName,
+Extent2.FirstName,
+Extent2.Age,
+Extent3.EmployeeId,
+Extent3.Salary
+FROM Employees AS Extent2 LEFT OUTER JOIN SalariedEmployees AS Extent3 ON Extent2.Id = Extent3.EmployeeId) AS Join1 ON (Extent1.EmployeeID = Join1.Id) OR ((Extent1.EmployeeID IS NULL) AND (Join1.Id IS NULL))
+ WHERE Extent1.Weight > 7</value>
+ </data>
+ <data name="JoinOnRightSideNameClash" xml:space="preserve">
+ <value>SELECT
+1 AS C1,
+Extent1.Id,
+Extent1.Name,
+Join1.Id AS Id1,
+Join1.Name AS Name1,
+Join1.Id1 AS Id2,
+Join1.Name1 AS Name2
+FROM Companies AS Extent1 INNER JOIN (SELECT
+Extent2.Id,
+Extent2.Name,
+Extent2.Age,
+Extent3.Id AS Id1,
+Extent3.Name AS Name1,
+Extent3.Pages,
+Extent3.Author_id,
+Extent3.Publisher_id
+FROM Authors AS Extent2 INNER JOIN Books AS Extent3 ON Extent2.Id = Extent3.Id) AS Join1 ON Extent1.Id = Join1.Id</value>
+ </data>
+ <data name="MaxInSubQuery1" xml:space="preserve">
+ <value>SELECT
+Extent1.Id,
+Extent1.Name,
+Extent1.Address,
+Extent1.City,
+Extent1.State,
+Extent1.ZipCode
+FROM Stores AS Extent1 INNER JOIN (SELECT
+MAX(Extent3.Id) AS A1
+FROM Orders AS Extent2 LEFT OUTER JOIN Stores AS Extent3 ON Extent2.StoreId = Extent3.Id) AS GroupBy1 ON Extent1.Id = GroupBy1.A1</value>
+ </data>
+ <data name="MaxInSubQuery2" xml:space="preserve">
+ <value>SELECT
+Extent1.Id,
+Extent1.Name,
+Extent1.Address,
+Extent1.City,
+Extent1.State,
+Extent1.ZipCode
+FROM Stores AS Extent1 INNER JOIN (SELECT
+MAX(Extent3.Id) AS A1
+FROM Orders AS Extent2 LEFT OUTER JOIN Stores AS Extent3 ON Extent2.StoreId = Extent3.Id) AS GroupBy1 ON Extent1.Id = GroupBy1.A1</value>
+ </data>
+ <data name="MaxSimple" xml:space="preserve">
+ <value>SELECT
+GroupBy1.A1 AS C1
+FROM (SELECT
+Max(Extent1.MinAge) AS A1
+FROM Toys AS Extent1) AS GroupBy1</value>
+ </data>
+ <data name="MaxWithGrouping" xml:space="preserve">
+ <value>SELECT
+GroupBy1.A1 AS C1
+FROM (SELECT
+Extent2.Id AS K1,
+MAX(Extent1.Freight) AS A1
+FROM Orders AS Extent1 LEFT OUTER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ GROUP BY
+Extent2.Id) AS GroupBy1</value>
+ </data>
+ <data name="MaxWithPredicate" xml:space="preserve">
+ <value>SELECT
+1 AS C1,
+GroupBy1.A1 AS C2
+FROM (SELECT
+Max(Extent1.Freight) AS A1
+FROM Orders AS Extent1 INNER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ WHERE Extent2.Id = 1) AS GroupBy1</value>
+ </data>
+ <data name="MinSimple" xml:space="preserve">
+ <value>SELECT
+GroupBy1.A1 AS C1
+FROM (SELECT
+Min(Extent1.MinAge) AS A1
+FROM Toys AS Extent1) AS GroupBy1</value>
+ </data>
+ <data name="MinWithGrouping" xml:space="preserve">
+ <value>SELECT
+GroupBy1.A1 AS C1
+FROM (SELECT
+Extent2.Id AS K1,
+MIN(Extent1.Freight) AS A1
+FROM Orders AS Extent1 LEFT OUTER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ GROUP BY
+Extent2.Id) AS GroupBy1</value>
+ </data>
+ <data name="MinWithPredicate" xml:space="preserve">
+ <value>SELECT
+1 AS C1,
+GroupBy1.A1 AS C2
+FROM (SELECT
+Min(Extent1.Freight) AS A1
+FROM Orders AS Extent1 INNER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ WHERE Extent2.Id = 2) AS GroupBy1</value>
+ </data>
+ <data name="OrderBySimple" xml:space="preserve">
+ <value>SELECT
+Project1.Id,
+Project1.Name,
+Project1.DateBegan,
+Project1.NumEmployees,
+Project1.C1,
+Project1.Address,
+Project1.City,
+Project1.State,
+Project1.ZipCode
+FROM (SELECT
+Extent1.Id,
+Extent1.Name,
+Extent1.DateBegan,
+Extent1.NumEmployees,
+Extent1.Address,
+Extent1.City,
+Extent1.State,
+Extent1.ZipCode,
+1 AS C1
+FROM Companies AS Extent1) AS Project1
+ ORDER BY
+Project1.Name ASC</value>
+ </data>
+ <data name="OrderByWithPredicate" xml:space="preserve">
+ <value>SELECT
+Project1.Id,
+Project1.Name,
+Project1.DateBegan,
+Project1.NumEmployees,
+Project1.C1,
+Project1.Address,
+Project1.City,
+Project1.State,
+Project1.ZipCode
+FROM (SELECT
+Extent1.Id,
+Extent1.Name,
+Extent1.DateBegan,
+Extent1.NumEmployees,
+Extent1.Address,
+Extent1.City,
+Extent1.State,
+Extent1.ZipCode,
+1 AS C1
+FROM Companies AS Extent1
+ WHERE Extent1.NumEmployees > 100) AS Project1
+ ORDER BY
+Project1.Name ASC</value>
+ </data>
+ <data name="SelectWithComplexType" xml:space="preserve">
+ <value>SELECT
+1 AS C1,
+Extent1.LastName
+FROM Employees AS Extent1 LEFT OUTER JOIN SalariedEmployees AS Extent2 ON Extent1.Id = Extent2.EmployeeId
+ WHERE Extent1.Age > 20</value>
+ </data>
+ <data name="SimpleJoin" xml:space="preserve">
+ <value>SELECT
+1 AS C1,
+Extent1.Id,
+Extent1.Name,
+Extent2.Name AS Name1
+FROM Books AS Extent1 INNER JOIN Authors AS Extent2 ON (Extent1.Author_id = Extent2.Id) OR ((Extent1.Author_id IS NULL) AND (Extent2.Id IS NULL))</value>
+ </data>
+ <data name="SimpleJoinWithPredicate" xml:space="preserve">
+ <value>SELECT
+1 AS C1,
+Extent1.Id,
+Extent1.Name,
+Extent2.Name AS Name1
+FROM Books AS Extent1 INNER JOIN Authors AS Extent2 ON (Extent1.Author_id = Extent2.Id) OR ((Extent1.Author_id IS NULL) AND (Extent2.Id IS NULL))
+ WHERE Extent1.Pages > 300</value>
+ </data>
+ <data name="SimpleSelect" xml:space="preserve">
+ <value>SELECT
+1 AS C1,
+Extent1.Id,
+Extent1.Name,
+Extent1.MinAge,
+Extent1.SupplierId
+FROM Toys AS Extent1</value>
+ </data>
+ <data name="SimpleSelectWithFilter" xml:space="preserve">
+ <value>SELECT
+1 AS C1,
+Extent1.Id,
+Extent1.Name,
+Extent1.MinAge,
+Extent1.SupplierId
+FROM Toys AS Extent1
+ WHERE Extent1.MinAge = 4</value>
+ </data>
+ <data name="SimpleSelectWithParam" xml:space="preserve">
+ <value>SELECT
+1 AS C1,
+Extent1.Id,
+Extent1.Name,
+Extent1.MinAge,
+Extent1.SupplierId
+FROM Toys AS Extent1
+ WHERE Extent1.MinAge > @age</value>
+ </data>
+ <data name="Skip" xml:space="preserve">
+ <value>SELECT
+Project1.Id,
+Project1.Name,
+Project1.DateBegan,
+Project1.NumEmployees,
+Project1.C1,
+Project1.Address,
+Project1.City,
+Project1.State,
+Project1.ZipCode
+FROM (SELECT
+Extent1.Id,
+Extent1.Name,
+Extent1.DateBegan,
+Extent1.NumEmployees,
+Extent1.Address,
+Extent1.City,
+Extent1.State,
+Extent1.ZipCode,
+1 AS C1
+FROM Companies AS Extent1) AS Project1
+ ORDER BY
+Project1.Id ASC LIMIT 3,18446744073709551615</value>
+ </data>
+ <data name="SkipAndTakeSimple" xml:space="preserve">
+ <value>SELECT
+Project1.Id,
+Project1.Name,
+Project1.DateBegan,
+Project1.NumEmployees,
+Project1.C1,
+Project1.Address,
+Project1.City,
+Project1.State,
+Project1.ZipCode
+FROM (SELECT
+Extent1.Id,
+Extent1.Name,
+Extent1.DateBegan,
+Extent1.NumEmployees,
+Extent1.Address,
+Extent1.City,
+Extent1.State,
+Extent1.ZipCode,
+1 AS C1
+FROM Companies AS Extent1) AS Project1
+ ORDER BY
+Project1.Id ASC LIMIT 2,2</value>
+ </data>
+ <data name="SkipAndTakeWithOrdering" xml:space="preserve">
+ <value>SELECT
+Project1.Id,
+Project1.Name,
+Project1.DateBegan,
+Project1.NumEmployees,
+Project1.C1,
+Project1.Address,
+Project1.City,
+Project1.State,
+Project1.ZipCode
+FROM (SELECT
+Extent1.Id,
+Extent1.Name,
+Extent1.DateBegan,
+Extent1.NumEmployees,
+Extent1.Address,
+Extent1.City,
+Extent1.State,
+Extent1.ZipCode,
+1 AS C1
+FROM Companies AS Extent1) AS Project1
+ ORDER BY
+Project1.Name DESC LIMIT 2,2</value>
+ </data>
+ <data name="String1" xml:space="preserve">
+ <value />
+ </data>
+ <data name="SumSimple" xml:space="preserve">
+ <value>SELECT
+GroupBy1.A1 AS C1
+FROM (SELECT
+Sum(Extent1.MinAge) AS A1
+FROM Toys AS Extent1) AS GroupBy1</value>
+ </data>
+ <data name="SumWithGrouping" xml:space="preserve">
+ <value>SELECT
+GroupBy1.A1 AS C1
+FROM (SELECT
+Extent2.Id AS K1,
+SUM(Extent1.Freight) AS A1
+FROM Orders AS Extent1 LEFT OUTER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ GROUP BY
+Extent2.Id) AS GroupBy1</value>
+ </data>
+ <data name="SumWithPredicate" xml:space="preserve">
+ <value>SELECT
+GroupBy1.A1 AS C1
+FROM (SELECT
+Sum(Extent1.Freight) AS A1
+FROM Orders AS Extent1 INNER JOIN Stores AS Extent2 ON Extent1.StoreId = Extent2.Id
+ WHERE Extent2.Id = 2) AS GroupBy1</value>
+ </data>
+ <data name="Top" xml:space="preserve">
+ <value>SELECT
+Limit1.Id,
+Limit1.Name,
+Limit1.DateBegan,
+Limit1.NumEmployees,
+Limit1.C1,
+Limit1.Address,
+Limit1.City,
+Limit1.State,
+Limit1.ZipCode
+FROM (SELECT
+Extent1.Id,
+Extent1.Name,
+Extent1.DateBegan,
+Extent1.NumEmployees,
+Extent1.Address,
+Extent1.City,
+Extent1.State,
+Extent1.ZipCode,
+1 AS C1
+FROM Companies AS Extent1 LIMIT 2) AS Limit1</value>
+ </data>
+ <data name="UnionAll" xml:space="preserve">
+ <value>SELECT
+UnionAll1.C1,
+UnionAll1.Id AS C2,
+UnionAll1.Name AS C3
+FROM (SELECT
+1 AS C1,
+Extent1.Id,
+Extent1.Name
+FROM Toys AS Extent1 UNION ALL SELECT
+1 AS C1,
+Extent2.Id,
+Extent2.Name
+FROM Companies AS Extent2) AS UnionAll1</value>
+ </data>
+ <data name="WhereLiteralOnRelation" xml:space="preserve">
+ <value>SELECT
+Extent1.Id,
+Extent1.Name,
+Extent1.DateBegan,
+Extent1.NumEmployees,
+1 AS C1,
+Extent1.Address,
+Extent1.City,
+Extent1.State,
+Extent1.ZipCode
+FROM Companies AS Extent1
+ WHERE Extent1.City = @gp1</value>
+ </data>
+ <data name="WhereWithRelatedEntities1" xml:space="preserve">
+ <value>SELECT
+1 AS C1,
+Extent1.Id,
+Extent1.Name,
+Extent1.MinAge,
+Extent1.SupplierId
+FROM Toys AS Extent1 INNER JOIN Companies AS Extent2 ON Extent1.SupplierId = Extent2.Id
+ WHERE Extent2.State = @gp1</value>
+ </data>
+ <data name="WhereWithRelatedEntities2" xml:space="preserve">
+ <value>SELECT
+1 AS C1,
+Filter1.Id,
+Filter1.Name,
+Filter1.MinAge,
+Filter1.SupplierId
+FROM (SELECT
+Extent1.Id,
+Extent1.SupplierId,
+Extent1.Name,
+Extent1.MinAge,
+Extent2.Id AS Id1,
+Extent2.Name AS Name1,
+Extent2.DateBegan,
+Extent2.NumEmployees,
+Extent2.Address,
+Extent2.City,
+Extent2.State,
+Extent2.ZipCode
+FROM Toys AS Extent1 LEFT OUTER JOIN Companies AS Extent2 ON Extent1.SupplierId = Extent2.Id
+ WHERE Extent2.State != @gp1) AS Filter1 LEFT OUTER JOIN Companies AS Extent3 ON Filter1.SupplierId = Extent3.Id
+ WHERE Extent3.State != @gp2</value>
+ </data>
+</root>
\ No newline at end of file
=== added directory 'VS2008/Tests/MySql.Data.Tests'
=== added file 'VS2008/Tests/MySql.Data.Tests/MySql.Data.Tests.csproj'
--- a/VS2008/Tests/MySql.Data.Tests/MySql.Data.Tests.csproj 1970-01-01 00:00:00 +0000
+++ b/VS2008/Tests/MySql.Data.Tests/MySql.Data.Tests.csproj 2011-06-21 18:51:27 +0000
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>MySql.Data.MySqlClient.Tests</RootNamespace>
+ <AssemblyName>MySql.Data.Tests</AssemblyName>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <TargetFrameworkProfile />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>TRACE;DEBUG;NUNIT</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <CodeAnalysisRules>
+ </CodeAnalysisRules>
+ <RunCodeAnalysis>false</RunCodeAnalysis>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="nunit.framework" />
+ <Reference Include="System" />
+ <Reference Include="System.Configuration" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Transactions" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\..\..\Source\MySql.Data\Properties\VersionInfo.cs">
+ <Link>Properties\VersionInfo.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\Properties\AssemblyInfo.cs">
+ <Link>Properties\AssemblyInfo.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\AsyncTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\BaseTest.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\BlobTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\CharacterSetTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\CommandBuilderTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\CommandTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\ConnectionStringBuilder.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\ConnectionTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\BulkLoading.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\OutputParameters.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\PartialTrustSandbox.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\SqlServerMode.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\Logging.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\ScriptExecution.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\SqlTokenizer.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\Tokenizer.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\CultureTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\DataAdapterTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\DataReaderTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\DataTypeTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\DateTimeTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\EventTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\ExceptionTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\GetSchemaTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\InterfaceTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\LanguageTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\ParameterTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\PerfMonTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\PoolingTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\PreparedStatements.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\ProcedureParameters.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\SimpleTransactions.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\StoredProcedure.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\StressTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\Syntax.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\Syntax2.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\Threading.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\TimeoutAndCancel.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\Transactions.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\UsageAdvisor.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Data.Tests\Utils.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\Tests\MySql.Data.Tests\client.pfx">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="..\..\..\Tests\MySql.Data.Tests\Properties\Setup.sql">
+ <Link>Properties\Setup.sql</Link>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Source\MySql.Data\MySql.Data.csproj">
+ <Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
+ <Name>MySql.Data</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
=== added directory 'VS2008/Tests/MySql.Data.Tests/Properties'
=== added directory 'VS2008/Tests/MySql.Web.Tests'
=== added file 'VS2008/Tests/MySql.Web.Tests/MySql.Web.Tests.csproj'
--- a/VS2008/Tests/MySql.Web.Tests/MySql.Web.Tests.csproj 1970-01-01 00:00:00 +0000
+++ b/VS2008/Tests/MySql.Web.Tests/MySql.Web.Tests.csproj 2011-06-21 18:51:27 +0000
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{83462D15-E576-4079-BBC9-9EE1CF0B24DD}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>MySql.Web.Tests</RootNamespace>
+ <AssemblyName>MySql.Web.Tests</AssemblyName>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <TargetFrameworkProfile />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="nunit.framework" />
+ <Reference Include="System" />
+ <Reference Include="System.Configuration" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Web" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\..\..\Source\MySql.Data\Properties\VersionInfo.cs">
+ <Link>Properties\VersionInfo.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Tests\MySql.Web.Tests\BaseTest.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Web.Tests\ProfileTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Web.Tests\RoleManagement.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Web.Tests\SchemaTests.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Web.Tests\Properties\AssemblyInfo.cs">
+ <Link>Properties\AssemblyInfo.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\Tests\MySql.Web.Tests\TestProfile.cs" />
+ <Compile Include="..\..\..\Tests\MySql.Web.Tests\UserManagement.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\Tests\MySql.Web.Tests\App.config" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Source\MySql.Data\MySql.Data.csproj">
+ <Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
+ <Name>MySql.Data</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Source\MySql.Web\MySql.Web.csproj">
+ <Project>{C28B1166-1380-445D-AEC1-8A18B990DD18}</Project>
+ <Name>MySql.Web</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\MySql.Data.Tests\MySql.Data.Tests.csproj">
+ <Project>{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}</Project>
+ <Name>MySql.Data.Tests</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
=== added directory 'VS2008/Tests/MySql.Web.Tests/Properties'
No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).| Thread |
|---|
| • bzr commit into connector-net-6.4 branch (reggie.burnett:1002) | Reggie Burnett | 21 Jun |
