List:Commits« Previous MessageNext Message »
From:rburnett Date:August 24 2007 7:29pm
Subject:Connector/NET commit: r974 - in trunk: MySql.Web/Tests TestSuite
View as plain text  
Modified:
   trunk/MySql.Web/Tests/MySql.Web.Tests.csproj
   trunk/TestSuite/MySql.Data.Tests.CF.csproj
   trunk/TestSuite/MySql.Data.Tests.csproj
Log:
merged from 5.1 up through r:973

Modified: trunk/MySql.Web/Tests/MySql.Web.Tests.csproj
===================================================================
--- trunk/MySql.Web/Tests/MySql.Web.Tests.csproj	2007-08-24 19:25:38 UTC (rev 973)
+++ trunk/MySql.Web/Tests/MySql.Web.Tests.csproj	2007-08-24 19:29:27 UTC (rev 974)
@@ -28,7 +28,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
+    <Reference Include="nunit.framework, Version=2.4.3.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />

Modified: trunk/TestSuite/MySql.Data.Tests.CF.csproj
===================================================================
--- trunk/TestSuite/MySql.Data.Tests.CF.csproj	2007-08-24 19:25:38 UTC (rev 973)
+++ trunk/TestSuite/MySql.Data.Tests.CF.csproj	2007-08-24 19:29:27 UTC (rev 974)
@@ -95,6 +95,12 @@
     <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>

Modified: trunk/TestSuite/MySql.Data.Tests.csproj
===================================================================
--- trunk/TestSuite/MySql.Data.Tests.csproj	2007-08-24 19:25:38 UTC (rev 973)
+++ trunk/TestSuite/MySql.Data.Tests.csproj	2007-08-24 19:29:27 UTC (rev 974)
@@ -37,7 +37,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
+    <Reference Include="nunit.framework, Version=2.4.3.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />

Thread
Connector/NET commit: r974 - in trunk: MySql.Web/Tests TestSuiterburnett24 Aug