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 @@
-
+
\ 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("\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("");
- context.Response.Write(jsonWritter.Write(context.Request));
+ context.Response.Write(JsonWriter.WriteObject(context.Request, indent: true));
context.Response.Write("
");
}
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 @@
-
- ..\packages\VAR.Json.1.1.1.36534\lib\net461\VAR.Json.dll
+
+ ..\packages\VAR.Json.1.2.2\lib\netstandard2.0\VAR.Json.dll