List:Commits« Previous MessageNext Message »
From:Reggie Burnett Date:June 21 2011 7:31pm
Subject:bzr commit into connector-net-6.3 branch (reggie.burnett:1012)
View as plain text  
#At file:///C:/Users/Reggie/work/connector-net/6.3/ based on revid:reggie.burnett@stripped

 1012 Reggie Burnett	2011-06-21
      a bit more refactoring on the CF projects

    removed:
      VS2008/Source/MySql.Data/base/
      VS2008/Source/MySql.Data/cf/
    added:
      VS2008/Source/MySql.Data.CF/
      VS2008/Source/MySql.Data.CF/Properties/
      VS2008/Source/MySql.Data.CF/Types/
      VS2008/Source/MySql.Data.CF/common/
      VS2008/Source/MySql.Data.CF/zlib/
      VS2008/Tests/MySql.Data.CF.Tests/Properties/
    renamed:
      Source/MySql.Data/base/ => VS2008/Source/MySql.Data.CF/base/
      Source/MySql.Data/cf/ => VS2008/Source/MySql.Data.CF/cf/
      VS2008/Source/MySql.Data/MySql.Data.CF.csproj => VS2008/Source/MySql.Data.CF/MySql.Data.CF.csproj
    modified:
      VS2008/MySQLClient.sln
      VS2008/Tests/MySql.Data.CF.Tests/MySql.Data.CF.Tests.csproj
      VS2008/Source/MySql.Data.CF/MySql.Data.CF.csproj
=== modified file 'VS2008/MySQLClient.sln'
=== modified file 'VS2008/MySQLClient.sln'
--- a/VS2008/MySQLClient.sln	2011-06-21 18:51:27 +0000
+++ b/VS2008/MySQLClient.sln	2011-06-21 19:31:39 +0000
@@ -13,12 +13,12 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity.Tests", "Tests\MySql.Data.Entity.Tests\MySql.Data.Entity.Tests.csproj", "{D37B3572-767F-4622-A835-844B0EBEFD5B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.CF", "Source\MySql.Data\MySql.Data.CF.csproj", "{587A47FB-C1CC-459D-93B6-179D95E41EFB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.CF.Tests", "Tests\MySql.Data.Tests\MySql.Data.CF.Tests.csproj", "{710D9251-17A3-4429-9A91-63F03267F310}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.VisualStudio", "Source\MySql.VisualStudio\MySql.VisualStudio.csproj", "{DC3517FF-AC26-4755-9B7A-EF658FF69593}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.CF", "Source\MySql.Data.CF\MySql.Data.CF.csproj", "{587A47FB-C1CC-459D-93B6-179D95E41EFB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.CF.Tests", "Tests\MySql.Data.CF.Tests\MySql.Data.CF.Tests.csproj", "{710D9251-17A3-4429-9A91-63F03267F310}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -75,6 +75,14 @@
 		{D37B3572-767F-4622-A835-844B0EBEFD5B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D37B3572-767F-4622-A835-844B0EBEFD5B}.Release-4.0|Any CPU.ActiveCfg = Release|Any CPU
 		{D37B3572-767F-4622-A835-844B0EBEFD5B}.Release-4.0|Any CPU.Build.0 = Release|Any CPU
+		{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-4.0|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|Any CPU.Build.0 = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Any CPU.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Any CPU.Build.0 = Release|Any CPU
 		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug-4.0|Any CPU.ActiveCfg = Debug|Any CPU
@@ -91,14 +99,6 @@
 		{710D9251-17A3-4429-9A91-63F03267F310}.Release|Any CPU.Build.0 = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.Release-4.0|Any CPU.ActiveCfg = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.Release-4.0|Any CPU.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|Any CPU.Build.0 = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Any CPU.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

=== added directory 'VS2008/Source/MySql.Data.CF'
=== renamed file 'VS2008/Source/MySql.Data/MySql.Data.CF.csproj' => 'VS2008/Source/MySql.Data.CF/MySql.Data.CF.csproj'
--- a/VS2008/Source/MySql.Data/MySql.Data.CF.csproj	2011-06-21 18:51:27 +0000
+++ b/VS2008/Source/MySql.Data.CF/MySql.Data.CF.csproj	2011-06-21 19:31:39 +0000
@@ -68,21 +68,6 @@
     <Compile Include="..\..\..\Source\MySql.Data\Properties\VersionInfo.cs">
       <Link>Properties\VersionInfo.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\Source\MySql.Data\base\DbConnectionStringBuilder.cs">
-      <Link>base\DbConnectionStringBuilder.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\Source\MySql.Data\base\DbException.cs">
-      <Link>base\DbException.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\Source\MySql.Data\cf\BufferedStream.cs">
-      <Link>cf\BufferedStream.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\Source\MySql.Data\cf\MissingAttributes.cs">
-      <Link>cf\MissingAttributes.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\Source\MySql.Data\cf\WinCE.cs">
-      <Link>cf\WinCE.cs</Link>
-    </Compile>
     <Compile Include="..\..\..\Source\MySql.Data\CharSetMap.cs" />
     <Compile Include="..\..\..\Source\MySql.Data\command.cs">
       <SubType>Component</SubType>
@@ -256,6 +241,11 @@
     <Compile Include="..\..\..\Source\MySql.Data\zlib\ZStreamException.cs">
       <Link>zlib\ZStreamException.cs</Link>
     </Compile>
+    <Compile Include="base\DbConnectionStringBuilder.cs" />
+    <Compile Include="base\DbException.cs" />
+    <Compile Include="cf\BufferedStream.cs" />
+    <Compile Include="cf\MissingAttributes.cs" />
+    <Compile Include="cf\WinCE.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\..\..\Source\MySql.Data\Properties\Resources.resx">

=== added directory 'VS2008/Source/MySql.Data.CF/Properties'
=== added directory 'VS2008/Source/MySql.Data.CF/Types'
=== renamed directory 'Source/MySql.Data/base' => 'VS2008/Source/MySql.Data.CF/base'
=== renamed directory 'Source/MySql.Data/cf' => 'VS2008/Source/MySql.Data.CF/cf'
=== added directory 'VS2008/Source/MySql.Data.CF/common'
=== added directory 'VS2008/Source/MySql.Data.CF/zlib'
=== removed directory 'VS2008/Source/MySql.Data/base'
=== removed directory 'VS2008/Source/MySql.Data/cf'
=== modified file 'VS2008/Tests/MySql.Data.CF.Tests/MySql.Data.CF.Tests.csproj'
--- a/VS2008/Tests/MySql.Data.CF.Tests/MySql.Data.CF.Tests.csproj	2011-06-21 18:51:27 +0000
+++ b/VS2008/Tests/MySql.Data.CF.Tests/MySql.Data.CF.Tests.csproj	2011-06-21 19:31:39 +0000
@@ -99,7 +99,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Source\MySql.Data\MySql.Data.CF.csproj">
+    <ProjectReference Include="..\..\Source\MySql.Data.CF\MySql.Data.CF.csproj">
       <Project>{587A47FB-C1CC-459D-93B6-179D95E41EFB}</Project>
       <Name>MySql.Data.CF</Name>
     </ProjectReference>

=== added directory 'VS2008/Tests/MySql.Data.CF.Tests/Properties'

Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20110621193139-jz212vuhx6qn88dx.bundle
Thread
• bzr commit into connector-net-6.3 branch (reggie.burnett:1012) Reggie Burnett21 Jun