#At file:///C:/work/connector-net/trunk/ based on revid:reggie.burnett@stripped
949 Reggie Burnett 2010-12-08 [merge]
merged
removed:
MySql.Data.Entity/Provider/MySql.Data.Entity.VS2010.csproj
MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.VS2010.csproj
MySql.Data/Tests/MySql.Data.Tests.VS2010.csproj
MySql.VisualStudio/MySql.VisualStudio.csproj
MySql.Web/Providers/MySql.Web.VS2010.csproj
MySql.Web/Tests/MySql.Web.Tests.VS2010.csproj
added:
MySql.VisualStudio/Targets/
MySql.VisualStudio/Targets/VS.targets
MySql.VisualStudio/Targets/VS2008.targets
MySql.VisualStudio/Targets/VS2010.targets
modified:
.bzrignore
MySQLClient-VS2010.sln
MySql.Data.Entity/Provider/EFMySqlDataReader.cs
MySql.Data.Entity/Provider/MySql.Data.Entity.csproj
MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.csproj
MySql.Data/Provider/MySql.Data.csproj
MySql.Data/Tests/MySql.Data.Tests.csproj
MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj
MySql.Web/Providers/MySql.Web.csproj
MySql.Web/Providers/Properties/Resources.Designer.cs
MySql.Web/Tests/MySql.Web.Tests.csproj
=== modified file '.bzrignore'
=== modified file '.bzrignore'
--- a/.bzrignore 2010-05-19 17:56:19 +0000
+++ b/.bzrignore 2010-12-06 21:35:13 +0000
@@ -16,3 +16,4 @@
**/bin-4.0
Documentation/Output
_UpgradeReport_Files
+VS.targets
=== modified file 'MySQLClient-VS2010.sln'
--- a/MySQLClient-VS2010.sln 2010-11-17 19:25:46 +0000
+++ b/MySQLClient-VS2010.sln 2010-12-06 21:35:13 +0000
@@ -1,21 +1,21 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity.VS2010", "MySql.Data.Entity\Provider\MySql.Data.Entity.VS2010.csproj", "{A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.VisualStudio.VS2010", "MySql.VisualStudio\MySql.VisualStudio.VS2010.csproj", "{DC3517FF-AC26-4755-9B7A-EF658FF69593}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer.VS2010", "Installer\Installer.VS2010.wixproj", "{F533FC43-6C05-4A64-8AF6-72B690EB06C3}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity.Tests.VS2010", "MySql.Data.Entity\Tests\MySql.Data.Entity.Tests.VS2010.csproj", "{77EC4E20-293A-48BA-8415-D0AD869D91FA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.VS2010", "MySql.Data\Provider\MySql.Data.VS2010.csproj", "{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Tests.VS2010", "MySql.Data\Tests\MySql.Data.Tests.VS2010.csproj", "{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Web.VS2010", "MySql.Web\Providers\MySql.Web.VS2010.csproj", "{C28B1166-1380-445D-AEC1-8A18B990DD18}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Web.Tests.VS2010", "MySql.Web\Tests\MySql.Web.Tests.VS2010.csproj", "{DC704374-EC50-4167-93AA-8D262136502E}"
+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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -27,6 +27,10 @@
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
@@ -35,32 +39,12 @@
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
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Commercial|Any CPU.Build.0 = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Commercial|x64.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Commercial|x86.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Debug|x64.ActiveCfg = Debug|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Debug|x86.ActiveCfg = Debug|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.GPL|Any CPU.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.GPL|Any CPU.Build.0 = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.GPL|x64.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.GPL|x86.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Release|Any CPU.Build.0 = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Release|x64.ActiveCfg = Release|Any CPU
- {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}.Release|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
@@ -73,6 +57,12 @@
{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-4.0|Any CPU
+ {DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|Any CPU.Build.0 = Debug-4.0|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
@@ -85,6 +75,12 @@
{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-4.0|Any CPU
+ {DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Any CPU.Build.0 = Release-4.0|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
{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.ActiveCfg = Commercial|x86
{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.Build.0 = Commercial|x86
{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Mixed Platforms.ActiveCfg = Commercial|x86
@@ -98,6 +94,12 @@
{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|Mixed Platforms.Build.0 = 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
@@ -110,30 +112,47 @@
{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
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Commercial|Any CPU.Build.0 = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Commercial|x64.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Commercial|x86.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Debug|x64.ActiveCfg = Debug|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Debug|x86.ActiveCfg = Debug|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.GPL|Any CPU.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.GPL|Any CPU.Build.0 = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.GPL|x64.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.GPL|x86.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Release|Any CPU.Build.0 = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Release|x64.ActiveCfg = Release|Any CPU
- {77EC4E20-293A-48BA-8415-D0AD869D91FA}.Release|x86.ActiveCfg = Release|Any CPU
+ {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
+ {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
+ {C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
+ {C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|x64.ActiveCfg = Release|Any CPU
+ {C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|x86.ActiveCfg = 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-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|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
+ {C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
+ {C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|x64.ActiveCfg = Release|Any CPU
+ {C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|x86.ActiveCfg = Release|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-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
@@ -146,6 +165,12 @@
{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|Any CPU
+ {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug-4.0|Mixed Platforms.Build.0 = Debug|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
@@ -158,6 +183,48 @@
{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|Any CPU
+ {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release-4.0|Mixed Platforms.Build.0 = Release|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
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Commercial|x64.ActiveCfg = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Commercial|x86.ActiveCfg = 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-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|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug-4.0|Mixed Platforms.Build.0 = Debug|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
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.GPL|x64.ActiveCfg = Release|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.GPL|x86.ActiveCfg = Release|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
+ {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|Any CPU
+ {83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Release-4.0|Mixed Platforms.Build.0 = Release|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
@@ -170,6 +237,12 @@
{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|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug-4.0|Mixed Platforms.Build.0 = Debug|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
@@ -182,54 +255,84 @@
{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
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|x64.ActiveCfg = Release|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|x86.ActiveCfg = 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}.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
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|x64.ActiveCfg = Release|Any CPU
- {C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|x86.ActiveCfg = Release|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
- {DC704374-EC50-4167-93AA-8D262136502E}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Commercial|Any CPU.Build.0 = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Commercial|x64.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Commercial|x86.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Debug|x64.ActiveCfg = Debug|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Debug|x86.ActiveCfg = Debug|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.GPL|Any CPU.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.GPL|Any CPU.Build.0 = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.GPL|x64.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.GPL|x86.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Release|Any CPU.Build.0 = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.Release|x64.ActiveCfg = Release|Any CPU
- {DC704374-EC50-4167-93AA-8D262136502E}.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|Any CPU
+ {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release-4.0|Mixed Platforms.Build.0 = Release|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
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Commercial|x64.ActiveCfg = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Commercial|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}.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|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug-4.0|Mixed Platforms.Build.0 = Debug|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
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.GPL|x64.ActiveCfg = Release|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.GPL|x86.ActiveCfg = Release|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
+ {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|Any CPU
+ {EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Release-4.0|Mixed Platforms.Build.0 = Release|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
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Commercial|x64.ActiveCfg = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Commercial|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}.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|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug-4.0|Mixed Platforms.Build.0 = Debug|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
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.GPL|x64.ActiveCfg = Release|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.GPL|x86.ActiveCfg = Release|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
+ {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|Any CPU
+ {D37B3572-767F-4622-A835-844B0EBEFD5B}.Release-4.0|Mixed Platforms.Build.0 = Release|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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
=== modified file 'MySql.Data.Entity/Provider/EFMySqlDataReader.cs'
--- a/MySql.Data.Entity/Provider/EFMySqlDataReader.cs 2010-08-18 19:48:34 +0000
+++ b/MySql.Data.Entity/Provider/EFMySqlDataReader.cs 2010-12-09 03:36:45 +0000
@@ -27,6 +27,7 @@
using System.Data;
using System.Data.Metadata.Edm;
using System.Globalization;
+using System.Text;
namespace MySql.Data.Entity
{
@@ -207,9 +208,15 @@
private object ChangeType(object sourceValue, Type targetType)
{
- if (sourceValue is byte[] && targetType == typeof(Guid))
+ if (sourceValue is byte[])
{
- return new Guid((byte[])sourceValue);
+ if (targetType == typeof(Guid))
+ return new Guid((byte[])sourceValue);
+ else if (targetType == typeof(bool))
+ {
+ byte[] bytes = (byte[])sourceValue;
+ return bytes[0] == '1';
+ }
}
if (sourceValue is DateTime && targetType == typeof(DateTimeOffset))
=== removed file 'MySql.Data.Entity/Provider/MySql.Data.Entity.VS2010.csproj'
--- a/MySql.Data.Entity/Provider/MySql.Data.Entity.VS2010.csproj 2010-11-17 19:25:46 +0000
+++ b/MySql.Data.Entity/Provider/MySql.Data.Entity.VS2010.csproj 1970-01-01 00:00:00 +0000
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" 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>{A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>MySql.Data.Entity</RootNamespace>
- <AssemblyName>MySql.Data.Entity</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <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>
- <BaseIntermediateOutputPath>obj\Debug-4.0</BaseIntermediateOutputPath>
- <OutputPath>bin\Debug-4.0\</OutputPath>
- <DefineConstants>TRACE;DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <BaseIntermediateOutputPath>obj\Release-4.0</BaseIntermediateOutputPath>
- <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.Core" />
- <Reference Include="System.Data.Entity" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="System.Data" />
- <Reference Include="System.Web.ApplicationServices" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Properties\SchemaMapping.msl" />
- <Compile Include="..\..\MySql.Data\Provider\Properties\VersionInfo.cs">
- <Link>Properties\VersionInfo.cs</Link>
- </Compile>
- <Compile Include="EF4ProviderServices.cs" />
- <Compile Include="EFMySqlCommand.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="EFMySqlDataReader.cs" />
- <Compile Include="Fragments\TableFragment.cs" />
- <Compile Include="Fragments\InputFragment.cs" />
- <Compile Include="Fragments\JoinFragment.cs" />
- <Compile Include="Fragments\SqlFragment.cs" />
- <Compile Include="Generators\DeleteGenerator.cs" />
- <Compile Include="Generators\FunctionGenerator.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Generators\FunctionProcessor.cs" />
- <Compile Include="Generators\InsertGenerator.cs" />
- <Compile Include="Generators\Scope.cs" />
- <Compile Include="Generators\SelectGenerator.cs" />
- <Compile Include="Generators\SqlGenerator.cs" />
- <Compile Include="Generators\UpdateGenerator.cs" />
- <Compile Include="Properties\Resources.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Resources.resx</DependentUpon>
- </Compile>
- <Compile Include="Statements\DeleteStatement.cs" />
- <Compile Include="Statements\InsertStatement.cs" />
- <Compile Include="Metadata.cs" />
- <Compile Include="ProviderManifest.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="ProviderServices.cs" />
- <Compile Include="Statements\SelectStatement.cs" />
- <Compile Include="Statements\UpdateStatement.cs" />
- <EmbeddedResource Include="Properties\ProviderManifest.xml" />
- <EmbeddedResource Include="Properties\SchemaDefinition-5.0.ssdl" />
- <EmbeddedResource Include="Properties\SchemaDefinition-6.0.ssdl" />
- <EmbeddedResource Include="Properties\SchemaDefinition-5.1.ssdl" />
- <EmbeddedResource Include="Properties\Resources.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- </EmbeddedResource>
- </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.VS2010.csproj">
- <Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
- <Name>MySql.Data.VS2010</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
=== modified file 'MySql.Data.Entity/Provider/MySql.Data.Entity.csproj'
--- a/MySql.Data.Entity/Provider/MySql.Data.Entity.csproj 2010-04-27 18:31:24 +0000
+++ b/MySql.Data.Entity/Provider/MySql.Data.Entity.csproj 2010-12-06 21:35:13 +0000
@@ -5,7 +5,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}</ProjectGuid>
+ <ProjectGuid>{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MySql.Data.Entity</RootNamespace>
@@ -51,6 +51,31 @@
<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>DEBUG;TRACE</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</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" />
=== removed file 'MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.VS2010.csproj'
--- a/MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.VS2010.csproj 2010-11-17 19:25:46 +0000
+++ b/MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.VS2010.csproj 1970-01-01 00:00:00 +0000
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" 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>{77EC4E20-293A-48BA-8415-D0AD869D91FA}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>MySql.Data.Entity.Tests</RootNamespace>
- <AssemblyName>MySql.Data.Entity.Tests</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <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>
- <BaseIntermediaOutputPath>obj\Debug-4.0</BaseIntermediaOutputPath>
- <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>
- <BaseIntermediaOutputPath>obj\Release-4.0</BaseIntermediaOutputPath>
- <OutputPath>bin\Release-4.0\</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="..\..\MySql.Data\Provider\Properties\VersionInfo.cs">
- <Link>Properties\VersionInfo.cs</Link>
- </Compile>
- <Compile Include="BaseEdmTest.cs" />
- <Compile Include="AggregateOperators.cs" />
- <Compile Include="CanonicalFunctions.cs" />
- <Compile Include="ModelFirst.cs" />
- <Compile Include="DataTypeTests.cs" />
- <Compile Include="Model1.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Model1.edmx</DependentUpon>
- </Compile>
- <Compile Include="ProceduresAndFunctions.cs" />
- <Compile Include="JoinTests.cs" />
- <Compile Include="SchemaInformation.cs" />
- <Compile Include="TestModel.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>TestModel.edmx</DependentUpon>
- </Compile>
- <Compile Include="Wizard.cs" />
- <Compile Include="RelationalOperators.cs" />
- <Compile Include="SetOperators.cs" />
- <Compile Include="Paging.cs" />
- <Compile Include="OrderingAndGrouping.cs" />
- <Compile Include="InsertTests.cs" />
- <Compile Include="UpdateTests.cs" />
- <Compile Include="DeleteTests.cs" />
- <Compile Include="RestrictionOperators.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\MySql.Data\Provider\MySql.Data.VS2010.csproj">
- <Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
- <Name>MySql.Data.VS2010</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\MySql.Data\Tests\MySql.Data.Tests.VS2010.csproj">
- <Project>{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}</Project>
- <Name>MySql.Data.Tests.VS2010</Name>
- </ProjectReference>
- <ProjectReference Include="..\Provider\MySql.Data.Entity.VS2010.csproj">
- <Project>{A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}</Project>
- <Name>MySql.Data.Entity.VS2010</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <None Include="App.Config" />
- <EmbeddedResource Include="Properties\procs.sql" />
- <EmbeddedResource Include="Properties\schema.sql" />
- <EmbeddedResource Include="Properties\Resources.resx">
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EntityDeploy Include="Model1.edmx">
- <Generator>EntityModelCodeGenerator</Generator>
- <LastGenOutput>Model1.Designer.cs</LastGenOutput>
- </EntityDeploy>
- </ItemGroup>
- <ItemGroup>
- <WCFMetadata Include="Service References" />
- </ItemGroup>
- <ItemGroup>
- <EntityDeploy Include="TestModel.edmx">
- <Generator>EntityModelCodeGenerator</Generator>
- <LastGenOutput>TestModel.Designer.cs</LastGenOutput>
- </EntityDeploy>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include=".NETFramework,Version=v4.0">
- <Visible>False</Visible>
- <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <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>false</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.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
- <PropertyGroup>
- <PreBuildEvent>
- </PreBuildEvent>
- </PropertyGroup>
-</Project>
\ No newline at end of file
=== modified file 'MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.csproj'
--- a/MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.csproj 2010-02-13 04:34:16 +0000
+++ b/MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.csproj 2010-12-06 21:35:13 +0000
@@ -5,7 +5,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{77EC4E20-293A-48BA-8415-D0AD869D91FA}</ProjectGuid>
+ <ProjectGuid>{D37B3572-767F-4622-A835-844B0EBEFD5B}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MySql.Data.Entity.Tests</RootNamespace>
@@ -51,6 +51,33 @@
<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>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>DEBUG;TRACE</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" />
@@ -111,7 +138,7 @@
<Name>MySql.Data.Tests</Name>
</ProjectReference>
<ProjectReference Include="..\Provider\MySql.Data.Entity.csproj">
- <Project>{A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}</Project>
+ <Project>{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}</Project>
<Name>MySql.Data.Entity</Name>
</ProjectReference>
</ItemGroup>
=== modified file 'MySql.Data/Provider/MySql.Data.csproj'
--- a/MySql.Data/Provider/MySql.Data.csproj 2010-04-23 17:29:29 +0000
+++ b/MySql.Data/Provider/MySql.Data.csproj 2010-12-06 21:35:13 +0000
@@ -47,6 +47,30 @@
<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>DEBUG;TRACE</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</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" />
=== removed file 'MySql.Data/Tests/MySql.Data.Tests.VS2010.csproj'
--- a/MySql.Data/Tests/MySql.Data.Tests.VS2010.csproj 2010-11-17 19:25:46 +0000
+++ b/MySql.Data/Tests/MySql.Data.Tests.VS2010.csproj 1970-01-01 00:00:00 +0000
@@ -1,150 +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>{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>v4.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-4.0\</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-4.0\</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="..\Provider\Properties\VersionInfo.cs">
- <Link>Properties\VersionInfo.cs</Link>
- </Compile>
- <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\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>
- <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>
- <ProjectReference Include="..\Provider\MySql.Data.VS2010.csproj">
- <Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
- <Name>MySql.Data.VS2010</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
=== modified file 'MySql.Data/Tests/MySql.Data.Tests.csproj'
--- a/MySql.Data/Tests/MySql.Data.Tests.csproj 2010-04-27 18:31:24 +0000
+++ b/MySql.Data/Tests/MySql.Data.Tests.csproj 2010-12-06 21:35:13 +0000
@@ -55,6 +55,34 @@
<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" />
=== modified file 'MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj'
--- a/MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj 2010-11-17 19:25:46 +0000
+++ b/MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj 2010-12-06 21:35:13 +0000
@@ -18,7 +18,6 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
@@ -37,49 +36,68 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <BaseIntermediateOutputPath>obj\Debug-4.0</BaseIntermediateOutputPath>
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <BaseIntermediateOutputPath>obj\Debug</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>
<RegisterForComInterop>false</RegisterForComInterop>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <UseVS2005MPF>true</UseVS2005MPF>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <BaseIntermediateOutputPath>obj\Release</BaseIntermediateOutputPath>
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <UseVS2005MPF>true</UseVS2005MPF>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-4.0|AnyCPU'">
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <DebugSymbols>true</DebugSymbols>
+ <BaseIntermediateOutputPath>obj\Debug-4.0</BaseIntermediateOutputPath>
+ <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>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-4.0|AnyCPU'">
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<BaseIntermediateOutputPath>obj\Release-4.0</BaseIntermediateOutputPath>
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
<OutputPath>bin\Release-4.0\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
+ <Optimize>true</Optimize>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+ <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+ <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
</PropertyGroup>
<ItemGroup>
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <Reference Include="Microsoft.Data.ConnectionUI, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.Data.ConnectionUI.dll</HintPath>
- </Reference>
<Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<SpecificVersion>True</SpecificVersion>
</Reference>
- <Reference Include="Microsoft.VisualStudio.Data, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Data.dll</HintPath>
- </Reference>
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<SpecificVersion>True</SpecificVersion>
<HintPath>c:\Program Files\Visual Studio 2005 SDK\2007.02\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.VisualStudio.Package.LanguageService.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Package.LanguageService.10.0.dll</HintPath>
- </Reference>
<Reference Include="Microsoft.VisualStudio.Shell, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.dll</HintPath>
@@ -88,36 +106,18 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <EmbedInteropTypes>True</EmbedInteropTypes>
- <HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
- </Reference>
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
- </Reference>
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.VisualStudio.TextManager.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <EmbedInteropTypes>True</EmbedInteropTypes>
- <HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.TextManager.Interop.10.0.dll</HintPath>
- </Reference>
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.VisualStudio.TextManager.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.TextManager.Interop.9.0.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Configuration.Install" />
@@ -125,10 +125,56 @@
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
- <Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
+ <ItemGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU' or '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+ <Reference Include="Microsoft.Data.ConnectionUI, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <SpecificVersion>True</SpecificVersion>
+ <HintPath>c:\Program Files\Visual Studio 2005 SDK\2007.02\VisualStudioIntegration\Common\Assemblies\Microsoft.Data.ConnectionUI.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Data, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <SpecificVersion>True</SpecificVersion>
+ <HintPath>c:\Program Files\Visual Studio 2005 SDK\2007.02\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.Data.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Package.LanguageService, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <SpecificVersion>True</SpecificVersion>
+ <HintPath>c:\Program Files\Visual Studio 2005 SDK\2007.02\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.Package.LanguageService.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-4.0|AnyCPU' or '$(Configuration)|$(Platform)' == 'Release-4.0|AnyCPU'">
+ <Reference Include="Microsoft.Data.ConnectionUI, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.Data.ConnectionUI.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Data, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Data.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Package.LanguageService.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Package.LanguageService.10.0.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Web.ApplicationServices" />
+ <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ <HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.TextManager.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ <HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.TextManager.Interop.10.0.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.TextManager.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.TextManager.Interop.9.0.dll</HintPath>
+ </Reference>
+ </ItemGroup>
<ItemGroup>
<Compile Include="..\MySql.Data\Provider\Properties\VersionInfo.cs">
<Link>Properties\VersionInfo.cs</Link>
@@ -275,6 +321,11 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
+ <Compile Include="Properties\Settings.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTimeSharedInput>True</DesignTimeSharedInput>
+ <DependentUpon>Settings.settings</DependentUpon>
+ </Compile>
<Compile Include="VsPkg.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="WebConfig\ConnectionStringEditorDlg.cs">
@@ -360,6 +411,11 @@
<EmbeddedResource Include="WebConfig\WebConfigDlg.resx">
<DependentUpon>WebConfigDlg.cs</DependentUpon>
</EmbeddedResource>
+ <None Include="app.config" />
+ <None Include="Properties\Settings.settings">
+ <Generator>SettingsSingleFileGenerator</Generator>
+ <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+ </None>
<None Include="Resources\ArrowKey.bmp" />
<None Include="Resources\Key.bmp" />
<None Include="Resources\bannrbmp.bmp" />
@@ -387,36 +443,9 @@
</VSCTCompile>
</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>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.VS2010.csproj">
+ <ProjectReference Include="..\MySql.Data\Provider\MySql.Data.csproj">
<Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
- <Name>MySql.Data.VS2010</Name>
+ <Name>MySql.Data</Name>
</ProjectReference>
</ItemGroup>
<PropertyGroup>
@@ -427,9 +456,21 @@
create experimental hive in HKEY_LOCAL_MACHINE -->
<RegisterWithRanu>false</RegisterWithRanu>
</PropertyGroup>
- <PropertyGroup />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <Import Project="C:\Program Files (x86)\MSBuild\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" />
+ <Import Project="Targets\VS.targets"/>
+ <!--<PropertyGroup>
+ <PreBuildEvent>copy $(ProjectDir)\Targets\vs2010.targets $(ProjectDir)\Active.targets</PreBuildEvent>
+ </PropertyGroup>-->
+ <!--<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\VSSDK\Microsoft.VsSDK.targets"
+ Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU' or '$(Configuration)|$(Platform)' == 'Release|AnyCPU'"/>
+
+ Condition="'$(Configuration)|$(Platform)' == 'Debug-4.0|AnyCPU' or '$(Configuration)|$(Platform)' == 'Release-4.0|AnyCPU'"/>-->
+ <!--<Import Project="C:\Program Files\Visual Studio 2005 SDK\2007.02\VisualStudioIntegration\Tools\Build\Microsoft.VsSDK.targets"
+ Condition="('$(Configuration)|$(Platform)' == 'Debug|AnyCPU' or '$(Configuration)|$(Platform)' == 'Release|AnyCPU') and
+ !Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\VSSDK\Microsoft.VsSDK.targets')" />
+ <Import Project="VSCT_overrides.targets"
+ Condition="('$(Configuration)|$(Platform)' == 'Debug|AnyCPU' or '$(Configuration)|$(Platform)' == 'Release|AnyCPU') and
+ !Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\VSSDK\Microsoft.VsSDK.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">
=== removed file 'MySql.VisualStudio/MySql.VisualStudio.csproj'
--- a/MySql.VisualStudio/MySql.VisualStudio.csproj 2010-08-18 19:52:04 +0000
+++ b/MySql.VisualStudio/MySql.VisualStudio.csproj 1970-01-01 00:00:00 +0000
@@ -1,418 +0,0 @@
-<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>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>MySql.Data.VisualStudio</RootNamespace>
- <AssemblyName>MySql.VisualStudio</AssemblyName>
- <SignAssembly>false</SignAssembly>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
- <ProjectGuid>{DC3517FF-AC26-4755-9B7A-EF658FF69593}</ProjectGuid>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <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>
- <RegisterForComInterop>false</RegisterForComInterop>
- <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="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <Reference Include="Microsoft.Data.ConnectionUI, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>True</SpecificVersion>
- <HintPath>c:\Program Files\Visual Studio 2005 SDK\2007.02\VisualStudioIntegration\Common\Assemblies\Microsoft.Data.ConnectionUI.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <SpecificVersion>True</SpecificVersion>
- </Reference>
- <Reference Include="Microsoft.VisualStudio.Data, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>True</SpecificVersion>
- <HintPath>c:\Program Files\Visual Studio 2005 SDK\2007.02\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.Data.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <SpecificVersion>True</SpecificVersion>
- <HintPath>c:\Program Files\Visual Studio 2005 SDK\2007.02\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.VisualStudio.Package.LanguageService, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>True</SpecificVersion>
- <HintPath>c:\Program Files\Visual Studio 2005 SDK\2007.02\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.Package.LanguageService.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.VisualStudio.Shell, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>True</SpecificVersion>
- <HintPath>c:\Program Files\Visual Studio 2005 SDK\2007.02\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.Shell.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <SpecificVersion>True</SpecificVersion>
- <HintPath>c:\Program Files\Visual Studio 2005 SDK\2007.02\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <SpecificVersion>True</SpecificVersion>
- <HintPath>c:\Program Files\Visual Studio 2005 SDK\2007.02\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <SpecificVersion>True</SpecificVersion>
- <HintPath>c:\Program Files\Visual Studio 2005 SDK\2007.02\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <SpecificVersion>True</SpecificVersion>
- <HintPath>c:\Program Files\Visual Studio 2005 SDK\2007.02\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.configuration" />
- <Reference Include="System.Configuration.Install" />
- <Reference Include="System.Data" />
- <Reference Include="System.Design" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Web" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="..\MySql.Data\Provider\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">
- <DependentUpon>MySqlConnectionUIControl.cs</DependentUpon>
- </Compile>
- <Compile Include="DDEX\MySqlDataConnectionPromptDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="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">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Editors\ConnectDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Editors\ConnectDialog.Designer.cs">
- <DependentUpon>ConnectDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="Editors\CustomPropertyDescriptor.cs" />
- <Compile Include="Editors\ForeignKeyDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Editors\ForeignKeyDialog.Designer.cs">
- <DependentUpon>ForeignKeyDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="Editors\GenerateChangeScriptDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Editors\GenerateChangeScriptDialog.Designer.cs">
- <DependentUpon>GenerateChangeScriptDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="Editors\IEditor.cs" />
- <Compile Include="Editors\IndexColumnEditorDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="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">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="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">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Editors\TableIndexDialog.Designer.cs">
- <DependentUpon>TableIndexDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="Editors\TableNamePromptDialog.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Editors\TableNamePromptDialog.Designer.cs">
- <DependentUpon>TableNamePromptDialog.cs</DependentUpon>
- </Compile>
- <Compile Include="Editors\UDFEditor.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Editors\UDFEditor.Designer.cs">
- <DependentUpon>UDFEditor.cs</DependentUpon>
- </Compile>
- <Compile Include="Editors\VS2005ColorTable.cs" />
- <Compile Include="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">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Guids.cs" />
- <Compile Include="LanguageService\MySqlScanner.cs" />
- <Compile Include="LanguageService\Tokenizer.cs" />
- <Compile Include="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">
- <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">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="WebConfig\ConnectionStringEditorDlg.Designer.cs">
- <DependentUpon>ConnectionStringEditorDlg.cs</DependentUpon>
- </Compile>
- <Compile Include="WebConfig\GenericConfig.cs" />
- <Compile Include="WebConfig\MembershipConfig.cs" />
- <Compile Include="WebConfig\MembershipOptionsDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="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">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="WebConfig\WebConfigDlg.Designer.cs">
- <DependentUpon>WebConfigDlg.cs</DependentUpon>
- </Compile>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Properties\Resources.resx">
- <Generator>PublicResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- <SubType>Designer</SubType>
- <MergeWithCTO>true</MergeWithCTO>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="DDEX\MySqlConnectionUIControl.resx">
- <DependentUpon>MySqlConnectionUIControl.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="DDEX\MySqlDataConnectionPromptDialog.resx">
- <DependentUpon>MySqlDataConnectionPromptDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DDEX\MySqlDataObjectSupport.xml" />
- <EmbeddedResource Include="DDEX\MySqlDataViewSupport.xml" />
- <EmbeddedResource Include="Editors\ConnectDialog.resx">
- <DependentUpon>ConnectDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Editors\ForeignKeyDialog.resx">
- <DependentUpon>ForeignKeyDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Editors\GenerateChangeScriptDialog.resx">
- <DependentUpon>GenerateChangeScriptDialog.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="Editors\IndexColumnEditorDialog.resx">
- <DependentUpon>IndexColumnEditorDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Editors\SqlEditor.resx">
- <DependentUpon>SqlEditor.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Editors\TableEditor.resx">
- <SubType>Designer</SubType>
- <DependentUpon>TableEditor.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Editors\TableIndexDialog.resx">
- <DependentUpon>TableIndexDialog.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="Editors\TableNamePromptDialog.resx">
- <DependentUpon>TableNamePromptDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Editors\UDFEditor.resx">
- <DependentUpon>UDFEditor.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="WebConfig\ConnectionStringEditorDlg.resx">
- <DependentUpon>ConnectionStringEditorDlg.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="WebConfig\MembershipOptionsDlg.resx">
- <DependentUpon>MembershipOptionsDlg.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="WebConfig\WebConfigDlg.resx">
- <DependentUpon>WebConfigDlg.cs</DependentUpon>
- </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" />
- </ItemGroup>
- <ItemGroup>
- <VSCTCompile Include="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">
- <Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
- <Name>MySql.Data</Name>
- </ProjectReference>
- </ItemGroup>
- <PropertyGroup>
- <RegisterOutputPackage>false</RegisterOutputPackage>
- <RegisterWithCodebase>true</RegisterWithCodebase>
- <!-- Make sure we are 2005 compatible, and don't rely on RegPkg.exe
- of VS2008 which uses Microsoft.VisualStudio.Shell.9.0 -->
- <UseVS2005MPF>true</UseVS2005MPF>
- <!-- Don't try to run as a normal user (RANA),
- create experimental hive in HKEY_LOCAL_MACHINE -->
- <RegisterWithRanu>false</RegisterWithRanu>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <Import Project="C:\Program Files\Visual Studio 2005 SDK\2007.02\VisualStudioIntegration\Tools\Build\Microsoft.VsSDK.targets" Condition="!Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\VSSDK\Microsoft.VsSDK.targets')" />
- <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\VSSDK\Microsoft.VsSDK.targets" Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\VSSDK\Microsoft.VsSDK.targets')" />
- <Import Project="VSCT_overrides.targets" Condition="!Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\VSSDK\Microsoft.VsSDK.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 'MySql.VisualStudio/Targets'
=== added file 'MySql.VisualStudio/Targets/VS.targets'
--- a/MySql.VisualStudio/Targets/VS.targets 1970-01-01 00:00:00 +0000
+++ b/MySql.VisualStudio/Targets/VS.targets 2010-12-06 21:35:13 +0000
@@ -0,0 +1,3 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="C:\Program Files (x86)\MSBuild\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets"/>
+</Project>
\ No newline at end of file
=== added file 'MySql.VisualStudio/Targets/VS2008.targets'
--- a/MySql.VisualStudio/Targets/VS2008.targets 1970-01-01 00:00:00 +0000
+++ b/MySql.VisualStudio/Targets/VS2008.targets 2010-12-06 21:35:13 +0000
@@ -0,0 +1,3 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\VSSDK\Microsoft.VsSDK.targets"/>
+</Project>
\ No newline at end of file
=== added file 'MySql.VisualStudio/Targets/VS2010.targets'
--- a/MySql.VisualStudio/Targets/VS2010.targets 1970-01-01 00:00:00 +0000
+++ b/MySql.VisualStudio/Targets/VS2010.targets 2010-12-06 21:35:13 +0000
@@ -0,0 +1,3 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="C:\Program Files (x86)\MSBuild\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets">
+</Project>
\ No newline at end of file
=== removed file 'MySql.Web/Providers/MySql.Web.VS2010.csproj'
--- a/MySql.Web/Providers/MySql.Web.VS2010.csproj 2010-11-17 19:25:46 +0000
+++ b/MySql.Web/Providers/MySql.Web.VS2010.csproj 1970-01-01 00:00:00 +0000
@@ -1,147 +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>{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>v4.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-4.0\</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-4.0\</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.Web.ApplicationServices" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="..\..\MySql.Data\Provider\Properties\VersionInfo.cs">
- <Link>Properties\VersionInfo.cs</Link>
- </Compile>
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Properties\Resources.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Resources.resx</DependentUpon>
- <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" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Properties\Resources.resx">
- <SubType>Designer</SubType>
- <Generator>PublicResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <None Include="Properties\schema6.sql" />
- <None Include="Properties\schema1.sql" />
- <None Include="Properties\schema4.sql" />
- <None Include="Properties\schema2.sql" />
- <None Include="Properties\schema3.sql" />
- <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.VS2010.csproj">
- <Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
- <Name>MySql.Data.VS2010</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
=== modified file 'MySql.Web/Providers/MySql.Web.csproj'
--- a/MySql.Web/Providers/MySql.Web.csproj 2010-04-27 18:31:24 +0000
+++ b/MySql.Web/Providers/MySql.Web.csproj 2010-12-06 21:35:13 +0000
@@ -60,6 +60,36 @@
<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>DEBUG;TRACE</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</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" />
@@ -69,6 +99,9 @@
<Reference Include="System.Web" />
<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">
<Link>Properties\VersionInfo.cs</Link>
@@ -108,12 +141,6 @@
<None Include="Properties\schema5.sql" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\MySql.Data\Provider\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>
@@ -135,6 +162,12 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\MySql.Data\Provider\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.
=== modified file 'MySql.Web/Providers/Properties/Resources.Designer.cs'
--- a/MySql.Web/Providers/Properties/Resources.Designer.cs 2010-02-13 04:34:16 +0000
+++ b/MySql.Web/Providers/Properties/Resources.Designer.cs 2010-12-06 21:35:13 +0000
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30128.1
+// Runtime Version:4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
=== removed file 'MySql.Web/Tests/MySql.Web.Tests.VS2010.csproj'
--- a/MySql.Web/Tests/MySql.Web.Tests.VS2010.csproj 2010-11-17 19:25:46 +0000
+++ b/MySql.Web/Tests/MySql.Web.Tests.VS2010.csproj 1970-01-01 00:00:00 +0000
@@ -1,123 +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>{DC704374-EC50-4167-93AA-8D262136502E}</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>v4.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-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="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>
- <Compile Include="..\..\MySql.Data\Provider\Properties\VersionInfo.cs">
- <Link>Properties\VersionInfo.cs</Link>
- </Compile>
- <Compile Include="BaseTest.cs" />
- <Compile Include="ProfileTests.cs" />
- <Compile Include="RoleManagement.cs" />
- <Compile Include="SchemaTests.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="TestProfile.cs" />
- <Compile Include="UserManagement.cs" />
- </ItemGroup>
- <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>
- <ItemGroup>
- <ProjectReference Include="..\..\MySql.Data\Provider\MySql.Data.VS2010.csproj">
- <Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
- <Name>MySql.Data.VS2010</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\MySql.Data\Tests\MySql.Data.Tests.VS2010.csproj">
- <Project>{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}</Project>
- <Name>MySql.Data.Tests.VS2010</Name>
- </ProjectReference>
- <ProjectReference Include="..\Providers\MySql.Web.VS2010.csproj">
- <Project>{C28B1166-1380-445D-AEC1-8A18B990DD18}</Project>
- <Name>MySql.Web.VS2010</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
=== modified file 'MySql.Web/Tests/MySql.Web.Tests.csproj'
--- a/MySql.Web/Tests/MySql.Web.Tests.csproj 2010-04-27 18:31:24 +0000
+++ b/MySql.Web/Tests/MySql.Web.Tests.csproj 2010-12-06 21:35:13 +0000
@@ -5,7 +5,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{DC704374-EC50-4167-93AA-8D262136502E}</ProjectGuid>
+ <ProjectGuid>{83462D15-E576-4079-BBC9-9EE1CF0B24DD}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MySql.Web.Tests</RootNamespace>
@@ -52,6 +52,33 @@
<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" />
@@ -60,6 +87,9 @@
<Reference Include="System.Web" />
<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">
<Link>Properties\VersionInfo.cs</Link>
Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20101209033948-0pgy07qnqesrfdzy.bundle
| Thread |
|---|
| • bzr commit into connector-net-trunk branch (reggie.burnett:949) | Reggie Burnett | 9 Dec |
