Merge pull request #184 from PepperDash/feature-2/device-ikeyed-ikeyname-updates

IKeyName changes/updates

src/CommunicationExtras.cs

@@ -5,6 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronSockets;
 using System.Text.RegularExpressions;
+using Newtonsoft.Json;
 
 namespace PepperDash.Core
 {
@@ -25,6 +26,7 @@ namespace PepperDash.Core
         /// <summary>
         /// Indicates connection status
         /// </summary>
+        [JsonProperty("isConnected")]
         bool IsConnected { get; }
         /// <summary>
         /// Connect to the device
@@ -70,6 +72,7 @@ namespace PepperDash.Core
         /// <summary>
         /// Object to enable stream debugging
         /// </summary>
+        [JsonProperty("streamDebugging")]
         CommunicationStreamDebugging StreamDebugging { get; }
     }
 
@@ -87,6 +90,8 @@ namespace PepperDash.Core
         /// <summary>
         /// The current socket status of the client
         /// </summary>
+        [JsonProperty("clinetStatus")]
+        [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
         SocketStatus ClientStatus { get; }
 	}
 
@@ -106,10 +111,12 @@ namespace PepperDash.Core
         /// <summary>
         /// Enable automatic recconnect
         /// </summary>
+        [JsonProperty("autoReconnect")]
 		bool AutoReconnect { get; set; }
         /// <summary>
         /// Interval in ms to attempt automatic recconnections
         /// </summary>
+        [JsonProperty("autoReconnectIntervalMs")]
 		int AutoReconnectIntervalMs { get; set; }
 	}
 

src/CoreInterfaces.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
+using Newtonsoft.Json;
 using Serilog;
 
 namespace PepperDash.Core
@@ -15,6 +16,7 @@ namespace PepperDash.Core
         /// <summary>
         /// Unique Key
         /// </summary>
+        [JsonProperty("key")]
 		string Key { get; }
     }
 
@@ -26,6 +28,7 @@ namespace PepperDash.Core
         /// <summary>
         /// Isn't it obvious :)
         /// </summary>
+        [JsonProperty("name")]
 		string Name { get; }
     }
 

src/Device.cs

@@ -99,7 +99,15 @@ namespace PepperDash.Core
         public void PreActivate()
         {
             if (_PreActivationActions != null)
-                _PreActivationActions.ForEach(a => a.Invoke());
+                _PreActivationActions.ForEach(a => {
+					try
+					{
+						a.Invoke();
+					} catch (Exception e)
+					{ 
+						Debug.LogMessage(e, "Error in PreActivationAction: " + e.Message, this);
+					}
+            });
         }
 
 		/// <summary>
@@ -123,7 +131,16 @@ namespace PepperDash.Core
         public void PostActivate()
         {
             if (_PostActivationActions != null)
-                _PostActivationActions.ForEach(a => a.Invoke());
+                _PostActivationActions.ForEach(a => {
+                    try
+                    {
+                        a.Invoke();
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.LogMessage(e, "Error in PostActivationAction: " + e.Message, this);
+                    }
+                });
         }
 
 		/// <summary>

src/PepperDash.Core.4Series.csproj

@@ -24,6 +24,14 @@
     <DebugType>pdbonly</DebugType>
     <DocumentationFile>bin\4Series\$(Configuration)\PepperDashCore.xml</DocumentationFile>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="lib\**" />
+    <Compile Remove="Properties\**" />
+    <EmbeddedResource Remove="lib\**" />
+    <EmbeddedResource Remove="Properties\**" />
+    <None Remove="lib\**" />
+    <None Remove="Properties\**" />
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />