perf: Disposing text readers

ICD.Common.Utils/IO/IcdTextReader.cs

@@ -1,13 +1,13 @@
-#if SIMPLSHARP
+using System;
+#if SIMPLSHARP
 using Crestron.SimplSharp.CrestronIO;
-
 #else
 using System.IO;
 #endif
 
 namespace ICD.Common.Utils.IO
 {
-	public class IcdTextReader
+	public class IcdTextReader : IDisposable
 	{
 		private readonly TextReader m_TextReader;
 
@@ -17,5 +17,10 @@ namespace ICD.Common.Utils.IO
 		{
 			m_TextReader = textReader;
 		}
+
+		public void Dispose()
+		{
+			m_TextReader.Dispose();
+		}
 	}
 }

ICD.Common.Utils/Json/JsonUtils.cs

@@ -205,8 +205,11 @@ namespace ICD.Common.Utils.Json
 
 			StringBuilder builder = new StringBuilder();
 
-			using (JsonTextWriter writer = new JsonTextWriter(new IcdStringWriter(builder).WrappedStringWriter))
+			using (IcdStringWriter stringWriter = new IcdStringWriter(builder))
-				serializeMethod(writer);
+			{
+				using (JsonTextWriter writer = new JsonTextWriter(stringWriter.WrappedStringWriter))
+					serializeMethod(writer);
+			}
 
 			return builder.ToString();
 		}
@@ -224,8 +227,11 @@ namespace ICD.Common.Utils.Json
 			if (deserializeMethod == null)
 				throw new ArgumentNullException("deserializeMethod");
 
-			using (JsonTextReader reader = new JsonTextReader(new IcdStringReader(json).WrappedStringReader))
+			using (IcdStringReader stringReader = new IcdStringReader(json))
-				return deserializeMethod(reader);
+			{
+				using (JsonTextReader reader = new JsonTextReader(stringReader.WrappedStringReader))
+					return deserializeMethod(reader);
+			}
 		}
 
 		/// <summary>