fix: update package references and clean up unused imports

.github/workflows/EssentialsPlugins-builds-4-series-caller.yml

@@ -1,21 +0,0 @@
-name: Build PepperDash Essentials
-
-on:
-  push:
-    branches:
-      - '**'
-
-jobs:
-  getVersion:
-    uses: PepperDash/workflow-templates/.github/workflows/essentialsplugins-getversion.yml@main
-    secrets: inherit
-  build-4Series:
-    uses: PepperDash/workflow-templates/.github/workflows/essentialsplugins-4Series-builds.yml@main
-    secrets: inherit
-    needs: getVersion
-    if: needs.getVersion.outputs.newVersion == 'true'
-    with:
-      newVersion: ${{ needs.getVersion.outputs.newVersion }}
-      version: ${{ needs.getVersion.outputs.version }}
-      tag: ${{ needs.getVersion.outputs.tag }}
-      channel: ${{ needs.getVersion.outputs.channel }}

.github/workflows/docker.yml

@@ -0,0 +1,94 @@
+name: Branch Build Using Docker
+
+on:
+  push:
+    branches:
+      - feature-2.0.0/*
+      - hotfix-2.0.0/*
+      - release-2.0.0/*
+      - development-2.0.0
+
+env:
+  # solution path doesn't need slashes unless there it is multiple folders deep
+  # solution name does not include extension. .sln is assumed
+  SOLUTION_PATH: .
+  SOLUTION_FILE: PepperDash.Essentials
+  # Do not edit this, we're just creating it here
+  VERSION: 0.0.0-buildtype-buildnumber
+  # Defaults to debug for build type
+  BUILD_TYPE: Debug
+  # Defaults to main as the release branch.  Change as necessary
+  RELEASE_BRANCH: main
+jobs:
+  Build_Project_4-Series:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set Version Number
+        id: setVersion
+        shell: powershell
+        run: |
+          $latestVersion = [version]"2.0.0"
+
+          $newVersion = [version]$latestVersion
+          $phase = ""
+          $newVersionString = ""
+
+          switch -regex ($Env:GITHUB_REF) {
+            '^refs\/pull\/*.' {
+              $phase = 'beta';
+              $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
+            }
+            '^refs\/heads\/hotfix-2.0.0\/*.' {
+              $phase = 'hotfix'
+              $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
+            }
+            '^refs\/heads\/release-2.0.0\/*.' {
+              $splitRef = $Env:GITHUB_REF -split "/"
+              $version = [version]($splitRef[-1] -replace "v", "")
+              $phase = 'rc'
+              $newVersionString = "{0}-{1}-{2}" -f $version, $phase, $Env:GITHUB_RUN_NUMBER
+            }
+            '^refs\/heads\/feature-2.0.0\/*.' {
+              $phase = 'alpha'
+              $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
+            }
+            'development-2.0.0' {
+              $phase = 'beta'
+              $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
+            }  
+          }   
+                   
+          echo "version=$newVersionString" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
+      - name: Setup MS Build
+        uses: microsoft/setup-msbuild@v1.1
+      - name: restore Nuget Packages
+        run: nuget restore .\$($Env:SOLUTION_FILE).sln
+      # Build the solutions in the docker image
+      - name: Build Solution
+        run: msbuild .\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Debug" /p:Version="${{ steps.setVersion.outputs.version }}" -m
+      - name: Pack Solution
+        run: dotnet pack .\$($Env:SOLUTION_FILE).sln --configuration $env:BUILD_TYPE --output ./output /p:Version="${{ steps.setVersion.outputs.version }}"
+      - name: Create tag for non-rc builds
+        if: ${{ !contains(steps.setVersion.outputs.version, 'rc') }}
+        run: |
+          git tag ${{ steps.setVersion.outputs.version }}
+          git push --tags origin
+      # Create the release on the source repo
+      - name: Create Release
+        id: create_release
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: 'output\**\*.*(cpz|cplz)'
+          generateReleaseNotes: true
+          prerelease: ${{contains('debug', env.BUILD_TYPE)}}
+          tag: ${{ steps.setVersion.outputs.version }}
+      - name: Setup Nuget
+        run: |
+          nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username pepperdash -password ${{ secrets.GITHUB_TOKEN }}
+          nuget setApiKey ${{ secrets.GITHUB_TOKEN }} -Source github          
+          nuget setApiKey ${{ secrets.NUGET_API_KEY }} -Source https://api.nuget.org/v3/index.json
+      - name: Publish to Nuget
+        run: nuget push .\output\*.nupkg -Source https://api.nuget.org/v3/index.json
+      - name: Publish to Github Nuget
+        run: nuget push .\output\*.nupkg -Source github

.github/workflows/main.yml

@@ -0,0 +1,57 @@
+name: main Build using Docker
+
+on:
+  release:
+    types:
+      - published
+    branches:
+      - main-2.0.0
+env:
+  # solution path doesn't need slashes unless there it is multiple folders deep
+  # solution name does not include extension. .sln is assumed
+  SOLUTION_PATH: PepperDashEssentials
+  SOLUTION_FILE: PepperDashEssentials
+  # Do not edit this, we're just creating it here
+  VERSION: 0.0.0-buildtype-buildnumber
+  # Defaults to debug for build type
+  BUILD_TYPE: Release
+  # Defaults to main as the release branch.  Change as necessary
+  RELEASE_BRANCH: main
+jobs:
+  Build_Project:
+    runs-on: windows-2019
+    steps:
+      # First we checkout the source repo
+      - name: Checkout repo
+        uses: actions/checkout@v3
+      # Generate the appropriate version number
+      - name: Set Version Number
+        shell: powershell
+        id: setVersion
+        env:
+          TAG_NAME: ${{ github.event.release.tag_name }}
+        run: echo "VERSION=$($Env:TAG_NAME)" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
+      - name: Setup MS Build
+        uses: microsoft/setup-msbuild@v1.1
+      - name: restore Nuget Packages
+        run: nuget restore .\$($Env:SOLUTION_FILE).sln
+      - name: Build Solution        
+        run: msbuild .\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Debug" /p:Version="${{ steps.setVersion.outputs.version }}" -m      
+      - name: Pack Solution
+        run: dotnet pack .\$($Env:SOLUTION_FILE).sln --configuration $env:BUILD_TYPE --output ./output /p:Version="${{ steps.setVersion.outputs.version }}"
+      - name: Upload Release
+        id: create_release
+        uses: ncipollo/release-action@v1
+        with:
+          updateRelease: true
+          artifacts: 'output\**\*.*(cpz|cplz)'          
+          tag: ${{ steps.setVersion.outputs.version }}
+      - name: Setup Nuget
+        run: | 
+          nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username pepperdash -password ${{ secrets.GITHUB_TOKEN }}
+          nuget setApiKey ${{ secrets.GITHUB_TOKEN }} -Source github          
+          nuget setApiKey ${{ secrets.NUGET_API_KEY }} -Source https://api.nuget.org/v3/index.json          
+      - name: Publish to Nuget
+        run: nuget push .\output\*.nupkg -Source https://api.nuget.org/v3/index.json
+      - name: Publish to Github Nuget
+        run: nuget push .\output\*.nupkg -Source github

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Essentials-Template-UI"]
+	path = Essentials-Template-UI
+	url = https://github.com/PepperDash/Essentials-Template-UI.git

.releaserc.json

@@ -1,36 +0,0 @@
-{
-  "plugins": [
-    [
-      "@semantic-release/commit-analyzer",
-      {
-        "releaseRules": [
-          { "scope": "force-patch", "release": "patch" },
-          { "scope": "no-release", "release": false }
-        ]
-      }
-    ],
-    "@semantic-release/release-notes-generator",    
-    ["@semantic-release/changelog", 
-      {
-        "changelogFile": "CHANGELOG.md"
-      }
-    ],
-    [
-      "@semantic-release/exec",
-      {
-        "verifyReleaseCmd": "echo \"newVersion=true\" >> $GITHUB_OUTPUT",
-        "publishCmd": "echo \"version=${nextRelease.version}\" >> $GITHUB_OUTPUT && echo \"tag=${nextRelease.gitTag}\" >> $GITHUB_OUTPUT && echo \"type=${nextRelease.type}\" >> $GITHUB_OUTPUT && echo \"channel=${nextRelease.channel}\" >> $GITHUB_OUTPUT"
-      }
-    ]
-  ],  
-  "branches": [
-    "main",
-    {"name": "development", "prerelease": "beta", "channel": "beta"},
-    {"name": "release", "prerelease": "rc", "channel": "rc"},
-    {
-      "name": "replace-me-feature-branch",
-      "prerelease": "replace-me-prerelease",
-      "channel": "replace-me-prerelease"
-    }
-  ]
-}

CONTRIBUTING.md

@@ -91,8 +91,8 @@ we receive and the availability of resources to evaluate contributions, we antic
   project remains dynamic and relevant.  This may  affect our responsiveness and ability to accept pull requests 
   quickly.  This does not mean we are ignoring them.
 - Not all innovative ideas need to be accepted as pull requests into this GitHub project to be valuable to the community.        
-  There may be times when we recommend that you just share your code for some enhancement to Essentials from your own 
-  repository. As we identify and recognize extensions that are of general interest to Essentials, we 
+  There may be times when we recommend that you just share your code for some enhancement to Ghidra from your own 
+  repository. As we identify and recognize extensions that are of general interest to the reverse engineering community, we 
   may seek to incorporate them with our baseline.
 
 ## Legal

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/CenIoCom/CenIoComController.cs

@@ -1,85 +0,0 @@
-using System.Collections.Generic;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.GeneralIO;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core.CrestronIO
-{
-	/// <summary>
-	/// Wrapper class for CEN-IO-COM-Xxx expander module
-	/// </summary>
-	[Description("Wrapper class for the CEN-IO-COM-102 & CEN-IO-COM-202 expander module")]
-	public class CenIoComController : CrestronGenericBaseDevice, IComPorts
-    {
-        private readonly CenIoCom _cenIoCom;
-
-        public CenIoComController(string key, string name, CenIoCom cenIo)
-			:base(key, name, cenIo)
-        {
-	        _cenIoCom = cenIo;
-        }
-
-        #region Implementation of IComPorts
-
-        public CrestronCollection<ComPort> ComPorts
-        {
-            get { return _cenIoCom.ComPorts; }
-        }
-
-        public int NumberOfComPorts
-        {
-            get { return _cenIoCom.NumberOfComPorts; }
-        }
-
-        #endregion
-
-    }
-
-	public class CenIoCom102ControllerFactory : EssentialsDeviceFactory<CenIoComController>
-	{
-		private const string CenIoCom102Type = "ceniocom102";
-		private const string CenIoCom202Type = "ceniocom202";
-
-        public CenIoCom102ControllerFactory()
-        {
-			TypeNames = new List<string> { CenIoCom102Type, CenIoCom202Type };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new CEN-IO-COM-Xxx Device");
-
-	        var control = CommFactory.GetControlPropertiesConfig(dc);
-	        if (control == null)
-	        {
-				Debug.Console(1, "Factory failed to create a new CEN-IO-COM-Xxx Device, control properties not found");
-				return null;
-	        }
-
-	        var ipid = control.IpIdInt;
-	        if (ipid < 2)
-	        {
-				Debug.Console(1, "Factory failed to create a new CEN-IO-COM-Xxx Device, invalid IP-ID found");
-				return null;
-	        }
-
-	        switch (dc.Type)
-	        {
-				case CenIoCom102Type:
-		        {
-					return new CenIoComController(dc.Key, dc.Name, new CenIoCom102(ipid, Global.ControlSystem));
-		        }
-				case CenIoCom202Type:
-		        {
-					return new CenIoComController(dc.Key, dc.Name, new CenIoCom202(ipid, Global.ControlSystem));
-		        }
-				default:
-		        {
-					Debug.Console(1, "Factory failed to create a new CEN-IO-COM-Xxx Device, invalid type '{0}'", dc.Type);
-					return null;
-		        }
-	        }
-        }
-    }
-}

essentials-framework/Essentials DM/Essentials_DM/Chassis/HdPsXxxAnalogAuxMixerController.cs

@@ -1,185 +0,0 @@
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.DM;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash_Essentials_DM.Chassis
-{
-	public class HdPsXxxAnalogAuxMixerController : IKeyed,
-		IHasVolumeControlWithFeedback, IHasMuteControlWithFeedback
-	{
-		public string Key { get; private set; }
-
-		private readonly HdPsXxxAnalogAuxMixer _mixer;
-
-		public HdPsXxxAnalogAuxMixerController(string parent, uint mixer, HdPsXxx chassis)
-		{
-			Key = string.Format("{0}-analogMixer{1}", parent, mixer);
-
-			_mixer = chassis.AnalogAuxiliaryMixer[mixer];
-
-			_mixer.AuxMixerPropertyChange += OnAuxMixerPropertyChange;
-			_mixer.AuxiliaryMuteControl.MuteAndVolumeControlPropertyChange += OnMuteAndVolumeControlPropertyChange;
-
-			VolumeLevelFeedback = new IntFeedback(() => VolumeLevel);
-			MuteFeedback = new BoolFeedback(() => IsMuted);
-		}
-
-		#region Volume
-
-		private void OnAuxMixerPropertyChange(object sender, GenericEventArgs args)
-		{
-			Debug.Console(2, this, "OnAuxMixerPropertyChange: {0} > Index-{1}, EventId-{2}", sender.ToString(), args.Index, args.EventId);
-
-			switch (args.EventId)
-			{
-				case MuteAndVolumeContorlEventIds.VolumeFeedbackEventId:
-					{
-						VolumeLevel = _mixer.VolumeFeedback.ShortValue;
-						break;
-					}
-				case MuteAndVolumeContorlEventIds.MuteOnEventId:
-				case MuteAndVolumeContorlEventIds.MuteOffEventId:
-					{
-						IsMuted = _mixer.AuxiliaryMuteControl.MuteOnFeedback.BoolValue;
-						break;
-					}
-				default:
-					{
-						Debug.Console(1, this, "OnAuxMixerPropertyChange: {0} > Index-{1}, EventId-{2} - unhandled eventId", sender.ToString(), args.Index, args.EventId);
-						break;
-					}
-			}
-		}
-
-		private const ushort CrestronLevelMin = 0;
-		private const ushort CrestronLevelMax = 65535;
-
-		private const int DeviceLevelMin = -800;
-		private const int DeviceLevelMax = 200;
-
-		private const int RampTime = 5000;
-
-		private int _volumeLevel;
-
-		public int VolumeLevel
-		{
-			get { return _volumeLevel; }
-			private set
-			{
-				var level = value;
-				
-				_volumeLevel = CrestronEnvironment.ScaleWithLimits(level, DeviceLevelMax, DeviceLevelMin, CrestronLevelMax, CrestronLevelMin);
-				
-				Debug.Console(1, this, "VolumeFeedback: level-'{0}', scaled-'{1}'", level, _volumeLevel);
-
-				VolumeLevelFeedback.FireUpdate();
-			}
-		}
-
-		public IntFeedback VolumeLevelFeedback { get; private set; }
-
-		public void SetVolume(ushort level)
-		{
-			var levelScaled = CrestronEnvironment.ScaleWithLimits(level, CrestronLevelMax, CrestronLevelMin, DeviceLevelMax, DeviceLevelMin);
-
-			Debug.Console(1, this, "SetVolume: level-'{0}', levelScaled-'{1}'", level, levelScaled);
-			
-			_mixer.Volume.ShortValue = (short)levelScaled;
-		}
-
-		public void VolumeUp(bool pressRelease)
-		{
-			if (pressRelease)
-			{
-				_mixer.Volume.CreateSignedRamp(DeviceLevelMax, RampTime);
-			}
-			else
-			{
-				_mixer.Volume.StopRamp();
-			}
-		}
-
-		public void VolumeDown(bool pressRelease)
-		{
-			if (pressRelease)
-			{
-				_mixer.Volume.CreateSignedRamp(DeviceLevelMin, RampTime);
-			}
-			else
-			{
-				_mixer.Volume.StopRamp();
-			}
-		}
-
-		#endregion
-
-
-
-
-		#region Mute
-
-		private void OnMuteAndVolumeControlPropertyChange(MuteControl device, GenericEventArgs args)
-		{
-			Debug.Console(2, this, "OnMuteAndVolumeControlPropertyChange: {0} > Index-{1}, EventId-{2}", device.ToString(), args.Index, args.EventId);
-
-			switch (args.EventId)
-			{
-				case MuteAndVolumeContorlEventIds.VolumeFeedbackEventId:
-					{
-						VolumeLevel = _mixer.VolumeFeedback.ShortValue;
-						break;
-					}
-				case MuteAndVolumeContorlEventIds.MuteOnEventId:
-				case MuteAndVolumeContorlEventIds.MuteOffEventId:
-					{
-						IsMuted = _mixer.AuxiliaryMuteControl.MuteOnFeedback.BoolValue;
-						break;
-					}
-				default:
-				{
-					Debug.Console(1, this, "OnMuteAndVolumeControlPropertyChange: {0} > Index-{1}, EventId-{2} - unhandled eventId", device.ToString(), args.Index, args.EventId);
-					break;
-				}
-			}
-		}
-
-		private bool _isMuted;
-
-		public bool IsMuted
-		{
-			get { return _isMuted; }
-			set
-			{
-				_isMuted = value;
-
-				Debug.Console(1, this, "IsMuted: _isMuted-'{0}'", _isMuted);
-
-				MuteFeedback.FireUpdate();
-			}
-		}
-
-		public BoolFeedback MuteFeedback { get; private set; }
-
-		public void MuteOn()
-		{
-			_mixer.AuxiliaryMuteControl.MuteOn();
-		}
-
-		public void MuteOff()
-		{
-			_mixer.AuxiliaryMuteControl.MuteOff();
-		}
-
-		public void MuteToggle()
-		{
-			if (IsMuted)
-				MuteOff();
-			else
-				MuteOn();
-		}
-
-		#endregion
-	}
-}

essentials-framework/Essentials DM/Essentials_DM/Chassis/HdPsXxxOutputAudioController.cs

@@ -1,167 +0,0 @@
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DM;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash_Essentials_DM.Chassis
-{
-	public class HdPsXxxOutputAudioController : IKeyed,
-		IHasVolumeControlWithFeedback, IHasMuteControlWithFeedback
-	{
-		public string Key { get; private set; }
-
-		private readonly HdPsXxxHdmiDmLiteOutputMixer _mixer;	// volume/volumeFeedback
-		private readonly HdPsXxxOutputPort _port;				// mute/muteFeedback
-
-		public HdPsXxxOutputAudioController(string parent, uint output, HdPsXxx chassis)
-		{
-			Key = string.Format("{0}-audioOut{1}", parent, output);
-
-			_port = chassis.HdmiDmLiteOutputs[output].OutputPort;
-			_mixer = chassis.HdmiDmLiteOutputs[output].Mixer;
-
-			chassis.DMOutputChange += ChassisOnDmOutputChange;
-
-			VolumeLevelFeedback = new IntFeedback(() => VolumeLevel);
-			MuteFeedback = new BoolFeedback(() => IsMuted);
-		}
-
-		private void ChassisOnDmOutputChange(Switch device, DMOutputEventArgs args)
-		{
-			switch (args.EventId)
-			{
-				case (DMOutputEventIds.VolumeEventId):
-					{
-						Debug.Console(2, this, "HdPsXxxOutputAudioController: {0} > Index-{1}, Number-{3}, EventId-{2} - AudioMute/UnmuteEventId",
-							device.ToString(), args.Index, args.EventId, args.Number);
-
-						VolumeLevel = _mixer.VolumeFeedback.ShortValue;
-
-						break;
-					}
-				case DMOutputEventIds.MuteOnEventId:
-				case DMOutputEventIds.MuteOffEventId:
-					{
-						Debug.Console(2, this, "HdPsXxxOutputAudioController: {0} > Index-{1}, Number-{3}, EventId-{2} - MuteOnEventId/MuteOffEventId",
-							device.ToString(), args.Index, args.EventId, args.Number);
-						
-						IsMuted = _port.MuteOnFeedback.BoolValue;
-						
-						break;
-					}
-				default:
-					{
-						Debug.Console(1, this, "HdPsXxxOutputAudioController: {0} > Index-{1}, Number-{3}, EventId-{2} - unhandled eventId", 
-							device.ToString(), args.Index, args.EventId, args.Number);
-						break;
-					}
-			}
-		}
-
-		#region Volume
-
-		private const ushort CrestronLevelMin = 0;
-		private const ushort CrestronLevelMax = 65535;
-
-		private const int DeviceLevelMin = -800;
-		private const int DeviceLevelMax = 200;
-
-		private const int RampTime = 5000;
-
-		private int _volumeLevel;
-
-		public int VolumeLevel
-		{
-			get { return _volumeLevel; }
-			private set
-			{
-				var level = value;
-
-				_volumeLevel = CrestronEnvironment.ScaleWithLimits(level, DeviceLevelMax, DeviceLevelMin, CrestronLevelMax, CrestronLevelMin);
-
-				Debug.Console(2, this, "VolumeFeedback: level-'{0}', scaled-'{1}'", level, _volumeLevel);
-
-				VolumeLevelFeedback.FireUpdate();
-			}
-		}
-
-		public IntFeedback VolumeLevelFeedback { get; private set; }
-
-		public void SetVolume(ushort level)
-		{
-			var levelScaled = CrestronEnvironment.ScaleWithLimits(level, CrestronLevelMax, CrestronLevelMin, DeviceLevelMax, DeviceLevelMin);
-
-			Debug.Console(1, this, "SetVolume: level-'{0}', levelScaled-'{1}'", level, levelScaled);
-
-			_mixer.Volume.ShortValue = (short)levelScaled;
-		}
-
-		public void VolumeUp(bool pressRelease)
-		{
-			if (pressRelease)
-			{
-				_mixer.Volume.CreateSignedRamp(DeviceLevelMax, RampTime);
-			}
-			else
-			{
-				_mixer.Volume.StopRamp();
-			}
-		}
-
-		public void VolumeDown(bool pressRelease)
-		{
-			if (pressRelease)
-			{
-				_mixer.Volume.CreateSignedRamp(DeviceLevelMin, RampTime);
-			}
-			else
-			{
-				_mixer.Volume.StopRamp();
-			}
-		}
-
-		#endregion
-
-
-
-
-		#region Mute
-
-		private bool _isMuted;
-
-		public bool IsMuted
-		{
-			get { return _isMuted; }
-			set
-			{
-				_isMuted = value;
-
-				Debug.Console(1, this, "IsMuted: _isMuted-'{0}'", _isMuted);
-
-				MuteFeedback.FireUpdate();
-			}
-		}
-
-		public BoolFeedback MuteFeedback { get; private set; }
-
-		public void MuteOn()
-		{
-			_port.MuteOn();
-		}
-
-		public void MuteOff()
-		{
-			_port.MuteOff();
-		}
-
-		public void MuteToggle()
-		{
-			if (IsMuted)
-				MuteOff();
-			else
-				MuteOn();
-		}
-
-		#endregion
-	}
-}

src/Directory.Build.targets

@@ -1,41 +1,26 @@
 <Project>
   <ItemGroup>
-    <None Include="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz" Condition="$(ProjectType) == 'Program'">
+    <None Include="$(PackageOutputPath)\$(AssemblyName)\*.cpz" Condition="$(ProjectType) == 'Program'">
       <Pack>true</Pack>
       <PackagePath>build;</PackagePath>
     </None>
-    <None Include="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cplz" Condition="$(ProjectType) == 'ProgramLibrary'">
+    <None Include="$(PackageOutputPath)\$(AssemblyName)\*.cplz" Condition="$(ProjectType) == 'ProgramLibrary'">
       <Pack>true</Pack>
       <PackagePath>build;</PackagePath>
     </None>
   </ItemGroup>
-  <PropertyGroup Condition="$(ProjectType) == 'ProgramLibrary'">
-    <FileName>$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cplz</FileName>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(ProjectType) == 'Program'">
-    <FileName>$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz</FileName>
-  </PropertyGroup>
-  <Target Name="DeleteCPLZ" BeforeTargets="PreBuildEvent" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != '' And Exists($(FileName))">
-    <Delete Files="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cplz">
-      <Output TaskParameter="DeletedFiles" ItemName="DeletedList"/>
-    </Delete>
-    <Message Text="Deleted files: '@(DeletedList)'" />
-  </Target>
-  <Target Name="CreateCPLZ" AfterTargets="Build" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != ''" DependsOnTargets="DeleteCPLZ">
+  <Target Name="Create CPLZ" AfterTargets="Build; AfterRebuild" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != ''">
     <Message Text="Creating CPLZ $(TargetDir)"></Message>
-    <MakeDir Directories="$(PackageOutputPath)" Condition="!Exists($(PackageOutputPath))" />    
-    <ZipDirectory SourceDirectory="$(TargetDir)" DestinationFile="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cplz" Overwrite="true"/>
-    <Copy SourceFiles="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cplz" DestinationFiles="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cplz" />
+    <MakeDir Directories="$(PackageOutputPath)" Condition="!Exists($(PackageOutputPath))" />
+    <MakeDir Directories="$(PackageOutputPath)\$(AssemblyName)" Condition="!Exists('$(PackageOutputPath)\$(AssemblyName)')" />
+    <ZipDirectory SourceDirectory="$(TargetDir)" DestinationFile="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cplz" Overwrite="true"/>    
   </Target>
-  <Target Name="DeleteCPZ" BeforeTargets="PreBuildEvent" Condition="$(ProjectType) == 'Program' And $(TargetDir) != '' And Exists($(FileName))">
-    <Delete Files="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz">
-      <Output TaskParameter="DeletedFiles" ItemName="DeletedList"/>
-    </Delete>
-    <Message Text="Deleted files: '@(DeletedList)'" />
-  </Target>
-  <Target Name="Copy CPZ" AfterTargets="SimplSharpPostProcess" Condition="($(ProjectType) == 'Program' And ( '$(TargetFramework)' != 'net6.0' ) And ( '$(TargetFramework)' != 'net8.0' ))">
+  <Target Name="Copy CPZ NET6" AfterTargets="SimplSharpPostProcess" Condition="($(ProjectType) == 'Program' And ( '$(TargetFramework)' == 'net6.0' ) Or ( '$(TargetFramework)' == 'net8.0' ))">
     <Message Text="Copying CPZ"></Message>
-    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz" />
-    <Copy SourceFiles="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz" DestinationFiles="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cpz" />
+    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cpz" />
+  </Target>
+  <Target Name="Copy CPZ NET47" AfterTargets="SimplSharpPostProcess47" Condition="($(ProjectType) == 'Program' And ( '$(TargetFramework)' != 'net6.0' ) And ( '$(TargetFramework)' != 'net8.0' ))">
+    <Message Text="Copying CPZ"></Message>
+    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cpz" />
   </Target>
 </Project>

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace PepperDash.Essentials.Core.Bridges
 {

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace PepperDash.Essentials.Core.Bridges
 {

src/PepperDash.Essentials.Core/Global/Scheduler.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Crestron.SimplSharp;
-using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharp.Scheduler;
 
 using PepperDash.Core;

src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj

@@ -4,7 +4,7 @@
     <Configurations>Debug;Release;Debug 4.7.2</Configurations>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6</TargetFrameworks>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <AssemblyName>PepperDash_Essentials_Core</AssemblyName>
@@ -26,7 +26,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
-    <PackageReference Include="PepperDashCore" Version="2.0.0" />
+    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-455" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Crestron\CrestronGenericBaseDevice.cs.orig" />

src/PepperDash.Essentials.Core/PepperDash_Essentials_Core.csproj

@@ -0,0 +1,432 @@
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PepperDash.Essentials.Core</RootNamespace>
+    <AssemblyName>PepperDash_Essentials_Core</AssemblyName>
+    <ProjectTypeGuids>{0B4745B0-194B-4BB6-8E21-E9057CA92300};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <PlatformFamilyName>WindowsCE</PlatformFamilyName>
+    <PlatformID>E2BECB1F-8C8C-41ba-B736-9BE7D946A398</PlatformID>
+    <OSVersion>5.0</OSVersion>
+    <DeployDirSuffix>SmartDeviceProject1</DeployDirSuffix>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <NativePlatformName>Windows CE</NativePlatformName>
+    <FormFactorID>
+    </FormFactorID>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <FileAlignment>512</FileAlignment>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <FileAlignment>512</FileAlignment>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
+    </Reference>
+    <Reference Include="Crestron.SimplSharpPro.DM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
+    </Reference>
+    <Reference Include="Crestron.SimplSharpPro.EthernetCommunications, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
+    </Reference>
+    <Reference Include="Crestron.SimplSharpPro.Fusion, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Fusion.dll</HintPath>
+    </Reference>
+    <Reference Include="Crestron.SimplSharpPro.Gateways, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
+    </Reference>
+    <Reference Include="Crestron.SimplSharpPro.GeneralIO, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
+    </Reference>
+    <Reference Include="Crestron.SimplSharpPro.Remotes, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Remotes.dll</HintPath>
+    </Reference>
+    <Reference Include="Crestron.SimplSharpPro.ThreeSeriesCards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.ThreeSeriesCards.dll</HintPath>
+    </Reference>
+    <Reference Include="Crestron.SimplSharpPro.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="PepperDash_Core, Version=1.2.1.30543, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
+    </Reference>
+    <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="SimplSharpCWSHelperInterface, Version=2.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCWSHelperInterface.dll</HintPath>
+    </Reference>
+    <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
+    </Reference>
+    <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
+    </Reference>
+    <Reference Include="SimplSharpTimerEventInterface, Version=1.0.6197.20052, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpTimerEventInterface.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Bridges\BridgeBase.cs" />
+    <Compile Include="Bridges\IBridge.cs" />
+    <Compile Include="Bridges\JoinMaps\AirMediaControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\AppleTvJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\GenericIrControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\HdPsXxxControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\IAnalogInputJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\IDigitalOutputJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\PduJoinMapBase.cs" />
+    <Compile Include="Bridges\JoinMaps\C2nRthsControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\CameraControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\CenOdtOccupancySensorBaseJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DigitalLoggerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DisplayControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmBladeChassisControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmChassisControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmpsAudioOutputControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmpsMicrophoneControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmpsRoutingControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmRmcControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmTxControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\GenericLightingJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\GenericRelayControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\GlsOccupancySensorBaseJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\GlsPartitionSensorJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\HdMdNxM4kEControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\HdMdxxxCEControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\Hrxxx0WirelessRemoteControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\IBasicCommunicationJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\IDigitalInputJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\IRBlurayBaseJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\SetTopBoxControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\StatusSignControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\SystemMonitorJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\VideoCodecControllerJoinMap.cs" />
+    <Compile Include="Comm and IR\CecPortController.cs" />
+    <Compile Include="Comm and IR\CommFactory.cs" />
+    <Compile Include="Comm and IR\CommunicationExtras.cs" />
+    <Compile Include="Comm and IR\ComPortController.cs" />
+    <Compile Include="Comm and IR\ComSpecJsonConverter.cs" />
+    <Compile Include="Comm and IR\ConsoleCommMockDevice.cs" />
+    <Compile Include="Comm and IR\GenericComm.cs" />
+    <Compile Include="Comm and IR\GenericHttpClient.cs" />
+    <Compile Include="Comm and IR\IRPortHelper.cs" />
+    <Compile Include="Config\Essentials\ConfigUpdater.cs" />
+    <Compile Include="Config\Essentials\ConfigReader.cs" />
+    <Compile Include="Config\Essentials\ConfigWriter.cs" />
+    <Compile Include="Config\Essentials\EssentialsConfig.cs" />
+    <Compile Include="Config\SourceDevicePropertiesConfigBase.cs" />
+    <Compile Include="Crestron IO\C2nIo\C2nIoController.cs" />
+    <Compile Include="Crestron IO\C2nRts\C2nRthsController.cs" />
+    <Compile Include="Crestron IO\Cards\C3CardControllerBase.cs" />
+    <Compile Include="Crestron IO\Cards\C3Com3Controller.cs" />
+    <Compile Include="Crestron IO\Cards\C3Io16Controller.cs" />
+    <Compile Include="Crestron IO\Cards\C3Ir8Controller.cs" />
+    <Compile Include="Crestron IO\Cards\C3Ry16Controller.cs" />
+    <Compile Include="Crestron IO\Cards\C3Ry8Controller.cs" />
+    <Compile Include="Crestron IO\Cards\CenCi31Controller.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Crestron IO\Cards\CenCi33Controller.cs" />
+    <Compile Include="Crestron IO\Cards\InternalCardCageController.cs" />
+    <Compile Include="Crestron IO\DinCenCn\DinCenCnController.cs" />
+    <Compile Include="Crestron IO\DinCenCn\IHasCresnetBranches.cs" />
+    <Compile Include="Crestron IO\DinIo8\DinIo8Controller.cs" />
+    <Compile Include="Crestron IO\Inputs\CenIoDigIn104Controller.cs" />
+    <Compile Include="Crestron IO\Inputs\GenericVersiportAnalogInputDevice.cs" />
+    <Compile Include="Crestron IO\Inputs\GenericDigitalInputDevice.cs" />
+    <Compile Include="Crestron IO\Inputs\GenericVersiportInputDevice.cs" />
+    <Compile Include="Crestron IO\Inputs\IAnalogInput.cs" />
+    <Compile Include="Crestron IO\Inputs\IDigitalInput.cs" />
+    <Compile Include="Crestron IO\IOPortConfig.cs" />
+    <Compile Include="Crestron IO\Ir\CenIoIr104Controller.cs" />
+    <Compile Include="Crestron IO\Outputs\GenericVersiportOutputDevice.cs" />
+    <Compile Include="Crestron IO\Outputs\IDigitalOutput.cs" />
+    <Compile Include="Crestron IO\Relay\CenIoRy104Controller.cs" />
+    <Compile Include="Crestron IO\Relay\GenericRelayDevice.cs" />
+    <Compile Include="Crestron IO\Relay\ISwitchedOutput.cs" />
+    <Compile Include="Crestron IO\StatusSign\StatusSignController.cs" />
+    <Compile Include="Device Info\NetworkDeviceHelpers.cs" />
+    <Compile Include="Devices\PowerInterfaces.cs" />
+    <Compile Include="Web\RequestHandlers\AppDebugRequestHandler.cs" />
+    <Compile Include="Web\RequestHandlers\GetFeedbacksForDeviceRequestHandler.cs" />
+    <Compile Include="Web\EssentialsWebApiHelpers.cs" />
+    <Compile Include="Web\RequestHandlers\GetTypesByFilterRequestHandler.cs" />
+    <Compile Include="Web\RequestHandlers\GetJoinMapForDeviceKeyRequestHandler.cs" />
+    <Compile Include="Web\RequestHandlers\DefaultRequestHandler.cs" />
+    <Compile Include="Web\RequestHandlers\DevListRequestHandler.cs" />
+    <Compile Include="Web\RequestHandlers\DevPropsRequestHandler.cs" />
+    <Compile Include="Web\RequestHandlers\DevJsonRequestHandler.cs" />
+    <Compile Include="Web\RequestHandlers\SetDeviceStreamDebugRequestHandler.cs" />
+    <Compile Include="Web\RequestHandlers\DisableAllStreamDebugRequestHandler.cs" />
+    <Compile Include="Web\RequestHandlers\ShowConfigRequestHandler.cs" />
+    <Compile Include="Web\RequestHandlers\GetTypesRequestHandler.cs" />
+    <Compile Include="Web\RequestHandlers\GetJoinMapForBridgeKeyRequestHandler.cs" />
+    <Compile Include="Web\EssemtialsWebApi.cs" />
+    <Compile Include="Web\EssentialsWebApiFactory.cs" />
+    <Compile Include="Web\EssentialsWebApiPropertiesConfig.cs" />
+    <Compile Include="Web\RequestHandlers\ReportVersionsRequestHandler.cs" />
+    <Compile Include="Device Info\DeviceInfo.cs" />
+    <Compile Include="Device Info\DeviceInfoEventArgs.cs" />
+    <Compile Include="Device Info\IDeviceInfoProvider.cs" />
+    <Compile Include="Devices\CodecInterfaces.cs" />
+    <Compile Include="Devices\CrestronProcessor.cs" />
+    <Compile Include="Devices\DestinationListItem.cs" />
+    <Compile Include="Devices\DeviceApiBase.cs" />
+    <Compile Include="Devices\DeviceFeedbackExtensions.cs" />
+    <Compile Include="Devices\EssentialsBridgeableDevice.cs" />
+    <Compile Include="Devices\EssentialsDevice.cs" />
+    <Compile Include="Devices\GenericIRController.cs" />
+    <Compile Include="Devices\IDspPreset.cs" />
+    <Compile Include="Devices\IProjectorInterfaces.cs" />
+    <Compile Include="Devices\IReconfigurableDevice.cs" />
+    <Compile Include="Devices\PC\InRoomPc.cs" />
+    <Compile Include="Devices\PC\Laptop.cs" />
+    <Compile Include="Devices\PduInterfaces.cs" />
+    <Compile Include="Devices\ReconfigurableDevice.cs" />
+    <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
+    <Compile Include="DeviceTypeInterfaces\IPasswordPrompt.cs" />
+    <Compile Include="DeviceTypeInterfaces\ITvPresetsProvider.cs" />
+    <Compile Include="DeviceTypeInterfaces\LanguageLabel.cs" />
+    <Compile Include="DeviceTypeInterfaces\ILanguageProvider.cs" />
+    <Compile Include="DeviceTypeInterfaces\IHasBranding.cs" />
+    <Compile Include="DeviceTypeInterfaces\ILanguageDefinition.cs" />
+    <Compile Include="DeviceTypeInterfaces\IHasFarEndContentStatus.cs" />
+    <Compile Include="DeviceTypeInterfaces\IHasPhoneDialing.cs" />
+    <Compile Include="DeviceTypeInterfaces\IMobileControl.cs" />
+    <Compile Include="Extensions\JsonExtensions.cs" />
+    <Compile Include="Extensions\StringExtensions.cs" />
+    <Compile Include="Factory\DeviceFactory.cs" />
+    <Compile Include="Factory\IDeviceFactory.cs" />
+    <Compile Include="Factory\ReadyEventArgs.cs" />
+    <Compile Include="Feedbacks\BoolFeedback.cs" />
+    <Compile Include="Feedbacks\FeedbackCollection.cs" />
+    <Compile Include="Feedbacks\FeedbackEventArgs.cs" />
+    <Compile Include="Feedbacks\IntFeedback.cs" />
+    <Compile Include="Feedbacks\SerialFeedback.cs" />
+    <Compile Include="Feedbacks\StringFeedback.cs" />
+    <Compile Include="File\FileIO.cs" />
+    <Compile Include="Fusion\EssentialsHuddleSpaceFusionSystemControllerBase.cs" />
+    <Compile Include="Fusion\FusionCustomPropertiesBridge.cs" />
+    <Compile Include="Fusion\FusionEventHandlers.cs" />
+    <Compile Include="Fusion\FusionProcessorQueries.cs" />
+    <Compile Include="Fusion\EssentialsHuddleSpaceRoomFusionRoomJoinMap.cs" />
+    <Compile Include="Fusion\FusionRviDataClasses.cs" />
+    <Compile Include="Gateways\CenRfgwController.cs" />
+    <Compile Include="Gateways\EssentialsRfGatewayConfig.cs" />
+    <Compile Include="Global\EthernetAdapterInfo.cs" />
+    <Compile Include="Interfaces\ILogStrings.cs" />
+    <Compile Include="Interfaces\ILogStringsWithLevel.cs" />
+    <Compile Include="Occupancy\GlsOccupancySensorPropertiesConfig.cs" />
+    <Compile Include="Occupancy\GlsOirOccupancySensorController.cs" />
+    <Compile Include="PartitionSensor\EssentialsPartitionController.cs" />
+    <Compile Include="PartitionSensor\GlsPartitionSensorPropertiesConfig.cs" />
+    <Compile Include="PartitionSensor\IPartitionStateProvider.cs" />
+    <Compile Include="Occupancy\OccupancyAggregatorConfig.cs" />
+    <Compile Include="Queues\ComsMessage.cs" />
+    <Compile Include="Queues\ProcessStringMessage.cs" />
+    <Compile Include="Queues\GenericQueue.cs" />
+    <Compile Include="Global\JobTimer.cs" />
+    <Compile Include="Global\Scheduler.cs" />
+    <Compile Include="Queues\IQueue.cs" />
+    <Compile Include="JoinMaps\JoinMapBase.cs" />
+    <Compile Include="Lighting\Lighting Interfaces.cs" />
+    <Compile Include="Lighting\LightingBase.cs" />
+    <Compile Include="Monitoring\SystemMonitorController.cs" />
+    <Compile Include="Microphone Privacy\MicrophonePrivacyController.cs" />
+    <Compile Include="Microphone Privacy\MicrophonePrivacyControllerConfig.cs" />
+    <Compile Include="Occupancy\CenOdtOccupancySensorBaseController.cs" />
+    <Compile Include="Occupancy\GlsOccupancySensorBaseController.cs" />
+    <Compile Include="Occupancy\GlsOdtOccupancySensorController.cs" />
+    <Compile Include="Occupancy\IOccupancyStatusProviderAggregator.cs" />
+    <Compile Include="PartitionSensor\GlsPartitionSensorController.cs" />
+    <Compile Include="Plugins\PluginLoader.cs" />
+    <Compile Include="Presets\PresetBase.cs" />
+    <Compile Include="Plugins\IPluginDeviceFactory.cs" />
+    <Compile Include="Queues\IQueueMessage.cs" />
+    <Compile Include="Ramps and Increments\ActionIncrementer.cs" />
+    <Compile Include="Config\BasicConfig.cs" />
+    <Compile Include="Config\ConfigPropertiesHelpers.cs" />
+    <Compile Include="Config\InfoConfig.cs" />
+    <Compile Include="Config\DeviceConfig.cs" />
+    <Compile Include="Devices\DisplayUiConstants.cs" />
+    <Compile Include="Devices\IUsageTracking.cs" />
+    <Compile Include="Devices\DeviceJsonApi.cs" />
+    <Compile Include="Devices\SourceListItem.cs" />
+    <Compile Include="DeviceTypeInterfaces\IDisplayBasic.cs" />
+    <Compile Include="DeviceTypeInterfaces\IDumbSource.cs" />
+    <Compile Include="DeviceTypeInterfaces\IWarmingCooling.cs" />
+    <Compile Include="DeviceTypeInterfaces\IDiscPlayerControls.cs" />
+    <Compile Include="DeviceTypeInterfaces\IPower.cs" />
+    <Compile Include="DeviceTypeInterfaces\IUiDisplayInfo.cs" />
+    <Compile Include="DeviceTypeInterfaces\ISetTopBoxControls.cs" />
+    <Compile Include="DeviceTypeInterfaces\IChannel.cs" />
+    <Compile Include="DeviceTypeInterfaces\IColorFunctions.cs" />
+    <Compile Include="DeviceTypeInterfaces\IDPad.cs" />
+    <Compile Include="DeviceTypeInterfaces\IDvr.cs" />
+    <Compile Include="DeviceTypeInterfaces\Template.cs" />
+    <Compile Include="DeviceTypeInterfaces\ITransport.cs" />
+    <Compile Include="Devices\GenericMonitoredTcpDevice.cs" />
+    <Compile Include="DeviceTypeInterfaces\INumeric.cs" />
+    <Compile Include="Devices\IVolumeAndAudioInterfaces.cs" />
+    <Compile Include="Display\BasicIrDisplay.cs" />
+    <Compile Include="Feedbacks\BoolFeedbackOneShot.cs" />
+    <Compile Include="Ramps and Increments\NumericalHelpers.cs" />
+    <Compile Include="Ramps and Increments\UshortSigIncrementer.cs" />
+    <Compile Include="Remotes\ButtonExtensions.cs" />
+    <Compile Include="Remotes\CrestronRemotePropertiesConfig.cs" />
+    <Compile Include="Remotes\Hrxx0WirelessRemoteController.cs" />
+    <Compile Include="Room\Behaviours\RoomOnToDefaultSourceWhenOccupied.cs" />
+    <Compile Include="Room\Combining\EssentialsRoomCombiner.cs" />
+    <Compile Include="Room\Combining\EssentialsRoomCombinerPropertiesConfig.cs" />
+    <Compile Include="Room\Combining\IEssentialsRoomCombiner.cs" />
+    <Compile Include="Room\Combining\RoomCombinationScenario.cs" />
+    <Compile Include="Room\EssentialsRoomBase.cs" />
+    <Compile Include="Room\Config\EssentialsRoomScheduledEventsConfig.cs" />
+    <Compile Include="Room\IEssentialsRoom.cs" />
+    <Compile Include="Room\Interfaces.cs" />
+    <Compile Include="Room\iOccupancyStatusProvider.cs" />
+    <Compile Include="Routing\DummyRoutingInputsDevice.cs" />
+    <Compile Include="Routing\ICardPortsDevice.cs" />
+    <Compile Include="InUseTracking\IInUseTracking.cs" />
+    <Compile Include="InUseTracking\InUseTracking.cs" />
+    <Compile Include="Routing\IRoutingInputsExtensions.cs" />
+    <Compile Include="Monitoring\StatusMonitorCollection.cs" />
+    <Compile Include="Monitoring\CrestronGenericBaseCommunicationMonitor.cs" />
+    <Compile Include="Monitoring\StatusMonitorBase.cs" />
+    <Compile Include="Monitoring\Interfaces.cs" />
+    <Compile Include="Monitoring\GenericCommunicationMonitor.cs" />
+    <Compile Include="Devices\AudioInterfaces.cs" />
+    <Compile Include="Devices\IAttachVideoStatusExtensions.cs" />
+    <Compile Include="Devices\IHasFeedbacks.cs" />
+    <Compile Include="Devices\SmartObjectBaseTypes.cs" />
+    <Compile Include="Devices\PresentationDeviceType.cs" />
+    <Compile Include="Display\MockDisplay.cs" />
+    <Compile Include="Ethernet\EthernetStatistics.cs" />
+    <Compile Include="Global\Global.cs" />
+    <Compile Include="License\EssentialsLicenseManager.cs" />
+    <Compile Include="Feedbacks\BoolOutputLogicals.cs" />
+    <Compile Include="Presets\Interfaces.cs" />
+    <Compile Include="Presets\PresetsListSubpageReferenceListItem.cs" />
+    <Compile Include="Presets\DevicePresetsView.cs" />
+    <Compile Include="Presets\PresetChannel.cs" />
+    <Compile Include="Presets\DevicePresets.cs" />
+    <Compile Include="Routing\RoutingInterfaces.cs" />
+    <Compile Include="Routing\RoutingPort.cs" />
+    <Compile Include="Routing\RoutingPortCollection.cs" />
+    <Compile Include="Feedbacks\BoolFeedbackPulseExtender.cs" />
+    <Compile Include="Routing\RoutingPortNames.cs" />
+    <Compile Include="Routing\TieLineConfig.cs" />
+    <Compile Include="Secrets\CrestronGlobalSecretsProvider.cs" />
+    <Compile Include="Secrets\CrestronLocalSecretsProvider.cs" />
+    <Compile Include="Secrets\CrestronSecret.cs" />
+    <Compile Include="Secrets\Interfaces.cs" />
+    <Compile Include="Secrets\SecretsManager.cs" />
+    <Compile Include="Secrets\SecretsPropertiesConfig.cs" />
+    <Compile Include="Shades\Shade Interfaces.cs" />
+    <Compile Include="Shades\ShadeBase.cs" />
+    <Compile Include="Shades\ShadeController.cs" />
+    <Compile Include="SmartObjects\SmartObjectNumeric.cs" />
+    <Compile Include="SmartObjects\SmartObjectDynamicList.cs" />
+    <Compile Include="SmartObjects\SmartObjectDPad.cs" />
+    <Compile Include="SmartObjects\SmartObjectHelperBase.cs" />
+    <Compile Include="Routing\TieLine.cs" />
+    <Compile Include="Queues\StringResponseProcessor.cs" />
+    <Compile Include="Timers\CountdownTimer.cs" />
+    <Compile Include="Timers\RetriggerableTimer.cs" />
+    <Compile Include="Touchpanels\CrestronTouchpanelPropertiesConfig.cs" />
+    <Compile Include="Touchpanels\Interfaces.cs" />
+    <Compile Include="Touchpanels\Keyboards\HabaneroKeyboardController.cs" />
+    <Compile Include="Touchpanels\Mpc3Touchpanel.cs" />
+    <Compile Include="Touchpanels\TriListExtensions.cs" />
+    <Compile Include="UI PageManagers\BlurayPageManager.cs" />
+    <Compile Include="UI PageManagers\SetTopBoxThreePanelPageManager.cs" />
+    <Compile Include="UI PageManagers\SinglePageManager.cs" />
+    <Compile Include="UI PageManagers\PageManager.cs" />
+    <Compile Include="UI PageManagers\SetTopBoxTwoPanelPageManager.cs" />
+    <Compile Include="UI\TouchpanelBase.cs" />
+    <Compile Include="Utilities\ActionSequence.cs" />
+    <Compile Include="VideoStatus\VideoStatusOutputs.cs" />
+    <Compile Include="Crestron\CrestronGenericBaseDevice.cs" />
+    <Compile Include="DeviceControlsParentInterfaces\IPresentationSource.cs" />
+    <Compile Include="Devices\DeviceManager.cs" />
+    <Compile Include="Devices\IrOutputPortController.cs" />
+    <Compile Include="Display\DisplayBase.cs" />
+    <Compile Include="Feedbacks\FeedbackBase.cs" />
+    <Compile Include="Room\Room.cs" />
+    <Compile Include="SmartObjects\SubpageReferencList\SourceListSubpageReferenceList.cs" />
+    <Compile Include="Touchpanels\ModalDialog.cs" />
+    <Compile Include="TriListBridges\HandlerBridge.cs" />
+    <Compile Include="Devices\FIND HOMES Interfaces.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SigHelper.cs" />
+    <Compile Include="SmartObjects\SubpageReferencList\SubpageReferenceList.cs" />
+    <Compile Include="SmartObjects\SubpageReferencList\SubpageReferenceListItem.cs" />
+    <None Include="app.config" />
+    <None Include="Properties\ControlSystem.cfg" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+    </VisualStudio>
+  </ProjectExtensions>
+  <PropertyGroup>
+    <PostBuildEvent>rem S# Pro preparation will execute after these operations</PostBuildEvent>
+  </PropertyGroup>
+</Project>

src/PepperDash.Essentials.Core/Touchpanels/Mpc3Touchpanel.cs

@@ -56,8 +56,6 @@ namespace PepperDash.Essentials.Core.Touchpanels
 					InitializeButton(buttonKey, buttonConfig);
 					InitializeButtonFeedback(buttonKey, buttonConfig);
 				}
-
-				ListButtons();
 			});
 		}
 
@@ -321,23 +319,6 @@ namespace PepperDash.Essentials.Core.Touchpanels
 
 			foreach (var eventType in button.EventTypes[type]) DeviceJsonApi.DoDeviceAction(eventType);
 		}
-
-
-		public void ListButtons()
-		{
-			var line = new string('-', 35);
-
-			Debug.Console(0, this, line);
-
-			Debug.Console(0, this, "MPC3 Controller {0} - Available Butons", Key);
-
-			foreach (var button in _buttons)
-			{
-				Debug.Console(0, this, "Key: {0}", button.Key);
-			}
-
-			Debug.Console(0, this, line);
-		}
 	}
 
 	/// <summary>

src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj

@@ -4,7 +4,7 @@
     <Configurations>Debug;Release;Debug 4.7.2</Configurations>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6</TargetFrameworks>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <AssemblyName>Essentials Devices Common</AssemblyName>
@@ -30,6 +30,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
-    <PackageReference Include="PepperDashCore" Version="2.0.0" />
+    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-455" />
   </ItemGroup>
 </Project>

src/PepperDash.Essentials.Devices.Common/VideoCodec/VideoCodecBase.cs

@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharp.Reflection;
+using System.Reflection;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharp;
 using PepperDash.Core;
@@ -20,7 +21,6 @@ using PepperDash.Essentials.Core.Bridges.JoinMaps;
 using Feedback = PepperDash.Essentials.Core.Feedback;
 using Serilog.Events;
 using PepperDash.Essentials.Core.Routing;
-using System.Text;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec
 {

src/PepperDash.Essentials/ControlSystem.cs

@@ -173,7 +173,7 @@ namespace PepperDash.Essentials
 
                 var dirSeparator = Global.DirectorySeparator;
 
-                string directoryPrefix;
+                string directoryPrefix; 
 
                 directoryPrefix = Directory.GetApplicationRootDirectory();
 
@@ -181,24 +181,10 @@ namespace PepperDash.Essentials
 
                 if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server)   // Handles 3-series running Windows CE OS
                 {
-                    string userFolder;
-                    string nvramFolder;
-                    bool is4series = false;
+                    string userFolder = "user";
+                    string nvramFolder = "nvram";    
 
-                    if (eCrestronSeries.Series4 == (Global.ProcessorSeries & eCrestronSeries.Series4)) // Handle 4-series
-                    {
-                        is4series = true;
-                        // Set path to user/
-                        userFolder = "user";
-                        nvramFolder = "nvram";
-                    }
-                    else
-                    {
-                        userFolder = "User";
-                        nvramFolder = "Nvram";
-                    }                    
-                    
-                    Debug.LogMessage(LogEventLevel.Information, "Starting Essentials v{version:l} on {processorSeries:l} Appliance", Global.AssemblyVersion, is4series ? "4-series" : "3-series");
+                    Debug.LogMessage(LogEventLevel.Information, "Starting Essentials v{version:l} on {processorSeries:l} Appliance", Global.AssemblyVersion, "4-series");
                     //Debug.LogMessage(LogEventLevel.Information, "Starting Essentials v{0} on {1} Appliance", Global.AssemblyVersion, is4series ? "4-series" : "3-series");
 
                     // Check if User/ProgramX exists
@@ -360,6 +346,7 @@ namespace PepperDash.Essentials
 		/// <summary>
 		/// 
 		/// </summary>
+
 		void Load()
 		{
 			LoadDevices();

src/PepperDash.Essentials/PepperDash.Essentials.csproj

@@ -6,7 +6,7 @@
   <PropertyGroup>
     <RootNamespace>PepperDash.Essentials</RootNamespace>
     <AssemblyName>PepperDashEssentials</AssemblyName>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6</TargetFrameworks>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <Title>PepperDash Essentials</Title>
@@ -48,8 +48,8 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.21.90" />
-    <PackageReference Include="PepperDashCore" Version="2.0.0" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.1.90" />
+    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-455" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />