PS build and testing both 4 and 5 together. Created new build config …

…mysql55
Vidarls · Mar 7, 2014 · 6fef6fe · 6fef6fe
1 parent efc696c
commit 6fef6fe
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 7 deletions.
diff --git a/Build/default.ps1 b/Build/default.ps1
diff --git a/Src/Simple.Data.Mysql.Test/InsertTests.cs b/Src/Simple.Data.Mysql.Test/InsertTests.cs
@@ -47,7 +47,7 @@ public void By_default_autoincrement_columns_are_not_inserted_to()
         [Test]
         public void With_the_insertidentity_option_the_autoincrement_column_should_be_inserted_to()
         {
-            var db = Db.WithOptions(new AdoOptions(identityInsert: true));
+            var db = Db.WithOptions(new AdoOptions(identityInsert: true, commandTimeout: 30));
             db.empty_table.DeleteAll();
             db.empty_table.Insert(new {id = 88888, Somevalue = "This is really not needed, is it?"});
             var inserted = db.empty_table.All().Single();
@@ -57,7 +57,7 @@ public void With_the_insertidentity_option_the_autoincrement_column_should_be_in
         [Test]
         public void With_the_insertidentity_option_the_autoincrement_column_should_autoincrement_when_no_value_is_provided()
         {
-            var db = Db.WithOptions(new AdoOptions(identityInsert: true));
+            var db = Db.WithOptions(new AdoOptions(identityInsert: true, commandTimeout: 30));
             db.empty_table.DeleteAll();
             db.empty_table.Insert(new {Somevalue = "humty dumpty"});
             var inserted = db.empty_table.All().Single();
@@ -71,7 +71,7 @@ public void With_the_insertidentity_option_the_autoincrement_column_should_autoi
         [Test]
         public void With_the_insertidentity_option_the_inserted_row_will_not_be_returned()
         {
-            var db = Db.WithOptions(new AdoOptions(identityInsert: true));
+            var db = Db.WithOptions(new AdoOptions(identityInsert: true, commandTimeout: 30));
             db.empty_table.DeleteAll();
             var toBeInserted = new {Id = 99997, Somevalue = "running out of ideas here"};
             var inserted = db.empty_table.Insert(toBeInserted);

diff --git a/Src/Simple.Data.Mysql.Test/Simple.Data.Mysql.Test.csproj b/Src/Simple.Data.Mysql.Test/Simple.Data.Mysql.Test.csproj
@@ -50,6 +50,12 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MySql55Tests|AnyCPU'">
+    <OutputPath>bin\MySql55Tests\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MySql55Tests|x86'">
+    <OutputPath>bin\x86\MySql55Tests\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Castle.Core">
       <HintPath>..\packages\Castle.Core.3.0.0.4001\lib\net40-client\Castle.Core.dll</HintPath>

diff --git a/Src/Simple.Data.Mysql.sln b/Src/Simple.Data.Mysql.sln
@@ -13,6 +13,8 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x86 = Debug|x86
+		MySql55Tests|Any CPU = MySql55Tests|Any CPU
+		MySql55Tests|x86 = MySql55Tests|x86
 		Release|Any CPU = Release|Any CPU
 		Release|x86 = Release|x86
 	EndGlobalSection
@@ -21,6 +23,10 @@ Global
 		{6BB6D48E-E2AB-4AF7-8FE3-10A3AACE3FC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6BB6D48E-E2AB-4AF7-8FE3-10A3AACE3FC7}.Debug|x86.ActiveCfg = Debug|x86
 		{6BB6D48E-E2AB-4AF7-8FE3-10A3AACE3FC7}.Debug|x86.Build.0 = Debug|x86
+		{6BB6D48E-E2AB-4AF7-8FE3-10A3AACE3FC7}.MySql55Tests|Any CPU.ActiveCfg = MySql55Tests|Any CPU
+		{6BB6D48E-E2AB-4AF7-8FE3-10A3AACE3FC7}.MySql55Tests|Any CPU.Build.0 = MySql55Tests|Any CPU
+		{6BB6D48E-E2AB-4AF7-8FE3-10A3AACE3FC7}.MySql55Tests|x86.ActiveCfg = MySql55Tests|x86
+		{6BB6D48E-E2AB-4AF7-8FE3-10A3AACE3FC7}.MySql55Tests|x86.Build.0 = MySql55Tests|x86
 		{6BB6D48E-E2AB-4AF7-8FE3-10A3AACE3FC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6BB6D48E-E2AB-4AF7-8FE3-10A3AACE3FC7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6BB6D48E-E2AB-4AF7-8FE3-10A3AACE3FC7}.Release|x86.ActiveCfg = Release|x86
@@ -29,13 +35,21 @@ Global
 		{B6507B06-C337-4661-B5D0-E23786CDEE87}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B6507B06-C337-4661-B5D0-E23786CDEE87}.Debug|x86.ActiveCfg = Debug|x86
 		{B6507B06-C337-4661-B5D0-E23786CDEE87}.Debug|x86.Build.0 = Debug|x86
+		{B6507B06-C337-4661-B5D0-E23786CDEE87}.MySql55Tests|Any CPU.ActiveCfg = MySql55Tests|Any CPU
+		{B6507B06-C337-4661-B5D0-E23786CDEE87}.MySql55Tests|Any CPU.Build.0 = MySql55Tests|Any CPU
+		{B6507B06-C337-4661-B5D0-E23786CDEE87}.MySql55Tests|x86.ActiveCfg = MySql55Tests|x86
+		{B6507B06-C337-4661-B5D0-E23786CDEE87}.MySql55Tests|x86.Build.0 = MySql55Tests|x86
 		{B6507B06-C337-4661-B5D0-E23786CDEE87}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B6507B06-C337-4661-B5D0-E23786CDEE87}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B6507B06-C337-4661-B5D0-E23786CDEE87}.Release|x86.ActiveCfg = Release|x86
 		{B6507B06-C337-4661-B5D0-E23786CDEE87}.Release|x86.Build.0 = Release|x86
 		{616499DF-BA33-4F6A-BEDB-2D7511C45B6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{616499DF-BA33-4F6A-BEDB-2D7511C45B6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{616499DF-BA33-4F6A-BEDB-2D7511C45B6A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{616499DF-BA33-4F6A-BEDB-2D7511C45B6A}.MySql55Tests|Any CPU.ActiveCfg = MySql55Tests|Any CPU
+		{616499DF-BA33-4F6A-BEDB-2D7511C45B6A}.MySql55Tests|Any CPU.Build.0 = MySql55Tests|Any CPU
+		{616499DF-BA33-4F6A-BEDB-2D7511C45B6A}.MySql55Tests|x86.ActiveCfg = MySql55Tests|Any CPU
+		{616499DF-BA33-4F6A-BEDB-2D7511C45B6A}.MySql55Tests|x86.Build.0 = MySql55Tests|Any CPU
 		{616499DF-BA33-4F6A-BEDB-2D7511C45B6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{616499DF-BA33-4F6A-BEDB-2D7511C45B6A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{616499DF-BA33-4F6A-BEDB-2D7511C45B6A}.Release|x86.ActiveCfg = Release|Any CPU

diff --git a/Src/Simple.Data.Mysql/Simple.Data.Mysql.csproj b/Src/Simple.Data.Mysql/Simple.Data.Mysql.csproj
@@ -50,6 +50,12 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MySql55Tests|AnyCPU'">
+    <OutputPath>bin\MySql55Tests\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MySql55Tests|x86'">
+    <OutputPath>bin\x86\MySql55Tests\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="MySql.Data, Version=6.8.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/Src/Simple.Data.Mysql5.Test.Features/Simple.Data.Mysql5.Test.Features.csproj b/Src/Simple.Data.Mysql5.Test.Features/Simple.Data.Mysql5.Test.Features.csproj
@@ -30,11 +30,10 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MySql55Tests|AnyCPU'">
+    <OutputPath>bin\MySql55Tests\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MySql.Data, Version=6.8.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\MySql.Data.6.8.3\lib\net40\MySql.Data.dll</HintPath>
-    </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.5.9.10348\lib\nunit.framework.dll</HintPath>
     </Reference>
@@ -75,6 +74,11 @@
       <Name>Simple.Data.Mysql</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="MySql.Data.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\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.