Merge pull request #1258 from PepperDash/fix-versioning

2026-02-16 21:24:54 +00:00 · 2025-04-21 18:59:20 -05:00
parent 8230d95746 87602c19d7
commit 781faa0431
649 changed files with 48886 additions and 48887 deletions
--- a/PepperDashEssentials.3Series.sln
+++ b/PepperDashEssentials.3Series.sln
@@ -1,21 +1,21 @@

 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDashEssentials", "PepperDashEssentials\PepperDashEssentials.csproj", "{1BED5BA9-88C4-4365-9362-6F4B128071D3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDashEssentials", "src\PepperDashEssentials\PepperDashEssentials.csproj", "{1BED5BA9-88C4-4365-9362-6F4B128071D3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{892B761C-E479-44CE-BD74-243E9214AF13} = {892B761C-E479-44CE-BD74-243E9214AF13}
 		{9199CE8A-0C9F-4952-8672-3EED798B284F} = {9199CE8A-0C9F-4952-8672-3EED798B284F}
 		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} = {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash_Essentials_Core", "essentials-framework\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj", "{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash_Essentials_Core", "src\essentials-framework\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj", "{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Essentials Devices Common", "essentials-framework\Essentials Devices Common\Essentials Devices Common\Essentials Devices Common.csproj", "{892B761C-E479-44CE-BD74-243E9214AF13}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Essentials Devices Common", "src\essentials-framework\Essentials Devices Common\Essentials Devices Common\Essentials Devices Common.csproj", "{892B761C-E479-44CE-BD74-243E9214AF13}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} = {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash_Essentials_DM", "essentials-framework\Essentials DM\Essentials_DM\PepperDash_Essentials_DM.csproj", "{9199CE8A-0C9F-4952-8672-3EED798B284F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash_Essentials_DM", "src\essentials-framework\Essentials DM\Essentials_DM\PepperDash_Essentials_DM.csproj", "{9199CE8A-0C9F-4952-8672-3EED798B284F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} = {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}
 	EndProjectSection
--- a/src/PepperDashEssentials/Audio/EssentialsVolumeLevelConfig.cs
+++ b/src/PepperDashEssentials/Audio/EssentialsVolumeLevelConfig.cs
--- a/src/PepperDashEssentials/Bridges/._EssentialsLightsBridge.cs
+++ b/src/PepperDashEssentials/Bridges/._EssentialsLightsBridge.cs
--- a/src/PepperDashEssentials/Bridges/AirMediaControllerBridge.cs
+++ b/src/PepperDashEssentials/Bridges/AirMediaControllerBridge.cs
--- a/src/PepperDashEssentials/Bridges/AppleTvBridge.cs
+++ b/src/PepperDashEssentials/Bridges/AppleTvBridge.cs
--- a/src/PepperDashEssentials/Bridges/BridgeFactory.cs
+++ b/src/PepperDashEssentials/Bridges/BridgeFactory.cs
--- a/src/PepperDashEssentials/Bridges/Bridges.BridgeFactory.cs
+++ b/src/PepperDashEssentials/Bridges/Bridges.BridgeFactory.cs
--- a/src/PepperDashEssentials/Bridges/C2nRthsControllerBridge.cs
+++ b/src/PepperDashEssentials/Bridges/C2nRthsControllerBridge.cs
--- a/src/PepperDashEssentials/Bridges/CameraControllerBridge.cs
+++ b/src/PepperDashEssentials/Bridges/CameraControllerBridge.cs
--- a/src/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs
+++ b/src/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs
--- a/src/PepperDashEssentials/Bridges/DmRmcControllerBridge.cs
+++ b/src/PepperDashEssentials/Bridges/DmRmcControllerBridge.cs
--- a/src/PepperDashEssentials/Bridges/DmTxControllerBridge.cs
+++ b/src/PepperDashEssentials/Bridges/DmTxControllerBridge.cs
--- a/src/PepperDashEssentials/Bridges/DmpsAudioOutputControllerBridge.cs
+++ b/src/PepperDashEssentials/Bridges/DmpsAudioOutputControllerBridge.cs
--- a/src/PepperDashEssentials/Bridges/DmpsRoutingControllerBridge.cs
+++ b/src/PepperDashEssentials/Bridges/DmpsRoutingControllerBridge.cs
--- a/src/PepperDashEssentials/Bridges/DspControllerBridge.cs
+++ b/src/PepperDashEssentials/Bridges/DspControllerBridge.cs
--- a/src/PepperDashEssentials/Bridges/EiscBridge.cs
+++ b/src/PepperDashEssentials/Bridges/EiscBridge.cs
--- a/src/PepperDashEssentials/Bridges/EssentialComms.cs
+++ b/src/PepperDashEssentials/Bridges/EssentialComms.cs
--- a/src/PepperDashEssentials/Bridges/EssentialDM.cs
+++ b/src/PepperDashEssentials/Bridges/EssentialDM.cs
--- a/src/PepperDashEssentials/Bridges/EssentialDsp.cs
+++ b/src/PepperDashEssentials/Bridges/EssentialDsp.cs
--- a/src/PepperDashEssentials/Bridges/EssentialTVOne.cs
+++ b/src/PepperDashEssentials/Bridges/EssentialTVOne.cs
--- a/src/PepperDashEssentials/Bridges/GenericLightingBridge.cs
+++ b/src/PepperDashEssentials/Bridges/GenericLightingBridge.cs
--- a/src/PepperDashEssentials/Bridges/GenericRelayDeviceBridge.cs
+++ b/src/PepperDashEssentials/Bridges/GenericRelayDeviceBridge.cs
--- a/src/PepperDashEssentials/Bridges/GlsOccupancySensorBaseControllerBridge.cs
+++ b/src/PepperDashEssentials/Bridges/GlsOccupancySensorBaseControllerBridge.cs
--- a/src/PepperDashEssentials/Bridges/HdMdxxxCEControllerBridge.cs
+++ b/src/PepperDashEssentials/Bridges/HdMdxxxCEControllerBridge.cs
--- a/src/PepperDashEssentials/Bridges/IBasicCommunicationBridge.cs
+++ b/src/PepperDashEssentials/Bridges/IBasicCommunicationBridge.cs
--- a/src/PepperDashEssentials/Bridges/IBridge.cs
+++ b/src/PepperDashEssentials/Bridges/IBridge.cs
--- a/src/PepperDashEssentials/Bridges/IDigitalInputBridge.cs
+++ b/src/PepperDashEssentials/Bridges/IDigitalInputBridge.cs
--- a/src/PepperDashEssentials/Bridges/IRSetTopBoxBaseBridge.cs
+++ b/src/PepperDashEssentials/Bridges/IRSetTopBoxBaseBridge.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/AirMediaControllerJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/AirMediaControllerJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/AppleTvJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/AppleTvJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/CameraControllerJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/CameraControllerJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/DigitalLoggerJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/DigitalLoggerJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/DisplayControllerJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/DisplayControllerJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/DmBladeChassisControllerJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/DmBladeChassisControllerJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/DmRmcControllerJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/DmRmcControllerJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/DmTxControllerJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/DmTxControllerJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/GenericLightingJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/GenericLightingJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/IDigitalInputJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/IDigitalInputJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/SetTopBoxControllerJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/SetTopBoxControllerJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/StatusSignControllerJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/StatusSignControllerJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/JoinMaps/SystemMonitorJoinMap.cs
+++ b/src/PepperDashEssentials/Bridges/JoinMaps/SystemMonitorJoinMap.cs
--- a/src/PepperDashEssentials/Bridges/StatusSignControllerBridge.cs
+++ b/src/PepperDashEssentials/Bridges/StatusSignControllerBridge.cs
--- a/src/PepperDashEssentials/Bridges/SystemMonitorBridge.cs
+++ b/src/PepperDashEssentials/Bridges/SystemMonitorBridge.cs
--- a/src/PepperDashEssentials/ClassDiagram1.cd
+++ b/src/PepperDashEssentials/ClassDiagram1.cd
--- a/src/PepperDashEssentials/ControlSystem.cs
+++ b/src/PepperDashEssentials/ControlSystem.cs
--- a/src/PepperDashEssentials/Devices/Amplifier.cs
+++ b/src/PepperDashEssentials/Devices/Amplifier.cs
--- a/Configuration/EssentialsHuddleSpaceRoom/configurationFile-HuddleSpace-2-Source.json
+++ b/Configuration/EssentialsHuddleSpaceRoom/configurationFile-HuddleSpace-2-Source.json
--- a/Configuration/EssentialsHuddleVtc1Room/configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json
+++ b/Configuration/EssentialsHuddleVtc1Room/configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json
--- a/Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json
+++ b/Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json
--- a/Configuration/SIMPLBridging/configurationFile-dmps3300c-avRouting.json
+++ b/Configuration/SIMPLBridging/configurationFile-dmps3300c-avRouting.json
--- a/src/PepperDashEssentials/Factory/DeviceFactory.cs
+++ b/src/PepperDashEssentials/Factory/DeviceFactory.cs
--- a/src/PepperDashEssentials/Fusion/EssentialsHuddleVtc1FusionController.cs
+++ b/src/PepperDashEssentials/Fusion/EssentialsHuddleVtc1FusionController.cs
--- a/src/PepperDashEssentials/Fusion/EssentialsTechRoomFusionSystemController.cs
+++ b/src/PepperDashEssentials/Fusion/EssentialsTechRoomFusionSystemController.cs
--- a/src/PepperDashEssentials/Fusion/FusionSystemController.cs.orig
+++ b/src/PepperDashEssentials/Fusion/FusionSystemController.cs.orig
--- a/src/PepperDashEssentials/PepperDash
+++ b/src/PepperDashEssentials/PepperDash
--- a/src/PepperDashEssentials/PepperDash
+++ b/src/PepperDashEssentials/PepperDash
--- a/src/PepperDashEssentials/PepperDashEssentials.csproj
+++ b/src/PepperDashEssentials/PepperDashEssentials.csproj
@@ -71,9 +71,9 @@
      <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">
+    <Reference Include="PepperDash_Core, Version=1.3.3.32940, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
+      <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>
--- a/src/PepperDashEssentials/PluginLoading/PluginLoading.cs
+++ b/src/PepperDashEssentials/PluginLoading/PluginLoading.cs
--- a/src/PepperDashEssentials/Properties/AssemblyInfo.cs
+++ b/src/PepperDashEssentials/Properties/AssemblyInfo.cs
--- a/src/PepperDashEssentials/Properties/AssemblyInfo.cs.orig
+++ b/src/PepperDashEssentials/Properties/AssemblyInfo.cs.orig
--- a/src/PepperDashEssentials/Properties/ControlSystem.cfg
+++ b/src/PepperDashEssentials/Properties/ControlSystem.cfg
--- a/src/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1
+++ b/src/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1
--- a/src/PepperDashEssentials/Room/Config/EssentialsDualDisplayRoomPropertiesConfig.cs
+++ b/src/PepperDashEssentials/Room/Config/EssentialsDualDisplayRoomPropertiesConfig.cs
--- a/src/PepperDashEssentials/Room/Config/EssentialsHuddleRoomPropertiesConfig.cs
+++ b/src/PepperDashEssentials/Room/Config/EssentialsHuddleRoomPropertiesConfig.cs
--- a/src/PepperDashEssentials/Room/Config/EssentialsHuddleVtc1PropertiesConfig.cs
+++ b/src/PepperDashEssentials/Room/Config/EssentialsHuddleVtc1PropertiesConfig.cs
--- a/src/PepperDashEssentials/Room/Config/EssentialsNDisplayRoomPropertiesConfig.cs
+++ b/src/PepperDashEssentials/Room/Config/EssentialsNDisplayRoomPropertiesConfig.cs
--- a/src/PepperDashEssentials/Room/Config/EssentialsPresentationPropertiesConfig.cs
+++ b/src/PepperDashEssentials/Room/Config/EssentialsPresentationPropertiesConfig.cs
--- a/src/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs
+++ b/src/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs
--- a/src/PepperDashEssentials/Room/Config/EssentialsRoomEmergencyConfig.cs
+++ b/src/PepperDashEssentials/Room/Config/EssentialsRoomEmergencyConfig.cs
--- a/src/PepperDashEssentials/Room/Config/EssentialsTechRoomConfig.cs
+++ b/src/PepperDashEssentials/Room/Config/EssentialsTechRoomConfig.cs
--- a/src/PepperDashEssentials/Room/Config/SimplRoomPropertiesConfig.cs
+++ b/src/PepperDashEssentials/Room/Config/SimplRoomPropertiesConfig.cs
--- a/src/PepperDashEssentials/Room/Emergency/EsentialsRoomEmergencyContactClosure.cs
+++ b/src/PepperDashEssentials/Room/Emergency/EsentialsRoomEmergencyContactClosure.cs
--- a/src/PepperDashEssentials/Room/Types/EssentialsCombinedHuddleVtc1Room.cs
+++ b/src/PepperDashEssentials/Room/Types/EssentialsCombinedHuddleVtc1Room.cs
--- a/src/PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs
+++ b/src/PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs
--- a/src/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs
+++ b/src/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs
--- a/src/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs.orig
+++ b/src/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs.orig
--- a/src/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
+++ b/src/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
--- a/src/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs.orig
+++ b/src/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs.orig
--- a/src/PepperDashEssentials/Room/Types/EssentialsNDisplayRoomBase.cs
+++ b/src/PepperDashEssentials/Room/Types/EssentialsNDisplayRoomBase.cs
--- a/src/PepperDashEssentials/Room/Types/EssentialsTechRoom.cs
+++ b/src/PepperDashEssentials/Room/Types/EssentialsTechRoom.cs
--- a/src/PepperDashEssentials/Room/Types/Interfaces/IEssentialsHuddleSpaceRoom.cs
+++ b/src/PepperDashEssentials/Room/Types/Interfaces/IEssentialsHuddleSpaceRoom.cs
--- a/src/PepperDashEssentials/Room/Types/Interfaces/IEssentialsHuddleVtc1Room.cs
+++ b/src/PepperDashEssentials/Room/Types/Interfaces/IEssentialsHuddleVtc1Room.cs
--- a/src/PepperDashEssentials/SGD/PepperDash
+++ b/src/PepperDashEssentials/SGD/PepperDash
--- a/src/PepperDashEssentials/SGD/PepperDash
+++ b/src/PepperDashEssentials/SGD/PepperDash
--- a/src/PepperDashEssentials/SGD/PepperDash
+++ b/src/PepperDashEssentials/SGD/PepperDash
--- a/ORPHANED-DELETE/CrestronTouchpanelPropertiesConfig.cs
+++ b/ORPHANED-DELETE/CrestronTouchpanelPropertiesConfig.cs
--- a/ORPHANED-DELETE/DualDisplaySourceSRLController.cs
+++ b/ORPHANED-DELETE/DualDisplaySourceSRLController.cs
--- a/ORPHANED-DELETE/EssentialsTouchpanelController.cs
+++ b/ORPHANED-DELETE/EssentialsTouchpanelController.cs
--- a/ORPHANED-DELETE/SubpageReferenceListActivityItem.cs
+++ b/ORPHANED-DELETE/SubpageReferenceListActivityItem.cs
--- a/ORPHANED-DELETE/SubpageReferenceListSourceItem.cs
+++ b/ORPHANED-DELETE/SubpageReferenceListSourceItem.cs
--- a/src/PepperDashEssentials/UI/DualDisplaySourceSRLController.cs
+++ b/src/PepperDashEssentials/UI/DualDisplaySourceSRLController.cs
--- a/src/PepperDashEssentials/UI/EssentialsTouchpanelController.cs
+++ b/src/PepperDashEssentials/UI/EssentialsTouchpanelController.cs
--- a/Show More
+++ b/Show More