List:Commits« Previous MessageNext Message »
From:Reggie Burnett Date:May 19 2010 5:56pm
Subject:bzr commit into connector-net-trunk branch (reggie.burnett:869)
View as plain text  
#At file:///C:/work/connector-net/trunk/ based on revid:reggie.burnett@stripped

  869 Reggie Burnett	2010-05-19
      - added editor template to installer
       - added clr4 variants of entity framework and visualstudio to installer
      - updated bzr ignore file

    added:
      Installer/Installer.VS2010.wixproj
      MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj
    modified:
      .bzrignore
      Installer/Installer.wixproj
      Installer/VS2005_Registry.wxi
      Installer/VS2008_Registry.wxi
      Installer/VS2010_Registry.wxi
      Installer/cf.wxs
      Installer/core.wxs
      Installer/main.wxs
      Installer/ui.wxs
      Installer/visualstudio.wxs
      Installer/webproviders.wxs
      MySQLClient-VS2010.sln
      MySql.Data.Entity/Provider/MySql.Data.Entity.VS2010.csproj
      MySql.VisualStudio/Editors/SqlEditor.Designer.cs
      MySql.VisualStudio/Editors/SqlEditor.resx
      MySql.VisualStudio/Editors/VSCodeEditor.cs
=== modified file '.bzrignore'
=== modified file '.bzrignore'
--- a/.bzrignore	2009-08-18 03:37:45 +0000
+++ b/.bzrignore	2010-05-19 17:56:19 +0000
@@ -10,3 +10,9 @@
 MySql.Data.Entity/Tests/Service References
 **/*.InstallLog
 UpgradeLog.XML
+**/UpgradeLog*.*
+Documention/Output/**
+**/bin-4.0/**
+**/bin-4.0
+Documentation/Output
+_UpgradeReport_Files

=== added file 'Installer/Installer.VS2010.wixproj'
--- a/Installer/Installer.VS2010.wixproj	1970-01-01 00:00:00 +0000
+++ b/Installer/Installer.VS2010.wixproj	2010-05-19 17:56:19 +0000
@@ -0,0 +1,162 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <UsingTask AssemblyFile="Binary\MyTasks.dll" TaskName="GetVersion" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <ProductVersion>3.0</ProductVersion>
+    <ProjectGuid>{f533fc43-6c05-4a64-8af6-72b690eb06c3}</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>MySql.Data</OutputName>
+    <OutputType>Package</OutputType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'GPL' ">
+    <IntermediateOutputPath>obj\GPL\</IntermediateOutputPath>
+    <OutputPath>bin\GPL\</OutputPath>
+    <DefineConstants>IsGPL=1</DefineConstants>
+    <IncludeSearchPaths>
+    </IncludeSearchPaths>
+    <Cultures>en-US</Cultures>
+    <Pedantic>False</Pedantic>
+    <ShowSourceTrace>False</ShowSourceTrace>
+    <SuppressSchemaValidation>False</SuppressSchemaValidation>
+    <SuppressSpecificWarnings>
+    </SuppressSpecificWarnings>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <VerboseOutput>False</VerboseOutput>
+    <AllowIdenticalRows>False</AllowIdenticalRows>
+    <CabinetCachePath>
+    </CabinetCachePath>
+    <CabinetCreationThreadCount>-1</CabinetCreationThreadCount>
+    <LeaveTemporaryFiles>False</LeaveTemporaryFiles>
+    <LinkerPedantic>False</LinkerPedantic>
+    <ReuseCabinetCache>False</ReuseCabinetCache>
+    <SetMsiAssemblyNameFileVersion>False</SetMsiAssemblyNameFileVersion>
+    <SuppressAclReset>False</SuppressAclReset>
+    <SuppressAssemblies>False</SuppressAssemblies>
+    <SuppressDefaultAdminSequenceActions>False</SuppressDefaultAdminSequenceActions>
+    <SuppressDefaultAdvSequenceActions>False</SuppressDefaultAdvSequenceActions>
+    <SuppressDefaultUISequenceActions>False</SuppressDefaultUISequenceActions>
+    <SuppressDroppingUnrealTables>False</SuppressDroppingUnrealTables>
+    <SuppressFileHashAndInfo>False</SuppressFileHashAndInfo>
+    <SuppressFiles>False</SuppressFiles>
+    <SuppressIces>
+    </SuppressIces>
+    <LinkerSuppressIntermediateFileVersionMatching>False</LinkerSuppressIntermediateFileVersionMatching>
+    <SuppressLayout>False</SuppressLayout>
+    <SuppressMsiAssemblyTableProcessing>False</SuppressMsiAssemblyTableProcessing>
+    <LinkerSuppressSchemaValidation>False</LinkerSuppressSchemaValidation>
+    <LinkerSuppressSpecificWarnings>
+    </LinkerSuppressSpecificWarnings>
+    <SuppressValidation>True</SuppressValidation>
+    <LinkerTreatWarningsAsErrors>False</LinkerTreatWarningsAsErrors>
+    <LinkerVerboseOutput>False</LinkerVerboseOutput>
+    <WixVariables>
+    </WixVariables>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Commercial' ">
+    <IntermediateOutputPath>obj\Commercial\</IntermediateOutputPath>
+    <Cultures>en-US</Cultures>
+    <OutputPath>bin\Commercial\</OutputPath>
+    <DefineConstants>IsGPL=0</DefineConstants>
+    <IncludeSearchPaths>
+    </IncludeSearchPaths>
+    <Pedantic>False</Pedantic>
+    <ShowSourceTrace>False</ShowSourceTrace>
+    <SuppressSchemaValidation>False</SuppressSchemaValidation>
+    <SuppressSpecificWarnings>
+    </SuppressSpecificWarnings>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <VerboseOutput>False</VerboseOutput>
+    <AllowIdenticalRows>False</AllowIdenticalRows>
+    <CabinetCachePath>
+    </CabinetCachePath>
+    <CabinetCreationThreadCount>-1</CabinetCreationThreadCount>
+    <LeaveTemporaryFiles>False</LeaveTemporaryFiles>
+    <LinkerPedantic>False</LinkerPedantic>
+    <ReuseCabinetCache>False</ReuseCabinetCache>
+    <SetMsiAssemblyNameFileVersion>False</SetMsiAssemblyNameFileVersion>
+    <SuppressAclReset>False</SuppressAclReset>
+    <SuppressAssemblies>False</SuppressAssemblies>
+    <SuppressDefaultAdminSequenceActions>False</SuppressDefaultAdminSequenceActions>
+    <SuppressDefaultAdvSequenceActions>False</SuppressDefaultAdvSequenceActions>
+    <SuppressDefaultUISequenceActions>False</SuppressDefaultUISequenceActions>
+    <SuppressDroppingUnrealTables>False</SuppressDroppingUnrealTables>
+    <SuppressFileHashAndInfo>False</SuppressFileHashAndInfo>
+    <SuppressFiles>False</SuppressFiles>
+    <SuppressIces>
+    </SuppressIces>
+    <LinkerSuppressIntermediateFileVersionMatching>False</LinkerSuppressIntermediateFileVersionMatching>
+    <SuppressLayout>False</SuppressLayout>
+    <SuppressMsiAssemblyTableProcessing>False</SuppressMsiAssemblyTableProcessing>
+    <LinkerSuppressSchemaValidation>False</LinkerSuppressSchemaValidation>
+    <LinkerSuppressSpecificWarnings>
+    </LinkerSuppressSpecificWarnings>
+    <SuppressValidation>True</SuppressValidation>
+    <LinkerTreatWarningsAsErrors>False</LinkerTreatWarningsAsErrors>
+    <LinkerVerboseOutput>False</LinkerVerboseOutput>
+    <WixVariables>
+    </WixVariables>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'GPL|x86' ">
+    <DefineConstants>IsGPL=1;PackageSuffix=</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Commercial|x86' ">
+    <DefineConstants>IsGPL=0;PackageSuffix=-com</DefineConstants>
+    <WixVariables>
+    </WixVariables>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="cf.wxs" />
+    <Compile Include="core.wxs" />
+    <Compile Include="main.wxs" />
+    <Compile Include="samples.wxs" />
+    <Compile Include="ui.wxs" />
+    <Compile Include="visualstudio.wxs" />
+    <Compile Include="webproviders.wxs" />
+  </ItemGroup>
+  <Target Name="RetrieveIdentities">
+    <GetVersion Assembly="..\MySql.Data\Provider\bin\release\mysql.data.dll" Format="{0}.{1}.{2}">
+      <Output TaskParameter="AsString" PropertyName="CurrentVersion" />
+    </GetVersion>
+    <CreateProperty Value="Version=$(CurrentVersion);$(DefineConstants)">
+      <Output TaskParameter="Value" PropertyName="DefineConstants" />
+    </CreateProperty>
+  </Target>
+  <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+      <Name>WixNetFxExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixVSExtension">
+      <HintPath>$(WixExtDir)\WixVSExtension.dll</HintPath>
+      <Name>WixVSExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="registration\loginhdr.jpg" />
+    <Content Include="registration\mysql_ca.dll" />
+    <Content Include="registration\register.htm" />
+    <Content Include="registration\svctag.xml" />
+    <Content Include="registration\webpage.ico" />
+    <Content Include="VS2005_Data.wxi" />
+    <Content Include="VS2005_Registry.wxi" />
+    <Content Include="VS2008_Data.wxi" />
+    <Content Include="VS2008_Registry.wxi" />
+    <Content Include="VS2010_Data.wxi" />
+    <Content Include="VS2010_Registry.wxi" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="registration\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.5\Wix.targets" />
+  <PropertyGroup>
+    <BuildDependsOn>RetrieveIdentities;$(BuildDependsOn)</BuildDependsOn>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

=== modified file 'Installer/Installer.wixproj'
--- a/Installer/Installer.wixproj	2010-04-10 01:40:44 +0000
+++ b/Installer/Installer.wixproj	2010-05-19 17:56:19 +0000
@@ -112,7 +112,6 @@
     <Compile Include="ui.wxs" />
     <Compile Include="visualstudio.wxs" />
     <Compile Include="webproviders.wxs" />
-    <Compile Include="registration.wxs" />
   </ItemGroup>
   <Target Name="RetrieveIdentities">
     <GetVersion Assembly="..\MySql.Data\Provider\bin\release\mysql.data.dll" Format="{0}.{1}.{2}">

=== modified file 'Installer/VS2005_Registry.wxi'
--- a/Installer/VS2005_Registry.wxi	2009-02-27 21:53:52 +0000
+++ b/Installer/VS2005_Registry.wxi	2010-05-19 17:56:19 +0000
@@ -43,4 +43,27 @@
     <RegistryValue Value="{79a115c9-b133-4891-9e7b-242509dad272}" Type="string"/>
     <RegistryValue Name="Name" Value="MySqlLanguageService" Type="string" />
   </RegistryKey>
+
+  <RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
+               Key="Software\Microsoft\VisualStudio\8.0\Projects\{a2fe74e1-b743-11d0-ae1a-00a0c90fffc3}\AddItemTemplates\TemplateDirs\{79a115c9-b133-4891-9e7b-242509dad272}">
+    <RegistryKey Key="/1">
+      <RegistryValue Value="#105" Type="string"/>
+      <RegistryValue Name="Package" Value="{79a115c9-b133-4891-9e7b-242509dad272}" Type="string"/>
+      <RegistryValue Name="SortPriority" Value="32" Type="integer"/>
+      <RegistryValue Name="TemplatesDir" Value="[VSTemplatesDir]" Type="string"/>
+    </RegistryKey>
+  </RegistryKey>
+
+  <RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
+               Key="Software\Microsoft\VisualStudio\8.0\Editors\{CAA648E8-D6BD-465e-A1B3-2A0BF9DA5581}">
+    <RegistryValue Value="MySql Tools for Visual Studio" Type="string"/>
+    <RegistryValue Name="DisplayName" Value="#105" Type="string"/>
+    <RegistryValue Name="Package" Value="{79A115C9-B133-4891-9E7B-242509DAD272}" Type="string"/>
+    <RegistryKey Key="Extensions">
+      <RegistryValue Name="mysql" Value="32" Type="integer"/>
+    </RegistryKey>
+    <RegistryKey Key="LogicalViews">
+      <RegistryValue Name="{7651a703-06e5-11d1-8ebd-00a0c90f26ea}" Value="" Type="string"/>
+    </RegistryKey>
+  </RegistryKey>
 </Include>

=== modified file 'Installer/VS2008_Registry.wxi'
--- a/Installer/VS2008_Registry.wxi	2009-02-27 21:53:52 +0000
+++ b/Installer/VS2008_Registry.wxi	2010-05-19 17:56:19 +0000
@@ -44,4 +44,27 @@
     <RegistryValue Name="Name" Value="MySqlLanguageService" Type="string" />
   </RegistryKey>
 
+  <RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
+               Key="Software\Microsoft\VisualStudio\9.0\Projects\{a2fe74e1-b743-11d0-ae1a-00a0c90fffc3}\AddItemTemplates\TemplateDirs\{79a115c9-b133-4891-9e7b-242509dad272}">
+    <RegistryKey Key="/1">
+      <RegistryValue Value="#105" Type="string"/>
+      <RegistryValue Name="Package" Value="{79a115c9-b133-4891-9e7b-242509dad272}" Type="string"/>
+      <RegistryValue Name="SortPriority" Value="32" Type="integer"/>
+      <RegistryValue Name="TemplatesDir" Value="[VSTemplatesDir]" Type="string"/>
+    </RegistryKey>
+  </RegistryKey>
+
+  <RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
+               Key="Software\Microsoft\VisualStudio\9.0\Editors\{CAA648E8-D6BD-465e-A1B3-2A0BF9DA5581}">
+    <RegistryValue Value="MySql Tools for Visual Studio" Type="string"/>
+    <RegistryValue Name="DisplayName" Value="#105" Type="string"/>
+    <RegistryValue Name="Package" Value="{79A115C9-B133-4891-9E7B-242509DAD272}" Type="string"/>
+    <RegistryKey Key="Extensions">
+      <RegistryValue Name="mysql" Value="32" Type="integer"/>
+    </RegistryKey>
+    <RegistryKey Key="LogicalViews">
+      <RegistryValue Name="{7651a703-06e5-11d1-8ebd-00a0c90f26ea}" Value="" Type="string"/>
+    </RegistryKey>
+  </RegistryKey>
+
 </Include>

=== modified file 'Installer/VS2010_Registry.wxi'
--- a/Installer/VS2010_Registry.wxi	2010-02-13 04:34:16 +0000
+++ b/Installer/VS2010_Registry.wxi	2010-05-19 17:56:19 +0000
@@ -44,4 +44,27 @@
     <RegistryValue Name="Name" Value="MySqlLanguageService" Type="string" />
   </RegistryKey>
 
+  <RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
+               Key="Software\Microsoft\VisualStudio\10.0\Projects\{a2fe74e1-b743-11d0-ae1a-00a0c90fffc3}\AddItemTemplates\TemplateDirs\{79a115c9-b133-4891-9e7b-242509dad272}">
+    <RegistryKey Key="/1">
+      <RegistryValue Value="#105" Type="string"/>
+      <RegistryValue Name="Package" Value="{79a115c9-b133-4891-9e7b-242509dad272}" Type="string"/>
+      <RegistryValue Name="SortPriority" Value="32" Type="integer"/>
+      <RegistryValue Name="TemplatesDir" Value="[VSTemplatesDir]" Type="string"/>
+    </RegistryKey>
+  </RegistryKey>
+
+  <RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
+               Key="Software\Microsoft\VisualStudio\10.0\Editors\{CAA648E8-D6BD-465e-A1B3-2A0BF9DA5581}">
+    <RegistryValue Value="MySql Tools for Visual Studio" Type="string"/>
+    <RegistryValue Name="DisplayName" Value="#105" Type="string"/>
+    <RegistryValue Name="Package" Value="{79A115C9-B133-4891-9E7B-242509DAD272}" Type="string"/>
+    <RegistryKey Key="Extensions">
+      <RegistryValue Name="mysql" Value="32" Type="integer"/>
+    </RegistryKey>
+    <RegistryKey Key="LogicalViews">
+      <RegistryValue Name="{7651a703-06e5-11d1-8ebd-00a0c90f26ea}" Value="" Type="string"/>
+    </RegistryKey>
+  </RegistryKey>
+
 </Include>

=== modified file 'Installer/cf.wxs'
--- a/Installer/cf.wxs	2009-07-28 20:00:05 +0000
+++ b/Installer/cf.wxs	2010-05-19 17:56:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment Id='CFFragment'>
-    <DirectoryRef Id='AssembliesDir'>
+    <DirectoryRef Id='assemblies_v2'>
       <Component Id="CFBinaries" Guid="5a9c32ad-62f5-4b24-a225-96acf42d88a1">
         <File Id="cf1" Name="MySql.Data.CF.dll"
               Source="..\mysql.data\provider\bin\release\mysql.data.CF.dll" DiskId="1"/>

=== modified file 'Installer/core.wxs'
--- a/Installer/core.wxs	2010-02-13 04:34:16 +0000
+++ b/Installer/core.wxs	2010-05-19 17:56:19 +0000
@@ -22,7 +22,7 @@
     </DirectoryRef>
 
     <!-- .Net 2.0 Binaries -->
-    <DirectoryRef Id='AssembliesDir'>
+    <DirectoryRef Id='assemblies_v2'>
       <Component Id="Net20" Guid="0e8af006-273c-49bb-b7c1-ec1737260a5a">
         <File Id="MySqlData" Name="MySql.Data.dll"
               Source="..\mysql.data\provider\bin\release\mysql.data.dll" DiskId="1"/>
@@ -64,26 +64,45 @@
       <ComponentRef Id="Net20"/>
       <ComponentRef Id="GAC20"/>
       <ComponentRef Id="StartMenuComponent"/>
-      <ComponentRef Id="Registration"/>
     </Feature>
 
-    <!-- Entity framework feature -->
-    <DirectoryRef Id='AssembliesDir'>
-      <Component Id="InstallEF" Guid="AB734C75-F5DC-491e-A2BC-52D5061881B7" DiskId="1">
+    <!-- Entity framework 2.0 feature -->
+    <DirectoryRef Id='assemblies_v2'>
+      <Component Id="EF.v2" Guid="AB734C75-F5DC-491e-A2BC-52D5061881B7" DiskId="1">
+        <Condition>NETFRAMEWORK20</Condition>
         <File Id="MySql.Data.EF" Name="MySql.Data.Entity.dll"
               Source="..\mysql.data.entity\provider\bin\release\mysql.data.entity.dll" DiskId="1"/>
       </Component>
-      <Component Id="GACEF" Guid="12218CCC-B085-46af-AA5F-FB9306FE621E" DiskId="1">
+      <Component Id="EF.v2.GAC" Guid="12218CCC-B085-46af-AA5F-FB9306FE621E" DiskId="1">
+        <Condition>NETFRAMEWORK20</Condition>
         <File Id="MySql.Data.EF.GAC" Name="MySql.Data.Entity.dll"
               Source="..\mysql.data.entity\provider\bin\release\mysql.data.entity.dll" DiskId="1"
               Assembly=".net" KeyPath="yes"/>
       </Component>
     </DirectoryRef>
 
+    <!-- Entity framework 4.0 feature -->
+    <DirectoryRef Id='assemblies_v4'>
+      <Component Id="EF.v4" Guid="E6B683F6-727A-43c9-B955-6BEE94EF61C7" DiskId="1">
+        <Condition>NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</Condition>
+        <File Id="MySql.Data.EF.v4" Name="MySql.Data.Entity.dll"
+              Source="..\mysql.data.entity\provider\bin\release\mysql.data.entity.dll" DiskId="1"/>
+      </Component>
+      <Component Id="EF.v4.GAC" Guid="A9C03468-5A59-443f-85DC-C0149EBB55C8" DiskId="1">
+        <Condition>NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</Condition>
+        <File Id="MySql.Data.EF.v4.GAC" Name="MySql.Data.Entity.dll"
+              Source="..\mysql.data.entity\provider\bin-4.0\release\mysql.data.entity.dll" DiskId="1"
+              Assembly=".net" KeyPath="yes"/>
+      </Component>
+    </DirectoryRef>
+
     <Feature Id="EntityFramework" Level="1" Title="Entity Framework Support"
              Description="Support for the entity framework">
-      <ComponentRef Id="InstallEF"/>
-      <ComponentRef Id="GACEF"/>
+      <Condition Level='0'>Not NETFRAMEWORK20 AND Not NETFRAMEWORK40FULL And Not NETFRAMEWORK40CLIENT</Condition>
+      <ComponentRef Id="EF.v2"/>
+      <ComponentRef Id="EF.v2.GAC"/>
+      <ComponentRef Id="EF.v4"/>
+      <ComponentRef Id="EF.v4.GAC"/>
     </Feature>
 
     <InstallExecuteSequence>

=== modified file 'Installer/main.wxs'
--- a/Installer/main.wxs	2010-02-13 04:34:16 +0000
+++ b/Installer/main.wxs	2010-05-19 17:56:19 +0000
@@ -14,9 +14,11 @@
       <![CDATA[ Privileged  ]]>
     </Condition>
 
-    <!-- First make sure that .NET 2.0 is installed -->
+    <!-- First make sure that .NET is installed -->
     <PropertyRef Id="NETFRAMEWORK20"/>
-    <Condition Message="The .NET Framework 2.0 must be installed before installing this package.">Installed OR NETFRAMEWORK20</Condition>
+    <PropertyRef Id="NETFRAMEWORK40FULL"/>
+    <PropertyRef Id="NETFRAMEWORK40CLIENT"/>
+    <Condition Message="The .NET Framework 2.0 or 4.0 must be installed before installing this package.">Installed OR NETFRAMEWORK20 OR NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</Condition>
 
     <!-- now make sure that we don't have an old version still around -->
     <Property Id="OLDVERSION">
@@ -37,8 +39,15 @@
       <Directory Id='ProgramFilesFolder' Name='PFiles'>
         <Directory Id='CompanyDir' Name='MySQL'>
           <Directory Id='INSTALLDIR' Name='$(var.ProductName)'>
-            <Directory Id='AssembliesDir' Name='Assemblies'/>
-            <Directory Id='IntegrationDir' Name='Integration'/>
+            <Directory Id='AssembliesDir' Name='Assemblies'>
+              <Directory Id='assemblies_v2' Name='v2.0'/>
+              <Directory Id='assemblies_v4' Name='v4.0'/>
+            </Directory>
+            <Directory Id='VSIntegrationDir' Name='Visual Studio Integration'>
+              <Directory Id='VSTemplatesDir' Name='Templates'/>
+              <Directory Id='VS2008Integration' Name='2005 and 2008'/>
+              <Directory Id='VS2010Integration' Name='2010'/>
+            </Directory>
             <Directory Id='DocsDir' Name='Documentation'/>
             <Directory Id='SampleDir' Name='Samples'/>
           </Directory>
@@ -50,6 +59,19 @@
           <Directory Id="ShortCutDir" Name="$(var.ProductName)"/>
         </Directory>
       </Directory>
+
+      <!-- Install the T4 DDL creation templates -->
+      <Directory Id="VS_2010_PATH" Name="VSPath">
+        <Directory Id="Entity.T4.ExtensionDir" Name="Extensions">
+          <Directory Id="Entity.T4.OracleDir" Name="Oracle">
+            <Directory Id="Entity.T4.EFToolsDir" Name="Entity Framework Tools">
+              <Directory Id="Entity.T4.DBGenDir" Name="DBGen"/>
+            </Directory>
+          </Directory>
+        </Directory>
+      </Directory>
+
+
     </Directory>
 
     <DirectoryRef Id='DocsDir'>
@@ -103,8 +125,8 @@
     The product urn is specific to each version 
     The registration package should be the name of the MSI
     -->
-    <Property Id="ProductURN">MSQZN-600-ZZZZ</Property>
-    <Property Id="RegistrationPackage">mysql-connector-net-$(var.Version)$(var.PackageSuffix).zip</Property>
+    <!--<Property Id="ProductURN">MSQZN-600-ZZZZ</Property>
+    <Property Id="RegistrationPackage">mysql-connector-net-$(var.Version)$(var.PackageSuffix).zip</Property>-->
   </Product>
 </Wix>
 

=== modified file 'Installer/ui.wxs'
--- a/Installer/ui.wxs	2010-02-13 04:34:16 +0000
+++ b/Installer/ui.wxs	2010-05-19 17:56:19 +0000
@@ -68,8 +68,8 @@
     <UI>
       <Dialog Id="MySQL_ExitDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
         <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="$(loc.WixUIFinish)">
-          <Publish Event="DoAction" Value="PostRegistration.SetProperty">RegisterServer and not Installed and ACTION="INSTALL"</Publish>
-          <Publish Event="DoAction" Value="PostRegistration">RegisterServer and not Installed and ACTION="INSTALL"</Publish>
+          <!--<Publish Event="DoAction" Value="PostRegistration.SetProperty">RegisterServer and not Installed and ACTION="INSTALL"</Publish>
+          <Publish Event="DoAction" Value="PostRegistration">RegisterServer and not Installed and ACTION="INSTALL"</Publish>-->
           <Publish Event="EndDialog" Value="Return">1</Publish>
         </Control>
         <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
@@ -78,9 +78,6 @@
         <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
         <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="40" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
         <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" />
-        <Control Id="LaunchCheckBox" Type="CheckBox" X="10" Y="243" Width="170" Height="17" Hidden="yes" Property="RegisterServer" Integer="yes" CheckBoxValue="1" Text=" Register [ProductName] with Sun.">
-          <Condition Action="show">NOT Installed</Condition>
-        </Control>
       </Dialog>
 
       <InstallUISequence>

=== modified file 'Installer/visualstudio.wxs'
--- a/Installer/visualstudio.wxs	2010-02-13 04:34:16 +0000
+++ b/Installer/visualstudio.wxs	2010-05-19 17:56:19 +0000
@@ -2,10 +2,19 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment Id='VSFragment'>
 
+    <DirectoryRef Id='VSTemplatesDir'>
+      <Component Id='VSTemplates' Guid='CB74DD46-A5D0-402f-9413-63A8DEFB3A26'>
+        <File Id='ScriptTemplate' Name='MySQL Script.mysql' DiskId='1'
+              Source='..\MySql.VisualStudio\Templates\MySQL Script.mysql'/>
+        <File Id='ScriptTemplate.vsdir' Name='MySqlDataProviderPackage.vsdir' DiskId='1'
+              Source='..\MySql.VisualStudio\Templates\MySqlDataProviderPackage.vsdir'/>
+      </Component>  
+    </DirectoryRef>
+    
     <!-- integration of VS2005 and VS2008 -->
-    <DirectoryRef Id='IntegrationDir'>
+    <DirectoryRef Id='VS2008Integration'>
       <!-- common DDEX component to be installed if VS2005 or VS2008 is selected -->
-      <Component Id='VS_Common' Guid='75F9BFA2-4D6E-4cb3-97E6-B27C478CDE44'>
+      <Component Id='VS2008_Common' Guid='75F9BFA2-4D6E-4cb3-97E6-B27C478CDE44'>
         <File Id='MySQL.VisualStudio' Name='MySQL.VisualStudio.dll' DiskId='1'
               Source='..\MySql.VisualStudio\bin\release\MySQL.VisualStudio.dll' />
       </Component>
@@ -13,7 +22,7 @@
       <Component Id='VS_2005_Registry' Guid='B99FF3E3-F742-47af-B1FE-BBF2CDC4B95D'>
         <RegistryKey Id="VS_2005_RegistryKey" Root="HKLM" Action="createAndRemoveOnUninstall"
                      Key="SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\MySQL Connector Net $(var.Version)">
-          <RegistryValue Id="VS_2005_RegistryValue" Value="[AssembliesDir]" Type="string" Action="write"/>
+          <RegistryValue Id="VS_2005_RegistryValue" Value="[assemblies_v2]" Type="string" Action="write"/>
         </RegistryKey>
         <?include VS2005_Registry.wxi?>
         <?include VS2005_Data.wxi ?>
@@ -22,16 +31,23 @@
       <Component Id='VS_2008_Registry' Guid='84AE8C43-294D-4e48-B75D-D9172396C2FD'>
         <RegistryKey Id="VS_2008_RegistryKey" Root="HKLM" Action="createAndRemoveOnUninstall"
                      Key="SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\MySQL Connector Net $(var.Version)">
-          <RegistryValue Id="VS_2008_RegistryValue" Value="[AssembliesDir]" Type="string" Action="write"/>
+          <RegistryValue Id="VS_2008_RegistryValue" Value="[assemblies_v2]" Type="string" Action="write"/>
         </RegistryKey>
         <?include VS2008_Registry.wxi?>
         <?include VS2008_Data.wxi?>
       </Component>
+    </DirectoryRef>
 
+    <DirectoryRef Id='VS2010Integration'>
+      <Component Id='VS2010_Common' Guid='EC2420A0-ADD0-477f-99B5-FFA96EC557F4'>
+        <File Id='MySQL.VisualStudio.2010' Name='MySQL.VisualStudio.dll' DiskId='1'
+              Source='..\MySql.VisualStudio\bin-4.0\release\MySQL.VisualStudio.dll' />
+      </Component>
+      
       <Component Id='VS_2010_Registry' Guid='84AE8C43-294D-4e48-B75D-D9172396C2FD'>
         <RegistryKey Id="VS_2010_RegistryKey" Root="HKLM" Action="createAndRemoveOnUninstall"
                      Key="SOFTWARE\Microsoft\.NETFramework\v4.0.30128\AssemblyFoldersEx\MySQL Connector Net $(var.Version)">
-          <RegistryValue Id="VS_2010_RegistryValue" Value="[AssembliesDir]" Type="string" Action="write"/>
+          <RegistryValue Id="VS_2010_RegistryValue" Value="[assemblies_v4]" Type="string" Action="write"/>
         </RegistryKey>
         <?include VS2010_Registry.wxi?>
         <?include VS2010_Data.wxi?>
@@ -40,19 +56,22 @@
 
     <Feature Id='VS2005Int' Level='1' Title='Visual Studio 2005'>
       <Condition Level='0'>Not VS_2005_PATH</Condition>
-      <ComponentRef Id='VS_Common'/>
+      <ComponentRef Id='VS2008_Common'/>
+      <ComponentRef Id='VSTemplates'/>
       <ComponentRef Id='VS_2005_Registry'/>
     </Feature>
 
     <Feature Id='VS2008Int' Level='1' Title='Visual Studio 2008'>
       <Condition Level='0'>Not VS_2008_PATH</Condition>
-      <ComponentRef Id='VS_Common'/>
+      <ComponentRef Id='VS2008_Common'/>
+      <ComponentRef Id='VSTemplates'/>
       <ComponentRef Id='VS_2008_Registry'/>
     </Feature>
 
     <Feature Id='VS2010Int' Level='1' Title='Visual Studio 2010'>
       <Condition Level='0'>Not VS_2010_PATH</Condition>
-      <ComponentRef Id='VS_Common'/>
+      <ComponentRef Id='VS2010_Common'/>
+      <ComponentRef Id='VSTemplates'/>
       <ComponentRef Id='VS_2010_Registry'/>
     </Feature>
 

=== modified file 'Installer/webproviders.wxs'
--- a/Installer/webproviders.wxs	2009-07-28 20:32:52 +0000
+++ b/Installer/webproviders.wxs	2010-05-19 17:56:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment Id='ProvidersFragment'>
-    <DirectoryRef Id='AssembliesDir'>
+    <DirectoryRef Id='assemblies_v2'>
       <Directory Id="MySql.Web.DummyDir" Name="GAC">
         <Component Id="ProvidersGAC" Guid="6b95d34b-91e1-41ff-9f3f-dcb5308a00ce">
           <File Id="ProviderAssemblyGAC" Name="MySql.Web.dll" ShortName="MW"

=== modified file 'MySQLClient-VS2010.sln'
--- a/MySQLClient-VS2010.sln	2010-04-09 19:38:48 +0000
+++ b/MySQLClient-VS2010.sln	2010-05-19 17:56:19 +0000
@@ -11,8 +11,16 @@
 EndProject
 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.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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Commercial|Any CPU = Commercial|Any CPU
@@ -153,6 +161,54 @@
 		{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
+		{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
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Mixed Platforms.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Mixed Platforms.Build.0 = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x64.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x86.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x86.Build.0 = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Any CPU.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Mixed Platforms.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Mixed Platforms.Build.0 = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|x64.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|x86.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|x86.Build.0 = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Any CPU.ActiveCfg = GPL|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Mixed Platforms.ActiveCfg = GPL|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Mixed Platforms.Build.0 = GPL|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|x64.ActiveCfg = GPL|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|x86.ActiveCfg = GPL|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|x86.Build.0 = GPL|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Any CPU.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Mixed Platforms.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Mixed Platforms.Build.0 = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x64.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x86.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x86.Build.0 = Commercial|x86
 		{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
@@ -177,6 +233,54 @@
 		{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
+		{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
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Mixed Platforms.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Mixed Platforms.Build.0 = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x64.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x86.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x86.Build.0 = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Any CPU.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Mixed Platforms.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Mixed Platforms.Build.0 = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|x64.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|x86.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|x86.Build.0 = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Any CPU.ActiveCfg = GPL|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Mixed Platforms.ActiveCfg = GPL|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Mixed Platforms.Build.0 = GPL|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|x64.ActiveCfg = GPL|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|x86.ActiveCfg = GPL|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|x86.Build.0 = GPL|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Any CPU.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Mixed Platforms.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Mixed Platforms.Build.0 = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x64.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x86.ActiveCfg = Commercial|x86
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x86.Build.0 = Commercial|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

=== modified file 'MySql.Data.Entity/Provider/MySql.Data.Entity.VS2010.csproj'
--- a/MySql.Data.Entity/Provider/MySql.Data.Entity.VS2010.csproj	2010-04-09 19:38:48 +0000
+++ b/MySql.Data.Entity/Provider/MySql.Data.Entity.VS2010.csproj	2010-05-19 17:56:19 +0000
@@ -37,7 +37,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>bin-4.0\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -46,7 +46,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>bin-4.0\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

=== modified file 'MySql.VisualStudio/Editors/SqlEditor.Designer.cs'
--- a/MySql.VisualStudio/Editors/SqlEditor.Designer.cs	2010-04-02 19:24:57 +0000
+++ b/MySql.VisualStudio/Editors/SqlEditor.Designer.cs	2010-05-19 17:56:19 +0000
@@ -35,7 +35,6 @@
             this.disconnectButton = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.runSqlButton = new System.Windows.Forms.ToolStripButton();
-            this.validateSqlButton = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.serverLabel = new System.Windows.Forms.ToolStripLabel();
             this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
@@ -65,7 +64,6 @@
             this.disconnectButton,
             this.toolStripSeparator1,
             this.runSqlButton,
-            this.validateSqlButton,
             this.toolStripSeparator2,
             this.serverLabel,
             this.toolStripSeparator3,
@@ -82,7 +80,7 @@
             // 
             this.connectButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
             this.connectButton.Image = global::MySql.Data.VisualStudio.Properties.Resources.sql_editor_connect;
-            this.connectButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.connectButton.ImageTransparentColor = System.Drawing.Color.Transparent;
             this.connectButton.Name = "connectButton";
             this.connectButton.Size = new System.Drawing.Size(23, 22);
             this.connectButton.Text = "connectButton";
@@ -94,7 +92,7 @@
             this.disconnectButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
             this.disconnectButton.Enabled = false;
             this.disconnectButton.Image = global::MySql.Data.VisualStudio.Properties.Resources.sql_editor_disconnect;
-            this.disconnectButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.disconnectButton.ImageTransparentColor = System.Drawing.Color.Transparent;
             this.disconnectButton.Name = "disconnectButton";
             this.disconnectButton.Size = new System.Drawing.Size(23, 22);
             this.disconnectButton.Text = "Disconnect from MySQL";
@@ -110,25 +108,13 @@
             this.runSqlButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
             this.runSqlButton.Enabled = false;
             this.runSqlButton.Image = global::MySql.Data.VisualStudio.Properties.Resources.sql_editor_runsql;
-            this.runSqlButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.runSqlButton.ImageTransparentColor = System.Drawing.Color.Transparent;
             this.runSqlButton.Name = "runSqlButton";
             this.runSqlButton.Size = new System.Drawing.Size(23, 22);
             this.runSqlButton.Text = "runSqlButton";
             this.runSqlButton.ToolTipText = "Run SQL";
             this.runSqlButton.Click += new System.EventHandler(this.runSqlButton_Click);
             // 
-            // validateSqlButton
-            // 
-            this.validateSqlButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.validateSqlButton.Enabled = false;
-            this.validateSqlButton.Image = global::MySql.Data.VisualStudio.Properties.Resources.sql_editor_validatesql;
-            this.validateSqlButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.validateSqlButton.Name = "validateSqlButton";
-            this.validateSqlButton.Size = new System.Drawing.Size(23, 22);
-            this.validateSqlButton.Text = "toolStripButton1";
-            this.validateSqlButton.ToolTipText = "Validate SQL";
-            this.validateSqlButton.Click += new System.EventHandler(this.validateSqlButton_Click);
-            // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
@@ -277,7 +263,6 @@
         private System.Windows.Forms.ToolStripButton runSqlButton;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
-        private System.Windows.Forms.ToolStripButton validateSqlButton;
         private System.Windows.Forms.ToolStripButton disconnectButton;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
         private System.Windows.Forms.ToolStripLabel userLabel;

=== modified file 'MySql.VisualStudio/Editors/SqlEditor.resx'
--- a/MySql.VisualStudio/Editors/SqlEditor.resx	2010-04-02 19:24:57 +0000
+++ b/MySql.VisualStudio/Editors/SqlEditor.resx	2010-05-19 17:56:19 +0000
@@ -112,23 +112,23 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>122, 17</value>
   </metadata>
   <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABg
-        CQAAAk1TRnQBSQFMAgEBAgEAARABAAEQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADM
+        CQAAAk1TRnQBSQFMAgEBAgEAASABAAEgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -156,19 +156,20 @@
         AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
         AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
         AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
-        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wEAB/8B9wdmAf8Q8CAA
-        Af8BtQFsAeoDbAH3Af8BCQG7ArUB9wFmAf8B8AHtARUBZgEVAWYBFQFmAhUBZgQVAfAgAAH/AbUBvAG1
-        A7sB9wH/Ak0BvAFJAbUBZgH/AfAB7QEHAe8DtQP3AbUD7QFmAfAgAAH/AbUB/wHzARkB3QFWAfcC/wHz
-        AfABBwG1AWYB/wHwAe0D/wHvAvQBGQH3Ad0CCQHtAWYB8CAAAf8BtQH/AfMCGQHdAbUB/wHjAU0B8gFQ
-        AbsBZgH/AfEB7QP/AbUB/wL0AfcBGQHdAQkB7QFmAfEgAAH/AbUB/wH0AfMCGQG1A/8B9AHxAbsBZgH/
-        AfEB7QG8AgcBuwHvAbUB7wK1AvcBkgEVAfEgAAH/AbUB/wH0ARkB8wEZAbsB/wF1AeMB/wFQAbUBbAH/
-        AfEBtQP/AQcD/wHvAfQCGQH3ARUB8SAAAf8BtQX/AbsD/wHxAWwCZgH/AfEB9wP/AQcD/wG1AvQBGQH3
-        ARUB8SAAAf8BtQHxAwcB7wG7Af8BlAF1AbUBvAFmAfEB/wHzAfcB8AG8BQcB7wG1Ae8B9wG1ARUB8yAA
-        Af8BtQHyAvMB3QIJA/8BtQFmAfEC/wHzAbUD/wEHA/8B7wL/AfQBtQEVAfMgAAH/AbUF/wEJAbwBCQK7
-        AfED/wHzAbUD/wG8A/8BBwP/AbUBZgHzIAAB/wG1AbsB7wG1A/cBrgf/AfMGtAetAacB8yAAAf8BtQH/
-        AfACvAEJAbUBrgf/AfQBtAPcAdYI1QGtAfQgAAH/AbUC/wH0AhkBCQGuB/8B9Ai0Bq0B9CAAAf8BtQX/
-        AfMBkQf/EPQgAAH/AgcF7wH3B/8Q9CAAAUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcA
-        A/+BAAs=
+        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wcAAf8B9wdmCv8GAAH/
+        IQABtQFsAeoDbAH3Af8BCQG7ArUB9wFmAQAB/wHtARUBZgEVAWYBFQFmAhUBZgQVIgABtQG8AbUDuwH3
+        Af8CTQG8AUkBtQFmAQAB/wHtAQcB7wO1A/cBtQPtAWYiAAG1Af8B8wEZAd0BVgH3Av8B8wHwAQcBtQFm
+        Af8BAAHtA/8B7wL0ARkB9wHdAgkB7QFmIgABtQH/AfMCGQHdAbUB/wHjAU0B8gFQAbsBZgH/AQAB7QP/
+        AbUB/wL0AfcBGQHdAQkB7QFmAf8hAAG1Af8B9AHzAhkBtQP/AfQB8QG7AWYB/wEAAe0BvAIHAbsB7wG1
+        Ae8CtQL3AZIBFQH/IAAB/wG1Af8B9AEZAfMBGQG7Af8BdQHjAf8BUAG1AWwB/wEAAbUD/wEHA/8B7wH0
+        AhkB9wEVAf8hAAG1Bf8BuwP/AfEBbAJmAf8BAAH3A/8BBwP/AbUC9AEZAfcBFQH/IQABtQHxAwcB7wG7
+        Af8BlAF1AbUBvAFmAfEB/wEAAfcB8AG8BQcB7wG1Ae8B9wG1ARUB/yAAAf8BtQHyAvMB3QIJA/8BtQFm
+        AfEB/wIAAbUD/wEHA/8B7wL/AfQBtQEVAf8hAAG1Bf8BCQG8AQkCuwHxAv8CAAG1A/8BvAP/AQcD/wG1
+        AWYB/yEAAbUBuwHvAbUD9wGuA/8BAAL/AgAGtAetAacB/yEAAbUB/wHwArwBCQG1Aa4E/wEAAf8CAAG0
+        A9wB1gjVAa0B/yEAAbUC/wH0AhkBCQGuA/8EAAH/CLQGrSIAAbUF/wHzAZED/zQAAf8CBwXvAfcB/wIA
+        Af8zAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/AQAB/AIAAX4EAAGAAQEBAAEB
+        BAABgAEBAQABAQQAAYABAAGAAQEEAAGAAQABgAUAAYABAAGABwABgAUAAYABAAGABQABgAEAAYAGAAEB
+        AYAFAAGAAQEBgAUAAYABCQGABQABgAEFAYAFAAGAAQ8BAAEBBAABgAEPAv8FAAE3Av8EAAs=
 </value>
   </data>
 </root>
\ No newline at end of file

=== modified file 'MySql.VisualStudio/Editors/VSCodeEditor.cs'
--- a/MySql.VisualStudio/Editors/VSCodeEditor.cs	2010-04-02 19:24:57 +0000
+++ b/MySql.VisualStudio/Editors/VSCodeEditor.cs	2010-05-19 17:56:19 +0000
@@ -141,6 +141,8 @@
             Guid guidVsTextBuffer = typeof(VsTextBufferClass).GUID;
             textBuffer = services.CreateObject(services.LocalRegistry, guidVsTextBuffer,
                 typeof(IVsTextBuffer).GUID) as IVsTextBuffer;
+            textBuffer.InitializeContent("ed", 2);
+
             Guid langSvc = new Guid("{fa498a2d-116a-4f25-9b55-7938e8e6dda7}");
 
             int hr = textBuffer.SetLanguageServiceID(ref langSvc);
@@ -151,9 +153,11 @@
             if (hr != VSConstants.S_OK)
                 Marshal.ThrowExceptionForHR(hr);
 
+            // this is necessary for the adapters to work in VS2010
+            Initialize(String.Empty);
+
             // create pane window
             IVsWindowPane windowPane = codeWindow as IVsWindowPane;
-
             hr = windowPane.SetSite(services.IOleServiceProvider);
             if (hr != VSConstants.S_OK)
                 Marshal.ThrowExceptionForHR(hr);

=== added file 'MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj'
--- a/MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj	1970-01-01 00:00:00 +0000
+++ b/MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj	2010-05-19 17:56:19 +0000
@@ -0,0 +1,439 @@
+<?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>
+    <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>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-4.0\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-4.0\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=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>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.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.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" />
+    <Reference Include="System.Data" />
+    <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>
+    <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\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_validatesql.bmp" />
+    <None Include="Resources\sql_editor_executionplan.bmp" />
+    <None Include="Resources\sql_editor_banner.bmp" />
+    <Content Include="Resources\sql_editor_connect.png" />
+    <Content Include="Resources\sql_editor_disconnect.png" />
+    <Content Include="Resources\sql_editor_runsql.png" />
+    <None Include="Resources\sql_editor_validatesql.png" />
+    <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 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.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

Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20100519175619-q1brhgp561vo8hqw.bundle
Thread
bzr commit into connector-net-trunk branch (reggie.burnett:869) Reggie Burnett19 May