diff --git a/Pepperdash Core/.vs/Pepperdash Core/v14/.suo b/Pepperdash Core/.vs/Pepperdash Core/v14/.suo new file mode 100644 index 0000000..4b1acef Binary files /dev/null and b/Pepperdash Core/.vs/Pepperdash Core/v14/.suo differ diff --git a/Pepperdash Core/Pepperdash Core.suo b/Pepperdash Core/Pepperdash Core.suo index 2e97bdf..71a36d1 100644 Binary files a/Pepperdash Core/Pepperdash Core.suo and b/Pepperdash Core/Pepperdash Core.suo differ diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpClient.cs new file mode 100644 index 0000000..0b584d0 --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpClient.cs @@ -0,0 +1,308 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Text.RegularExpressions; +using Crestron.SimplSharp; +using Crestron.SimplSharp.CrestronSockets; +using PepperDash.Core; + +namespace SecureTCP.SecureTCP.Client +{ + public class GenericSecureTcpClient : Device, ISocketStatus, IAutoReconnect + { + /// + /// + /// + public event EventHandler BytesReceived; + + /// + /// + /// + public event EventHandler TextReceived; + + /// + /// + /// + //public event GenericSocketStatusChangeEventDelegate SocketStatusChange; + public event EventHandler ConnectionChange; + + /// + /// Address of server + /// + public string Hostname { get; set; } + + /// + /// Port on server + /// + public int Port { get; set; } + + /// + /// Another damn S+ helper because S+ seems to treat large port nums as signed ints + /// which screws up things + /// + public ushort UPort + { + get { return Convert.ToUInt16(Port); } + set { Port = Convert.ToInt32(value); } + } + + /// + /// Defaults to 2000 + /// + public int BufferSize { get; set; } + + public SecureTCPClient Client; + + /// + /// + /// + public bool IsConnected + { + get { return Client != null && Client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; } + } + + /// + /// S+ helper for IsConnected + /// + public ushort UIsConnected + { + get { return (ushort)(IsConnected ? 1 : 0); } + } + + /// + /// + /// + public SocketStatus ClientStatus + { + get + { + if (Client == null) + return SocketStatus.SOCKET_STATUS_NO_CONNECT; + return Client.ClientStatus; + } + } + + /// + /// Contains the familiar Simpl analog status values. This drives the ConnectionChange event + /// and IsConnected with be true when this == 2. + /// + public ushort UStatus + { + get { return (ushort)ClientStatus; } + } + + /// + /// + /// + public string ClientStatusText { get { return ClientStatus.ToString(); } } + + /// + /// + /// + public string ConnectionFailure { get { return ClientStatus.ToString(); } } + + /// + /// + /// + public bool AutoReconnect { get; set; } + + /// + /// S+ helper for AutoReconnect + /// + public ushort UAutoReconnect + { + get { return (ushort)(AutoReconnect ? 1 : 0); } + set { AutoReconnect = value == 1; } + } + /// + /// Milliseconds to wait before attempting to reconnect. Defaults to 5000 + /// + public int AutoReconnectIntervalMs { get; set; } + + /// + /// Set only when the disconnect method is called. + /// + bool DisconnectCalledByUser; + + /// + /// + /// + public bool Connected + { + get { return Client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; } + } + + CTimer RetryTimer; + + public GenericSecureTcpClient(string key, string address, int port, int bufferSize) + : base(key) + { + Hostname = address; + Port = port; + BufferSize = bufferSize; + AutoReconnectIntervalMs = 5000; + } + + public GenericSecureTcpClient() + : base("Uninitialized SecureTcpClient") + { + CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler); + AutoReconnectIntervalMs = 5000; + BufferSize = 2000; + } + + /// + /// Just to help S+ set the key + /// + public void Initialize(string key) + { + Key = key; + } + + /// + /// Handles closing this up when the program shuts down + /// + void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType) + { + if (programEventType == eProgramStatusEventType.Stopping) + { + if (Client != null) + { + Debug.Console(1, this, "Program stopping. Closing connection"); + Client.DisconnectFromServer(); + Client.Dispose(); + } + } + } + + public override bool Deactivate() + { + if(Client != null) + Client.SocketStatusChange -= this.Client_SocketStatusChange; + return true; + } + + public void Connect() + { + if (IsConnected) + return; + + if (string.IsNullOrEmpty(Hostname)) + { + Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericSecureTcpClient '{0}': No address set", Key); + return; + } + if (Port < 1 || Port > 65535) + { + { + Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericSecureTcpClient '{0}': Invalid port", Key); + return; + } + } + + Client = new SecureTCPClient(Hostname, Port, BufferSize); + Client.SocketStatusChange += Client_SocketStatusChange; + try + { + DisconnectCalledByUser = false; + SocketErrorCodes error = Client.ConnectToServer(); + } + catch (Exception ex) + { + CrestronConsole.PrintLine("Secure Client could not connect. Error: {0}", ex.Message); + } + } + + public void Disconnect() + { + DisconnectCalledByUser = true; + Client.DisconnectFromServer(); + } + + void ConnectToServerCallback(object o) + { + Client.ConnectToServer(); + if (Client.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED) + WaitAndTryReconnect(); + } + + void WaitAndTryReconnect() + { + Client.DisconnectFromServer(); + Debug.Console(2, "Attempting reconnect, status={0}", Client.ClientStatus); + RetryTimer = new CTimer(ConnectToServerCallback, 1000); + } + + void Receive(SecureTCPClient client, int numBytes) + { + if (numBytes > 0) + { + var bytes = client.IncomingDataBuffer.Take(numBytes).ToArray(); + var bytesHandler = BytesReceived; + if (bytesHandler != null) + bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes)); + var textHandler = TextReceived; + if (textHandler != null) + { + var str = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length); + textHandler(this, new GenericCommMethodReceiveTextArgs(str)); + } + } + Client.ReceiveDataAsync(Receive); + } + + /// + /// General send method + /// + public void SendText(string text) + { + var bytes = Encoding.GetEncoding(28591).GetBytes(text); + // Check debug level before processing byte array + //if (Debug.Level == 2) + // Debug.Console(2, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes)); + Client.SendData(bytes, bytes.Length); + } + + /// + /// This is useful from console and...? + /// + public void SendEscapedText(string text) + { + var unescapedText = Regex.Replace(text, @"\\x([0-9a-fA-F][0-9a-fA-F])", s => + { + var hex = s.Groups[1].Value; + return ((char)Convert.ToByte(hex, 16)).ToString(); + }); + SendText(unescapedText); + } + + public void SendBytes(byte[] bytes) + { + //if (Debug.Level == 2) + // Debug.Console(2, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes)); + Client.SendData(bytes, bytes.Length); + } + + + void Client_SocketStatusChange(SecureTCPClient client, SocketStatus clientSocketStatus) + { + Debug.Console(2, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText); + if (client.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED && !DisconnectCalledByUser) + WaitAndTryReconnect(); + + // Probably doesn't need to be a switch since all other cases were eliminated + switch (clientSocketStatus) + { + case SocketStatus.SOCKET_STATUS_CONNECTED: + Client.ReceiveDataAsync(Receive); + DisconnectCalledByUser = false; + break; + } + + var handler = ConnectionChange; + if (handler != null) + ConnectionChange(this, new GenericSocketStatusChageEventArgs(this)); + } + } +} \ No newline at end of file diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj b/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj index 6a5e649..d83069a 100644 --- a/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj +++ b/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj @@ -67,6 +67,7 @@ + diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo b/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo index 9a102a7..a867796 100644 Binary files a/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo and b/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo differ diff --git a/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-28 15-37-03).log b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-28 15-37-03).log new file mode 100644 index 0000000..b74a243 --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-28 15-37-03).log @@ -0,0 +1,67 @@ +2/28/2017 3:37:03 PM, Info: Initializing SIMPLSharp Services... +2/28/2017 3:37:03 PM, Info: ProjectInfo successfully initialized. +2/28/2017 3:41:39 PM, Info: Saving project information... +2/28/2017 3:41:39 PM, Info: Saving project information... +2/28/2017 3:46:39 PM, Info: Saving project information... +2/28/2017 3:46:39 PM, Info: Saving project information... +2/28/2017 3:51:39 PM, Info: Saving project information... +2/28/2017 3:51:39 PM, Info: Saving project information... +2/28/2017 3:56:39 PM, Info: Saving project information... +2/28/2017 3:56:39 PM, Info: Saving project information... +2/28/2017 4:01:39 PM, Info: Saving project information... +2/28/2017 4:01:39 PM, Info: Saving project information... +2/28/2017 4:06:39 PM, Info: Saving project information... +2/28/2017 4:06:39 PM, Info: Saving project information... +2/28/2017 4:11:39 PM, Info: Saving project information... +2/28/2017 4:11:39 PM, Info: Saving project information... +2/28/2017 4:16:39 PM, Info: Saving project information... +2/28/2017 4:16:39 PM, Info: Saving project information... +2/28/2017 4:21:39 PM, Info: Saving project information... +2/28/2017 4:21:39 PM, Info: Saving project information... +2/28/2017 4:26:39 PM, Info: Saving project information... +2/28/2017 4:26:39 PM, Info: Saving project information... +2/28/2017 4:31:39 PM, Info: Saving project information... +2/28/2017 4:31:39 PM, Info: Saving project information... +2/28/2017 4:36:39 PM, Info: Saving project information... +2/28/2017 4:36:39 PM, Info: Saving project information... +2/28/2017 4:41:39 PM, Info: Saving project information... +2/28/2017 4:41:39 PM, Info: Saving project information... +2/28/2017 4:46:39 PM, Info: Saving project information... +2/28/2017 4:46:39 PM, Info: Saving project information... +2/28/2017 4:51:39 PM, Info: Saving project information... +2/28/2017 4:51:39 PM, Info: Saving project information... +2/28/2017 4:56:39 PM, Info: Saving project information... +2/28/2017 4:56:39 PM, Info: Saving project information... +2/28/2017 5:01:39 PM, Info: Saving project information... +2/28/2017 5:01:39 PM, Info: Saving project information... +2/28/2017 5:06:39 PM, Info: Saving project information... +2/28/2017 5:06:39 PM, Info: Saving project information... +2/28/2017 5:11:39 PM, Info: Saving project information... +2/28/2017 5:11:39 PM, Info: Saving project information... +2/28/2017 5:16:39 PM, Info: Saving project information... +2/28/2017 5:16:39 PM, Info: Saving project information... +2/28/2017 5:21:39 PM, Info: Saving project information... +2/28/2017 5:21:39 PM, Info: Saving project information... +2/28/2017 5:26:39 PM, Info: Saving project information... +2/28/2017 5:26:39 PM, Info: Saving project information... +2/28/2017 5:31:39 PM, Info: Saving project information... +2/28/2017 5:31:39 PM, Info: Saving project information... +2/28/2017 5:36:39 PM, Info: Saving project information... +2/28/2017 5:36:39 PM, Info: Saving project information... +2/28/2017 5:41:39 PM, Info: Saving project information... +2/28/2017 5:41:39 PM, Info: Saving project information... +2/28/2017 5:46:39 PM, Info: Saving project information... +2/28/2017 5:46:39 PM, Info: Saving project information... +2/28/2017 5:51:39 PM, Info: Saving project information... +2/28/2017 5:51:39 PM, Info: Saving project information... +2/28/2017 5:56:39 PM, Info: Saving project information... +2/28/2017 5:56:39 PM, Info: Saving project information... +2/28/2017 6:01:39 PM, Info: Saving project information... +2/28/2017 6:01:39 PM, Info: Saving project information... +2/28/2017 6:06:39 PM, Info: Saving project information... +2/28/2017 6:06:39 PM, Info: Saving project information... +2/28/2017 6:11:39 PM, Info: Saving project information... +2/28/2017 6:11:39 PM, Info: Saving project information... +2/28/2017 6:16:39 PM, Info: Saving project information... +2/28/2017 6:16:39 PM, Info: Saving project information... +2/28/2017 6:20:39 PM, Info: Terminating SIMPLSharp Services diff --git a/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-28 23-59-56).log b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-28 23-59-56).log new file mode 100644 index 0000000..39d88d4 --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-28 23-59-56).log @@ -0,0 +1,3 @@ +2/28/2017 11:59:56 PM, Info: Initializing SIMPLSharp Services... +2/28/2017 11:59:56 PM, Info: ProjectInfo successfully initialized. +3/2/2017 1:03:52 AM, Info: Terminating SIMPLSharp Services diff --git a/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-03 00-07-38).log b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-03 00-07-38).log new file mode 100644 index 0000000..b656452 --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-03 00-07-38).log @@ -0,0 +1,3 @@ +3/3/2017 12:07:38 AM, Info: Initializing SIMPLSharp Services... +3/3/2017 12:07:38 AM, Info: ProjectInfo successfully initialized. +3/3/2017 1:09:41 AM, Info: Terminating SIMPLSharp Services diff --git a/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-03 20-17-06).log b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-03 20-17-06).log new file mode 100644 index 0000000..0c7854b --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-03 20-17-06).log @@ -0,0 +1,3 @@ +3/3/2017 8:17:06 PM, Info: Initializing SIMPLSharp Services... +3/3/2017 8:17:06 PM, Info: ProjectInfo successfully initialized. +3/3/2017 8:27:24 PM, Info: Terminating SIMPLSharp Services diff --git a/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-03 21-03-55).log b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-03 21-03-55).log new file mode 100644 index 0000000..d21fad5 --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-03 21-03-55).log @@ -0,0 +1,3 @@ +3/3/2017 9:03:55 PM, Info: Initializing SIMPLSharp Services... +3/3/2017 9:03:55 PM, Info: ProjectInfo successfully initialized. +3/3/2017 9:06:43 PM, Info: Terminating SIMPLSharp Services diff --git a/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-03 21-07-02).log b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-03 21-07-02).log new file mode 100644 index 0000000..0b0c207 --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-03 21-07-02).log @@ -0,0 +1,3 @@ +3/3/2017 9:07:02 PM, Info: Initializing SIMPLSharp Services... +3/3/2017 9:07:02 PM, Info: ProjectInfo successfully initialized. +3/4/2017 11:03:40 AM, Info: Terminating SIMPLSharp Services diff --git a/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-06 16-15-17).log b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-06 16-15-17).log new file mode 100644 index 0000000..5b011a5 --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-06 16-15-17).log @@ -0,0 +1,3 @@ +3/6/2017 4:15:17 PM, Info: Initializing SIMPLSharp Services... +3/6/2017 4:15:18 PM, Info: ProjectInfo successfully initialized. +3/7/2017 11:02:41 AM, Info: Terminating SIMPLSharp Services diff --git a/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-07 11-30-02).log b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-07 11-30-02).log new file mode 100644 index 0000000..e7713ef --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-07 11-30-02).log @@ -0,0 +1,3 @@ +3/7/2017 11:30:02 AM, Info: Initializing SIMPLSharp Services... +3/7/2017 11:30:02 AM, Info: ProjectInfo successfully initialized. +3/7/2017 2:27:46 PM, Info: Terminating SIMPLSharp Services diff --git a/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-08 10-36-13).log b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-08 10-36-13).log new file mode 100644 index 0000000..bab6603 --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-03-08 10-36-13).log @@ -0,0 +1,3 @@ +3/8/2017 10:36:13 AM, Info: Initializing SIMPLSharp Services... +3/8/2017 10:36:13 AM, Info: ProjectInfo successfully initialized. +3/8/2017 5:47:06 PM, Info: Terminating SIMPLSharp Services diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz index a5e0834..748d9e4 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz differ diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config index 0a35bc2..3a016a5 100644 --- a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config +++ b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config @@ -10,11 +10,11 @@ - 2/27/2017 12:04:27 PM - 1.0.6267.21733 + 3/9/2017 11:48:28 PM + 1.0.6277.42853 - Crestron.SIMPLSharp, Version=2.0.48.0, Culture=neutral, PublicKeyToken=812d080f93e2de10 - + Crestron.SIMPLSharp, Version=2.0.52.0, Culture=neutral, PublicKeyToken=812d080f93e2de10 + 2.05.020 \ No newline at end of file diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll index bcb3b53..ea49e6d 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll differ diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb index a66c44d..b93f3d3 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb differ diff --git a/Pepperdash Core/Pepperdash Core/bin/SimplSharpCustomAttributesInterface.dll b/Pepperdash Core/Pepperdash Core/bin/SimplSharpCustomAttributesInterface.dll index 6fd71ec..dd68158 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/SimplSharpCustomAttributesInterface.dll and b/Pepperdash Core/Pepperdash Core/bin/SimplSharpCustomAttributesInterface.dll differ diff --git a/Pepperdash Core/Pepperdash Core/bin/SimplSharpHelperInterface.dll b/Pepperdash Core/Pepperdash Core/bin/SimplSharpHelperInterface.dll index 78ba937..03222b5 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/SimplSharpHelperInterface.dll and b/Pepperdash Core/Pepperdash Core/bin/SimplSharpHelperInterface.dll differ diff --git a/Pepperdash Core/Pepperdash Core/bin/SimplSharpNewtonsoft.dll b/Pepperdash Core/Pepperdash Core/bin/SimplSharpNewtonsoft.dll index 81103a7..2111350 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/SimplSharpNewtonsoft.dll and b/Pepperdash Core/Pepperdash Core/bin/SimplSharpNewtonsoft.dll differ diff --git a/Pepperdash Core/Pepperdash Core/bin/SimplSharpReflectionInterface.dll b/Pepperdash Core/Pepperdash Core/bin/SimplSharpReflectionInterface.dll index edc2f9f..42a55b9 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/SimplSharpReflectionInterface.dll and b/Pepperdash Core/Pepperdash Core/bin/SimplSharpReflectionInterface.dll differ diff --git a/Pepperdash Core/Pepperdash Core/bin/SimplSharpSQLHelperInterface.dll b/Pepperdash Core/Pepperdash Core/bin/SimplSharpSQLHelperInterface.dll index 69b6dc7..7f1841c 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/SimplSharpSQLHelperInterface.dll and b/Pepperdash Core/Pepperdash Core/bin/SimplSharpSQLHelperInterface.dll differ diff --git a/Pepperdash Core/Pepperdash Core/bin/manifest.info b/Pepperdash Core/Pepperdash Core/bin/manifest.info index 54b68ef..1ef813c 100644 --- a/Pepperdash Core/Pepperdash Core/bin/manifest.info +++ b/Pepperdash Core/Pepperdash Core/bin/manifest.info @@ -1,4 +1,4 @@ -MainAssembly=PepperDash_Core.dll:ea8b7cdd5d032cd2744d5213412c61f1 +MainAssembly=PepperDash_Core.dll:27cdfa30fe4a62d52b62944b0c35d6e3 MainAssemblyMinFirmwareVersion=1.007.0017 MainAssemblyResource=SimplSharpData.dat:315526abf906cded47fb0c7510266a7e ü diff --git a/Pepperdash Core/Pepperdash Core/bin/manifest.ser b/Pepperdash Core/Pepperdash Core/bin/manifest.ser index c115138..bd17c41 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/manifest.ser and b/Pepperdash Core/Pepperdash Core/bin/manifest.ser differ diff --git a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll index ca48cfa..393d09a 100644 Binary files a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll and b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll differ diff --git a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb index 86082ab..c012a2a 100644 Binary files a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb and b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb differ diff --git a/Pepperdash Core/Pepperdash Core/obj/Debug/Pepperdash_Core.csproj.FileListAbsolute.txt b/Pepperdash Core/Pepperdash Core/obj/Debug/Pepperdash_Core.csproj.FileListAbsolute.txt index 6f78127..b75bce8 100644 --- a/Pepperdash Core/Pepperdash Core/obj/Debug/Pepperdash_Core.csproj.FileListAbsolute.txt +++ b/Pepperdash Core/Pepperdash Core/obj/Debug/Pepperdash_Core.csproj.FileListAbsolute.txt @@ -18,3 +18,13 @@ C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepp C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\obj\Debug\ResolveAssemblyReference.cache C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\obj\Debug\PepperDash_Core.dll C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\obj\Debug\PepperDash_Core.pdb +C:\P\BitBucket\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll +C:\P\BitBucket\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.pdb +C:\P\BitBucket\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\SimplSharpCustomAttributesInterface.dll +C:\P\BitBucket\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\SimplSharpHelperInterface.dll +C:\P\BitBucket\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\SimplSharpNewtonsoft.dll +C:\P\BitBucket\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\SimplSharpSQLHelperInterface.dll +C:\P\BitBucket\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\SimplSharpReflectionInterface.dll +C:\P\BitBucket\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\obj\Debug\ResolveAssemblyReference.cache +C:\P\BitBucket\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\obj\Debug\PepperDash_Core.dll +C:\P\BitBucket\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\obj\Debug\PepperDash_Core.pdb diff --git a/Pepperdash Core/Pepperdash Core/obj/Debug/ResolveAssemblyReference.cache b/Pepperdash Core/Pepperdash Core/obj/Debug/ResolveAssemblyReference.cache index bc60b6a..b8689b4 100644 Binary files a/Pepperdash Core/Pepperdash Core/obj/Debug/ResolveAssemblyReference.cache and b/Pepperdash Core/Pepperdash Core/obj/Debug/ResolveAssemblyReference.cache differ