Version 1.1.1

gsimardnet · gsimardnet · commit eb6d22618cf7 · 2019-08-15T15:22:12.000-04:00
diff --git a/Client/ObjectExtension.cs b/Client/ObjectExtension.cs
@@ -39,22 +39,23 @@ public static string ToContentXML(this DataTable dataTable)
         /// <returns></returns>
         public static string ToHTML(this DataTable dataTable)
         {
-            string columnHeaders = "";
+            StringBuilder columnHeaders = new StringBuilder();
+
             foreach (DataColumn dc in dataTable.Columns)
             {
-                columnHeaders += $"\n                        <th>{dc.ColumnName}</th>";
+                columnHeaders.Append($"\n                        <th>{dc.ColumnName}</th>");
             }
 
-            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                        <td>{HttpUtility.HtmlEncode(i.ToString())}</td>";
+                    row.Append($"\n                        <td>{HttpUtility.HtmlEncode(i.ToString())}</td>");
                 }
-                row = $"\n                    <tr>{row}</tr>";
-                rows += row;
+                row.Append($"\n                    <tr>{row}</tr>");
+                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)
         /// <returns></returns>
         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<string>(dc.ColumnName) + '"';
-                    //else
-                    //    content += dr.Field<string>(dc.ColumnName);
+                        content.Append(dr[dc.ColumnName].ToString());
 
                     if (dc.ColumnName != lastColumn)
-                        content += delimiter;
+                        content.Append(delimiter);
                 }
             }
 
-            return content;
+            return content.ToString();
         }
 
         /// <summary>
diff --git 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,13 +58,15 @@ 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
 		{C4521615-F8A1-4021-90C4-A2B85EB09703}.Debug|Any CPU.Build.0 = Debug|x86
 		{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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:sql="http://schemas.microsoft.com/wix/SqlExtension">
   <?include $(sys.CURRENTDIR)\Config.wxi?>  
-  <Product Id="95f93336-b7a9-4a68-acf5-1492ec0c5d72" Name="PowerQueryNet" Language="1033" Version="1.1.0" Manufacturer="Guillaume Simard" UpgradeCode="115ef465-536f-4030-bd2d-44b0edb1bbe5">
+  <Product Id="95f93336-b7a9-4a68-acf5-1492ec0c5d72" Name="PowerQueryNet" Language="1033" Version="1.1.1" Manufacturer="Guillaume Simard" UpgradeCode="115ef465-536f-4030-bd2d-44b0edb1bbe5">
     <Package Id="5e1dc07c-131a-43d4-8a98-4d091537ac0f" InstallPrivileges="elevated" InstallerVersion="200" Platform ="x64" Compressed="yes" InstallScope="perMachine" Languages="1033" SummaryCodepage="1252" Description="[ProductName]" />
     <Icon Id="PQNet.ico" SourceFile="Resources\PQNet.ico" />
     <Property Id="ARPPRODUCTICON" Value="PQNet.ico" />

Original file line number	Diff line number	Diff line change
`@@ -39,22 +39,23 @@ public static string ToContentXML(this DataTable dataTable)`
`39`	`39`	`/// <returns></returns>`
`40`	`40`	`public static string ToHTML(this DataTable dataTable)`
`41`	`41`	`{`
`42`		`- string columnHeaders = "";`
	`42`	`+ StringBuilder columnHeaders = new StringBuilder();`
	`43`	`+`
`43`	`44`	`foreach (DataColumn dc in dataTable.Columns)`
`44`	`45`	`{`
`45`		`- columnHeaders += $"\n <th>{dc.ColumnName}</th>";`
	`46`	`+ columnHeaders.Append($"\n <th>{dc.ColumnName}</th>");`
`46`	`47`	`}`
`47`	`48`
`48`		`- string rows = "";`
	`49`	`+ StringBuilder rows = new StringBuilder();`
`49`	`50`	`foreach (DataRow dr in dataTable.Rows)`
`50`	`51`	`{`
`51`		`- string row = "";`
	`52`	`+ StringBuilder row = new StringBuilder();`
`52`	`53`	`foreach (var i in dr.ItemArray)`
`53`	`54`	`{`
`54`		`- row += $"\n <td>{HttpUtility.HtmlEncode(i.ToString())}</td>";`
	`55`	`+ row.Append($"\n <td>{HttpUtility.HtmlEncode(i.ToString())}</td>");`
`55`	`56`	`}`
`56`		`- row = $"\n <tr>{row}</tr>";`
`57`		`- rows += row;`
	`57`	`+ row.Append($"\n <tr>{row}</tr>");`
	`58`	`+ rows.Append(row);`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`string html = $@"`
`@@ -109,6 +110,7 @@ public static string ToContentJSON(this DataTable dataTable)`
`109`	`110`	`}`
`110`	`111`	`rows.Add(row);`
`111`	`112`	`}`
	`113`	`+ javaScriptSerializer.MaxJsonLength = int.MaxValue;`
`112`	`114`	`return javaScriptSerializer.Serialize(rows);`
`113`	`115`	`}`
`114`	`116`
`@@ -134,37 +136,34 @@ public static string ToContentXML(this DataRow dataRow)`
`134`	`136`	`/// <returns></returns>`
`135`	`137`	`public static string ToDelimitedFile(this DataTable dataTable, char delimiter, bool inQuote)`
`136`	`138`	`{`
`137`		`- string content = "";`
	`139`	`+ StringBuilder content = new StringBuilder();`
	`140`	`+`
`138`	`141`	`string lastColumn = dataTable.Columns[dataTable.Columns.Count - 1].ColumnName;`
`139`	`142`	`foreach (DataColumn dc in dataTable.Columns)`
`140`	`143`	`{`
`141`		`- content += dc.ColumnName;`
	`144`	`+ content.Append(dc.ColumnName);`
`142`	`145`	`if (dc.ColumnName != lastColumn)`
`143`		`- content += delimiter;`
	`146`	`+ content.Append(delimiter);`
`144`	`147`	`}`
`145`	`148`
	`149`	`+ int i = 0;`
`146`	`150`	`foreach (DataRow dr in dataTable.Rows)`
`147`	`151`	`{`
`148`		`- content += Environment.NewLine;`
	`152`	`+ content.Append(Environment.NewLine);`
`149`	`153`
`150`	`154`	`foreach (DataColumn dc in dataTable.Columns)`
`151`	`155`	`{`
`152`	`156`	`if (inQuote)`
`153`		`- content += '"' + dr[dc.ColumnName].ToString() + '"';`
	`157`	`+ content.Append('"' + dr[dc.ColumnName].ToString() + '"');`
`154`	`158`	`else`
`155`		`- content += dr[dc.ColumnName].ToString();`
`156`		`-`
`157`		`- //if (inQuote)`
`158`		`- // content += '"' + dr.Field<string>(dc.ColumnName) + '"';`
`159`		`- //else`
`160`		`- // content += dr.Field<string>(dc.ColumnName);`
	`159`	`+ content.Append(dr[dc.ColumnName].ToString());`
`161`	`160`
`162`	`161`	`if (dc.ColumnName != lastColumn)`
`163`		`- content += delimiter;`
	`162`	`+ content.Append(delimiter);`
`164`	`163`	`}`
`165`	`164`	`}`
`166`	`165`
`167`		`- return content;`
	`166`	`+ return content.ToString();`
`168`	`167`	`}`
`169`	`168`
`170`	`169`	`/// <summary>`