From 4fd6276ec2bca74f27ea93222f6913ae7577736e Mon Sep 17 00:00:00 2001 From: Deathmax Date: Wed, 14 Dec 2011 14:43:52 +0800 Subject: [PATCH] Hopefully fix build errors on Bamboo. --- DBEditor/Main.cs | 2 +- DBEditor/TShockDBEditor.csproj | 5 +++-- UnitTests/BanManagerTest.cs | 4 ++-- UnitTests/GroupManagerTest.cs | 2 +- UnitTests/ItemManagerTest.cs | 2 +- UnitTests/RegionManagerTest.cs | 2 +- UnitTests/UnitTests.csproj | 9 +++------ 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/DBEditor/Main.cs b/DBEditor/Main.cs index d5a98e2c..180d779b 100644 --- a/DBEditor/Main.cs +++ b/DBEditor/Main.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.IO; using System.Security.Cryptography; -using Community.CsharpSqlite.SQLiteClient; +using Mono.Data.Sqlite; using MySql.Data.MySqlClient; using System.Windows.Forms; diff --git a/DBEditor/TShockDBEditor.csproj b/DBEditor/TShockDBEditor.csproj index 3d95e73b..ac8260c1 100644 --- a/DBEditor/TShockDBEditor.csproj +++ b/DBEditor/TShockDBEditor.csproj @@ -26,6 +26,7 @@ true 0 1.0.0.%2a + false false true @@ -49,8 +50,8 @@ 4 - - ..\SqlBins\Community.CsharpSqlite.SQLiteClient.dll + + ..\SqlBins\Mono.Data.Sqlite.dll False diff --git a/UnitTests/BanManagerTest.cs b/UnitTests/BanManagerTest.cs index d18ca714..52f19d9f 100644 --- a/UnitTests/BanManagerTest.cs +++ b/UnitTests/BanManagerTest.cs @@ -3,7 +3,7 @@ using System.Data; using System.Text; using System.Collections.Generic; using System.Linq; -using Community.CsharpSqlite.SQLiteClient; +using Mono.Data.Sqlite; using Microsoft.VisualStudio.TestTools.UnitTesting; using TShockAPI; using TShockAPI.DB; @@ -43,7 +43,7 @@ namespace UnitTests [TestMethod] public void FindBanTest() { - Assert.IsNotNull(Bans.GetBanByIp("127.0.0.1")); + D:\SVNs\TShock_GitHub\UnitTests\BanManagerTest.orderedtest Assert.IsNotNull(Bans.GetBanByIp("127.0.0.1")); TShock.Config.EnableBanOnUsernames = true; Assert.IsNotNull(Bans.GetBanByName("BanTest")); TShock.Config.EnableBanOnUsernames = false; diff --git a/UnitTests/GroupManagerTest.cs b/UnitTests/GroupManagerTest.cs index ab7912fc..2e4efc1d 100644 --- a/UnitTests/GroupManagerTest.cs +++ b/UnitTests/GroupManagerTest.cs @@ -3,7 +3,7 @@ using System.Data; using System.Text; using System.Collections.Generic; using System.Linq; -using Community.CsharpSqlite.SQLiteClient; +using Mono.Data.Sqlite; using Microsoft.VisualStudio.TestTools.UnitTesting; using TShockAPI; using TShockAPI.DB; diff --git a/UnitTests/ItemManagerTest.cs b/UnitTests/ItemManagerTest.cs index ef6ed314..7e19d5d6 100644 --- a/UnitTests/ItemManagerTest.cs +++ b/UnitTests/ItemManagerTest.cs @@ -10,7 +10,7 @@ using System.Diagnostics; using System.Net; using System.Reflection; using System.Threading; -using Community.CsharpSqlite.SQLiteClient; +using Mono.Data.Sqlite; using TShockAPI.DB; using TShockAPI; diff --git a/UnitTests/RegionManagerTest.cs b/UnitTests/RegionManagerTest.cs index 8fd1ea08..a8620117 100644 --- a/UnitTests/RegionManagerTest.cs +++ b/UnitTests/RegionManagerTest.cs @@ -5,7 +5,7 @@ using System.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Data; using TShockAPI; -using Community.CsharpSqlite.SQLiteClient; +using Mono.Data.Sqlite; using TShockAPI.DB; using Region = TShockAPI.DB.Region; diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index d8e57ddc..ec70bd7f 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -48,13 +48,10 @@ 4 - - ..\SqlBins\Community.CsharpSqlite.dll - - - ..\SqlBins\Community.CsharpSqlite.SQLiteClient.dll - + + ..\SqlBins\Mono.Data.Sqlite.dll + ..\SqlBins\MySql.Data.dll