diff --git a/src/JsonToSimpl/JsonToSimplMaster.cs b/src/JsonToSimpl/JsonToSimplMaster.cs index d531d18..2f872e4 100644 --- a/src/JsonToSimpl/JsonToSimplMaster.cs +++ b/src/JsonToSimpl/JsonToSimplMaster.cs @@ -1,5 +1,6 @@ -using System; +using System; using System.Collections.Generic; +using System.IO; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; using Newtonsoft.Json; @@ -159,7 +160,11 @@ namespace PepperDash.Core.JsonToSimpl /// public static JObject ParseObject(string json) { - using (var reader = new JsonTextReader(new StringReader(json))) + #if NET6_0 + using (var reader = new JsonTextReader(new System.IO.StringReader(json))) +#else + using (var reader = new JsonTextReader(new Crestron.SimplSharp.CrestronIO.StringReader(json))) +#endif { var startDepth = reader.Depth; var obj = JObject.Load(reader); @@ -176,7 +181,11 @@ namespace PepperDash.Core.JsonToSimpl /// public static JArray ParseArray(string json) { - using (var reader = new JsonTextReader(new StringReader(json))) + #if NET6_0 + using (var reader = new JsonTextReader(new System.IO.StringReader(json))) +#else + using (var reader = new JsonTextReader(new Crestron.SimplSharp.CrestronIO.StringReader(json))) +#endif { var startDepth = reader.Depth; var obj = JArray.Load(reader); diff --git a/src/PepperDash.Core.4Series.csproj b/src/PepperDash.Core.4Series.csproj index 1433862..d2a2c62 100644 --- a/src/PepperDash.Core.4Series.csproj +++ b/src/PepperDash.Core.4Series.csproj @@ -39,7 +39,7 @@ - + @@ -48,6 +48,9 @@ + + +