From 98e06855607469a332b20b41a7b09840fb94ea9b Mon Sep 17 00:00:00 2001
From: "Valeriano A.R" <valen.alfonso@gmail.com>
Date: Sun, 13 Jun 2021 12:24:12 +0200
Subject: [PATCH] Update VAR.Json and usage.

---
 VAR.Focus.Web/Controls/CtrCardBoard.cs         |  3 +--
 VAR.Focus.Web/Controls/CtrChat.cs              |  3 +--
 VAR.Focus.Web/VAR.Focus.Web.csproj             |  4 ++--
 VAR.Focus.Web/packages.config                  |  2 +-
 VAR.WebForms.Common/Code/ExtensionMethods.cs   |  3 +--
 VAR.WebForms.Common/Controls/CTextBox.cs       | 10 ++++------
 VAR.WebForms.Common/Pages/FrmEcho.cs           |  3 +--
 VAR.WebForms.Common/VAR.WebForms.Common.csproj | 10 +++++-----
 VAR.WebForms.Common/packages.config            |  2 +-
 9 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/VAR.Focus.Web/Controls/CtrCardBoard.cs b/VAR.Focus.Web/Controls/CtrCardBoard.cs
index ffa855a..85b045b 100644
--- a/VAR.Focus.Web/Controls/CtrCardBoard.cs
+++ b/VAR.Focus.Web/Controls/CtrCardBoard.cs
@@ -155,10 +155,9 @@ namespace VAR.Focus.Web.Controls
                     {"ConfirmDelete", MultiLang.GetLiteral("ConfirmDelete")},
                 } },
             };
-            JsonWriter jsonWriter = new JsonWriter();
             StringBuilder sbCfg = new StringBuilder();
             sbCfg.AppendFormat("<script>\n");
-            sbCfg.AppendFormat("var {0} = {1};\n", strCfgName, jsonWriter.Write(cfg));
+            sbCfg.AppendFormat("var {0} = {1};\n", strCfgName, JsonWriter.WriteObject(cfg));
             sbCfg.AppendFormat("RunCardBoard({0});\n", strCfgName);
             sbCfg.AppendFormat("</script>\n");
             LiteralControl liScript = new LiteralControl(sbCfg.ToString());
diff --git a/VAR.Focus.Web/Controls/CtrChat.cs b/VAR.Focus.Web/Controls/CtrChat.cs
index 99a2dcc..4779548 100644
--- a/VAR.Focus.Web/Controls/CtrChat.cs
+++ b/VAR.Focus.Web/Controls/CtrChat.cs
@@ -157,10 +157,9 @@ namespace VAR.Focus.Web.Controls
                     {"Disconnected", MultiLang.GetLiteral("Disconnected")},
                 } },
             };
-            JsonWriter jsonWriter = new JsonWriter();
             StringBuilder sbCfg = new StringBuilder();
             sbCfg.AppendFormat("<script>\n");
-            sbCfg.AppendFormat("var {0} = {1};\n", strCfgName, jsonWriter.Write(cfg));
+            sbCfg.AppendFormat("var {0} = {1};\n", strCfgName, JsonWriter.WriteObject(cfg));
             sbCfg.AppendFormat("RunChat({0});\n", strCfgName);
             sbCfg.AppendFormat("</script>\n");
             LiteralControl liScript = new LiteralControl(sbCfg.ToString());
diff --git a/VAR.Focus.Web/VAR.Focus.Web.csproj b/VAR.Focus.Web/VAR.Focus.Web.csproj
index 002b95d..b913acb 100644
--- a/VAR.Focus.Web/VAR.Focus.Web.csproj
+++ b/VAR.Focus.Web/VAR.Focus.Web.csproj
@@ -45,8 +45,8 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Web" />
-    <Reference Include="VAR.Json, Version=1.1.1.36534, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VAR.Json.1.1.1.36534\lib\net461\VAR.Json.dll</HintPath>
+    <Reference Include="VAR.Json, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VAR.Json.1.2.2\lib\netstandard2.0\VAR.Json.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/VAR.Focus.Web/packages.config b/VAR.Focus.Web/packages.config
index 4953ba8..f74ed9e 100644
--- a/VAR.Focus.Web/packages.config
+++ b/VAR.Focus.Web/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="VAR.Json" version="1.1.1.36534" targetFramework="net461" />
+  <package id="VAR.Json" version="1.2.2" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/VAR.WebForms.Common/Code/ExtensionMethods.cs b/VAR.WebForms.Common/Code/ExtensionMethods.cs
index fe66ed3..9750638 100644
--- a/VAR.WebForms.Common/Code/ExtensionMethods.cs
+++ b/VAR.WebForms.Common/Code/ExtensionMethods.cs
@@ -22,9 +22,8 @@ namespace VAR.WebForms.Common.Code
 
         public static void ResponseObject(this HttpContext context, object obj)
         {
-            var jsonWritter = new JsonWriter();
             context.Response.ContentType = "text/json";
-            string strObject = jsonWritter.Write(obj);
+            string strObject = JsonWriter.WriteObject(obj);
             context.Response.Write(strObject);
         }
 
diff --git a/VAR.WebForms.Common/Controls/CTextBox.cs b/VAR.WebForms.Common/Controls/CTextBox.cs
index a5bdd01..aa1ee8f 100644
--- a/VAR.WebForms.Common/Controls/CTextBox.cs
+++ b/VAR.WebForms.Common/Controls/CTextBox.cs
@@ -109,10 +109,9 @@ namespace VAR.WebForms.Common.Controls
                     {"hidSize", _hidSize.ClientID},
                     {"keepSize", _keepSize },
                 };
-                JsonWriter jsonWriter = new JsonWriter();
                 StringBuilder sbCfg = new StringBuilder();
                 sbCfg.AppendFormat("<script>\n");
-                sbCfg.AppendFormat("var {0} = {1};\n", strCfgName, jsonWriter.Write(cfg));
+                sbCfg.AppendFormat("var {0} = {1};\n", strCfgName, JsonWriter.WriteObject(cfg));
                 sbCfg.AppendFormat("CTextBox_Multiline_Init({0});\n", strCfgName);
                 sbCfg.AppendFormat("</script>\n");
                 LiteralControl liScript = new LiteralControl(sbCfg.ToString());
@@ -182,7 +181,7 @@ namespace VAR.WebForms.Common.Controls
 
         public void SetClientsideHeight(int? height)
         {
-            if(height == null)
+            if (height == null)
             {
                 _hidSize.Value = string.Empty;
                 return;
@@ -201,10 +200,9 @@ namespace VAR.WebForms.Common.Controls
                     { "scrollTop", null },
                 };
             }
-            JsonWriter jsonWriter = new JsonWriter();
-            _hidSize.Value = jsonWriter.Write(sizeObj);
+            _hidSize.Value = JsonWriter.WriteObject(sizeObj);
         }
-        
+
         #endregion Public methods
     }
 }
\ No newline at end of file
diff --git a/VAR.WebForms.Common/Pages/FrmEcho.cs b/VAR.WebForms.Common/Pages/FrmEcho.cs
index 16f4ad9..6d589cc 100644
--- a/VAR.WebForms.Common/Pages/FrmEcho.cs
+++ b/VAR.WebForms.Common/Pages/FrmEcho.cs
@@ -14,9 +14,8 @@ namespace VAR.WebForms.Common.Pages
 
         public void ProcessRequest(HttpContext context)
         {
-            var jsonWritter = new JsonWriter(new JsonWriterConfiguration(indent: true));
             context.Response.Write("<pre><code>");
-            context.Response.Write(jsonWritter.Write(context.Request));
+            context.Response.Write(JsonWriter.WriteObject(context.Request, indent: true));
             context.Response.Write("</code></pre>");
         }
 
diff --git a/VAR.WebForms.Common/VAR.WebForms.Common.csproj b/VAR.WebForms.Common/VAR.WebForms.Common.csproj
index 7be5c60..d6f8f2b 100644
--- a/VAR.WebForms.Common/VAR.WebForms.Common.csproj
+++ b/VAR.WebForms.Common/VAR.WebForms.Common.csproj
@@ -40,8 +40,8 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="VAR.Json, Version=1.1.1.36534, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VAR.Json.1.1.1.36534\lib\net461\VAR.Json.dll</HintPath>
+    <Reference Include="VAR.Json, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VAR.Json.1.2.2\lib\netstandard2.0\VAR.Json.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -71,9 +71,6 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Scripts\01. Base.js" />
     <EmbeddedResource Include="Scripts\02. Ajax.js" />
@@ -81,5 +78,8 @@
     <EmbeddedResource Include="Styles\00. Reset.css" />
     <EmbeddedResource Include="Styles\01. base.css" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/VAR.WebForms.Common/packages.config b/VAR.WebForms.Common/packages.config
index 4953ba8..f74ed9e 100644
--- a/VAR.WebForms.Common/packages.config
+++ b/VAR.WebForms.Common/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="VAR.Json" version="1.1.1.36534" targetFramework="net461" />
+  <package id="VAR.Json" version="1.2.2" targetFramework="net461" />
 </packages>
\ No newline at end of file