MySQL Lists: commits: bzr commit into connector-net-trunk branch (reggie.burnett:952)

List:	Commits	« Previous Message Next Message »
From:	Reggie Burnett	Date:	December 22 2010 9:22pm
Subject:	bzr commit into connector-net-trunk branch (reggie.burnett:952)
View as plain text
#At file:///C:/Documents%20and%20Settings/Reggie/work/connector-net/trunk/ based on revid:reggie.burnett@strippedm-20101214230533-gi993j08z9zaggxk

  952 Reggie Burnett	2010-12-22 [merge]
      merged

    added:
      MySql.VisualStudio/Targets/blank.targets
    renamed:
      MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj => MySql.VisualStudio/MySql.VisualStudio.csproj
    modified:
      Documentation/help.shfbproj
      Installer/Installer.VS2010.wixproj
      Installer/Installer.wixproj
      Installer/core.wxs
      Installer/main.wxs
      Installer/ui.wxs
      Installer/webproviders.wxs
      MySQLClient-VS2010.sln
      MySQLClient.sln
      MySql.Data/Provider/MySql.Data.csproj
      MySql.Data/Provider/Properties/AssemblyInfo.cs
      MySql.VisualStudio/Targets/VS.targets
      MySql.VisualStudio/Targets/VS2010.targets
      MySql.Web/Providers/MySql.Web.csproj
      MySql.Web/Providers/Properties/AssemblyInfo.cs
      MySql.VisualStudio/MySql.VisualStudio.csproj
=== modified file 'Documentation/help.shfbproj'
=== modified file 'Documentation/help.shfbproj'
--- a/Documentation/help.shfbproj	2010-08-30 20:17:30 +0000
+++ b/Documentation/help.shfbproj	2010-12-22 21:21:41 +0000
@@ -28,8 +28,8 @@
     </ProjectSummary>
     <MissingTags>None</MissingTags>
     <VisibleItems>InheritedMembers, InheritedFrameworkMembers, Protected, SealedProtected</VisibleItems>
-    <HtmlHelp1xCompilerPath>C:\Program Files (x86)\HTML Help Workshop\</HtmlHelp1xCompilerPath>
-    <HtmlHelp2xCompilerPath>c:\Program Files (x86)\Common Files\microsoft shared\Help 2.0 Compiler\</HtmlHelp2xCompilerPath>
+    <HtmlHelp1xCompilerPath>..\..\..\..\..\..\Program Files\HTML Help Workshop\</HtmlHelp1xCompilerPath>
+    <HtmlHelp2xCompilerPath>..\..\..\..\..\..\Program Files\Common Files\microsoft shared\Help 2.0 Compiler\</HtmlHelp2xCompilerPath>
     <SandcastlePath>
     </SandcastlePath>
     <WorkingPath>

=== modified file 'Installer/Installer.VS2010.wixproj'
--- a/Installer/Installer.VS2010.wixproj	2010-09-01 17:50:11 +0000
+++ b/Installer/Installer.VS2010.wixproj	2010-12-22 21:21:41 +0000
@@ -108,6 +108,7 @@
   <ItemGroup>
     <Compile Include="cf.wxs" />
     <Compile Include="core.wxs" />
+    <Compile Include="EntityFramework.wxs" />
     <Compile Include="main.wxs" />
     <Compile Include="samples.wxs" />
     <Compile Include="ui.wxs" />

=== modified file 'Installer/Installer.wixproj'
--- a/Installer/Installer.wixproj	2010-08-30 20:17:30 +0000
+++ b/Installer/Installer.wixproj	2010-12-22 21:21:41 +0000
@@ -147,7 +147,7 @@
     <Content Include="VS2010_Data.wxi" />
     <Content Include="VS2010_Registry.wxi" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets" />
   <PropertyGroup>
     <BuildDependsOn>RetrieveIdentities;$(BuildDependsOn)</BuildDependsOn>
   </PropertyGroup>

=== modified file 'Installer/core.wxs'
--- a/Installer/core.wxs	2010-12-01 17:55:00 +0000
+++ b/Installer/core.wxs	2010-12-22 21:21:41 +0000
@@ -26,20 +26,13 @@
     <!-- .Net 2.0 Binaries -->
     <DirectoryRef Id='assemblies_v2'>
       <Component Id="C.v2" Guid="0e8af006-273c-49bb-b7c1-ec1737260a5a">
-        <Condition>NETFRAMEWORK20</Condition>
         <File Id="MySql.Data.v2" Name="MySql.Data.dll"
               Source="..\mysql.data\provider\bin\release\mysql.data.dll" DiskId="1"/>
 
-        <util:PerformanceCategory Id="PMDataCategoryId" Name=".NET Data Provider for MySQL"
-                                  MultiInstance="no" Help="This category includes a series of counters for MySQL.">
-          <util:PerformanceCounter Name="HardProcedureQueries" Type="numberOfItems32" Help="The number of times a procedures metadata had to be queried from the server." />
-          <util:PerformanceCounter Name="SoftProcedureQueries" Type="rateOfCountsPerSecond32" Help="The number of times a procedures metadata was retrieved from the client-side cache." />
-        </util:PerformanceCategory>
-
-        <RemoveFile Id="RemoveStateFile" Name="*.InstallState" On="uninstall"/>
+        <RemoveFile Id="RemoveStateFile.v2" Name="*.InstallState" On="uninstall"/>
 
       </Component>
-      <Directory Id="MySql.Data.DummyDir" Name="GAC">
+      <Directory Id="MySql.Data.DummyDir.2" Name="GAC">
         <Component Id="C.v2.GAC" Guid="58f70e4a-96f7-4b67-bdab-9b77a60f9c09">
           <Condition>NETFRAMEWORK20</Condition>
           <File Id="MySql.Data.v2.GAC" Name="MySql.Data.dll"
@@ -51,20 +44,13 @@
     <!-- .Net 4.0 Binaries -->
     <DirectoryRef Id='assemblies_v4'>
       <Component Id="C.v4" Guid="C66D3DF6-A151-4F29-B388-A9803C89131A">
-        <Condition>NETFRAMEWORK40FULL</Condition>
         <File Id="MySql.Data.v4" Name="MySql.Data.dll"
               Source="..\mysql.data\provider\bin\release-4.0\mysql.data.dll" DiskId="1"/>
 
-        <util:PerformanceCategory Id="PMDataCategoryId" Name=".NET Data Provider for MySQL"
-                                  MultiInstance="no" Help="This category includes a series of counters for MySQL.">
-          <util:PerformanceCounter Name="HardProcedureQueries" Type="numberOfItems32" Help="The number of times a procedures metadata had to be queried from the server." />
-          <util:PerformanceCounter Name="SoftProcedureQueries" Type="rateOfCountsPerSecond32" Help="The number of times a procedures metadata was retrieved from the client-side cache." />
-        </util:PerformanceCategory>
-
-        <RemoveFile Id="RemoveStateFile" Name="*.InstallState" On="uninstall"/>
+        <RemoveFile Id="RemoveStateFile.v4" Name="*.InstallState" On="uninstall"/>
 
       </Component>
-      <Directory Id="MySql.Data.DummyDir" Name="GAC">
+      <Directory Id="MySql.Data.DummyDir.4" Name="GAC">
         <Component Id="C.v4.GAC" Guid="34B6C828-355D-405F-82BC-F18BBC13871D">
           <Condition>NETFRAMEWORK40FULL</Condition>
           <File Id="MySql.Data.v4.GAC" Name="MySql.Data.dll"
@@ -85,6 +71,13 @@
         <Shortcut Id="S102" Name="Release Notes" Description="Release notes"
                   Directory="ShortCutDir" Target="[INSTALLDIR]/Release Notes.txt"/>
       </Component>
+      <Component Id="PerfMon" Guid="27A03933-72F0-45DB-9468-6FCA354D232E">
+        <util:PerformanceCategory Id="PMDataCategoryId" Name=".NET Data Provider for MySQL"
+                                  MultiInstance="no" Help="This category includes a series of counters for MySQL.">
+          <util:PerformanceCounter Name="HardProcedureQueries" Type="numberOfItems32" Help="The number of times a procedures metadata had to be queried from the server." />
+          <util:PerformanceCounter Name="SoftProcedureQueries" Type="rateOfCountsPerSecond32" Help="The number of times a procedures metadata was retrieved from the client-side cache." />
+        </util:PerformanceCategory>
+      </Component>
     </DirectoryRef>
 
     <Feature Id="Core.Feature" Level="1" Title="Core Components" Description="Core Components"
@@ -94,38 +87,27 @@
       <ComponentRef Id="C.v2.GAC"/>
       <ComponentRef Id="C.v4"/>
       <ComponentRef Id="C.v4.GAC"/>
+      <ComponentRef Id="PerfMon"/>
       <ComponentRef Id="StartMenuComponent"/>
     </Feature>
 
     <InstallExecuteSequence>
       <!-- v2 custom action scheduling -->
-      <Custom Action='ManagedDataInstallSetupv2' After="InstallFiles">NETFRAMEWORK20 AND NOT Installed</Custom>
-      <Custom Action='ManagedDataInstallv2' After="ManagedDataInstallSetupv2">NETFRAMEWORK20 AND NOT Installed</Custom>
-      <Custom Action='ManagedDataUnInstallSetupv2' Before="RemoveFiles">NETFRAMEWORK20 AND Installed</Custom>
-      <Custom Action='ManagedDataUnInstallv2' After="ManagedDataUnInstallSetupv2">NETFRAMEWORK20 AND Installed</Custom>
-
-      <!-- v4 custom action scheduling -->
-      <Custom Action='ManagedDataInstallSetupv4' After="InstallFiles">NETFRAMEWORK40FULL AND NOT Installed</Custom>
-      <Custom Action='ManagedDataInstallv4' After="ManagedDataInstallSetupv4">NETFRAMEWORK40FULL AND NOT Installed</Custom>
-      <Custom Action='ManagedDataUnInstallSetupv4' Before="RemoveFiles">NETFRAMEWORK40FULL AND Installed</Custom>
-      <Custom Action='ManagedDataUnInstallv4' After="ManagedDataUnInstallSetupv4">NETFRAMEWORK40FULL AND Installed</Custom>
+      <Custom Action='Setv4InstallUtil' After='InstallValidate'>NETFRAMEWORK40FULL</Custom>
+      <Custom Action='ManagedDataInstallSetup' After="InstallFiles">NOT Installed</Custom>
+      <Custom Action='ManagedDataInstall' After="ManagedDataInstallSetup">NOT Installed</Custom>
+      <Custom Action='ManagedDataUnInstallSetup' Before="RemoveFiles">Installed</Custom>
+      <Custom Action='ManagedDataUnInstall' After="ManagedDataUnInstallSetup">Installed</Custom>
     </InstallExecuteSequence>
 
-    <!-- v2 custom actions -->
-    <CustomAction Id="ManagedDataInstallSetupv2" Property="ManagedDataInstallv2"
-                  Value='"[WindowsFolder]\Microsoft.NET\Framework\v2.0.50727\installUtil.exe" /LogToConsole=false /LogFile=  "[#MySql.Data.v2]"'/>
-    <CustomAction Id='ManagedDataUnInstallSetupv2' Property="ManagedDataUnInstallv2"
-                  Value='"[WindowsFolder]\Microsoft.NET\Framework\v2.0.50727\installUtil.exe" /LogToConsole=false /LogFile= /u "[#MySql.Data.v2]"'/>
-    <CustomAction Id="ManagedDataInstallv2" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="check" Execute='deferred' Impersonate='no'/>
-    <CustomAction Id="ManagedDataUnInstallv2" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="check" Execute='deferred' Impersonate='no'/>
-
-    <!-- v4 custom actions -->
-    <CustomAction Id="ManagedDataInstallSetupv4" Property="ManagedDataInstallv4"
-                  Value='"[WindowsFolder]\Microsoft.NET\Framework\v4.0.30319\installUtil.exe" /LogToConsole=false /LogFile=  "[#MySql.Data.v4]"'/>
-    <CustomAction Id='ManagedDataUnInstallSetupv4' Property="ManagedDataUnInstallv4"
-                  Value='"[WindowsFolder]\Microsoft.NET\Framework\v4.0.30319\installUtil.exe" /LogToConsole=false /LogFile= /u "[#MySql.Data.v4]"'/>
-    <CustomAction Id="ManagedDataInstallv4" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="check" Execute='deferred' Impersonate='no'/>
-    <CustomAction Id="ManagedDataUnInstallv4" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="check" Execute='deferred' Impersonate='no'/>
+    <!-- Custom Actions -->
+    <CustomAction Id="Setv4InstallUtil" Property="InstallUtil" Value="c:\windows\microsoft.net\framework\v4.0.30319"/>
+    <CustomAction Id="ManagedDataInstallSetup" Property="ManagedDataInstall"
+                  Value='"[InstallUtil]\installUtil.exe" /LogToConsole=false /LogFile=  "[#MySql.Data.v2]"'/>
+    <CustomAction Id='ManagedDataUnInstallSetup' Property="ManagedDataUnInstall"
+                  Value='"[InstallUtil]\installUtil.exe" /LogToConsole=false /LogFile= /u "[#MySql.Data.v2]"'/>
+    <CustomAction Id="ManagedDataInstall" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="check" Execute='deferred' Impersonate='no'/>
+    <CustomAction Id="ManagedDataUnInstall" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="check" Execute='deferred' Impersonate='no'/>
   </Fragment>
 </Wix>
 

=== modified file 'Installer/main.wxs'
--- a/Installer/main.wxs	2010-11-10 23:14:26 +0000
+++ b/Installer/main.wxs	2010-12-22 21:21:41 +0000
@@ -110,36 +110,37 @@
 
     <Binary Id="H2Reg" SourceFile="Binary\H2Reg.exe"/>
     <Property Id="WIXUI_INSTALLDIR" Value='INSTALLDIR'/>
+    <Property Id='INSTALLUTIL' Value='[NETFRAMEWORK20INSTALLROOTDIR]'/>
+    
     <!-- Remove the license agreement dialog -->
-    <UIRef Id="WixUI_MySQL"/>
+    <UIRef Id='WixUI_MySQL'/>
     <WixVariable Id="WixUIBannerBmp" Value="Bitmaps/BannrBmp.bmp"/>
     <WixVariable Id="WixUIDialogBmp" Value="Bitmaps/DlgBmp.bmp"/>
     <WixVariable Id="WixUICostingPopupOptOut" Value="true"/>
 
-
     <Icon Id="ChangeLogIcon" SourceFile="Bitmaps\document.ico"/>
 
     <InstallExecuteSequence>
       <Custom Action='RegisterHelp' After="InstallFiles">(&amp;DocsFeature=3) AND NOT(!DocsFeature=3)</Custom>
       <Custom Action="UnRegisterHelp" Before="RemoveFiles">(&amp;DocsFeature=2) AND (!DocsFeature=3)</Custom>
-      
-      <!--<Custom Action="CleanVS2010Help" After="RegisterHelp">(&amp;DocsFeature=3) AND NOT(!DocsFeature=3) AND (VS2010Int=3)</Custom>
-      <Custom Action="InstallVS2010Help" After="CleanVS2010Help">(&amp;DocsFeature=3) AND NOT(!DocsFeature=3) AND (VS2010Int=3)</Custom>
-      <Custom Action="RemoveVS2010Help" After="UnRegisterHelp">(&amp;DocsFeature=2) AND (!DocsFeature=3) AND (!VS2010Int=3)</Custom>-->
+
+      <Custom Action="SetHLMPath" After="AppSearch"></Custom>
+      <Custom Action="Register2010Help" After="PublishProduct">HLM_LOCATION AND (&amp;DocsFeature=3) AND NOT(!DocsFeature=3)</Custom>
+      <Custom Action="UnRegister2010Help" After="RemoveFiles">HLM_LOCATION AND (&amp;DocsFeature=2) AND (!DocsFeature=3)</Custom>
     </InstallExecuteSequence>
 
+    <!-- Custom actions for VS2005/VS2008 help -->
     <CustomAction Id="RegisterHelp" ExeCommand='-r -q CmdFile="[#H2Reg.ini]"' BinaryKey="H2Reg" Execute="deferred" Return="check" Impersonate="no"/>
     <CustomAction Id="UnRegisterHelp" ExeCommand='-u -q CmdFile="[#H2Reg.ini]"' BinaryKey="H2Reg" Execute="deferred" Return="check" Impersonate="no"/>
 
-    <!--<CustomAction Id="InstallVS2010HelpSetup" Property="InstallVS2010Help"
-                  Value='"[HLM_LOCATION]\HelpLibManager.exe" /product VS /version 100 /locale en-us /silent /vendor "Oracle" /sourceMedia "[#MSHA_File]"'/>
-    <CustomAction Id="CleanVS2010HelpSetup" Property="CleanVS2010Help"
-                  Value='"[HLM_LOCATION]\HelpLibManager.exe" /product VS /version 100 /locale en-us /uninstall /silent /vendor "Oracle" /mediaBookList "MySQL Connector/Net" /productName "MySQL Connector/Net" > NUL'/>
-    <CustomAction Id="RemoveVS2010HelpSetup" Property="RemoveVS2010Help"
-                  Value='"[HLM_LOCATION]\HelpLibManager.exe" /product VS /version 100 /locale en-us /uninstall /silent /vendor "Oracle" /mediaBookList "MySQL Connector/Net" /productName "MySQL Connector/Net" > NUL'/>
-    <CustomAction Id="InstallVS2010Help" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="check" Execute='deferred' Impersonate='no'/>
-    <CustomAction Id="RemoveVS2010Help" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="check" Execute='deferred' Impersonate='no'/>
-    <CustomAction Id="CleanVS2010Help" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="check" Execute='deferred' Impersonate='no'/>-->
+    <!-- custom actions for VS2010 help -->
+    <CustomAction Id="SetHLMPath" Property="HelpLibManager" Value="[HLM_LOCATION]HelpLibManager.exe"/>
+    <CustomAction Id="Register2010Help"
+                  ExeCommand ='/product VS /version 100 /locale en-us /brandingPackage Dev10.mshc /sourceMedia "[#MSHA_File]"'
+                  Property='HelpLibManager' Return='check'/>
+    <CustomAction Id="UnRegister2010Help"
+                  ExeCommand ='/product VS /version 100 /locale en-us /uninstall /silent /vendor "Oracle" /mediaBookList "MySQL Connector/Net" /productName "MySQL Connector/Net" > NUL'
+                  Property='HelpLibManager' Return='check'/>
   </Product>
 </Wix>
 

=== modified file 'Installer/ui.wxs'
--- a/Installer/ui.wxs	2010-08-30 20:17:30 +0000
+++ b/Installer/ui.wxs	2010-12-22 21:21:41 +0000
@@ -55,8 +55,8 @@
       <ProgressText Action="RegisterHelp">Registering help collection</ProgressText>
       <ProgressText Action="UnRegisterHelp">Unregistering help collection</ProgressText>
 
-      <ProgressText Action="InstallVS2010Help">Registering help collection with Visual Studio 2010</ProgressText>
-      <ProgressText Action="RemoveVS2010Help">Unregistering help collection from Visual Studio 2010</ProgressText>
+      <ProgressText Action="Register2010Help">Registering help collection with Visual Studio 2010</ProgressText>
+      <ProgressText Action="UnRegister2010Help">Unregistering help collection from Visual Studio 2010</ProgressText>
 
       <ProgressText Action='VS_2005_INSTALL_EXEC'>Installing Visual Studio 2005 Integration</ProgressText>
       <ProgressText Action='VS_2005_REMOVE_EXEC'>Removing Visual Studio 2005 Integration</ProgressText>

=== modified file 'Installer/webproviders.wxs'
--- a/Installer/webproviders.wxs	2010-11-17 19:25:46 +0000
+++ b/Installer/webproviders.wxs	2010-12-22 21:21:41 +0000
@@ -6,15 +6,14 @@
       <Directory Id="MySql.Web.DummyDir" Name="GAC">
         <Component Id="C.Web.v2.GAC" Guid="6b95d34b-91e1-41ff-9f3f-dcb5308a00ce">
           <Condition>NETFRAMEWORK20</Condition>
-          <File Id="ProviderAssemblyGAC" Name="MySql.Web.dll" ShortName="MW"
+          <File Id="ProviderAssemblyGAC.v2" Name="MySql.Web.dll" ShortName="MW"
                 Source="..\MySql.Web\providers\bin\release\mysql.web.dll" DiskId="1" Assembly=".net" KeyPath="yes"/>
         </Component>
       </Directory>
       <Component Id="C.Web.v2" Guid="8578813e-e123-45ad-9c92-565382a058b6">
-        <Condition>NETFRAMEWORK20</Condition>
-        <File Id="MySqlWeb" Name="MySql.Web.dll" DiskId="1"
+        <File Id="MySqlWeb.v2" Name="MySql.Web.dll" DiskId="1"
               Source="..\MySql.Web\providers\bin\release\mysql.web.dll"/>
-        <RemoveFile Id="RemoveWebStateFile" Name="*.InstallState" On="uninstall"/>
+        <RemoveFile Id="RemoveWebStateFile.v2" Name="*.InstallState" On="uninstall"/>
       </Component>
     </DirectoryRef>
 
@@ -22,15 +21,14 @@
       <Directory Id="MySql.Web.DummyDir.v4" Name="GAC">
         <Component Id="C.Web.v4.GAC" Guid="A30C8C85-C943-4976-8C9C-4ACFBBCD0764">
           <Condition>NETFRAMEWORK40FULL</Condition>
-          <File Id="ProviderAssemblyGAC" Name="MySql.Web.dll" ShortName="MW"
+          <File Id="ProviderAssemblyGAC.v4" Name="MySql.Web.dll" ShortName="MW"
                 Source="..\MySql.Web\providers\bin\release-4.0\mysql.web.dll" DiskId="1" Assembly=".net" KeyPath="yes"/>
         </Component>
       </Directory>
       <Component Id="C.Web.v4" Guid="64B61967-2AB9-4DCC-B82B-23CA348B3CCF">
-        <Condition>NETFRAMEWORK40FULL</Condition>
-        <File Id="MySqlWeb" Name="MySql.Web.dll" DiskId="1"
+        <File Id="MySqlWeb.v4" Name="MySql.Web.dll" DiskId="1"
               Source="..\MySql.Web\providers\bin\release-4.0\mysql.web.dll"/>
-        <RemoveFile Id="RemoveWebStateFile" Name="*.InstallState" On="uninstall"/>
+        <RemoveFile Id="RemoveWebStateFile.v4" Name="*.InstallState" On="uninstall"/>
       </Component>
     </DirectoryRef>
 
@@ -50,9 +48,9 @@
     </InstallExecuteSequence>
 
     <CustomAction Id="ManagedWebInstallSetup" Property="ManagedWebInstall"
-                  Value='"[WindowsFolder]\Microsoft.NET\Framework\[FrameworkVersion]\installUtil.exe" /LogToConsole=false /LogFile=  "[#MySqlWeb]"'/>
+                  Value='"[InstallUtil]\installUtil.exe" /LogToConsole=false /LogFile=  "[#MySqlWeb.v2]"'/>
     <CustomAction Id='ManagedWebUnInstallSetup' Property="ManagedWebUnInstall"
-                  Value='"[WindowsFolder]\Microsoft.NET\Framework\[FrameworkVersion]\installUtil.exe" /LogToConsole=false /LogFile= /u "[#MySqlWeb]"'/>
+                  Value='"[InstallUtil]\installUtil.exe" /LogToConsole=false /LogFile= /u "[#MySqlWeb.v2]"'/>
     <CustomAction Id="ManagedWebInstall" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="check" Execute='deferred' Impersonate='no'/>
     <CustomAction Id="ManagedWebUnInstall" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="check" Execute='deferred' Impersonate='no'/>
   </Fragment>

=== modified file 'MySQLClient-VS2010.sln'
--- a/MySQLClient-VS2010.sln	2010-12-06 21:35:13 +0000
+++ b/MySQLClient-VS2010.sln	2010-12-22 21:21:41 +0000
@@ -1,8 +1,6 @@
 ∩╗┐
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-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.Web", "MySql.Web\Providers\MySql.Web.csproj", "{C28B1166-1380-445D-AEC1-8A18B990DD18}"
@@ -17,6 +15,8 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity.Tests", "MySql.Data.Entity\Tests\MySql.Data.Entity.Tests.csproj", "{D37B3572-767F-4622-A835-844B0EBEFD5B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.VisualStudio", "MySql.VisualStudio\MySql.VisualStudio.csproj", "{DC3517FF-AC26-4755-9B7A-EF658FF69593}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Commercial|Any CPU = Commercial|Any CPU
@@ -45,42 +45,6 @@
 		Release-4.0|x86 = Release-4.0|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{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
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|x64.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|x86.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|Any CPU.ActiveCfg = Debug-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
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|x64.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|x86.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x64.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x86.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Any CPU.ActiveCfg = Release-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
@@ -96,7 +60,6 @@
 		{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
@@ -133,6 +96,7 @@
 		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug-4.0|Any CPU.ActiveCfg = Debug-4.0|Any CPU
 		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug-4.0|Any CPU.Build.0 = Debug-4.0|Any CPU
 		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug-4.0|Mixed Platforms.ActiveCfg = Debug-4.0|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug-4.0|Mixed Platforms.Build.0 = Debug-4.0|Any CPU
 		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug-4.0|x64.ActiveCfg = Debug-4.0|Any CPU
 		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug-4.0|x86.ActiveCfg = Debug-4.0|Any CPU
 		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|Any CPU.ActiveCfg = Release|Any CPU
@@ -167,8 +131,8 @@
 		{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|Mixed Platforms.ActiveCfg = Debug-4.0|Any CPU
+		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug-4.0|Mixed Platforms.Build.0 = Debug-4.0|Any CPU
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug-4.0|x64.ActiveCfg = Debug|Any CPU
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug-4.0|x86.ActiveCfg = Debug|Any CPU
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|Any CPU.ActiveCfg = Release|Any CPU
@@ -203,8 +167,8 @@
 		{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|Mixed Platforms.ActiveCfg = Debug-4.0|Any CPU
+		{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug-4.0|Mixed Platforms.Build.0 = Debug-4.0|Any CPU
 		{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug-4.0|x64.ActiveCfg = Debug|Any CPU
 		{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.Debug-4.0|x86.ActiveCfg = Debug|Any CPU
 		{83462D15-E576-4079-BBC9-9EE1CF0B24DD}.GPL|Any CPU.ActiveCfg = Release|Any CPU
@@ -239,8 +203,8 @@
 		{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|Mixed Platforms.ActiveCfg = Debug-4.0|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug-4.0|Mixed Platforms.Build.0 = Debug-4.0|Any CPU
 		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug-4.0|x64.ActiveCfg = Debug|Any CPU
 		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug-4.0|x86.ActiveCfg = Debug|Any CPU
 		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|Any CPU.ActiveCfg = Release|Any CPU
@@ -275,8 +239,8 @@
 		{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|Mixed Platforms.ActiveCfg = Debug-4.0|Any CPU
+		{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug-4.0|Mixed Platforms.Build.0 = Debug-4.0|Any CPU
 		{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug-4.0|x64.ActiveCfg = Debug|Any CPU
 		{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.Debug-4.0|x86.ActiveCfg = Debug|Any CPU
 		{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}.GPL|Any CPU.ActiveCfg = Release|Any CPU
@@ -311,8 +275,8 @@
 		{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|Mixed Platforms.ActiveCfg = Debug-4.0|Any CPU
+		{D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug-4.0|Mixed Platforms.Build.0 = Debug-4.0|Any CPU
 		{D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug-4.0|x64.ActiveCfg = Debug|Any CPU
 		{D37B3572-767F-4622-A835-844B0EBEFD5B}.Debug-4.0|x86.ActiveCfg = Debug|Any CPU
 		{D37B3572-767F-4622-A835-844B0EBEFD5B}.GPL|Any CPU.ActiveCfg = Release|Any CPU
@@ -333,6 +297,42 @@
 		{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
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Any CPU.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Any CPU.Build.0 = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Mixed Platforms.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Mixed Platforms.Build.0 = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|x64.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|x86.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|Any CPU.ActiveCfg = Debug-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-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|Mixed Platforms.Build.0 = Debug-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|x64.ActiveCfg = Debug-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|x86.ActiveCfg = Debug-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Any CPU.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Any CPU.Build.0 = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Mixed Platforms.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Mixed Platforms.Build.0 = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|x64.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|x86.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x64.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x86.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Any CPU.ActiveCfg = Release-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-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Mixed Platforms.Build.0 = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|x64.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|x86.ActiveCfg = Release-4.0|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

=== modified file 'MySQLClient.sln'
--- a/MySQLClient.sln	2010-12-14 15:25:24 +0000
+++ b/MySQLClient.sln	2010-12-22 21:21:41 +0000
@@ -13,25 +13,22 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.CF.Tests", "MySql.Data\Tests\MySql.Data.CF.Tests.csproj", "{710D9251-17A3-4429-9A91-63F03267F310}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.VisualStudio", "MySql.VisualStudio\MySql.VisualStudio.csproj", "{DC3517FF-AC26-4755-9B7A-EF658FF69593}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity", "MySql.Data.Entity\Provider\MySql.Data.Entity.csproj", "{EDED3135-95D2-4BCE-A810-F3F2AD7935B7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity.Tests", "MySql.Data.Entity\Tests\MySql.Data.Entity.Tests.csproj", "{D37B3572-767F-4622-A835-844B0EBEFD5B}"
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{F533FC43-6C05-4A64-8AF6-72B690EB06C3}"
 	ProjectSection(ProjectDependencies) = postProject
-		{77EC4E20-293A-48BA-8415-D0AD869D91FA} = {77EC4E20-293A-48BA-8415-D0AD869D91FA}
 		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4} = {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}
 		{710D9251-17A3-4429-9A91-63F03267F310} = {710D9251-17A3-4429-9A91-63F03267F310}
 		{C28B1166-1380-445D-AEC1-8A18B990DD18} = {C28B1166-1380-445D-AEC1-8A18B990DD18}
-		{DC704374-EC50-4167-93AA-8D262136502E} = {DC704374-EC50-4167-93AA-8D262136502E}
-		{A8E799B1-D6AC-42BD-907E-B213D7E9B3C5} = {A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D} = {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}
 		{587A47FB-C1CC-459D-93B6-179D95E41EFB} = {587A47FB-C1CC-459D-93B6-179D95E41EFB}
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593} = {DC3517FF-AC26-4755-9B7A-EF658FF69593}
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.VisualStudio", "MySql.VisualStudio\MySql.VisualStudio.csproj", "{DC3517FF-AC26-4755-9B7A-EF658FF69593}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Commercial|Any CPU = Commercial|Any CPU
@@ -200,30 +197,6 @@
 		{710D9251-17A3-4429-9A91-63F03267F310}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.Release|x64.ActiveCfg = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.Release|x86.ActiveCfg = Release|Any CPU
-		{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
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|x64.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|x86.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.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
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|x64.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|x86.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x64.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x86.ActiveCfg = Release|Any CPU
 		{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
@@ -298,6 +271,26 @@
 		{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
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|x64.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|x86.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|x64.ActiveCfg = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|x86.ActiveCfg = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x64.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

=== modified file 'MySql.Data/Provider/MySql.Data.csproj'
--- a/MySql.Data/Provider/MySql.Data.csproj	2010-12-06 21:35:13 +0000
+++ b/MySql.Data/Provider/MySql.Data.csproj	2010-12-22 21:21:41 +0000
@@ -52,7 +52,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <IntermediateOutputPath>obj\Debug-4.0\</IntermediateOutputPath>
     <OutputPath>bin\Debug-4.0\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;CLR4</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
@@ -62,7 +62,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <IntermediateOutputPath>obj\Release-4.0\</IntermediateOutputPath>
     <OutputPath>bin\Release-4.0\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;CLR4</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>

=== modified file 'MySql.Data/Provider/Properties/AssemblyInfo.cs'
--- a/MySql.Data/Provider/Properties/AssemblyInfo.cs	2010-08-18 19:52:04 +0000
+++ b/MySql.Data/Provider/Properties/AssemblyInfo.cs	2010-12-22 21:21:41 +0000
@@ -47,6 +47,10 @@
 [assembly: AssemblyTitle("MySql.Data.CF.dll")]
 #endif
 
+#if CLR4
+[assembly: SecurityRules(SecurityRuleSet.Level1)]
+#endif
+
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
 // Microsoft .NET Framework documentation for more information on assembly signing.

=== renamed file 'MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj' => 'MySql.VisualStudio/MySql.VisualStudio.csproj'
--- a/MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj	2010-12-06 21:35:13 +0000
+++ b/MySql.VisualStudio/MySql.VisualStudio.csproj	2010-12-22 21:21:41 +0000
@@ -34,6 +34,7 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
@@ -48,6 +49,7 @@
     <RegisterForComInterop>false</RegisterForComInterop>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <UseVS2005MPF>true</UseVS2005MPF>
+    <VSVersion>VS2008</VSVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
@@ -60,6 +62,7 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <UseVS2005MPF>true</UseVS2005MPF>
+    <VSVersion>VS2008</VSVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-4.0|AnyCPU'">
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
@@ -73,6 +76,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+    <VSVersion>VS2010</VSVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-4.0|AnyCPU'">
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
@@ -87,6 +91,7 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+    <VSVersion>VS2010</VSVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -321,11 +326,6 @@
       <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">
@@ -411,11 +411,6 @@
     <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" />
@@ -457,10 +452,7 @@
     <RegisterWithRanu>false</RegisterWithRanu>
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="Targets\VS.targets"/>
-  <!--<PropertyGroup>
-    <PreBuildEvent>copy $(ProjectDir)\Targets\vs2010.targets $(ProjectDir)\Active.targets</PreBuildEvent>
-  </PropertyGroup>-->
+  <Import Project="Targets\VS.targets" />
   <!--<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\VSSDK\Microsoft.VsSDK.targets"
           Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU' or '$(Configuration)|$(Platform)' == 'Release|AnyCPU'"/>
   
@@ -478,4 +470,8 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <PropertyGroup>
+    <PreBuildEvent>copy "$(ProjectDir)Targets\$(VSVersion).targets" "$(ProjectDir)Targets\VS.targets"</PreBuildEvent>
+    <PostBuildEvent>copy "$(ProjectDir)Targets\blank.targets" "$(ProjectDir)Targets\VS.targets"</PostBuildEvent>
+  </PropertyGroup>
 </Project>
\ No newline at end of file

=== modified file 'MySql.VisualStudio/Targets/VS.targets'
--- a/MySql.VisualStudio/Targets/VS.targets	2010-12-06 21:35:13 +0000
+++ b/MySql.VisualStudio/Targets/VS.targets	2010-12-22 21:21:41 +0000
@@ -1,3 +1,2 @@
 <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

=== modified file 'MySql.VisualStudio/Targets/VS2010.targets'
--- a/MySql.VisualStudio/Targets/VS2010.targets	2010-12-06 21:35:13 +0000
+++ b/MySql.VisualStudio/Targets/VS2010.targets	2010-12-22 21:21:41 +0000
@@ -1,3 +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">
+	<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets"/>
 </Project>
\ No newline at end of file

=== added file 'MySql.VisualStudio/Targets/blank.targets'
--- a/MySql.VisualStudio/Targets/blank.targets	1970-01-01 00:00:00 +0000
+++ b/MySql.VisualStudio/Targets/blank.targets	2010-12-22 21:21:41 +0000
@@ -0,0 +1,2 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file

=== modified file 'MySql.Web/Providers/MySql.Web.csproj'
--- a/MySql.Web/Providers/MySql.Web.csproj	2010-12-06 21:35:13 +0000
+++ b/MySql.Web/Providers/MySql.Web.csproj	2010-12-22 21:21:41 +0000
@@ -65,7 +65,7 @@
     <DebugSymbols>true</DebugSymbols>
     <IntermediateOutputPath>obj\Debug-4.0\</IntermediateOutputPath>
     <OutputPath>bin\Debug-4.0\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;CLR4</DefineConstants>
     <NoWarn>1699</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -78,7 +78,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <IntermediateOutputPath>obj\Release-4.0\</IntermediateOutputPath>
     <OutputPath>bin\Release-4.0\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;CLR4</DefineConstants>
     <DocumentationFile>bin\release\webdocs.xml</DocumentationFile>
     <Optimize>true</Optimize>
     <NoWarn>1699</NoWarn>

=== modified file 'MySql.Web/Providers/Properties/AssemblyInfo.cs'
--- a/MySql.Web/Providers/Properties/AssemblyInfo.cs	2010-08-30 21:23:16 +0000
+++ b/MySql.Web/Providers/Properties/AssemblyInfo.cs	2010-12-22 21:21:41 +0000
@@ -43,6 +43,10 @@
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
+#if CLR4
+[assembly: SecurityRules(SecurityRuleSet.Level1)]
+#endif
+
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 //[assembly: Guid("01520f33-9ecd-4574-96d0-5e6604e0f3aa")]
 

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
Thread
• bzr commit into connector-net-trunk branch (reggie.burnett:952)	Reggie Burnett	22 Dec