From 6fbb4a6a89992839e042776f1cc55f1f6b90bc52 Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Mon, 16 Oct 2017 16:13:45 -0400 Subject: [PATCH 1/3] Tidying --- ICD.Common.Utils/Extensions/CollectionExtensions.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ICD.Common.Utils/Extensions/CollectionExtensions.cs b/ICD.Common.Utils/Extensions/CollectionExtensions.cs index c77ded3..ec831c9 100644 --- a/ICD.Common.Utils/Extensions/CollectionExtensions.cs +++ b/ICD.Common.Utils/Extensions/CollectionExtensions.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using ICD.Common.Properties; namespace ICD.Common.Utils.Extensions { @@ -15,6 +16,7 @@ namespace ICD.Common.Utils.Extensions /// /// /// + [PublicAPI] public static void RemoveAll(this ICollection extends, IEnumerable other) { if (extends == null) @@ -23,7 +25,7 @@ namespace ICD.Common.Utils.Extensions if (other == null) throw new ArgumentNullException("other"); - extends.RemoveAll(i => other.Contains(i)); + extends.RemoveAll(other.Contains); } /// @@ -32,6 +34,7 @@ namespace ICD.Common.Utils.Extensions /// /// /// + [PublicAPI] public static void RemoveAll(this ICollection extends, Func predicate) { if (extends == null) From eee712453d3063f8d334a0b16ad1a12c742a1902 Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Mon, 16 Oct 2017 16:13:51 -0400 Subject: [PATCH 2/3] Fixing namespace --- ICD.Common.Utils/Attributes/Rpc/RpcAttribute.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ICD.Common.Utils/Attributes/Rpc/RpcAttribute.cs b/ICD.Common.Utils/Attributes/Rpc/RpcAttribute.cs index e7f0bab..e810cd1 100644 --- a/ICD.Common.Utils/Attributes/Rpc/RpcAttribute.cs +++ b/ICD.Common.Utils/Attributes/Rpc/RpcAttribute.cs @@ -1,17 +1,18 @@ using System; using System.Collections.Generic; using System.Linq; +using Crestron.SimplSharp.Reflection; +using ICD.Common.Attributes; using ICD.Common.Properties; -using ICD.Common.Utils; using ICD.Common.Utils.Collections; using ICD.Common.Utils.Extensions; #if SIMPLSHARP -using Crestron.SimplSharp.Reflection; + #else using System.Reflection; #endif -namespace ICD.Common.Attributes.Rpc +namespace ICD.Common.Utils.Attributes.Rpc { /// /// Represents a method that can be called by the server via RPC. From 57062276306dcbf79c6c29faa0c3ccd70fbc5675 Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Mon, 16 Oct 2017 16:41:08 -0400 Subject: [PATCH 3/3] Fixing bad using directive --- ICD.Common.Utils/Attributes/Rpc/RpcAttribute.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ICD.Common.Utils/Attributes/Rpc/RpcAttribute.cs b/ICD.Common.Utils/Attributes/Rpc/RpcAttribute.cs index e810cd1..aac1c1a 100644 --- a/ICD.Common.Utils/Attributes/Rpc/RpcAttribute.cs +++ b/ICD.Common.Utils/Attributes/Rpc/RpcAttribute.cs @@ -1,13 +1,12 @@ using System; using System.Collections.Generic; using System.Linq; -using Crestron.SimplSharp.Reflection; using ICD.Common.Attributes; using ICD.Common.Properties; using ICD.Common.Utils.Collections; using ICD.Common.Utils.Extensions; #if SIMPLSHARP - +using Crestron.SimplSharp.Reflection; #else using System.Reflection; #endif