Merge branch 'dev' into MetLife_v5.3

CHANGELOG.md

@@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [5.0.0] - 2018-09-14
+### Added
+ - Stopwatch profiling methods
+ - Attempt to interpret old assembly naming convention when parsing types
+ - Added RegexUtils
+
+### Changed
+ - Significant performance improvements across the board
+
 ## [4.0.0] - 2018-07-19
 ### Added
  - Added extension method for getting type name without trailing generic info

ICD.Common.Utils/Extensions/MethodInfoExtensions.cs

@@ -91,10 +91,13 @@ namespace ICD.Common.Utils.Extensions
 						}
 						sigBuilder.Append("this ");
 					}
-#endif
 				}
 				else if (secondParam)
+				{
 					secondParam = false;
+#endif
+				}
+				
 				else
 					sigBuilder.Append(", ");
 

ICD.Common.Utils/IcdConsole.cs

@@ -1,9 +1,10 @@
 using System;
-using System.Diagnostics;
 using System.Linq;
 using ICD.Common.Properties;
 #if SIMPLSHARP
 using Crestron.SimplSharp;
+#else
+using System.Diagnostics;
 #endif
 
 namespace ICD.Common.Utils

ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs

@@ -10,10 +10,7 @@ namespace ICD.Common.Utils.Json
 		/// Creates a new instance of T.
 		/// </summary>
 		/// <returns></returns>
-		protected virtual T Instantiate()
-		{
-			return ReflectionUtils.CreateInstance<T>();
-		}
+		protected abstract T Instantiate();
 
 		/// <summary>
 		/// Writes the JSON representation of the object.

ICD.Common.Utils/Properties/AssemblyInfo.cs

@@ -4,4 +4,4 @@ using System.Reflection;
 [assembly: AssemblyCompany("ICD Systems")]
 [assembly: AssemblyProduct("ICD.Common.Utils")]
 [assembly: AssemblyCopyright("Copyright © ICD Systems 2018")]
-[assembly: AssemblyVersion("4.0.0.0")]
+[assembly: AssemblyVersion("5.0.0.0")]

ICD.Common.Utils/RecursionUtils.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using ICD.Common.Properties;
 using ICD.Common.Utils.Collections;
-using ICD.Common.Utils.Extensions;
 
 namespace ICD.Common.Utils
 {

ICD.Common.Utils/Services/Scheduler/AbstractScheduledAction.cs

@@ -1,5 +1,4 @@
 using System;
-using ICD.Common.Utils.EventArguments;
 using ICD.Common.Utils.Extensions;
 
 namespace ICD.Common.Utils.Services.Scheduler