icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-15 20:54:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into MetLife_v5.3

Browse Source
This commit is contained in:
Jack Kanarish
2018-09-19 10:01:43 -04:00
parent 667c1cdd21 df30585917
commit db15ea24d9
7 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ICD.Common.Utils/Extensions/MethodInfoExtensions.cs
View File

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

3
ICD.Common.Utils/IcdConsole.cs
View File

@@ -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

5
ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs
View File

@@ -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.

2
ICD.Common.Utils/Properties/AssemblyInfo.cs
View File

@@ -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")]

1
ICD.Common.Utils/RecursionUtils.cs
View File

@@ -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
{

1
ICD.Common.Utils/Services/Scheduler/AbstractScheduledAction.cs
View File

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