diff --git a/Makefile b/Makefile index 8197b07d7e..bb48ef0234 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ SDK ?= CSC = mcs $(SDK) CSFLAGS = -nologo -warn:4 -codepage:utf8 -langversion:5 -unsafe -warnaserror DEFINE = TRACE -COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Numerics.dll System.Xml.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/Eluant.dll thirdparty/download/rix0rrr.BeaconLib.dll +COMMON_LIBS = System.dll System.Core.dll System.Numerics.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/Eluant.dll thirdparty/download/rix0rrr.BeaconLib.dll NUNIT_LIBS_PATH := NUNIT_LIBS := $(NUNIT_LIBS_PATH)nunit.framework.dll diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index 22d761df78..ec1a6608b1 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -46,9 +46,6 @@ - - - ..\thirdparty\download\Eluant.dll False diff --git a/OpenRA.Mods.Common/UtilityCommands/Extensions.cs b/OpenRA.Mods.Common/UtilityCommands/Extensions.cs index 31aa12763f..80cca2c9e6 100644 --- a/OpenRA.Mods.Common/UtilityCommands/Extensions.cs +++ b/OpenRA.Mods.Common/UtilityCommands/Extensions.cs @@ -11,48 +11,11 @@ using System; using System.Collections.Generic; -using System.Data; -using System.Text; namespace OpenRA.Mods.Common.UtilityCommands { public static class Extensions { - public static string ToCharacterSeparatedValues(this DataTable table, string delimiter, bool includeHeader) - { - var result = new StringBuilder(); - - if (includeHeader) - { - foreach (DataColumn column in table.Columns) - { - result.Append(column.ColumnName); - result.Append(delimiter); - } - - result.Remove(result.Length, 0); - result.AppendLine(); - } - - foreach (DataRow row in table.Rows) - { - for (var x = 0; x < table.Columns.Count; x++) - { - if (x != 0) - result.Append(delimiter); - - result.Append(row[table.Columns[x]]); - } - - result.AppendLine(); - } - - result.Remove(result.Length, 0); - result.AppendLine(); - - return result.ToString(); - } - public static IEnumerable DistinctBy(this IEnumerable source, Func keySelector) { var knownKeys = new HashSet();