diff --git a/Client/ObjectExtension.cs b/Client/ObjectExtension.cs
index 4320e33..b078bf4 100644
--- a/Client/ObjectExtension.cs
+++ b/Client/ObjectExtension.cs
@@ -39,22 +39,23 @@ public static string ToContentXML(this DataTable dataTable)
///
public static string ToHTML(this DataTable dataTable)
{
- string columnHeaders = "";
+ StringBuilder columnHeaders = new StringBuilder();
+
foreach (DataColumn dc in dataTable.Columns)
{
- columnHeaders += $"\n
{dc.ColumnName} | ";
+ columnHeaders.Append($"\n {dc.ColumnName} | ");
}
- string rows = "";
+ StringBuilder rows = new StringBuilder();
foreach (DataRow dr in dataTable.Rows)
{
- string row = "";
+ StringBuilder row = new StringBuilder();
foreach (var i in dr.ItemArray)
{
- row += $"\n {HttpUtility.HtmlEncode(i.ToString())} | ";
+ row.Append($"\n {HttpUtility.HtmlEncode(i.ToString())} | ");
}
- row = $"\n {row}
";
- rows += row;
+ row.Append($"\n {row}
");
+ rows.Append(row);
}
string html = $@"
@@ -109,6 +110,7 @@ public static string ToContentJSON(this DataTable dataTable)
}
rows.Add(row);
}
+ javaScriptSerializer.MaxJsonLength = int.MaxValue;
return javaScriptSerializer.Serialize(rows);
}
@@ -134,37 +136,34 @@ public static string ToContentXML(this DataRow dataRow)
///
public static string ToDelimitedFile(this DataTable dataTable, char delimiter, bool inQuote)
{
- string content = "";
+ StringBuilder content = new StringBuilder();
+
string lastColumn = dataTable.Columns[dataTable.Columns.Count - 1].ColumnName;
foreach (DataColumn dc in dataTable.Columns)
{
- content += dc.ColumnName;
+ content.Append(dc.ColumnName);
if (dc.ColumnName != lastColumn)
- content += delimiter;
+ content.Append(delimiter);
}
+ int i = 0;
foreach (DataRow dr in dataTable.Rows)
{
- content += Environment.NewLine;
+ content.Append(Environment.NewLine);
foreach (DataColumn dc in dataTable.Columns)
{
if (inQuote)
- content += '"' + dr[dc.ColumnName].ToString() + '"';
+ content.Append('"' + dr[dc.ColumnName].ToString() + '"');
else
- content += dr[dc.ColumnName].ToString();
-
- //if (inQuote)
- // content += '"' + dr.Field(dc.ColumnName) + '"';
- //else
- // content += dr.Field(dc.ColumnName);
+ content.Append(dr[dc.ColumnName].ToString());
if (dc.ColumnName != lastColumn)
- content += delimiter;
+ content.Append(delimiter);
}
}
- return content;
+ return content.ToString();
}
///
diff --git a/PowerQueryNet.sln b/PowerQueryNet.sln
index 494e8ad..cd0b676 100644
--- a/PowerQueryNet.sln
+++ b/PowerQueryNet.sln
@@ -10,6 +10,13 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine", "Engine\Engine.csproj", "{35C425A2-E884-4306-8285-3FD66A86B601}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup", "Setup\Setup.wixproj", "{17CC49B9-0954-42EF-95B9-895A9DC29BDE}"
+ ProjectSection(ProjectDependencies) = postProject
+ {24503A13-7D35-49D9-B071-A0173CD54276} = {24503A13-7D35-49D9-B071-A0173CD54276}
+ {C4521615-F8A1-4021-90C4-A2B85EB09703} = {C4521615-F8A1-4021-90C4-A2B85EB09703}
+ {91D3B517-685E-4806-A17F-5589CFF21E29} = {91D3B517-685E-4806-A17F-5589CFF21E29}
+ {5DCDA550-A251-4C69-AE33-88D3BC1326FB} = {5DCDA550-A251-4C69-AE33-88D3BC1326FB}
+ {35C425A2-E884-4306-8285-3FD66A86B601} = {35C425A2-E884-4306-8285-3FD66A86B601}
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Setup.Actions", "Setup.Actions\Setup.Actions.csproj", "{C4521615-F8A1-4021-90C4-A2B85EB09703}"
EndProject
@@ -51,6 +58,7 @@ Global
{17CC49B9-0954-42EF-95B9-895A9DC29BDE}.Debug|x86.ActiveCfg = Debug|x86
{17CC49B9-0954-42EF-95B9-895A9DC29BDE}.Debug|x86.Build.0 = Debug|x86
{17CC49B9-0954-42EF-95B9-895A9DC29BDE}.Release|Any CPU.ActiveCfg = Release|x86
+ {17CC49B9-0954-42EF-95B9-895A9DC29BDE}.Release|Any CPU.Build.0 = Release|x86
{17CC49B9-0954-42EF-95B9-895A9DC29BDE}.Release|x86.ActiveCfg = Release|x86
{17CC49B9-0954-42EF-95B9-895A9DC29BDE}.Release|x86.Build.0 = Release|x86
{C4521615-F8A1-4021-90C4-A2B85EB09703}.Debug|Any CPU.ActiveCfg = Debug|x86
@@ -58,6 +66,7 @@ Global
{C4521615-F8A1-4021-90C4-A2B85EB09703}.Debug|x86.ActiveCfg = Debug|x86
{C4521615-F8A1-4021-90C4-A2B85EB09703}.Debug|x86.Build.0 = Debug|x86
{C4521615-F8A1-4021-90C4-A2B85EB09703}.Release|Any CPU.ActiveCfg = Release|x86
+ {C4521615-F8A1-4021-90C4-A2B85EB09703}.Release|Any CPU.Build.0 = Release|x86
{C4521615-F8A1-4021-90C4-A2B85EB09703}.Release|x86.ActiveCfg = Release|x86
{C4521615-F8A1-4021-90C4-A2B85EB09703}.Release|x86.Build.0 = Release|x86
{91D3B517-685E-4806-A17F-5589CFF21E29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
diff --git a/Setup/Product.wxs b/Setup/Product.wxs
index a1582fb..1cc1040 100644
--- a/Setup/Product.wxs
+++ b/Setup/Product.wxs
@@ -1,7 +1,7 @@
-
+