List:Commits« Previous MessageNext Message »
From:rburnett Date:April 15 2008 1:54pm
Subject:Connector/NET commit: r1252 - in trunk: MySql.Data/Provider MySql.Data/Provider/Source MySql.Data/Tests MySql.Data/Tests/Source MySql.Web/Providers My...
View as plain text  
Added:
   trunk/MySql.Data/Tests/MySql.Data.CF.Tests.csproj
Removed:
   trunk/MySql.Data/Tests/MySql.Data.Tests.CF.csproj
Modified:
   trunk/MySql.Data/Provider/MySql.Data.CF.csproj
   trunk/MySql.Data/Provider/MySql.Data.csproj
   trunk/MySql.Data/Provider/Source/ISSchemaProvider.cs
   trunk/MySql.Data/Tests/MySql.Data.Tests.csproj
   trunk/MySql.Data/Tests/Source/CommandBuilderTests.cs
   trunk/MySql.Web/Providers/MySql.Web.csproj
   trunk/MySql.Web/Tests/MySql.Web.Tests.csproj
Log:
merged

Modified: trunk/MySql.Data/Provider/MySql.Data.CF.csproj
===================================================================
--- trunk/MySql.Data/Provider/MySql.Data.CF.csproj	2008-04-15 13:39:36 UTC (rev 1251)
+++ trunk/MySql.Data/Provider/MySql.Data.CF.csproj	2008-04-15 13:54:11 UTC (rev 1252)
@@ -67,8 +67,10 @@
     <Compile Include="Source\cf\WinCE.cs" />
     <Compile Include="Source\CharSetMap.cs" />
     <Compile Include="Source\command.cs">
+      <SubType>Component</SubType>
     </Compile>
     <Compile Include="Source\CommandBuilder.cs">
+      <SubType>Component</SubType>
     </Compile>
     <Compile Include="Source\common\Cache.cs" />
     <Compile Include="Source\common\ContextString.cs" />
@@ -85,6 +87,7 @@
     </Compile>
     <Compile Include="Source\Crypt.cs" />
     <Compile Include="Source\dataadapter.cs">
+      <SubType>Component</SubType>
     </Compile>
     <Compile Include="Source\datareader.cs" />
     <Compile Include="Source\Driver.cs" />

Modified: trunk/MySql.Data/Provider/MySql.Data.csproj
===================================================================
--- trunk/MySql.Data/Provider/MySql.Data.csproj	2008-04-15 13:39:36 UTC (rev 1251)
+++ trunk/MySql.Data/Provider/MySql.Data.csproj	2008-04-15 13:54:11 UTC (rev 1252)
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -118,10 +118,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\CHANGES" />
-    <None Include="..\README" />
-  </ItemGroup>
-  <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Source\CharSetMap.cs" />
     <Compile Include="Source\command.cs">

Modified: trunk/MySql.Data/Provider/Source/ISSchemaProvider.cs
===================================================================
--- trunk/MySql.Data/Provider/Source/ISSchemaProvider.cs	2008-04-15 13:39:36 UTC (rev 1251)
+++ trunk/MySql.Data/Provider/Source/ISSchemaProvider.cs	2008-04-15 13:54:11 UTC (rev 1252)
@@ -272,7 +272,7 @@
             // now get our where clause and append it if there is one
             string where = GetWhereClause(null, keys, restrictions);
             if (!String.IsNullOrEmpty(where))
-                sql.AppendFormat(" WHERE {0}", where);
+                sql.AppendFormat(CultureInfo.InvariantCulture, " WHERE {0}", where);
 
             DataTable dt = GetTable(sql.ToString());
             dt.TableName = "Procedure Parameters";
@@ -510,7 +510,7 @@
             string token = tokenizer.NextToken();
             if (tokenizer.IsSize)
             {
-                dtd.AppendFormat("({0})", token);
+                dtd.AppendFormat(CultureInfo.InvariantCulture, "({0})", token);
                 if (type != "ENUM" && type != "SET")
                     ParseDataTypeSize(row, token);
                 token = tokenizer.NextToken();
@@ -533,7 +533,7 @@
                 else if (String.Compare(token, "COLLATE", true) == 0)
                     row["COLLATION_NAME"] = tokenizer.NextToken();
                 else
-                    dtd.AppendFormat(" {0}", token);
+                    dtd.AppendFormat(CultureInfo.InvariantCulture, " {0}", token);
                 token = tokenizer.NextToken();
             }
 

Copied: trunk/MySql.Data/Tests/MySql.Data.CF.Tests.csproj (from rev 1250, trunk/MySql.Data/Tests/MySql.Data.Tests.CF.csproj)
===================================================================
--- trunk/MySql.Data/Tests/MySql.Data.CF.Tests.csproj	                        (rev 0)
+++ trunk/MySql.Data/Tests/MySql.Data.CF.Tests.csproj	2008-04-15 13:54:11 UTC (rev 1252)
@@ -0,0 +1,124 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{710D9251-17A3-4429-9A91-63F03267F310}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MySql.Data.CF.Tests</RootNamespace>
+    <AssemblyName>MySql.Data.CF.Tests</AssemblyName>
+    <ProjectTypeGuids>{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <PlatformFamilyName>WindowsCE</PlatformFamilyName>
+    <PlatformID>E2BECB1F-8C8C-41ba-B736-9BE7D946A398</PlatformID>
+    <OSVersion>5.00</OSVersion>
+    <DeployDirSuffix>MySql.Data.Tests.CF</DeployDirSuffix>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FormFactorID>
+    </FormFactorID>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <NativePlatformName>Windows CE</NativePlatformName>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\net-2.0\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;CF;NET20</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <FileAlignment>512</FileAlignment>
+    <WarningLevel>4</WarningLevel>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\net-2.0\Release\</OutputPath>
+    <DefineConstants>TRACE;CF;NET20</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <FileAlignment>512</FileAlignment>
+    <WarningLevel>4</WarningLevel>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="MbUnit.Framework, Version=2.41.232.0, Culture=neutral, PublicKeyToken=5e72ecd30bc408d5">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>C:\Program Files (x86)\MbUnit\MbUnit.Framework.dll</HintPath>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Source\AsyncTests.cs" />
+    <Compile Include="Source\BaseTest.cs" />
+    <Compile Include="Source\BlobTests.cs" />
+    <Compile Include="Source\CharacterSetTests.cs" />
+    <Compile Include="Source\CommandBuilderTests.cs" />
+    <Compile Include="Source\CommandTests.cs" />
+    <Compile Include="Source\ConfigurationManager.cs" />
+    <Compile Include="Source\ConnectionStringBuilder.cs" />
+    <Compile Include="Source\ConnectionTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Source\CultureTests.cs" />
+    <Compile Include="Source\DataAdapterTests.cs" />
+    <Compile Include="Source\DataReaderTests.cs" />
+    <Compile Include="Source\DataTypeTests.cs" />
+    <Compile Include="Source\DateTimeTests.cs" />
+    <Compile Include="Source\EventTests.cs" />
+    <Compile Include="Source\ExceptionTests.cs" />
+    <Compile Include="Source\GetSchemaTests.cs" />
+    <Compile Include="Source\InterfaceTests.cs" />
+    <Compile Include="Source\LanguageTests.cs" />
+    <Compile Include="Source\MicroPerfTests.cs" />
+    <Compile Include="Source\MySqlHelperTests.cs" />
+    <Compile Include="Source\ParameterTests.cs" />
+    <Compile Include="Source\PoolingTests.cs" />
+    <Compile Include="Source\PreparedStatements.cs" />
+    <Compile Include="Source\ProcedureParameters.cs" />
+    <Compile Include="Source\SimpleTransactions.cs" />
+    <Compile Include="Source\StoredProcedure.cs" />
+    <Compile Include="Source\StressTests.cs" />
+    <Compile Include="Source\Syntax.cs" />
+    <Compile Include="Source\Syntax2.cs" />
+    <Compile Include="Source\Tester\TestClasses.cs" />
+    <Compile Include="Source\Tester\TestRunner.cs" />
+    <Compile Include="Source\TimeoutAndCancel.cs" />
+    <Compile Include="Source\Utils.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Provider\MySql.Data.CF.csproj">
+      <Project>{587A47FB-C1CC-459D-93B6-179D95E41EFB}</Project>
+      <Name>MySql.Data.CF</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Condition="'$(TargetFrameworkVersion)' == 'v1.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.v1.targets" />
+  <Import Condition="'$(TargetFrameworkVersion)' == 'v2.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}">
+        <HostingProcess disable="1" />
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+  <!-- 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>
+  -->
+  <Import Condition="'$(TargetFrameworkVersion)' == 'v3.5'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
+</Project>
\ No newline at end of file

Deleted: trunk/MySql.Data/Tests/MySql.Data.Tests.CF.csproj
===================================================================
--- trunk/MySql.Data/Tests/MySql.Data.Tests.CF.csproj	2008-04-15 13:39:36 UTC (rev 1251)
+++ trunk/MySql.Data/Tests/MySql.Data.Tests.CF.csproj	2008-04-15 13:54:11 UTC (rev 1252)
@@ -1,124 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{710D9251-17A3-4429-9A91-63F03267F310}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MySql.Data.Tests.CF</RootNamespace>
-    <AssemblyName>MySql.Data.Tests.CF</AssemblyName>
-    <ProjectTypeGuids>{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PlatformFamilyName>WindowsCE</PlatformFamilyName>
-    <PlatformID>E2BECB1F-8C8C-41ba-B736-9BE7D946A398</PlatformID>
-    <OSVersion>5.00</OSVersion>
-    <DeployDirSuffix>MySql.Data.Tests.CF</DeployDirSuffix>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FormFactorID>
-    </FormFactorID>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <NativePlatformName>Windows CE</NativePlatformName>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\net-2.0\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;CF;NET20</DefineConstants>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <ErrorReport>prompt</ErrorReport>
-    <FileAlignment>512</FileAlignment>
-    <WarningLevel>4</WarningLevel>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\net-2.0\Release\</OutputPath>
-    <DefineConstants>TRACE;CF;NET20</DefineConstants>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <ErrorReport>prompt</ErrorReport>
-    <FileAlignment>512</FileAlignment>
-    <WarningLevel>4</WarningLevel>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="MbUnit.Framework, Version=2.41.232.0, Culture=neutral, PublicKeyToken=5e72ecd30bc408d5">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\MbUnit\MbUnit.Framework.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Source\AsyncTests.cs" />
-    <Compile Include="Source\BaseTest.cs" />
-    <Compile Include="Source\BlobTests.cs" />
-    <Compile Include="Source\CharacterSetTests.cs" />
-    <Compile Include="Source\CommandBuilderTests.cs" />
-    <Compile Include="Source\CommandTests.cs" />
-    <Compile Include="Source\ConfigurationManager.cs" />
-    <Compile Include="Source\ConnectionStringBuilder.cs" />
-    <Compile Include="Source\ConnectionTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Source\CultureTests.cs" />
-    <Compile Include="Source\DataAdapterTests.cs" />
-    <Compile Include="Source\DataReaderTests.cs" />
-    <Compile Include="Source\DataTypeTests.cs" />
-    <Compile Include="Source\DateTimeTests.cs" />
-    <Compile Include="Source\EventTests.cs" />
-    <Compile Include="Source\ExceptionTests.cs" />
-    <Compile Include="Source\GetSchemaTests.cs" />
-    <Compile Include="Source\InterfaceTests.cs" />
-    <Compile Include="Source\LanguageTests.cs" />
-    <Compile Include="Source\MicroPerfTests.cs" />
-    <Compile Include="Source\MySqlHelperTests.cs" />
-    <Compile Include="Source\ParameterTests.cs" />
-    <Compile Include="Source\PoolingTests.cs" />
-    <Compile Include="Source\PreparedStatements.cs" />
-    <Compile Include="Source\ProcedureParameters.cs" />
-    <Compile Include="Source\SimpleTransactions.cs" />
-    <Compile Include="Source\StoredProcedure.cs" />
-    <Compile Include="Source\StressTests.cs" />
-    <Compile Include="Source\Syntax.cs" />
-    <Compile Include="Source\Syntax2.cs" />
-    <Compile Include="Source\Tester\TestClasses.cs" />
-    <Compile Include="Source\Tester\TestRunner.cs" />
-    <Compile Include="Source\TimeoutAndCancel.cs" />
-    <Compile Include="Source\Utils.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Driver\MySql.Data.CF.csproj">
-      <Project>{587A47FB-C1CC-459D-93B6-179D95E41EFB}</Project>
-      <Name>MySql.Data.CF</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Condition="'$(TargetFrameworkVersion)' == 'v1.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.v1.targets" />
-  <Import Condition="'$(TargetFrameworkVersion)' == 'v2.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}">
-        <HostingProcess disable="1" />
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <!-- 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>
-  -->
-  <Import Condition="'$(TargetFrameworkVersion)' == 'v3.5'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
-</Project>
\ No newline at end of file

Modified: trunk/MySql.Data/Tests/MySql.Data.Tests.csproj
===================================================================
--- trunk/MySql.Data/Tests/MySql.Data.Tests.csproj	2008-04-15 13:39:36 UTC (rev 1251)
+++ trunk/MySql.Data/Tests/MySql.Data.Tests.csproj	2008-04-15 13:54:11 UTC (rev 1252)
@@ -84,7 +84,7 @@
     <Compile Include="Source\Utils.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Driver\MySql.Data.csproj">
+    <ProjectReference Include="..\Provider\MySql.Data.csproj">
       <Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
       <Name>MySql.Data</Name>
     </ProjectReference>

Modified: trunk/MySql.Data/Tests/Source/CommandBuilderTests.cs
===================================================================
--- trunk/MySql.Data/Tests/Source/CommandBuilderTests.cs	2008-04-15 13:39:36 UTC (rev 1251)
+++ trunk/MySql.Data/Tests/Source/CommandBuilderTests.cs	2008-04-15 13:54:11 UTC (rev 1252)
@@ -164,17 +164,17 @@
             da.InsertCommand = cb.GetInsertCommand();
         }
 
-		/// <summary>
-		/// Bug #8382  	Commandbuilder does not handle queries to other databases than the default one-
-		/// </summary>
-		[Test]
-		public void DifferentDatabase()
-		{
+        /// <summary>
+        /// Bug #8382  	Commandbuilder does not handle queries to other databases than the default one-
+        /// </summary>
+        [Test]
+        public void DifferentDatabase()
+        {
             if (Version < new Version(4, 1)) return;
 
             execSQL("INSERT INTO Test (id, name) VALUES (1,'test1')");
-			execSQL("INSERT INTO Test (id, name) VALUES (2,'test2')");
-			execSQL("INSERT INTO Test (id, name) VALUES (3,'test3')");
+            execSQL("INSERT INTO Test (id, name) VALUES (2,'test2')");
+            execSQL("INSERT INTO Test (id, name) VALUES (3,'test3')");
 
             conn.ChangeDatabase(database1);
 
@@ -369,7 +369,6 @@
                 da.Update(changes);
                 dt.AcceptChanges();
 
-<<<<<<< .working
                 dt.Rows[0]["id"] = 7;
                 dt.Rows[0]["name"] = "test7";
                 dt.Rows[1]["id"] = 8;
@@ -385,7 +384,7 @@
             {
                 Assert.Fail(ex.Message);
             }
-		}
+        }
 
         /// <summary>
         /// Bug #30077  	MySqlDataAdapter.Update() exception due to date field format
@@ -421,18 +420,6 @@
                 Assert.Fail(ex.Message);
             }
         }
-    }
-=======
-				dt.Clear();
-				da.SelectCommand.CommandText = "SELECT * FROM test WHERE cod=6";
-				da.Fill(dt);
-				Assert.AreEqual(6, dt.Rows[0]["cod"]);
-			}
-			catch (Exception ex)
-			{
-				Assert.Fail(ex.Message);
-			}
-		}
 
         /// <summary>
         /// Bug #35492 Please implement DbCommandBuilder.QuoteIdentifier 
@@ -450,6 +437,5 @@
             Assert.AreEqual("`boo", cb.UnquoteIdentifier("`boo"));
             Assert.AreEqual("bo`o", cb.UnquoteIdentifier("`bo``o`"));
         }
-	}
->>>>>>> .merge-right.r1210
+    }
 }

Modified: trunk/MySql.Web/Providers/MySql.Web.csproj
===================================================================
--- trunk/MySql.Web/Providers/MySql.Web.csproj	2008-04-15 13:39:36 UTC (rev 1251)
+++ trunk/MySql.Web/Providers/MySql.Web.csproj	2008-04-15 13:54:11 UTC (rev 1252)
@@ -77,7 +77,7 @@
     <None Include="Properties\schema3.sql" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Driver\MySql.Data.csproj">
+    <ProjectReference Include="..\..\MySql.Data\Provider\MySql.Data.csproj">
       <Project>{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}</Project>
       <Name>MySql.Data</Name>
     </ProjectReference>

Modified: trunk/MySql.Web/Tests/MySql.Web.Tests.csproj
===================================================================
--- trunk/MySql.Web/Tests/MySql.Web.Tests.csproj	2008-04-15 13:39:36 UTC (rev 1251)
+++ trunk/MySql.Web/Tests/MySql.Web.Tests.csproj	2008-04-15 13:54:11 UTC (rev 1252)
@@ -33,7 +33,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
+    <Reference Include="nunit.framework, Version=2.4.6.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />
@@ -74,4 +74,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file

Thread
Connector/NET commit: r1252 - in trunk: MySql.Data/Provider MySql.Data/Provider/Source MySql.Data/Tests MySql.Data/Tests/Source MySql.Web/Providers My...rburnett15 Apr