chore: move all files to file-scoped namespace

src/PepperDash.Core/Comm/CommunicationGather.cs

@@ -8,8 +8,8 @@ using Crestron.SimplSharp;
 using PepperDash.Core;
 
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
-{
+
 	/// <summary>
 	/// Defines the string event handler for line events on the gather
 	/// </summary>
@@ -176,4 +176,3 @@ namespace PepperDash.Core
 			Stop();
 		}
 	}
-}

src/PepperDash.Core/Comm/CommunicationStreamDebugging.cs

@@ -5,13 +5,13 @@ using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Core;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Controls the ability to disable/enable debugging of TX/RX data sent to/from a device with a built in timer to disable
+/// </summary>
+public class CommunicationStreamDebugging
 {
-    /// <summary>
-    /// Controls the ability to disable/enable debugging of TX/RX data sent to/from a device with a built in timer to disable
-    /// </summary>
-    public class CommunicationStreamDebugging
-    {
     /// <summary>
     /// Device Key that this instance configures
     /// </summary>
@@ -129,14 +129,14 @@ namespace PepperDash.Core
         DebugExpiryPeriod.Dispose();
         DebugExpiryPeriod = null;
     }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// The available settings for stream debugging
+/// The available settings for stream debugging
-    /// </summary>
+/// </summary>
-    [Flags]
+[Flags]
-    public enum eStreamDebuggingSetting
+public enum eStreamDebuggingSetting
-    {
+{
     /// <summary>
     /// Debug off
     /// </summary>
@@ -153,14 +153,14 @@ namespace PepperDash.Core
     /// Debug both received and transmitted data
     /// </summary>
     Both = Rx | Tx
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// The available settings for stream debugging response types
+/// The available settings for stream debugging response types
-    /// </summary>
+/// </summary>
-    [Flags]
+[Flags]
-    public enum eStreamDebuggingDataTypeSettings
+public enum eStreamDebuggingDataTypeSettings
-    {
+{
     /// <summary>
     /// Debug data in byte format
     /// </summary>
@@ -173,5 +173,4 @@ namespace PepperDash.Core
     /// Debug data in both byte and text formats
     /// </summary>
     Both = Bytes | Text,
-    }
 }

src/PepperDash.Core/Comm/ControlPropertiesConfig.cs

@@ -3,13 +3,13 @@ using Crestron.SimplSharp;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Config properties that indicate how to communicate with a device for control
+/// </summary>
+public class ControlPropertiesConfig
 {
-    /// <summary>
-    /// Config properties that indicate how to communicate with a device for control
-    /// </summary>
-    public class ControlPropertiesConfig
-    {
     /// <summary>
     /// The method of control
     /// </summary>
@@ -89,5 +89,4 @@ namespace PepperDash.Core
     public ControlPropertiesConfig()
     {            
     }
-    }
 }

src/PepperDash.Core/Comm/EventArgs.cs

@@ -16,17 +16,17 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronSockets;
 
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
-{
-    /// <summary>
-    /// Delegate for notifying of socket status changes
-    /// </summary>
-    /// <param name="client"></param>
-    public delegate void GenericSocketStatusChangeEventDelegate(ISocketStatus client);
 
-    /// <summary>
+/// <summary>
-    /// EventArgs class for socket status changes
+/// Delegate for notifying of socket status changes
-    /// </summary>
+/// </summary>
+/// <param name="client"></param>
+public delegate void GenericSocketStatusChangeEventDelegate(ISocketStatus client);
+
+/// <summary>
+/// EventArgs class for socket status changes
+/// </summary>
 	public class GenericSocketStatusChageEventArgs : EventArgs
 	{
     /// <summary>
@@ -46,19 +46,19 @@ namespace PepperDash.Core
 		/// S+ Constructor
 		/// </summary>
 		public GenericSocketStatusChageEventArgs() { }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// Delegate for notifying of TCP Server state changes
+/// Delegate for notifying of TCP Server state changes
-    /// </summary>
+/// </summary>
-    /// <param name="state"></param>
+/// <param name="state"></param>
-    public delegate void GenericTcpServerStateChangedEventDelegate(ServerState state);
+public delegate void GenericTcpServerStateChangedEventDelegate(ServerState state);
 
-    /// <summary>
+/// <summary>
-    /// EventArgs class for TCP Server state changes
+/// EventArgs class for TCP Server state changes
-    /// </summary>
+/// </summary>
-    public class GenericTcpServerStateChangedEventArgs : EventArgs
+public class GenericTcpServerStateChangedEventArgs : EventArgs
-    {
+{
     /// <summary>
     /// 
     /// </summary>
@@ -76,20 +76,20 @@ namespace PepperDash.Core
 		/// S+ Constructor
 		/// </summary>
 		public GenericTcpServerStateChangedEventArgs() { }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// Delegate for TCP Server socket status changes
+/// Delegate for TCP Server socket status changes
-    /// </summary>
+/// </summary>
-    /// <param name="socket"></param>
+/// <param name="socket"></param>
-    /// <param name="clientIndex"></param>
+/// <param name="clientIndex"></param>
-    /// <param name="clientStatus"></param>
+/// <param name="clientStatus"></param>
-    public delegate void GenericTcpServerSocketStatusChangeEventDelegate(object socket, uint clientIndex, SocketStatus clientStatus);
+public delegate void GenericTcpServerSocketStatusChangeEventDelegate(object socket, uint clientIndex, SocketStatus clientStatus);
-    /// <summary>
+/// <summary>
-    /// EventArgs for TCP server socket status changes
+/// EventArgs for TCP server socket status changes
-    /// </summary>
+/// </summary>
-    public class GenericTcpServerSocketStatusChangeEventArgs : EventArgs
+public class GenericTcpServerSocketStatusChangeEventArgs : EventArgs
-    {
+{
     /// <summary>
     /// 
     /// </summary>
@@ -130,13 +130,13 @@ namespace PepperDash.Core
 		/// S+ Constructor
 		/// </summary>
 		public GenericTcpServerSocketStatusChangeEventArgs() { }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// EventArgs for TCP server com method receive text
+/// EventArgs for TCP server com method receive text
-    /// </summary>
+/// </summary>
-    public class GenericTcpServerCommMethodReceiveTextArgs : EventArgs
+public class GenericTcpServerCommMethodReceiveTextArgs : EventArgs
-    {
+{
     /// <summary>
     /// 
     /// </summary>
@@ -181,13 +181,13 @@ namespace PepperDash.Core
 		/// S+ Constructor
 		/// </summary>
 		public GenericTcpServerCommMethodReceiveTextArgs() { }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// EventArgs for TCP server client ready for communication
+/// EventArgs for TCP server client ready for communication
-    /// </summary>
+/// </summary>
-    public class GenericTcpServerClientReadyForcommunicationsEventArgs : EventArgs
+public class GenericTcpServerClientReadyForcommunicationsEventArgs : EventArgs
-    {
+{
     /// <summary>
     /// 
     /// </summary>
@@ -205,13 +205,13 @@ namespace PepperDash.Core
 		/// S+ Constructor
 		/// </summary>
 		public GenericTcpServerClientReadyForcommunicationsEventArgs() { }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// EventArgs for UDP connected
+/// EventArgs for UDP connected
-    /// </summary>
+/// </summary>
-    public class GenericUdpConnectedEventArgs : EventArgs
+public class GenericUdpConnectedEventArgs : EventArgs
-    {
+{
     /// <summary>
     /// 
     /// </summary>
@@ -244,8 +244,5 @@ namespace PepperDash.Core
         Connected = connected;
     }
 
-    }
-
-   
-
 }
+

src/PepperDash.Core/Comm/GenericSecureTcpIpClient.cs

@@ -7,13 +7,13 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronSockets;
 using PepperDash.Core.Logging;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// A class to handle secure TCP/IP communications with a server
+/// </summary>
+public class GenericSecureTcpIpClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
 {
-    /// <summary>
-    /// A class to handle secure TCP/IP communications with a server
-    /// </summary>
-    public class GenericSecureTcpIpClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
-    {
     private const string SplusKey = "Uninitialized Secure Tcp _client";
     /// <summary>
     /// Stream debugging 
@@ -950,6 +950,4 @@ namespace PepperDash.Core
         handler(this, new GenericTcpServerClientReadyForcommunicationsEventArgs(IsReadyForCommunication));
     }
     #endregion
-    }
-
 }

src/PepperDash.Core/Comm/GenericSecureTcpIpClient_ForServer.cs

@@ -19,13 +19,13 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronSockets;
 using PepperDash.Core.Logging;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Generic secure TCP/IP client for server
+/// </summary>
+public class GenericSecureTcpIpClient_ForServer : Device, IAutoReconnect
 {
-    /// <summary>
-    /// Generic secure TCP/IP client for server
-    /// </summary>
-    public class GenericSecureTcpIpClient_ForServer : Device, IAutoReconnect
-    {
     /// <summary>
     /// Band aid delegate for choked server
     /// </summary>
@@ -904,6 +904,4 @@ namespace PepperDash.Core
             handler(this, new GenericTcpServerClientReadyForcommunicationsEventArgs(IsReadyForCommunication));
     }
     #endregion
-    }
-
 }

src/PepperDash.Core/Comm/GenericSecureTcpIpServer.cs

@@ -17,13 +17,13 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronSockets;
 using PepperDash.Core.Logging;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Generic secure TCP/IP server
+/// </summary>
+public class GenericSecureTcpIpServer : Device
 {
-    /// <summary>
-    /// Generic secure TCP/IP server
-    /// </summary>
-    public class GenericSecureTcpIpServer : Device
-    {
     #region Events
     /// <summary>
     /// Event for Receiving text
@@ -1080,5 +1080,4 @@ namespace PepperDash.Core
         }
     }
     #endregion
-    }
 }

src/PepperDash.Core/Comm/GenericSshClient.cs

@@ -8,13 +8,13 @@ using PepperDash.Core.Logging;
 using Renci.SshNet;
 using Renci.SshNet.Common;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// 
+/// </summary>
+public class GenericSshClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
 {
-    /// <summary>
-    /// 
-    /// </summary>
-    public class GenericSshClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
-    {
     private const string SPlusKey = "Uninitialized SshClient";
     /// <summary>
     /// Object to enable stream debugging
@@ -542,7 +542,7 @@ namespace PepperDash.Core
             this.LogException(ex, "Exception sending {message}", ComTextHelper.GetEscapedText(bytes));
         }           
 		}
-    #endregion
+#endregion
 
 }
 
@@ -588,5 +588,4 @@ public class SshConnectionChangeEventArgs : EventArgs
         IsConnected = isConnected;
         Client = client;
     }
-    }
 }

src/PepperDash.Core/Comm/GenericTcpIpClient.cs

@@ -6,13 +6,13 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronSockets;
 using Newtonsoft.Json;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
-{
+
-    /// <summary>
+/// <summary>
-    /// A class to handle basic TCP/IP communications with a server
+/// A class to handle basic TCP/IP communications with a server
-    /// </summary>
+/// </summary>
 	public class GenericTcpIpClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
-    {
+{
     private const string SplusKey = "Uninitialized TcpIpClient";
     /// <summary>
     /// Object to enable stream debugging
@@ -508,9 +508,9 @@ namespace PepperDash.Core
 		}
 	}
 
-    /// <summary>
+/// <summary>
-    /// Configuration properties for TCP/SSH Connections
+/// Configuration properties for TCP/SSH Connections
-    /// </summary>
+/// </summary>
 	public class TcpSshPropertiesConfig
 	{
     /// <summary>
@@ -562,5 +562,3 @@ namespace PepperDash.Core
 		}
 
 	}
-
-}

src/PepperDash.Core/Comm/GenericTcpIpClient_ForServer.cs

@@ -19,13 +19,13 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronSockets;
 using PepperDash.Core.Logging;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Generic TCP/IP client for server
+/// </summary>
+public class GenericTcpIpClient_ForServer : Device, IAutoReconnect
 {
-    /// <summary>
-    /// Generic TCP/IP client for server
-    /// </summary>
-    public class GenericTcpIpClient_ForServer : Device, IAutoReconnect
-    {
     /// <summary>
     /// Band aid delegate for choked server
     /// </summary>
@@ -770,6 +770,4 @@ namespace PepperDash.Core
             handler(this, new GenericTcpServerClientReadyForcommunicationsEventArgs(IsReadyForCommunication));
     }
     #endregion
-    }
-    
 }

src/PepperDash.Core/Comm/GenericTcpIpServer.cs

@@ -17,13 +17,13 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronSockets;
 using PepperDash.Core.Logging;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Generic TCP/IP server device
+/// </summary>
+public class GenericTcpIpServer : Device
 {
-    /// <summary>
-    /// Generic TCP/IP server device
-    /// </summary>
-    public class GenericTcpIpServer : Device
-    {
     #region Events
     /// <summary>
     /// Event for Receiving text
@@ -1007,5 +1007,4 @@ namespace PepperDash.Core
         }
     }
     #endregion
-    }
 }

src/PepperDash.Core/Comm/GenericUdpServer.cs

@@ -8,13 +8,13 @@ using Crestron.SimplSharp.CrestronSockets;
 using Newtonsoft.Json;
 using PepperDash.Core.Logging;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Generic UDP Server device
+/// </summary>
+public class GenericUdpServer : Device, ISocketStatusWithStreamDebugging
 {
-    /// <summary>
-    /// Generic UDP Server device
-    /// </summary>
-    public class GenericUdpServer : Device, ISocketStatusWithStreamDebugging
-    {
     private const string SplusKey = "Uninitialized Udp Server";
     /// <summary>
     /// Object to enable stream debugging
@@ -318,11 +318,11 @@ namespace PepperDash.Core
             Server.SendData(bytes, bytes.Length);
     }
 
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// 
+/// 
-    /// </summary>
+/// </summary>
 	public class GenericUdpReceiveTextExtraArgs : EventArgs
 	{
     /// <summary>
@@ -363,11 +363,11 @@ namespace PepperDash.Core
 		public GenericUdpReceiveTextExtraArgs() { }
 	}
 
-    /// <summary>
+/// <summary>
-    /// 
+/// 
-    /// </summary>
+/// </summary>
-    public class UdpServerPropertiesConfig
+public class UdpServerPropertiesConfig
-    {
+{
     /// <summary>
     /// 
     /// </summary>
@@ -392,5 +392,4 @@ namespace PepperDash.Core
     {
         BufferSize = 32768;
     }
-    }
 }

src/PepperDash.Core/Comm/TcpClientConfigObject.cs

@@ -1,12 +1,12 @@
 using Newtonsoft.Json;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Client config object for TCP client with server that inherits from TcpSshPropertiesConfig and adds properties for shared key and heartbeat
+/// </summary>
+public class TcpClientConfigObject
 {
-    /// <summary>
-    /// Client config object for TCP client with server that inherits from TcpSshPropertiesConfig and adds properties for shared key and heartbeat
-    /// </summary>
-    public class TcpClientConfigObject
-    {
     /// <summary>
     /// TcpSsh Properties 
     /// </summary>
@@ -55,5 +55,4 @@ namespace PepperDash.Core
     /// </summary>
     [JsonProperty("receiveQueueSize")]
     public int ReceiveQueueSize { get; set; }
-    }
 }

src/PepperDash.Core/Comm/TcpServerConfigObject.cs

@@ -4,13 +4,13 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Tcp Server Config object with properties for a tcp server with shared key and heartbeat capabilities
+/// </summary>
+public class TcpServerConfigObject
 {
-    /// <summary>
-    /// Tcp Server Config object with properties for a tcp server with shared key and heartbeat capabilities
-    /// </summary>
-    public class TcpServerConfigObject
-    {
     /// <summary>
     /// Uique key
     /// </summary>
@@ -56,5 +56,4 @@ namespace PepperDash.Core
     /// Receive Queue size must be greater than 20 or defaults to 20
     /// </summary>
     public int ReceiveQueueSize { get; set; }
-    }
 }

src/PepperDash.Core/Comm/eControlMethods.cs

@@ -4,13 +4,13 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Crestron Control Methods for a comm object
+/// </summary>
+public enum eControlMethod
 {
-    /// <summary>
-    /// Crestron Control Methods for a comm object
-    /// </summary>
-    public enum eControlMethod
-    {
     /// <summary>
     /// 
     /// </summary>
@@ -75,5 +75,4 @@ namespace PepperDash.Core
     /// Secure TCP/IP
     /// </summary>
     SecureTcpIp
-    }
 }

src/PepperDash.Core/CommunicationExtras.cs

@@ -7,13 +7,13 @@ using Crestron.SimplSharp.CrestronSockets;
 using System.Text.RegularExpressions;
 using Newtonsoft.Json;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// An incoming communication stream
+/// </summary>
+public interface ICommunicationReceiver : IKeyed
 {
-    /// <summary>
-    /// An incoming communication stream
-    /// </summary>
-    public interface ICommunicationReceiver : IKeyed
-    {
     /// <summary>
     /// Notifies of bytes received
     /// </summary>
@@ -36,12 +36,12 @@ namespace PepperDash.Core
     /// Disconnect from the device
     /// </summary>
     void Disconnect();
-    }
+}
 
 	/// <summary>
 	/// Represents a device that uses basic connection
 	/// </summary>
-    public interface IBasicCommunication : ICommunicationReceiver
+public interface IBasicCommunication : ICommunicationReceiver
 	{
     /// <summary>
     /// Send text to the device
@@ -56,25 +56,25 @@ namespace PepperDash.Core
 		void SendBytes(byte[] bytes);
 	}
 
-    /// <summary>
+/// <summary>
-    /// Represents a device that implements IBasicCommunication and IStreamDebugging
+/// Represents a device that implements IBasicCommunication and IStreamDebugging
-    /// </summary>
+/// </summary>
-    public interface IBasicCommunicationWithStreamDebugging : IBasicCommunication, IStreamDebugging
+public interface IBasicCommunicationWithStreamDebugging : IBasicCommunication, IStreamDebugging
-    {
+{
 
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// Represents a device with stream debugging capablities
+/// Represents a device with stream debugging capablities
-    /// </summary>
+/// </summary>
-    public interface IStreamDebugging
+public interface IStreamDebugging
-    {
+{
     /// <summary>
     /// Object to enable stream debugging
     /// </summary>
     [JsonProperty("streamDebugging")]
     CommunicationStreamDebugging StreamDebugging { get; }
-    }
+}
 
 	/// <summary>
 	/// For IBasicCommunication classes that have SocketStatus. GenericSshClient,
@@ -95,17 +95,17 @@ namespace PepperDash.Core
     SocketStatus ClientStatus { get; }
 	}
 
-    /// <summary>
+/// <summary>
-    /// Describes a device that implements ISocketStatus and IStreamDebugging
+/// Describes a device that implements ISocketStatus and IStreamDebugging
-    /// </summary>
+/// </summary>
-    public interface ISocketStatusWithStreamDebugging : ISocketStatus, IStreamDebugging
+public interface ISocketStatusWithStreamDebugging : ISocketStatus, IStreamDebugging
-    {
+{
 
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// Describes a device that can automatically attempt to reconnect
+/// Describes a device that can automatically attempt to reconnect
-    /// </summary>
+/// </summary>
 	public interface IAutoReconnect
 	{
     /// <summary>
@@ -244,4 +244,3 @@ namespace PepperDash.Core
         return Regex.Replace(text, @"[^\u0020-\u007E]", a => GetEscapedText(a.Value));
     }
 	}
-}

src/PepperDash.Core/Config/PortalConfigReader.cs

@@ -7,11 +7,11 @@ using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using Serilog.Events;
 
-namespace PepperDash.Core.Config
+namespace PepperDash.Core.Config;
-{
+
-    /// <summary>
+/// <summary>
-    /// Reads a Portal formatted config file
+/// Reads a Portal formatted config file
-    /// </summary>
+/// </summary>
 	public class PortalConfigReader
 	{
 		/// <summary>
@@ -232,4 +232,3 @@ namespace PepperDash.Core.Config
 			return o1;
 		}
 	}
-}

src/PepperDash.Core/Conversion/Convert.cs

@@ -4,10 +4,10 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+public class EncodingHelper
 {
-    public class EncodingHelper
-    {
     public static string ConvertUtf8ToAscii(string utf8String)
     {
         return Encoding.ASCII.GetString(Encoding.UTF8.GetBytes(utf8String), 0, utf8String.Length);
@@ -18,5 +18,4 @@ namespace PepperDash.Core
         return Encoding.Unicode.GetString(Encoding.UTF8.GetBytes(utf8String), 0, utf8String.Length);
     }
 
-    }
 }

src/PepperDash.Core/CoreInterfaces.cs

@@ -6,11 +6,11 @@ using Crestron.SimplSharp;
 using Newtonsoft.Json;
 using Serilog;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
-{
+
-    /// <summary>
+/// <summary>
-    /// Unique key interface to require a unique key for the class
+/// Unique key interface to require a unique key for the class
-    /// </summary>
+/// </summary>
 	public interface IKeyed
 	{
     /// <summary>
@@ -18,18 +18,16 @@ namespace PepperDash.Core
     /// </summary>
     [JsonProperty("key")]
 		string Key { get; }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// Named Keyed device interface. Forces the device to have a Unique Key and a name. 
+/// Named Keyed device interface. Forces the device to have a Unique Key and a name. 
-    /// </summary>
+/// </summary>
 	public interface IKeyName : IKeyed
-    {
+{
     /// <summary>
     /// Gets the name associated with the current object.
     /// </summary>
     [JsonProperty("name")]
 		string Name { get; }
-    }
-
 }

src/PepperDash.Core/Device.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using Serilog.Events;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
-{
+
 	//*********************************************************************************************************
 	/// <summary>
 	/// The core event and status-bearing class that most if not all device and connectors can derive from.
@@ -189,4 +189,3 @@ namespace PepperDash.Core
 			return string.Format("{0} - {1}", Key, string.IsNullOrEmpty(Name) ? "---" : Name);
 		}
 	}
-}

src/PepperDash.Core/EthernetHelper.cs

@@ -2,11 +2,11 @@
 using Newtonsoft.Json;
 using Serilog.Events;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
-{
+
-    /// <summary>
+/// <summary>
-    /// Class to help with accessing values from the CrestronEthernetHelper class 
+/// Class to help with accessing values from the CrestronEthernetHelper class 
-    /// </summary>
+/// </summary>
 	public class EthernetHelper
 	{
 		/// <summary>
@@ -114,4 +114,3 @@ namespace PepperDash.Core
 			}
 		}
 	}
-}

src/PepperDash.Core/EventArgs.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
-{
+
 	/// <summary>
 	/// Bool change event args
 	/// </summary>
@@ -169,4 +169,3 @@ namespace PepperDash.Core
 			Index = index;
 		}
 	}	
-}

src/PepperDash.Core/GenericRESTfulCommunications/Constants.cs

@@ -4,13 +4,13 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.GenericRESTfulCommunications
+namespace PepperDash.Core.GenericRESTfulCommunications;
-{
+
 	/// <summary>
 	/// Constants
 	/// </summary>
-    public class GenericRESTfulConstants
+public class GenericRESTfulConstants
-    {
+{
 		/// <summary>
 		/// Generic boolean change
 		/// </summary>
@@ -35,5 +35,4 @@ namespace PepperDash.Core.GenericRESTfulCommunications
 		/// Error string change
 		/// </summary>
 		public const ushort ErrorStringChange = 203;
-    }
 }

src/PepperDash.Core/GenericRESTfulCommunications/GenericRESTfulClient.cs

@@ -6,8 +6,8 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.Net.Http;
 using Crestron.SimplSharp.Net.Https;
 
-namespace PepperDash.Core.GenericRESTfulCommunications
+namespace PepperDash.Core.GenericRESTfulCommunications;
-{
+
 	/// <summary>
 	/// Generic RESTful communication class
 	/// </summary>
@@ -253,4 +253,3 @@ namespace PepperDash.Core.GenericRESTfulCommunications
 			}
 		}
 	}
-}

src/PepperDash.Core/JsonStandardObjects/EventArgs and Constants.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.JsonStandardObjects
+namespace PepperDash.Core.JsonStandardObjects;
-{
+
 	/// <summary>
 	/// Constants for simpl modules
 	/// </summary>
@@ -74,4 +74,3 @@ namespace PepperDash.Core.JsonStandardObjects
 			Index = index;
 		}
 	}
-}

src/PepperDash.Core/JsonStandardObjects/JsonToSimplDevice.cs

@@ -4,8 +4,8 @@ using Crestron.SimplSharp;
 using PepperDash.Core.JsonToSimpl;
 using Serilog.Events;
 
-namespace PepperDash.Core.JsonStandardObjects
+namespace PepperDash.Core.JsonStandardObjects;
-{
+
 	/// <summary>
 	/// Device class
 	/// </summary>
@@ -180,4 +180,3 @@ namespace PepperDash.Core.JsonStandardObjects
 
 		#endregion EventHandler Helpers
 	}
-}

src/PepperDash.Core/JsonStandardObjects/JsonToSimplDeviceConfig.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.JsonStandardObjects
+namespace PepperDash.Core.JsonStandardObjects;
-{
+
 	/*
 	Convert JSON snippt to C#: http://json2csharp.com/#
 	
@@ -254,4 +254,3 @@ namespace PepperDash.Core.JsonStandardObjects
     /// </summary>
 		public List<DeviceConfig> devices { get; set; }
 	}
-}

src/PepperDash.Core/JsonToSimpl/Constants.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.JsonToSimpl
+namespace PepperDash.Core.JsonToSimpl;
-{
+
 	/// <summary>
 	/// Constants for Simpl modules
 	/// </summary>
@@ -140,4 +140,3 @@ namespace PepperDash.Core.JsonToSimpl
     /// </summary>
     String
 	}
-}

src/PepperDash.Core/JsonToSimpl/Global.cs

@@ -7,11 +7,11 @@ using Serilog.Events;
 
 //using PepperDash.Core;
 
-namespace PepperDash.Core.JsonToSimpl
+namespace PepperDash.Core.JsonToSimpl;
-{
+
-    /// <summary>
+/// <summary>
-    /// The global class to manage all the instances of JsonToSimplMaster 
+/// The global class to manage all the instances of JsonToSimplMaster 
-    /// </summary>
+/// </summary>
 	public class J2SGlobal
 	{
 		static List<JsonToSimplMaster> Masters = new List<JsonToSimplMaster>();
@@ -57,4 +57,3 @@ namespace PepperDash.Core.JsonToSimpl
 			return Masters.FirstOrDefault(m => m.UniqueID.Equals(file, StringComparison.OrdinalIgnoreCase));
 		}
 	}
-}

src/PepperDash.Core/JsonToSimpl/JsonToSimplArrayLookupChild.cs

@@ -3,11 +3,11 @@ using System.Linq;
 using Newtonsoft.Json.Linq;
 using Serilog.Events;
 
-namespace PepperDash.Core.JsonToSimpl
+namespace PepperDash.Core.JsonToSimpl;
-{
+
-    /// <summary>
+/// <summary>
-    /// Used to interact with an array of values with the S+ modules
+/// Used to interact with an array of values with the S+ modules
-    /// </summary>
+/// </summary>
 	public class JsonToSimplArrayLookupChild : JsonToSimplChildObjectBase
 	{
     /// <summary>
@@ -159,4 +159,3 @@ namespace PepperDash.Core.JsonToSimpl
 			return false;
 		}
 	}
-}

src/PepperDash.Core/JsonToSimpl/JsonToSimplChildObjectBase.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json.Linq;
 
-namespace PepperDash.Core.JsonToSimpl
+namespace PepperDash.Core.JsonToSimpl;
-{
+
-    /// <summary>
+/// <summary>
-    /// Base class for JSON objects
+/// Base class for JSON objects
-    /// </summary>
+/// </summary>
 	public abstract class JsonToSimplChildObjectBase : IKeyed
 	{
     /// <summary>
@@ -401,4 +401,3 @@ namespace PepperDash.Core.JsonToSimpl
 			}
 		}
 	}
-}

src/PepperDash.Core/JsonToSimpl/JsonToSimplFileMaster.cs

@@ -7,13 +7,13 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Newtonsoft.Json.Linq;
 
-namespace PepperDash.Core.JsonToSimpl
+namespace PepperDash.Core.JsonToSimpl;
+
+/// <summary>
+/// Represents a JSON file that can be read and written to
+/// </summary>
+public class JsonToSimplFileMaster : JsonToSimplMaster
 {
-    /// <summary>
-    /// Represents a JSON file that can be read and written to
-    /// </summary>
-    public class JsonToSimplFileMaster : JsonToSimplMaster
-    {
     /// <summary>
     ///  Sets the filepath as well as registers this with the Global.Masters list
     /// </summary>
@@ -285,5 +285,4 @@ namespace PepperDash.Core.JsonToSimpl
             }
         }
     }
-    }
 }

src/PepperDash.Core/JsonToSimpl/JsonToSimplFixedPathObject.cs

@@ -1,10 +1,10 @@
 
 
-namespace PepperDash.Core.JsonToSimpl
+namespace PepperDash.Core.JsonToSimpl;
-{
+
-    /// <summary>
+/// <summary>
-    /// 
+/// 
-    /// </summary>
+/// </summary>
 	public class JsonToSimplFixedPathObject : JsonToSimplChildObjectBase
 	{
     /// <summary>
@@ -15,4 +15,3 @@ namespace PepperDash.Core.JsonToSimpl
 			this.LinkedToObject = true;
 		}
 	}
-}

src/PepperDash.Core/JsonToSimpl/JsonToSimplGenericMaster.cs

@@ -3,13 +3,13 @@ using System.Collections.Generic;
 using Crestron.SimplSharp;
 using Newtonsoft.Json.Linq;
 
-namespace PepperDash.Core.JsonToSimpl
+namespace PepperDash.Core.JsonToSimpl;
-{
+
-    /// <summary>
+/// <summary>
-    /// Generic Master
+/// Generic Master
-    /// </summary>
+/// </summary>
 	public class JsonToSimplGenericMaster : JsonToSimplMaster
-    {
+{
 		/*****************************************************************************************/
 		/** Privates **/
 
@@ -115,4 +115,3 @@ namespace PepperDash.Core.JsonToSimpl
 				Debug.Console(0, this, "WARNING: No save callback defined.");
 		}
 	}
-}

src/PepperDash.Core/JsonToSimpl/JsonToSimplMaster.cs

@@ -5,11 +5,11 @@ using Crestron.SimplSharp;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace PepperDash.Core.JsonToSimpl
+namespace PepperDash.Core.JsonToSimpl;
-{
+
-    /// <summary>
+/// <summary>
-    /// Abstract base class for JsonToSimpl interactions
+/// Abstract base class for JsonToSimpl interactions
-    /// </summary>
+/// </summary>
 	public abstract class JsonToSimplMaster : IKeyed
 	{
     /// <summary>
@@ -236,4 +236,3 @@ namespace PepperDash.Core.JsonToSimpl
 			}
 		}
 	}
-}

src/PepperDash.Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs

@@ -6,13 +6,13 @@ using Crestron.SimplSharp.CrestronIO;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core.Config;
 
-namespace PepperDash.Core.JsonToSimpl
+namespace PepperDash.Core.JsonToSimpl;
+
+/// <summary>
+/// Portal File Master
+/// </summary>
+public class JsonToSimplPortalFileMaster : JsonToSimplMaster
 {
-    /// <summary>
-    /// Portal File Master
-    /// </summary>
-    public class JsonToSimplPortalFileMaster : JsonToSimplMaster
-    {
 		/// <summary>
 		///  Sets the filepath as well as registers this with the Global.Masters list
 		/// </summary>
@@ -188,4 +188,3 @@ namespace PepperDash.Core.JsonToSimpl
 			}
 		}
 	}
-}

src/PepperDash.Core/Logging/CrestronEnricher.cs

@@ -7,10 +7,10 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PepperDash.Core.Logging
+namespace PepperDash.Core.Logging;
+
+public class CrestronEnricher : ILogEventEnricher
 {
-    public class CrestronEnricher : ILogEventEnricher
-    {
     static readonly string _appName;
 
     static CrestronEnricher()
@@ -33,5 +33,4 @@ namespace PepperDash.Core.Logging
 
         logEvent.AddOrUpdateProperty(property);
     }
-    }
 }

src/PepperDash.Core/Logging/Debug.cs

@@ -16,8 +16,8 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Text.RegularExpressions;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
-{
+
     /// <summary>
     /// Contains debug commands for use in various situations
     /// </summary>
@@ -1024,5 +1024,4 @@ namespace PepperDash.Core
             /// </summary>
             None,
     }
-    }
 }

src/PepperDash.Core/Logging/DebugConsoleSink.cs

@@ -9,10 +9,10 @@ using System.IO;
 using System.Text;
 
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+public class DebugConsoleSink : ILogEventSink
 {
-    public class DebugConsoleSink : ILogEventSink
-    {
     private readonly ITextFormatter _textFormatter;
 
     public void Emit(LogEvent logEvent)
@@ -40,16 +40,14 @@ namespace PepperDash.Core
         _textFormatter = formatProvider ?? new JsonFormatter();
     }
 
-    }
+}
 
-    public static class DebugConsoleSinkExtensions
+public static class DebugConsoleSinkExtensions
-    {
+{
     public static LoggerConfiguration DebugConsoleSink(
                          this LoggerSinkConfiguration loggerConfiguration,
                                           ITextFormatter formatProvider = null)
     {
         return loggerConfiguration.Sink(new DebugConsoleSink(formatProvider));
     }
-    }
-
 }

src/PepperDash.Core/Logging/DebugContext.cs

@@ -6,13 +6,13 @@ using Crestron.SimplSharp.CrestronIO;
 using Newtonsoft.Json;
 
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Represents a debugging context
+/// </summary>
+public class DebugContext
 {
-    /// <summary>
-    /// Represents a debugging context
-    /// </summary>
-    public class DebugContext
-    {
     /// <summary>
     /// Describes the folder location where a given program stores it's debug level memory. By default, the
     /// file written will be named appNdebug where N is 1-10.
@@ -266,16 +266,15 @@ namespace PepperDash.Core
     {
         return string.Format(@"\NVRAM\debugSettings\program{0}-{1}", InitialParametersClass.ApplicationNumber, Key);
     }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// 
+/// 
-    /// </summary>
+/// </summary>
-    public class DebugContextSaveData
+public class DebugContextSaveData
-    {
+{
     /// <summary>
     /// 
     /// </summary>
     public int Level { get; set; }
-    }
 }

src/PepperDash.Core/Logging/DebugCrestronLoggerSink.cs

@@ -3,10 +3,10 @@ using Crestron.SimplSharp.CrestronLogger;
 using Serilog.Core;
 using Serilog.Events;
 
-namespace PepperDash.Core.Logging
+namespace PepperDash.Core.Logging;
+
+public class DebugCrestronLoggerSink : ILogEventSink
 {
-    public class DebugCrestronLoggerSink : ILogEventSink
-    {
     public void Emit(LogEvent logEvent)
     {
         if (!Debug.IsRunningOnAppliance) return;
@@ -25,5 +25,4 @@ namespace PepperDash.Core.Logging
     {
         CrestronLogger.Initialize(1, LoggerModeEnum.RM);
     }
-    }
 }

src/PepperDash.Core/Logging/DebugErrorLogSink.cs

@@ -9,10 +9,10 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PepperDash.Core.Logging
+namespace PepperDash.Core.Logging;
+
+public class DebugErrorLogSink : ILogEventSink
 {
-    public class DebugErrorLogSink : ILogEventSink
-    {
     private ITextFormatter _formatter;
 
     private Dictionary<LogEventLevel, Action<string>> _errorLogMap = new Dictionary<LogEventLevel, Action<string>>
@@ -61,5 +61,4 @@ namespace PepperDash.Core.Logging
     {
         _formatter = formatter;
     }
-    }
 }

src/PepperDash.Core/Logging/DebugExtensions.cs

@@ -2,10 +2,10 @@
 using System;
 using Log = PepperDash.Core.Debug;
 
-namespace PepperDash.Core.Logging
+namespace PepperDash.Core.Logging;
+
+public static class DebugExtensions
 {
-    public static class DebugExtensions
-    {
     public static void LogException(this IKeyed device, Exception ex, string message, params object[] args)
     {
         Log.LogMessage(ex, message, device, args);
@@ -70,5 +70,4 @@ namespace PepperDash.Core.Logging
     {
         Log.LogMessage(LogEventLevel.Fatal, device, message, args);
     }
-    }
 }

src/PepperDash.Core/Logging/DebugMemory.cs

@@ -2,11 +2,11 @@
 using Crestron.SimplSharp;
 using Newtonsoft.Json;
 
-namespace PepperDash.Core.Logging
+namespace PepperDash.Core.Logging;
-{
+
-    /// <summary>
+/// <summary>
-    /// Class to persist current Debug settings across program restarts
+/// Class to persist current Debug settings across program restarts
-    /// </summary>
+/// </summary>
 	public class DebugContextCollection
 	{
     /// <summary>
@@ -112,4 +112,3 @@ namespace PepperDash.Core.Logging
     [JsonProperty("doNotLoadOnNextBoot")]
     public bool DoNotLoadOnNextBoot { get; set; }
 	}
-}

src/PepperDash.Core/Logging/DebugWebsocketSink.cs

@@ -13,8 +13,8 @@ using WebSocketSharp;
 using WebSocketSharp.Server;
 using X509Certificate2 = System.Security.Cryptography.X509Certificates.X509Certificate2;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
-{
+
     /// <summary>
     /// Provides a WebSocket-based logging sink for debugging purposes, allowing log events to be broadcast to connected
     /// WebSocket clients.
@@ -327,5 +327,4 @@ namespace PepperDash.Core
 
             Debug.Console(2, Debug.ErrorLogLevel.Notice, "WebSocket UiClient Error: {0} message: {1}", e.Exception, e.Message);
     }
-    }
 }

src/PepperDash.Core/Network/DiscoveryThings.cs

@@ -4,11 +4,11 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
-{
+
-    /// <summary>
+/// <summary>
-    /// Not in use
+/// Not in use
-    /// </summary>
+/// </summary>
 	public static class NetworkComm
 	{
     /// <summary>
@@ -18,5 +18,3 @@ namespace PepperDash.Core
 		{
 		}
 	}
-
-}

src/PepperDash.Core/PasswordManagement/Config.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.PasswordManagement
+namespace PepperDash.Core.PasswordManagement;
-{
+
 	/// <summary>
 	/// JSON password configuration 
 	/// </summary>
@@ -23,4 +23,3 @@ namespace PepperDash.Core.PasswordManagement
 	        
 	    }
 	}
-}

src/PepperDash.Core/PasswordManagement/Constants.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.PasswordManagement
+namespace PepperDash.Core.PasswordManagement;
-{
+
 	/// <summary>
 	/// Constants
 	/// </summary>
@@ -54,4 +54,3 @@ namespace PepperDash.Core.PasswordManagement
 		/// </summary>
 		public const ushort StringValueChange = 201;		
 	}
-}

src/PepperDash.Core/PasswordManagement/PasswordClient.cs

@@ -1,10 +1,10 @@
 using System;
 
-namespace PepperDash.Core.PasswordManagement
+namespace PepperDash.Core.PasswordManagement;
-{
+
-    /// <summary>
+/// <summary>
-    /// A class to allow user interaction with the PasswordManager
+/// A class to allow user interaction with the PasswordManager
-    /// </summary>
+/// </summary>
 	public class PasswordClient
 	{
 		/// <summary>
@@ -184,4 +184,3 @@ namespace PepperDash.Core.PasswordManagement
 			}
 		}
 	}
-}

src/PepperDash.Core/PasswordManagement/PasswordManager.cs

@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.PasswordManagement
+namespace PepperDash.Core.PasswordManagement;
-{
+
-    /// <summary>
+/// <summary>
-    /// Allows passwords to be stored and managed
+/// Allows passwords to be stored and managed
-    /// </summary>
+/// </summary>
 	public class PasswordManager
 	{
 		/// <summary>
@@ -238,4 +238,3 @@ namespace PepperDash.Core.PasswordManagement
 			}
 		}
 	}
-}

src/PepperDash.Core/SystemInfo/EventArgs and Constants.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.SystemInfo
+namespace PepperDash.Core.SystemInfo;
-{
+
 	/// <summary>
 	/// Constants 
 	/// </summary>
@@ -261,4 +261,3 @@ namespace PepperDash.Core.SystemInfo
 			Index = index;
 		}
 	}
-}

src/PepperDash.Core/SystemInfo/SystemInfoConfig.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.SystemInfo
+namespace PepperDash.Core.SystemInfo;
-{
+
 	/// <summary>
 	/// Processor info class
 	/// </summary>
@@ -201,4 +201,3 @@ namespace PepperDash.Core.SystemInfo
 			
 		}
 	}
-}

src/PepperDash.Core/SystemInfo/SystemInfoToSimpl.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.SystemInfo
+namespace PepperDash.Core.SystemInfo;
-{
+
 	/// <summary>
 	/// System Info class
 	/// </summary>
@@ -459,4 +459,3 @@ namespace PepperDash.Core.SystemInfo
 			}
 		}
 	}
-}

src/PepperDash.Core/Web/BouncyCertificate.cs

@@ -20,13 +20,13 @@ using Org.BouncyCastle.Crypto.Operators;
 using BigInteger = Org.BouncyCastle.Math.BigInteger;
 using X509Certificate = Org.BouncyCastle.X509.X509Certificate;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Taken From https://github.com/rlipscombe/bouncy-castle-csharp/
+/// </summary>
+internal class BouncyCertificate
 {
-    /// <summary>
-    /// Taken From https://github.com/rlipscombe/bouncy-castle-csharp/
-    /// </summary>
-    internal class BouncyCertificate
-    {
     public string CertificatePassword { get; set; } = "password";
     public X509Certificate2 LoadCertificate(string issuerFileName, string password)
     {
@@ -352,5 +352,4 @@ namespace PepperDash.Core
 
         return bRet;
     }
-    }
 }

src/PepperDash.Core/Web/RequestHandlers/DefaultRequestHandler.cs

@@ -1,7 +1,7 @@
 using Crestron.SimplSharp.WebScripting;
 
-namespace PepperDash.Core.Web.RequestHandlers
+namespace PepperDash.Core.Web.RequestHandlers;
-{
+
 	/// <summary>
 	/// Web API default request handler
 	/// </summary>
@@ -14,4 +14,3 @@ namespace PepperDash.Core.Web.RequestHandlers
 			: base(true)
 		{ }
 	}
-}

src/PepperDash.Core/Web/RequestHandlers/WebApiBaseRequestAsyncHandler.cs

@@ -3,10 +3,10 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace PepperDash.Core.Web.RequestHandlers
+namespace PepperDash.Core.Web.RequestHandlers;
+
+public abstract class WebApiBaseRequestAsyncHandler:IHttpCwsHandler
 {
-    public abstract class WebApiBaseRequestAsyncHandler:IHttpCwsHandler
-    {
     private readonly Dictionary<string, Func<HttpCwsContext, Task>> _handlers;
     protected readonly bool EnableCors;
 
@@ -159,5 +159,4 @@ namespace PepperDash.Core.Web.RequestHandlers
 
         handlerTask.GetAwaiter().GetResult();
     }
-    }
 }

src/PepperDash.Core/Web/RequestHandlers/WebApiBaseRequestHandler.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using Crestron.SimplSharp.WebScripting;
 
-namespace PepperDash.Core.Web.RequestHandlers
+namespace PepperDash.Core.Web.RequestHandlers;
-{
+
 	/// <summary>
 	/// CWS Base Handler, implements IHttpCwsHandler
 	/// </summary>
@@ -162,4 +162,3 @@ namespace PepperDash.Core.Web.RequestHandlers
 			handler(context);
 		}
 	}
-}

src/PepperDash.Core/Web/WebApiServer.cs

@@ -7,8 +7,8 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core.Web.RequestHandlers;
 
-namespace PepperDash.Core.Web
+namespace PepperDash.Core.Web;
-{
+
 	/// <summary>
 	/// Web API server
 	/// </summary>
@@ -281,4 +281,3 @@ namespace PepperDash.Core.Web
 			}
 		}
 	}
-}

src/PepperDash.Core/WebApi/Presets/Preset.cs

@@ -1,10 +1,10 @@
 using System;
 
-namespace PepperDash.Core.WebApi.Presets
+namespace PepperDash.Core.WebApi.Presets;
-{
+
-    /// <summary>
+/// <summary>
-    /// Represents a preset
+/// Represents a preset
-    /// </summary>
+/// </summary>
 	public class Preset
 	{
     /// <summary>
@@ -84,4 +84,3 @@ namespace PepperDash.Core.WebApi.Presets
 			Preset = preset;
 		}
 	}
-}

src/PepperDash.Core/WebApi/Presets/User.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.WebApi.Presets
+namespace PepperDash.Core.WebApi.Presets;
-{
+
 	/// <summary>
 	/// 
 	/// </summary>
@@ -90,4 +90,3 @@ namespace PepperDash.Core.WebApi.Presets
     /// </summary>
 		public int PresetNumber { get; set; }
 	}
-}

src/PepperDash.Core/WebApi/Presets/WebApiPasscodeClient.cs

@@ -8,11 +8,11 @@ using Newtonsoft.Json.Linq;
 using PepperDash.Core.JsonToSimpl;
 
 
-namespace PepperDash.Core.WebApi.Presets
+namespace PepperDash.Core.WebApi.Presets;
-{
+
-    /// <summary>
+/// <summary>
-    /// Passcode client for the WebApi
+/// Passcode client for the WebApi
-    /// </summary>
+/// </summary>
 	public class WebApiPasscodeClient : IKeyed
 	{
     /// <summary>
@@ -270,4 +270,3 @@ namespace PepperDash.Core.WebApi.Presets
 			}
 		}
 	}
-}

src/PepperDash.Core/XSigUtility/Serialization/IXSigSerialization.cs

@@ -1,13 +1,13 @@
 using System.Collections.Generic;
 using PepperDash.Core.Intersystem.Tokens;
 
-namespace PepperDash.Core.Intersystem.Serialization
+namespace PepperDash.Core.Intersystem.Serialization;
+
+/// <summary>
+/// Interface to determine XSig serialization for an object.
+/// </summary>
+public interface IXSigSerialization
 {
-    /// <summary>
-    /// Interface to determine XSig serialization for an object.
-    /// </summary>
-    public interface IXSigSerialization
-    {
     /// <summary>
     /// Serialize the sig data
     /// </summary>
@@ -21,5 +21,4 @@ namespace PepperDash.Core.Intersystem.Serialization
     /// <param name="tokens"></param>
     /// <returns></returns>
     T Deserialize<T>(IEnumerable<XSigToken> tokens) where T : class, IXSigSerialization;
-    }
 }

src/PepperDash.Core/XSigUtility/Serialization/XSigSerializationException.cs

@@ -1,12 +1,12 @@
 using System;
 
-namespace PepperDash.Core.Intersystem.Serialization
+namespace PepperDash.Core.Intersystem.Serialization;
+
+/// <summary>
+/// Class to handle this specific exception type
+/// </summary>
+public class XSigSerializationException : Exception
 {
-    /// <summary>
-    /// Class to handle this specific exception type
-    /// </summary>
-    public class XSigSerializationException : Exception
-    {
     /// <summary>
     /// default constructor
     /// </summary>
@@ -24,5 +24,4 @@ namespace PepperDash.Core.Intersystem.Serialization
     /// <param name="message"></param>
     /// <param name="inner"></param>
     public XSigSerializationException(string message, Exception inner) : base(message, inner) { }
-    }
 }

src/PepperDash.Core/XSigUtility/Tokens/XSigAnalogToken.cs

@@ -1,12 +1,12 @@
 using System;
 
-namespace PepperDash.Core.Intersystem.Tokens
+namespace PepperDash.Core.Intersystem.Tokens;
+
+/// <summary>
+/// Represents an XSigAnalogToken
+/// </summary>
+public sealed class XSigAnalogToken : XSigToken, IFormattable
 {
-    /// <summary>
-    /// Represents an XSigAnalogToken
-    /// </summary>
-    public sealed class XSigAnalogToken : XSigToken, IFormattable
-    {
     private readonly ushort _value;
 
     /// <summary>
@@ -84,5 +84,4 @@ namespace PepperDash.Core.Intersystem.Tokens
     {
         return Value.ToString(format, formatProvider);
     }
-    }
 }

src/PepperDash.Core/XSigUtility/Tokens/XSigDigitalToken.cs

@@ -1,12 +1,12 @@
 using System;
 
-namespace PepperDash.Core.Intersystem.Tokens
+namespace PepperDash.Core.Intersystem.Tokens;
+
+/// <summary>
+/// Represents an XSigDigitalToken
+/// </summary>
+public sealed class XSigDigitalToken : XSigToken
 {
-    /// <summary>
-    /// Represents an XSigDigitalToken
-    /// </summary>
-    public sealed class XSigDigitalToken : XSigToken
-    {
     private readonly bool _value;
 
     /// <summary>
@@ -81,5 +81,4 @@ namespace PepperDash.Core.Intersystem.Tokens
     {
         return Value.ToString(formatProvider);
     }
-    }
 }

src/PepperDash.Core/XSigUtility/Tokens/XSigSerialToken.cs

@@ -1,13 +1,13 @@
 using System;
 using System.Text;
 
-namespace PepperDash.Core.Intersystem.Tokens
+namespace PepperDash.Core.Intersystem.Tokens;
+
+/// <summary>
+/// Represents an XSigSerialToken
+/// </summary>
+public sealed class XSigSerialToken : XSigToken
 {
-    /// <summary>
-    /// Represents an XSigSerialToken
-    /// </summary>
-    public sealed class XSigSerialToken : XSigToken
-    {
     private readonly string _value;
 
     /// <summary>
@@ -77,5 +77,4 @@ namespace PepperDash.Core.Intersystem.Tokens
     {
         return Index + " = \"" + Value + "\"";
     }
-    }
 }

src/PepperDash.Core/XSigUtility/Tokens/XSigToken.cs

@@ -1,10 +1,10 @@
-namespace PepperDash.Core.Intersystem.Tokens
+namespace PepperDash.Core.Intersystem.Tokens;
+
+/// <summary>
+/// Represents the base class for all XSig datatypes.
+/// </summary>
+public abstract class XSigToken
 {
-    /// <summary>
-    /// Represents the base class for all XSig datatypes.
-    /// </summary>
-    public abstract class XSigToken
-    {
     private readonly int _index;
 
     /// <summary>
@@ -41,5 +41,4 @@ namespace PepperDash.Core.Intersystem.Tokens
     /// <param name="offset">Offset to adjust the index with.</param>
     /// <returns>XSigToken</returns>
     public abstract XSigToken GetTokenWithOffset(int offset);
-    }
 }

src/PepperDash.Core/XSigUtility/Tokens/XSigTokenType.cs

@@ -1,10 +1,10 @@
-namespace PepperDash.Core.Intersystem.Tokens
+namespace PepperDash.Core.Intersystem.Tokens;
+
+/// <summary>
+/// XSig token types.
+/// </summary>
+public enum XSigTokenType
 {
-    /// <summary>
-    /// XSig token types.
-    /// </summary>
-    public enum XSigTokenType
-    {
     /// <summary>
     /// Digital signal datatype.
     /// </summary>
@@ -19,5 +19,4 @@ namespace PepperDash.Core.Intersystem.Tokens
     /// Serial signal datatype.
     /// </summary>
     Serial
-    }
 }

src/PepperDash.Core/XSigUtility/XSigHelpers.cs

@@ -18,17 +18,17 @@ using PepperDash.Core.Intersystem.Tokens;
         11111111 <- denotes end of data
 */
 
-namespace PepperDash.Core.Intersystem
+namespace PepperDash.Core.Intersystem;
+
+/// <summary>
+/// Helper methods for creating XSig byte sequences compatible with the Intersystem Communications (ISC) symbol.
+/// </summary>
+/// <remarks>
+/// Indexing is not from the start of each signal type but rather from the beginning of the first defined signal
+/// the Intersystem Communications (ISC) symbol.
+/// </remarks>
+public static class XSigHelpers
 {
-    /// <summary>
-    /// Helper methods for creating XSig byte sequences compatible with the Intersystem Communications (ISC) symbol.
-    /// </summary>
-    /// <remarks>
-    /// Indexing is not from the start of each signal type but rather from the beginning of the first defined signal
-    /// the Intersystem Communications (ISC) symbol.
-    /// </remarks>
-    public static class XSigHelpers
-    {
     /// <summary>
     /// Forces all outputs to 0.
     /// </summary>
@@ -235,5 +235,4 @@ namespace PepperDash.Core.Intersystem
 
         return bytes;
     }
-    }
 }

src/PepperDash.Core/XSigUtility/XSigTokenStreamReader.cs

@@ -4,13 +4,13 @@ using Crestron.SimplSharp.CrestronIO;
 using PepperDash.Core.Intersystem.Serialization;
 using PepperDash.Core.Intersystem.Tokens;
 
-namespace PepperDash.Core.Intersystem
+namespace PepperDash.Core.Intersystem;
+
+/// <summary>
+/// XSigToken stream reader.
+/// </summary>
+public sealed class XSigTokenStreamReader : IDisposable
 {
-    /// <summary>
-    /// XSigToken stream reader.
-    /// </summary>
-    public sealed class XSigTokenStreamReader : IDisposable
-    {
     private readonly Stream _stream;
     private readonly bool _leaveOpen;
 
@@ -143,5 +143,4 @@ namespace PepperDash.Core.Intersystem
         if (!_leaveOpen)
             _stream.Dispose();
     }
-    }
 }

src/PepperDash.Core/XSigUtility/XSigTokenStreamWriter.cs

@@ -5,13 +5,13 @@ using Crestron.SimplSharp.CrestronIO;
 using PepperDash.Core.Intersystem.Serialization;
 using PepperDash.Core.Intersystem.Tokens;
 
-namespace PepperDash.Core.Intersystem
+namespace PepperDash.Core.Intersystem;
+
+/// <summary>
+/// XSigToken stream writer.
+/// </summary>
+public sealed class XSigTokenStreamWriter : IDisposable
 {
-    /// <summary>
-    /// XSigToken stream writer.
-    /// </summary>
-    public sealed class XSigTokenStreamWriter : IDisposable
-    {
     private readonly Stream _stream;
     private readonly bool _leaveOpen;
 
@@ -132,5 +132,4 @@ namespace PepperDash.Core.Intersystem
         if (!_leaveOpen)
             _stream.Dispose();
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs

@@ -16,25 +16,25 @@ using Serilog.Events;
 
 //using PepperDash.Essentials.Devices.Common.Cameras;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+/// <summary>
+/// Base class for bridge API variants
+/// </summary>
+public abstract class BridgeApi : EssentialsDevice
 {
-    /// <summary>
-    /// Base class for bridge API variants
-    /// </summary>
-    public abstract class BridgeApi : EssentialsDevice
-    {
     protected BridgeApi(string key) :
         base(key)
     {
 
     }
-    }
+}
 
-    /// <summary>
+/// <summary>
-    /// Bridge API using EISC
+/// Bridge API using EISC
-    /// </summary>
+/// </summary>
-    public class EiscApiAdvanced : BridgeApi, ICommunicationMonitor
+public class EiscApiAdvanced : BridgeApi, ICommunicationMonitor
-    {
+{
     public EiscApiPropertiesConfig PropertiesConfig { get; private set; }
 
     public Dictionary<string, JoinMapBaseAdvanced> JoinMaps { get; private set; }
@@ -321,10 +321,10 @@ namespace PepperDash.Essentials.Core.Bridges
     public StatusMonitorBase CommunicationMonitor { get; private set; }
 
     #endregion
-    }
+}
 
-    public class EiscApiPropertiesConfig
+public class EiscApiPropertiesConfig
-    {
+{
     [JsonProperty("control")]
     public EssentialsControlPropertiesConfig Control { get; set; }
 
@@ -359,10 +359,10 @@ namespace PepperDash.Essentials.Core.Bridges
         public string JoinMapKey { get; set; }
     }
 
-    }
+}
 
-    public class EiscApiAdvancedFactory : EssentialsDeviceFactory<EiscApiAdvanced>
+public class EiscApiAdvancedFactory : EssentialsDeviceFactory<EiscApiAdvanced>
-    {
+{
     public EiscApiAdvancedFactory()
     {
         TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient", "vceiscapiadv", "vceiscapiadvanced" };
@@ -420,6 +420,4 @@ namespace PepperDash.Essentials.Core.Bridges
 
         return new EiscApiAdvanced(dc, eisc);
     }
-    }
-
 }

src/PepperDash.Essentials.Core/Bridges/BridgeHelper.cs

@@ -3,13 +3,13 @@ using Serilog.Events;
 
 //using PepperDash.Essentials.Devices.Common.Cameras;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+/// <summary>
+/// Helper methods for bridges
+/// </summary>
+public static class BridgeHelper
 {
-    /// <summary>
-    /// Helper methods for bridges
-    /// </summary>
-    public static class BridgeHelper
-    {
     public static void PrintJoinMap(string command)
     {
         var targets = command.Split(' ');
@@ -61,6 +61,4 @@ namespace PepperDash.Essentials.Core.Bridges
 
         }
     }
-    }
-
 }

src/PepperDash.Essentials.Core/Bridges/IBridge.cs

@@ -1,12 +1,11 @@
 using Crestron.SimplSharpPro.DeviceSupport;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+/// <summary>
+/// Defines a device that uses JoinMapBaseAdvanced for its join map
+/// </summary>
+public interface IBridgeAdvanced
 {
-    /// <summary>
-    /// Defines a device that uses JoinMapBaseAdvanced for its join map
-    /// </summary>
-    public interface IBridgeAdvanced
-    {
     void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge);
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/AirMediaControllerJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class AirMediaControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class AirMediaControllerJoinMap : JoinMapBaseAdvanced
-    {
     [JoinName("IsOnline")]
     public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
         new JoinMetadata { Description = "Air Media Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
@@ -67,5 +67,4 @@ namespace PepperDash.Essentials.Core.Bridges
     /// <param name="joinStart">Join this join map will start at</param>
     /// <param name="type">Type of the child join map</param>
     protected AirMediaControllerJoinMap(uint joinStart, Type type) : base(joinStart, type){}
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/AppleTvJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class AppleTvJoinMap : JoinMapBaseAdvanced
 {
-    public class AppleTvJoinMap : JoinMapBaseAdvanced
-    {
     [JoinName("UpArrow")]
     public JoinDataComplete UpArrow = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
         new JoinMetadata { Description = "AppleTv Nav Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
@@ -49,5 +49,4 @@ namespace PepperDash.Essentials.Core.Bridges
     public AppleTvJoinMap(uint joinStart, Type type) : base(joinStart, type)
     {
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class C2nRthsControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class C2nRthsControllerJoinMap : JoinMapBaseAdvanced
-    {
     [JoinName("IsOnline")]
     public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
         new JoinMetadata { Description = "Temp Sensor Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
@@ -41,5 +41,4 @@ namespace PepperDash.Essentials.Core.Bridges
     protected C2nRthsControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
     {
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/CameraControllerJoinMap.cs

@@ -1,12 +1,12 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+/// <summary>
+/// Join map for CameraBase devices
+/// </summary>
+public class CameraControllerJoinMap : JoinMapBaseAdvanced
 {
-    /// <summary>
-    /// Join map for CameraBase devices
-    /// </summary>
-    public class CameraControllerJoinMap : JoinMapBaseAdvanced
-    {
     [JoinName("TiltUp")]
     public JoinDataComplete TiltUp = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 }, new JoinMetadata { Description = "Tilt Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
     [JoinName("TiltDown")]
@@ -65,5 +65,4 @@ namespace PepperDash.Essentials.Core.Bridges
     /// <param name="joinStart">Join this join map will start at</param>
     /// <param name="type">Type of the child join map</param>
     protected CameraControllerJoinMap(uint joinStart, Type type) : base(joinStart, type){}
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/CenOdtOccupancySensorBaseJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class CenOdtOccupancySensorBaseJoinMap : JoinMapBaseAdvanced
 {
-    public class CenOdtOccupancySensorBaseJoinMap : JoinMapBaseAdvanced
-    {
     #region Digitals
 
     [JoinName("Online")]
@@ -193,6 +193,4 @@ namespace PepperDash.Essentials.Core.Bridges
     protected CenOdtOccupancySensorBaseJoinMap(uint joinStart, Type type) : base(joinStart, type)
     {
     }
-    }
-
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DisplayControllerJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class DisplayControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class DisplayControllerJoinMap : JoinMapBaseAdvanced
-    {
     [JoinName("Name")]
     public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
         new JoinMetadata { Description = "Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
@@ -81,5 +81,4 @@ namespace PepperDash.Essentials.Core.Bridges
     protected DisplayControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
     {
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmBladeChassisControllerJoinMap.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges {
+namespace PepperDash.Essentials.Core.Bridges; 
-    public class DmBladeChassisControllerJoinMap : JoinMapBaseAdvanced {
+public class DmBladeChassisControllerJoinMap : JoinMapBaseAdvanced {
 
     [JoinName("IsOnline")]
     public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
@@ -70,5 +70,4 @@ namespace PepperDash.Essentials.Core.Bridges {
     {
     }
 
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmChassisControllerJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class DmChassisControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class DmChassisControllerJoinMap : JoinMapBaseAdvanced
-    {
     [JoinName("EnableAudioBreakaway")]
     public JoinDataComplete EnableAudioBreakaway = new JoinDataComplete(
         new JoinData {JoinNumber = 4, JoinSpan = 1},
@@ -166,5 +166,4 @@ namespace PepperDash.Essentials.Core.Bridges
     protected DmChassisControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
     {
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmRmcControllerJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class DmRmcControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class DmRmcControllerJoinMap : JoinMapBaseAdvanced
-    {
     [JoinName("IsOnline")]
     public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
         new JoinMetadata { Description = "DM RMC Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
@@ -88,5 +88,4 @@ namespace PepperDash.Essentials.Core.Bridges
         : base(joinStart, type)
     {
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmTxControllerJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class DmTxControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class DmTxControllerJoinMap : JoinMapBaseAdvanced
-    {
     [JoinName("IsOnline")]
     public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
         new JoinMetadata { Description = "DM TX Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
@@ -92,5 +92,4 @@ namespace PepperDash.Essentials.Core.Bridges
         : base(joinStart, type)
     {
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class DmpsAudioOutputControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class DmpsAudioOutputControllerJoinMap : JoinMapBaseAdvanced
-    {
 
     [JoinName("MasterVolumeLevel")]
     public JoinDataComplete MasterVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
@@ -170,5 +170,4 @@ namespace PepperDash.Essentials.Core.Bridges
     protected DmpsAudioOutputControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
     {
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsMicrophoneControllerJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class DmpsMicrophoneControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class DmpsMicrophoneControllerJoinMap : JoinMapBaseAdvanced
-    {
     [JoinName("MicGain")]
     public JoinDataComplete MicGain = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
         new JoinMetadata { Description = "Mic Gain dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
@@ -46,5 +46,4 @@ namespace PepperDash.Essentials.Core.Bridges
         : base(joinStart, type)
     {
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class DmpsRoutingControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class DmpsRoutingControllerJoinMap : JoinMapBaseAdvanced
-    {
     [JoinName("EnableRouting")]
     public JoinDataComplete EnableRouting = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
         new JoinMetadata { Description = "DMPS Enable Audio and Video Routing", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
@@ -119,5 +119,4 @@ namespace PepperDash.Essentials.Core.Bridges
     protected DmpsRoutingControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
     {
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericIrControllerJoinMap.cs

@@ -1,7 +1,7 @@
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Core.Bridges.JoinMaps
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps;
-{
+
 		public sealed class GenericIrControllerJoinMap : JoinMapBaseAdvanced
 		{
 			[JoinName("PLAY")]
@@ -824,4 +824,3 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			{
 			}
 	}
-}

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericLightingJoinMap.cs

@@ -1,10 +1,10 @@
 using System;
 
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class GenericLightingJoinMap : JoinMapBaseAdvanced
 {
-    public class GenericLightingJoinMap : JoinMapBaseAdvanced
-    {
 
     [JoinName("IsOnline")]
     public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
@@ -45,5 +45,4 @@ namespace PepperDash.Essentials.Core.Bridges
     protected GenericLightingJoinMap(uint joinStart, Type type) : base(joinStart, type)
     {
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class GenericRelayControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class GenericRelayControllerJoinMap : JoinMapBaseAdvanced
-    {
 
     [JoinName("Relay")]
     public JoinDataComplete Relay = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
@@ -27,5 +27,4 @@ namespace PepperDash.Essentials.Core.Bridges
     {
         
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class GlsOccupancySensorBaseJoinMap : JoinMapBaseAdvanced
 {
-    public class GlsOccupancySensorBaseJoinMap : JoinMapBaseAdvanced
-    {
     [JoinName("IsOnline")]
     public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
         new JoinMetadata { Description = "Occ Sensor Is Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
@@ -180,5 +180,5 @@ namespace PepperDash.Essentials.Core.Bridges
     {
     }
 
-    }
 }
+

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GlsPartitionSensorJoinMap.cs

@@ -1,10 +1,10 @@
 using System;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Core.Bridges.JoinMaps
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps;
+
+public class GlsPartitionSensorJoinMap : JoinMapBaseAdvanced
 {
-    public class GlsPartitionSensorJoinMap : JoinMapBaseAdvanced
-    {
 
     #region Digital
 
@@ -153,5 +153,4 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
     {
 
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdMdNxM4kEControllerJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class HdMdNxM4kEControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class HdMdNxM4kEControllerJoinMap : JoinMapBaseAdvanced
-    {
     [JoinName("Name")]
     public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
         new JoinMetadata { Description = "Device Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
@@ -62,5 +62,4 @@ namespace PepperDash.Essentials.Core.Bridges
         : base(joinStart, type)
     {
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class HdMdxxxCEControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class HdMdxxxCEControllerJoinMap : JoinMapBaseAdvanced
-    {
 
     [JoinName("IsOnline")]
     public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
@@ -72,5 +72,4 @@ namespace PepperDash.Essentials.Core.Bridges
         : base(joinStart, type)
     {
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdPsXxxControllerJoinMap.cs

@@ -1,8 +1,8 @@
 using System;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
-{
+
 	public class HdPsXxxControllerJoinMap : JoinMapBaseAdvanced
 	{
 
@@ -187,4 +187,3 @@ namespace PepperDash.Essentials.Core.Bridges
 		{
 		}
 	}
-}

src/PepperDash.Essentials.Core/Bridges/JoinMaps/Hrxxx0WirelessRemoteControllerJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class Hrxxx0WirelessRemoteControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class Hrxxx0WirelessRemoteControllerJoinMap : JoinMapBaseAdvanced
-    {
     [JoinName("Power")]
     public JoinDataComplete Power = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
         new JoinMetadata { Description = "Power", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
@@ -242,5 +242,4 @@ namespace PepperDash.Essentials.Core.Bridges
         : base(joinStart, type)
     {
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/IAnalogInputJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class IAnalogInputJoinMap : JoinMapBaseAdvanced
 {
-    public class IAnalogInputJoinMap : JoinMapBaseAdvanced
-    {
 
     [JoinName("InputValue")]
     public JoinDataComplete InputValue = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
@@ -30,5 +30,4 @@ namespace PepperDash.Essentials.Core.Bridges
         : base(joinStart, type)
     {
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class IBasicCommunicationJoinMap : JoinMapBaseAdvanced
 {
-    public class IBasicCommunicationJoinMap : JoinMapBaseAdvanced
-    {
     [JoinName("TextReceived")]
     public JoinDataComplete TextReceived = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
         new JoinMetadata { Description = "Text Received From Remote Device", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
@@ -46,5 +46,4 @@ namespace PepperDash.Essentials.Core.Bridges
         : base(joinStart, type)
     {
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/IDigitalInputJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class IDigitalInputJoinMap : JoinMapBaseAdvanced
 {
-    public class IDigitalInputJoinMap : JoinMapBaseAdvanced
-    {
 
     [JoinName("InputState")]
     public JoinDataComplete InputState = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
@@ -27,5 +27,4 @@ namespace PepperDash.Essentials.Core.Bridges
         : base(joinStart, type)
     {
     }
-    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/IDigitalOutputJoinMap.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class IDigitalOutputJoinMap : JoinMapBaseAdvanced
 {
-    public class IDigitalOutputJoinMap : JoinMapBaseAdvanced
-    {
 
     [JoinName("OutputState")]
     public JoinDataComplete OutputState = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
@@ -27,5 +27,4 @@ namespace PepperDash.Essentials.Core.Bridges
         : base(joinStart, type)
     {
     }
-    }
 }