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

  871 Reggie Burnett	2010-05-19
      updated release notes and some pre-release tidying up

    added:
      MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.VS2010.csproj
    modified:
      Installer/VS2010_Registry.wxi
      Installer/core.wxs
      Installer/main.wxs
      Installer/visualstudio.wxs
      MySQLClient-VS2010.sln
      MySql.Data.Entity/Provider/MySql.Data.Entity.VS2010.csproj
      MySql.Data.Entity/T4Templates/SSDLToMySQL.tt
      MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj
      Release Notes.txt
=== modified file 'Installer/VS2010_Registry.wxi'
=== modified file 'Installer/VS2010_Registry.wxi'
--- a/Installer/VS2010_Registry.wxi	2010-05-19 17:56:19 +0000
+++ b/Installer/VS2010_Registry.wxi	2010-05-20 04:15:01 +0000
@@ -11,7 +11,7 @@
     <RegistryValue Value="MySQL Connector Net $(var.Version)" Type="string"/>
     <RegistryValue Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" />
     <RegistryValue Name="Class" Value="MySql.Data.VisualStudio.MySqlDataProviderPackage" Type="string" />
-    <RegistryValue Name="CodeBase" Value="[#MySQL.VisualStudio]" Type="string"/>
+    <RegistryValue Name="CodeBase" Value="[#MySQL.VisualStudio.2010]" Type="string"/>
     <RegistryValue Name="ID" Value="100" Type="integer" />
     <RegistryValue Name="MinEdition" Value="Standard" Type="string" />
     <RegistryValue Name="ProductVersion" Value="1.1" Type="string" />

=== modified file 'Installer/core.wxs'
--- a/Installer/core.wxs	2010-05-19 17:56:19 +0000
+++ b/Installer/core.wxs	2010-05-20 04:15:01 +0000
@@ -96,6 +96,16 @@
       </Component>
     </DirectoryRef>
 
+    <DirectoryRef Id="Entity.T4.DBGenDir">
+      <Component Id="EF.T4" Guid="6555D339-120C-4D62-B60C-08764D8CA739">
+        <Condition>VS_2010_PATH</Condition>
+        <File Id="SSDLToMySQL" Name="SSDLToMySQL.tt" DiskId="1"
+              Source="..\MySql.Data.Entity\T4Templates\SSDLToMySQL.tt"/>
+        <File Id="GenerateMySQL.Utility" Name="GenerateMySQL.Utility.ttinclude" DiskId="1"
+              Source="..\MySql.Data.Entity\T4Templates\GenerateMySQL.Utility.ttinclude"/>
+      </Component>
+    </DirectoryRef>    
+    
     <Feature Id="EntityFramework" Level="1" Title="Entity Framework Support"
              Description="Support for the entity framework">
       <Condition Level='0'>Not NETFRAMEWORK20 AND Not NETFRAMEWORK40FULL And Not NETFRAMEWORK40CLIENT</Condition>
@@ -103,6 +113,7 @@
       <ComponentRef Id="EF.v2.GAC"/>
       <ComponentRef Id="EF.v4"/>
       <ComponentRef Id="EF.v4.GAC"/>
+      <ComponentRef Id="EF.T4"/>
     </Feature>
 
     <InstallExecuteSequence>

=== modified file 'Installer/main.wxs'
--- a/Installer/main.wxs	2010-05-19 17:56:19 +0000
+++ b/Installer/main.wxs	2010-05-20 04:15:01 +0000
@@ -63,7 +63,7 @@
       <!-- 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.OracleDir" Name="Microsoft">
             <Directory Id="Entity.T4.EFToolsDir" Name="Entity Framework Tools">
               <Directory Id="Entity.T4.DBGenDir" Name="DBGen"/>
             </Directory>
@@ -71,7 +71,6 @@
         </Directory>
       </Directory>
 
-
     </Directory>
 
     <DirectoryRef Id='DocsDir'>
@@ -120,13 +119,6 @@
 
     <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"/>
-
-    <!-- 
-    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>-->
   </Product>
 </Wix>
 

=== modified file 'Installer/visualstudio.wxs'
--- a/Installer/visualstudio.wxs	2010-05-19 17:56:19 +0000
+++ b/Installer/visualstudio.wxs	2010-05-20 04:15:01 +0000
@@ -44,7 +44,7 @@
               Source='..\MySql.VisualStudio\bin-4.0\release\MySQL.VisualStudio.dll' />
       </Component>
       
-      <Component Id='VS_2010_Registry' Guid='84AE8C43-294D-4e48-B75D-D9172396C2FD'>
+      <Component Id='VS_2010_Registry' Guid='E602F4FD-4D11-4632-8204-C0CFE22F8C7C'>
         <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="[assemblies_v4]" Type="string" Action="write"/>

=== modified file 'MySQLClient-VS2010.sln'
--- a/MySQLClient-VS2010.sln	2010-05-19 17:56:19 +0000
+++ b/MySQLClient-VS2010.sln	2010-05-20 04:15:01 +0000
@@ -17,10 +17,6 @@
 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
@@ -233,54 +229,6 @@
 		{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-05-19 17:56:19 +0000
+++ b/MySql.Data.Entity/Provider/MySql.Data.Entity.VS2010.csproj	2010-05-20 04:15:01 +0000
@@ -32,6 +32,7 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkProfile />
+    <BaseIntermediateOutputPath>obj-4.0</BaseIntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

=== modified file 'MySql.Data.Entity/T4Templates/SSDLToMySQL.tt'
--- a/MySql.Data.Entity/T4Templates/SSDLToMySQL.tt	2010-04-09 19:38:48 +0000
+++ b/MySql.Data.Entity/T4Templates/SSDLToMySQL.tt	2010-05-20 04:15:01 +0000
@@ -116,6 +116,7 @@
         string tableName = MyId(entitySet.GetTableName());
 #>
 -- Creating table '<#=tableName#>'
+
 CREATE TABLE `<#=databaseName#>`.`<#=tableName#>` (
 <#
         for (int p = 0; p < entitySet.ElementType.Properties.Count; p++)
@@ -153,6 +154,7 @@
 		if (hasAutoColumn) continue;
 #>
 -- Creating primary key on <#=WriteMySqlColumns(entitySet.ElementType.GetKeyProperties(), ',')#> in table '<#=tableName#>'
+
 ALTER TABLE `<#=databaseName#>`.`<#=tableName#>`
 ADD CONSTRAINT `PK_<#=tableName#>`
     PRIMARY KEY (<#=WriteMySqlColumns(entitySet.ElementType.GetKeyProperties(), ',')#> );
@@ -175,6 +177,7 @@
         string principalTableName = MyId(principalSetEnd.EntitySet.GetTableName());
 #>
 -- Creating foreign key on <#=WriteMySqlColumns(constraint.ToProperties, ',')#> in table '<#=dependentTableName#>'
+
 ALTER TABLE `<#=databaseName#>`.`<#=dependentTableName#>`
 ADD CONSTRAINT `<#=WriteFKConstraintName(constraint)#>`
     FOREIGN KEY (<#=WriteMySqlColumns(constraint.ToProperties, ',')#>)
@@ -188,6 +191,7 @@
 #>
 
 -- Creating non-clustered index for FOREIGN KEY '<#=WriteFKConstraintName(constraint)#>'
+
 CREATE INDEX `IX_<#=WriteFKConstraintName(constraint)#>`
 ON `<#=databaseName#>`.`<#=dependentTableName#>`
     (<#=WriteMySqlColumns(constraint.ToProperties, ',')#>);

=== added file 'MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.VS2010.csproj'
--- a/MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.VS2010.csproj	1970-01-01 00:00:00 +0000
+++ b/MySql.Data.Entity/Tests/MySql.Data.Entity.Tests.VS2010.csproj	2010-05-20 04:15:01 +0000
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{77EC4E20-293A-48BA-8415-D0AD869D91FA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MySql.Data.Entity.Tests</RootNamespace>
+    <AssemblyName>MySql.Data.Entity.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
+    <BaseIntermediaOutputPath>obj-4.0</BaseIntermediaOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework" />
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.Entity">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>

+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.Entity.Design">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Runtime.Serialization">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Security" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\MySql.Data\Provider\Properties\VersionInfo.cs">
+      <Link>Properties\VersionInfo.cs</Link>
+    </Compile>
+    <Compile Include="BaseEdmTest.cs" />
+    <Compile Include="AggregateOperators.cs" />
+    <Compile Include="CanonicalFunctions.cs" />
+    <Compile Include="DataTypeTests.cs" />
+    <Compile Include="ProceduresAndFunctions.cs" />
+    <Compile Include="JoinTests.cs" />
+    <Compile Include="SchemaInformation.cs" />
+    <Compile Include="TestModel.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>TestModel.edmx</DependentUpon>
+    </Compile>
+    <Compile Include="Wizard.cs" />
+    <Compile Include="RelationalOperators.cs" />
+    <Compile Include="SetOperators.cs" />
+    <Compile Include="Paging.cs" />
+    <Compile Include="OrderingAndGrouping.cs" />
+    <Compile Include="InsertTests.cs" />
+    <Compile Include="UpdateTests.cs" />
+    <Compile Include="DeleteTests.cs" />
+    <Compile Include="RestrictionOperators.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MySql.Data\Provider\MySql.Data.csproj">
+      <Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
+      <Name>MySql.Data</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MySql.Data\Tests\MySql.Data.Tests.csproj">
+      <Project>{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}</Project>
+      <Name>MySql.Data.Tests</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Provider\MySql.Data.Entity.VS2010.csproj">
+      <Project>{A8E799B1-D6AC-42BD-907E-B213D7E9B3C5}</Project>
+      <Name>MySql.Data.Entity.VS2010</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.Config" />
+    <EmbeddedResource Include="Properties\procs.sql" />
+    <EmbeddedResource Include="Properties\schema.sql" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <WCFMetadata Include="Service References" />
+  </ItemGroup>
+  <ItemGroup>
+    <EntityDeploy Include="TestModel.edmx">
+      <Generator>EntityModelCodeGenerator</Generator>
+      <LastGenOutput>TestModel.Designer.cs</LastGenOutput>
+    </EntityDeploy>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

=== modified file 'MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj'
--- a/MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj	2010-05-19 17:56:19 +0000
+++ b/MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj	2010-05-20 04:15:01 +0000
@@ -35,6 +35,7 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <BaseIntermediateOutputPath>obj-4.0</BaseIntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

=== modified file 'Release Notes.txt'
--- a/Release Notes.txt	2010-03-08 21:29:40 +0000
+++ b/Release Notes.txt	2010-05-20 04:15:01 +0000
@@ -9,9 +9,19 @@
 - Support for Visual Studio 2010
 - Nested transaction scopes now work though they still must use the same connection (no XA)
 - The ability to enable query analysis at runtime
+- New SQL editor
 
 
 What we know is broken
 ----------------------
-- Documentation has been been integrated into VS2010 yet
+- Documentation has not been integrated into VS2010 yet
+- The Generate Database Wizard will work the first time you generate DDL for your database.
+  Every time after that it will throw an exception.  There is an easy workaround however.  Just
+  dismiss the exception dialog, click the Previous button in the wizard, and then click Next.
+  Your DDL will then be generated properly.  We will have this one resolved for beta 2!
+- The Generated Database Wizard will save the file with the extension .sql.  You will need to
+  manually change the extension to .mysql to use the new editor.  We hope to resolve this for beta 2.
+
+
+
 

Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20100520041501-ssd6bdxcgrmqioqh.bundle
Thread
bzr commit into connector-net-trunk branch (reggie.burnett:871) Reggie Burnett20 May