From 638df4dd3b6a8b2a3faa575341f020cc201bd10d Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Tue, 4 Mar 2025 08:28:30 -0600 Subject: [PATCH] feat!: support only .NET Framework 4.7.2 In order to conform with the plugin format and the workflow, the .csproj file was moved up a level to the root of the `src` folder and the solution file was renamed. Workflows were also changed to match the plugin workflows. BREAKING CHANGE: Supports ONLY .NET Framework 4.7.2 --- ._Readme.md | Bin 4096 -> 0 bytes .github/workflows/docker.yml | 85 ------------------ .github/workflows/main.yml | 54 ----------- .releaserc.json | 34 +++++++ ...sh Core.sln => PepperDash.Core.4Series.sln | 0 .../Comm/._GenericSshClient.cs | Bin .../Comm/._GenericTcpIpClient.cs | Bin .../Comm/CommunicationGather.cs | 0 .../Comm/CommunicationStreamDebugging.cs | 0 .../Comm/ControlPropertiesConfig.cs | 0 .../Comm/DynamicTCPServer.cs | 0 src/{Pepperdash Core => }/Comm/EventArgs.cs | 0 .../Comm/FINISH CommStatic.cs | 0 .../Comm/GenericHttpSseClient.cs | 0 .../Comm/GenericSecureTcpIpClient.cs | 0 .../GenericSecureTcpIpClient_ForServer.cs | 0 .../Comm/GenericSecureTcpIpServer.cs | 0 .../Comm/GenericSshClient.cs | 0 .../Comm/GenericTcpIpClient.cs | 0 .../Comm/GenericTcpIpClient_ForServer.cs | 0 .../Comm/GenericTcpIpServer.cs | 0 .../Comm/GenericUdpServer.cs | 0 .../Comm/QscCoreDoubleTcpIpClient.cs | 0 .../Comm/TcpClientConfigObject.cs | 0 .../Comm/TcpServerConfigObject.cs | 0 .../Comm/eControlMethods.cs | 0 .../CommunicationExtras.cs | 0 .../Config/PortalConfigReader.cs | 0 .../Conversion/Convert.cs | 0 src/{Pepperdash Core => }/CoreInterfaces.cs | 0 src/{Pepperdash Core => }/Device.cs | 0 ...sentialsPlugins-builds-4-series-caller.yml | 21 +++++ src/{Pepperdash Core => }/EthernetHelper.cs | 0 src/{Pepperdash Core => }/EventArgs.cs | 0 .../GenericRESTfulCommunications/Constants.cs | 0 .../GenericRESTfulClient.cs | 0 .../EventArgs and Constants.cs | 0 .../JsonStandardObjects/JsonToSimplDevice.cs | 0 .../JsonToSimplDeviceConfig.cs | 0 .../JsonToSimpl/Constants.cs | 0 .../JsonToSimpl/Global.cs | 0 .../JsonToSimplArrayLookupChild.cs | 0 .../JsonToSimpl/JsonToSimplChildObjectBase.cs | 0 .../JsonToSimpl/JsonToSimplFileMaster.cs | 0 .../JsonToSimpl/JsonToSimplFixedPathObject.cs | 0 .../JsonToSimpl/JsonToSimplGenericMaster.cs | 0 .../JsonToSimpl/JsonToSimplMaster.cs | 0 .../JsonToSimplPortalFileMaster.cs | 0 .../Logging/CrestronEnricher.cs | 0 src/{Pepperdash Core => }/Logging/Debug.cs | 0 .../Logging/DebugConsoleSink.cs | 0 .../Logging/DebugContext.cs | 0 .../Logging/DebugCrestronLoggerSink.cs | 0 .../Logging/DebugErrorLogSink.cs | 0 .../Logging/DebugExtensions.cs | 0 .../Logging/DebugMemory.cs | 0 .../Logging/DebugWebsocketSink.cs | 0 .../Network/DiscoveryThings.cs | 0 .../PasswordManagement/Config.cs | 0 .../PasswordManagement/Constants.cs | 0 .../PasswordManagement/OLD-ARRAY-Config.cs | 0 .../OLD-ARRAY-PasswordClient.cs | 0 .../OLD-ARRAY-PasswordManager.cs | 0 .../PasswordManagement/PasswordClient.cs | 0 .../PasswordManagement/PasswordManager.cs | 0 src/PepperDash Core.sln | 25 ------ ....csproj => PepperDash.Core.4Series.csproj} | 4 +- .../PepperDash_Core.projectinfo | Bin 1194 -> 0 bytes .../Properties/ControlSystem.cfg | 0 .../SystemInfo/EventArgs and Constants.cs | 0 .../SystemInfo/SystemInfoConfig.cs | 0 .../SystemInfo/SystemInfoToSimpl.cs | 0 .../Web/BouncyCertificate.cs | 0 .../RequestHandlers/DefaultRequestHandler.cs | 0 .../WebApiBaseRequestAsyncHandler.cs | 0 .../WebApiBaseRequestHandler.cs | 0 src/{Pepperdash Core => }/Web/WebApiServer.cs | 0 .../WebApi/Presets/Preset.cs | 0 .../WebApi/Presets/User.cs | 0 .../WebApi/Presets/WebApiPasscodeClient.cs | 0 .../Serialization/IXSigSerialization.cs | 0 .../XSigSerializationException.cs | 0 .../XSigUtility/Tokens/XSigAnalogToken.cs | 0 .../XSigUtility/Tokens/XSigDigitalToken.cs | 0 .../XSigUtility/Tokens/XSigSerialToken.cs | 0 .../XSigUtility/Tokens/XSigToken.cs | 0 .../XSigUtility/Tokens/XSigTokenType.cs | 0 .../XSigUtility/XSigHelpers.cs | 0 .../XSigUtility/XSigTokenStreamReader.cs | 0 .../XSigUtility/XSigTokenStreamWriter.cs | 0 .../lib/net35/PepperDash_Core.clz | Bin .../lib/net35/PepperDash_Core.dll | Bin 92 files changed, 57 insertions(+), 166 deletions(-) delete mode 100644 ._Readme.md delete mode 100644 .github/workflows/docker.yml delete mode 100644 .github/workflows/main.yml create mode 100644 .releaserc.json rename PepperDash Core.sln => PepperDash.Core.4Series.sln (100%) rename src/{Pepperdash Core => }/Comm/._GenericSshClient.cs (100%) rename src/{Pepperdash Core => }/Comm/._GenericTcpIpClient.cs (100%) rename src/{Pepperdash Core => }/Comm/CommunicationGather.cs (100%) rename src/{Pepperdash Core => }/Comm/CommunicationStreamDebugging.cs (100%) rename src/{Pepperdash Core => }/Comm/ControlPropertiesConfig.cs (100%) rename src/{Pepperdash Core => }/Comm/DynamicTCPServer.cs (100%) rename src/{Pepperdash Core => }/Comm/EventArgs.cs (100%) rename src/{Pepperdash Core => }/Comm/FINISH CommStatic.cs (100%) rename src/{Pepperdash Core => }/Comm/GenericHttpSseClient.cs (100%) rename src/{Pepperdash Core => }/Comm/GenericSecureTcpIpClient.cs (100%) rename src/{Pepperdash Core => }/Comm/GenericSecureTcpIpClient_ForServer.cs (100%) rename src/{Pepperdash Core => }/Comm/GenericSecureTcpIpServer.cs (100%) rename src/{Pepperdash Core => }/Comm/GenericSshClient.cs (100%) rename src/{Pepperdash Core => }/Comm/GenericTcpIpClient.cs (100%) rename src/{Pepperdash Core => }/Comm/GenericTcpIpClient_ForServer.cs (100%) rename src/{Pepperdash Core => }/Comm/GenericTcpIpServer.cs (100%) rename src/{Pepperdash Core => }/Comm/GenericUdpServer.cs (100%) rename src/{Pepperdash Core => }/Comm/QscCoreDoubleTcpIpClient.cs (100%) rename src/{Pepperdash Core => }/Comm/TcpClientConfigObject.cs (100%) rename src/{Pepperdash Core => }/Comm/TcpServerConfigObject.cs (100%) rename src/{Pepperdash Core => }/Comm/eControlMethods.cs (100%) rename src/{Pepperdash Core => }/CommunicationExtras.cs (100%) rename src/{Pepperdash Core => }/Config/PortalConfigReader.cs (100%) rename src/{Pepperdash Core => }/Conversion/Convert.cs (100%) rename src/{Pepperdash Core => }/CoreInterfaces.cs (100%) rename src/{Pepperdash Core => }/Device.cs (100%) create mode 100644 src/EssentialsPlugins-builds-4-series-caller.yml rename src/{Pepperdash Core => }/EthernetHelper.cs (100%) rename src/{Pepperdash Core => }/EventArgs.cs (100%) rename src/{Pepperdash Core => }/GenericRESTfulCommunications/Constants.cs (100%) rename src/{Pepperdash Core => }/GenericRESTfulCommunications/GenericRESTfulClient.cs (100%) rename src/{Pepperdash Core => }/JsonStandardObjects/EventArgs and Constants.cs (100%) rename src/{Pepperdash Core => }/JsonStandardObjects/JsonToSimplDevice.cs (100%) rename src/{Pepperdash Core => }/JsonStandardObjects/JsonToSimplDeviceConfig.cs (100%) rename src/{Pepperdash Core => }/JsonToSimpl/Constants.cs (100%) rename src/{Pepperdash Core => }/JsonToSimpl/Global.cs (100%) rename src/{Pepperdash Core => }/JsonToSimpl/JsonToSimplArrayLookupChild.cs (100%) rename src/{Pepperdash Core => }/JsonToSimpl/JsonToSimplChildObjectBase.cs (100%) rename src/{Pepperdash Core => }/JsonToSimpl/JsonToSimplFileMaster.cs (100%) rename src/{Pepperdash Core => }/JsonToSimpl/JsonToSimplFixedPathObject.cs (100%) rename src/{Pepperdash Core => }/JsonToSimpl/JsonToSimplGenericMaster.cs (100%) rename src/{Pepperdash Core => }/JsonToSimpl/JsonToSimplMaster.cs (100%) rename src/{Pepperdash Core => }/JsonToSimpl/JsonToSimplPortalFileMaster.cs (100%) rename src/{Pepperdash Core => }/Logging/CrestronEnricher.cs (100%) rename src/{Pepperdash Core => }/Logging/Debug.cs (100%) rename src/{Pepperdash Core => }/Logging/DebugConsoleSink.cs (100%) rename src/{Pepperdash Core => }/Logging/DebugContext.cs (100%) rename src/{Pepperdash Core => }/Logging/DebugCrestronLoggerSink.cs (100%) rename src/{Pepperdash Core => }/Logging/DebugErrorLogSink.cs (100%) rename src/{Pepperdash Core => }/Logging/DebugExtensions.cs (100%) rename src/{Pepperdash Core => }/Logging/DebugMemory.cs (100%) rename src/{Pepperdash Core => }/Logging/DebugWebsocketSink.cs (100%) rename src/{Pepperdash Core => }/Network/DiscoveryThings.cs (100%) rename src/{Pepperdash Core => }/PasswordManagement/Config.cs (100%) rename src/{Pepperdash Core => }/PasswordManagement/Constants.cs (100%) rename src/{Pepperdash Core => }/PasswordManagement/OLD-ARRAY-Config.cs (100%) rename src/{Pepperdash Core => }/PasswordManagement/OLD-ARRAY-PasswordClient.cs (100%) rename src/{Pepperdash Core => }/PasswordManagement/OLD-ARRAY-PasswordManager.cs (100%) rename src/{Pepperdash Core => }/PasswordManagement/PasswordClient.cs (100%) rename src/{Pepperdash Core => }/PasswordManagement/PasswordManager.cs (100%) delete mode 100644 src/PepperDash Core.sln rename src/{Pepperdash Core/PepperDash_Core.csproj => PepperDash.Core.4Series.csproj} (95%) delete mode 100644 src/Pepperdash Core/PepperDash_Core.projectinfo rename src/{Pepperdash Core => }/Properties/ControlSystem.cfg (100%) rename src/{Pepperdash Core => }/SystemInfo/EventArgs and Constants.cs (100%) rename src/{Pepperdash Core => }/SystemInfo/SystemInfoConfig.cs (100%) rename src/{Pepperdash Core => }/SystemInfo/SystemInfoToSimpl.cs (100%) rename src/{Pepperdash Core => }/Web/BouncyCertificate.cs (100%) rename src/{Pepperdash Core => }/Web/RequestHandlers/DefaultRequestHandler.cs (100%) rename src/{Pepperdash Core => }/Web/RequestHandlers/WebApiBaseRequestAsyncHandler.cs (100%) rename src/{Pepperdash Core => }/Web/RequestHandlers/WebApiBaseRequestHandler.cs (100%) rename src/{Pepperdash Core => }/Web/WebApiServer.cs (100%) rename src/{Pepperdash Core => }/WebApi/Presets/Preset.cs (100%) rename src/{Pepperdash Core => }/WebApi/Presets/User.cs (100%) rename src/{Pepperdash Core => }/WebApi/Presets/WebApiPasscodeClient.cs (100%) rename src/{Pepperdash Core => }/XSigUtility/Serialization/IXSigSerialization.cs (100%) rename src/{Pepperdash Core => }/XSigUtility/Serialization/XSigSerializationException.cs (100%) rename src/{Pepperdash Core => }/XSigUtility/Tokens/XSigAnalogToken.cs (100%) rename src/{Pepperdash Core => }/XSigUtility/Tokens/XSigDigitalToken.cs (100%) rename src/{Pepperdash Core => }/XSigUtility/Tokens/XSigSerialToken.cs (100%) rename src/{Pepperdash Core => }/XSigUtility/Tokens/XSigToken.cs (100%) rename src/{Pepperdash Core => }/XSigUtility/Tokens/XSigTokenType.cs (100%) rename src/{Pepperdash Core => }/XSigUtility/XSigHelpers.cs (100%) rename src/{Pepperdash Core => }/XSigUtility/XSigTokenStreamReader.cs (100%) rename src/{Pepperdash Core => }/XSigUtility/XSigTokenStreamWriter.cs (100%) rename src/{Pepperdash Core => }/lib/net35/PepperDash_Core.clz (100%) rename src/{Pepperdash Core => }/lib/net35/PepperDash_Core.dll (100%) diff --git a/._Readme.md b/._Readme.md deleted file mode 100644 index 4a7c548aeb4b876ee8d84ed85cdf24ef8c50a25b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vS{8I^ zAw&nm0-$mMG%bukK2%&PIX_n~v7jI)RWB#8xTLf=H6eb6^f z7etSO(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@Rz!d_Z&L#+hfm}#NX0bw1 zYH@yPQF5w6T7FTsLS|k`YF> $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": "replace-me-feature-branch", + "prerelease": "replace-me-prerelease", + "channel": "replace-me-prerelease" + } + ] +} \ No newline at end of file diff --git a/PepperDash Core.sln b/PepperDash.Core.4Series.sln similarity index 100% rename from PepperDash Core.sln rename to PepperDash.Core.4Series.sln diff --git a/src/Pepperdash Core/Comm/._GenericSshClient.cs b/src/Comm/._GenericSshClient.cs similarity index 100% rename from src/Pepperdash Core/Comm/._GenericSshClient.cs rename to src/Comm/._GenericSshClient.cs diff --git a/src/Pepperdash Core/Comm/._GenericTcpIpClient.cs b/src/Comm/._GenericTcpIpClient.cs similarity index 100% rename from src/Pepperdash Core/Comm/._GenericTcpIpClient.cs rename to src/Comm/._GenericTcpIpClient.cs diff --git a/src/Pepperdash Core/Comm/CommunicationGather.cs b/src/Comm/CommunicationGather.cs similarity index 100% rename from src/Pepperdash Core/Comm/CommunicationGather.cs rename to src/Comm/CommunicationGather.cs diff --git a/src/Pepperdash Core/Comm/CommunicationStreamDebugging.cs b/src/Comm/CommunicationStreamDebugging.cs similarity index 100% rename from src/Pepperdash Core/Comm/CommunicationStreamDebugging.cs rename to src/Comm/CommunicationStreamDebugging.cs diff --git a/src/Pepperdash Core/Comm/ControlPropertiesConfig.cs b/src/Comm/ControlPropertiesConfig.cs similarity index 100% rename from src/Pepperdash Core/Comm/ControlPropertiesConfig.cs rename to src/Comm/ControlPropertiesConfig.cs diff --git a/src/Pepperdash Core/Comm/DynamicTCPServer.cs b/src/Comm/DynamicTCPServer.cs similarity index 100% rename from src/Pepperdash Core/Comm/DynamicTCPServer.cs rename to src/Comm/DynamicTCPServer.cs diff --git a/src/Pepperdash Core/Comm/EventArgs.cs b/src/Comm/EventArgs.cs similarity index 100% rename from src/Pepperdash Core/Comm/EventArgs.cs rename to src/Comm/EventArgs.cs diff --git a/src/Pepperdash Core/Comm/FINISH CommStatic.cs b/src/Comm/FINISH CommStatic.cs similarity index 100% rename from src/Pepperdash Core/Comm/FINISH CommStatic.cs rename to src/Comm/FINISH CommStatic.cs diff --git a/src/Pepperdash Core/Comm/GenericHttpSseClient.cs b/src/Comm/GenericHttpSseClient.cs similarity index 100% rename from src/Pepperdash Core/Comm/GenericHttpSseClient.cs rename to src/Comm/GenericHttpSseClient.cs diff --git a/src/Pepperdash Core/Comm/GenericSecureTcpIpClient.cs b/src/Comm/GenericSecureTcpIpClient.cs similarity index 100% rename from src/Pepperdash Core/Comm/GenericSecureTcpIpClient.cs rename to src/Comm/GenericSecureTcpIpClient.cs diff --git a/src/Pepperdash Core/Comm/GenericSecureTcpIpClient_ForServer.cs b/src/Comm/GenericSecureTcpIpClient_ForServer.cs similarity index 100% rename from src/Pepperdash Core/Comm/GenericSecureTcpIpClient_ForServer.cs rename to src/Comm/GenericSecureTcpIpClient_ForServer.cs diff --git a/src/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs b/src/Comm/GenericSecureTcpIpServer.cs similarity index 100% rename from src/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs rename to src/Comm/GenericSecureTcpIpServer.cs diff --git a/src/Pepperdash Core/Comm/GenericSshClient.cs b/src/Comm/GenericSshClient.cs similarity index 100% rename from src/Pepperdash Core/Comm/GenericSshClient.cs rename to src/Comm/GenericSshClient.cs diff --git a/src/Pepperdash Core/Comm/GenericTcpIpClient.cs b/src/Comm/GenericTcpIpClient.cs similarity index 100% rename from src/Pepperdash Core/Comm/GenericTcpIpClient.cs rename to src/Comm/GenericTcpIpClient.cs diff --git a/src/Pepperdash Core/Comm/GenericTcpIpClient_ForServer.cs b/src/Comm/GenericTcpIpClient_ForServer.cs similarity index 100% rename from src/Pepperdash Core/Comm/GenericTcpIpClient_ForServer.cs rename to src/Comm/GenericTcpIpClient_ForServer.cs diff --git a/src/Pepperdash Core/Comm/GenericTcpIpServer.cs b/src/Comm/GenericTcpIpServer.cs similarity index 100% rename from src/Pepperdash Core/Comm/GenericTcpIpServer.cs rename to src/Comm/GenericTcpIpServer.cs diff --git a/src/Pepperdash Core/Comm/GenericUdpServer.cs b/src/Comm/GenericUdpServer.cs similarity index 100% rename from src/Pepperdash Core/Comm/GenericUdpServer.cs rename to src/Comm/GenericUdpServer.cs diff --git a/src/Pepperdash Core/Comm/QscCoreDoubleTcpIpClient.cs b/src/Comm/QscCoreDoubleTcpIpClient.cs similarity index 100% rename from src/Pepperdash Core/Comm/QscCoreDoubleTcpIpClient.cs rename to src/Comm/QscCoreDoubleTcpIpClient.cs diff --git a/src/Pepperdash Core/Comm/TcpClientConfigObject.cs b/src/Comm/TcpClientConfigObject.cs similarity index 100% rename from src/Pepperdash Core/Comm/TcpClientConfigObject.cs rename to src/Comm/TcpClientConfigObject.cs diff --git a/src/Pepperdash Core/Comm/TcpServerConfigObject.cs b/src/Comm/TcpServerConfigObject.cs similarity index 100% rename from src/Pepperdash Core/Comm/TcpServerConfigObject.cs rename to src/Comm/TcpServerConfigObject.cs diff --git a/src/Pepperdash Core/Comm/eControlMethods.cs b/src/Comm/eControlMethods.cs similarity index 100% rename from src/Pepperdash Core/Comm/eControlMethods.cs rename to src/Comm/eControlMethods.cs diff --git a/src/Pepperdash Core/CommunicationExtras.cs b/src/CommunicationExtras.cs similarity index 100% rename from src/Pepperdash Core/CommunicationExtras.cs rename to src/CommunicationExtras.cs diff --git a/src/Pepperdash Core/Config/PortalConfigReader.cs b/src/Config/PortalConfigReader.cs similarity index 100% rename from src/Pepperdash Core/Config/PortalConfigReader.cs rename to src/Config/PortalConfigReader.cs diff --git a/src/Pepperdash Core/Conversion/Convert.cs b/src/Conversion/Convert.cs similarity index 100% rename from src/Pepperdash Core/Conversion/Convert.cs rename to src/Conversion/Convert.cs diff --git a/src/Pepperdash Core/CoreInterfaces.cs b/src/CoreInterfaces.cs similarity index 100% rename from src/Pepperdash Core/CoreInterfaces.cs rename to src/CoreInterfaces.cs diff --git a/src/Pepperdash Core/Device.cs b/src/Device.cs similarity index 100% rename from src/Pepperdash Core/Device.cs rename to src/Device.cs diff --git a/src/EssentialsPlugins-builds-4-series-caller.yml b/src/EssentialsPlugins-builds-4-series-caller.yml new file mode 100644 index 0000000..c4b4d2c --- /dev/null +++ b/src/EssentialsPlugins-builds-4-series-caller.yml @@ -0,0 +1,21 @@ +name: Build Essentials Plugin + +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 }} \ No newline at end of file diff --git a/src/Pepperdash Core/EthernetHelper.cs b/src/EthernetHelper.cs similarity index 100% rename from src/Pepperdash Core/EthernetHelper.cs rename to src/EthernetHelper.cs diff --git a/src/Pepperdash Core/EventArgs.cs b/src/EventArgs.cs similarity index 100% rename from src/Pepperdash Core/EventArgs.cs rename to src/EventArgs.cs diff --git a/src/Pepperdash Core/GenericRESTfulCommunications/Constants.cs b/src/GenericRESTfulCommunications/Constants.cs similarity index 100% rename from src/Pepperdash Core/GenericRESTfulCommunications/Constants.cs rename to src/GenericRESTfulCommunications/Constants.cs diff --git a/src/Pepperdash Core/GenericRESTfulCommunications/GenericRESTfulClient.cs b/src/GenericRESTfulCommunications/GenericRESTfulClient.cs similarity index 100% rename from src/Pepperdash Core/GenericRESTfulCommunications/GenericRESTfulClient.cs rename to src/GenericRESTfulCommunications/GenericRESTfulClient.cs diff --git a/src/Pepperdash Core/JsonStandardObjects/EventArgs and Constants.cs b/src/JsonStandardObjects/EventArgs and Constants.cs similarity index 100% rename from src/Pepperdash Core/JsonStandardObjects/EventArgs and Constants.cs rename to src/JsonStandardObjects/EventArgs and Constants.cs diff --git a/src/Pepperdash Core/JsonStandardObjects/JsonToSimplDevice.cs b/src/JsonStandardObjects/JsonToSimplDevice.cs similarity index 100% rename from src/Pepperdash Core/JsonStandardObjects/JsonToSimplDevice.cs rename to src/JsonStandardObjects/JsonToSimplDevice.cs diff --git a/src/Pepperdash Core/JsonStandardObjects/JsonToSimplDeviceConfig.cs b/src/JsonStandardObjects/JsonToSimplDeviceConfig.cs similarity index 100% rename from src/Pepperdash Core/JsonStandardObjects/JsonToSimplDeviceConfig.cs rename to src/JsonStandardObjects/JsonToSimplDeviceConfig.cs diff --git a/src/Pepperdash Core/JsonToSimpl/Constants.cs b/src/JsonToSimpl/Constants.cs similarity index 100% rename from src/Pepperdash Core/JsonToSimpl/Constants.cs rename to src/JsonToSimpl/Constants.cs diff --git a/src/Pepperdash Core/JsonToSimpl/Global.cs b/src/JsonToSimpl/Global.cs similarity index 100% rename from src/Pepperdash Core/JsonToSimpl/Global.cs rename to src/JsonToSimpl/Global.cs diff --git a/src/Pepperdash Core/JsonToSimpl/JsonToSimplArrayLookupChild.cs b/src/JsonToSimpl/JsonToSimplArrayLookupChild.cs similarity index 100% rename from src/Pepperdash Core/JsonToSimpl/JsonToSimplArrayLookupChild.cs rename to src/JsonToSimpl/JsonToSimplArrayLookupChild.cs diff --git a/src/Pepperdash Core/JsonToSimpl/JsonToSimplChildObjectBase.cs b/src/JsonToSimpl/JsonToSimplChildObjectBase.cs similarity index 100% rename from src/Pepperdash Core/JsonToSimpl/JsonToSimplChildObjectBase.cs rename to src/JsonToSimpl/JsonToSimplChildObjectBase.cs diff --git a/src/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs b/src/JsonToSimpl/JsonToSimplFileMaster.cs similarity index 100% rename from src/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs rename to src/JsonToSimpl/JsonToSimplFileMaster.cs diff --git a/src/Pepperdash Core/JsonToSimpl/JsonToSimplFixedPathObject.cs b/src/JsonToSimpl/JsonToSimplFixedPathObject.cs similarity index 100% rename from src/Pepperdash Core/JsonToSimpl/JsonToSimplFixedPathObject.cs rename to src/JsonToSimpl/JsonToSimplFixedPathObject.cs diff --git a/src/Pepperdash Core/JsonToSimpl/JsonToSimplGenericMaster.cs b/src/JsonToSimpl/JsonToSimplGenericMaster.cs similarity index 100% rename from src/Pepperdash Core/JsonToSimpl/JsonToSimplGenericMaster.cs rename to src/JsonToSimpl/JsonToSimplGenericMaster.cs diff --git a/src/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs b/src/JsonToSimpl/JsonToSimplMaster.cs similarity index 100% rename from src/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs rename to src/JsonToSimpl/JsonToSimplMaster.cs diff --git a/src/Pepperdash Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs b/src/JsonToSimpl/JsonToSimplPortalFileMaster.cs similarity index 100% rename from src/Pepperdash Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs rename to src/JsonToSimpl/JsonToSimplPortalFileMaster.cs diff --git a/src/Pepperdash Core/Logging/CrestronEnricher.cs b/src/Logging/CrestronEnricher.cs similarity index 100% rename from src/Pepperdash Core/Logging/CrestronEnricher.cs rename to src/Logging/CrestronEnricher.cs diff --git a/src/Pepperdash Core/Logging/Debug.cs b/src/Logging/Debug.cs similarity index 100% rename from src/Pepperdash Core/Logging/Debug.cs rename to src/Logging/Debug.cs diff --git a/src/Pepperdash Core/Logging/DebugConsoleSink.cs b/src/Logging/DebugConsoleSink.cs similarity index 100% rename from src/Pepperdash Core/Logging/DebugConsoleSink.cs rename to src/Logging/DebugConsoleSink.cs diff --git a/src/Pepperdash Core/Logging/DebugContext.cs b/src/Logging/DebugContext.cs similarity index 100% rename from src/Pepperdash Core/Logging/DebugContext.cs rename to src/Logging/DebugContext.cs diff --git a/src/Pepperdash Core/Logging/DebugCrestronLoggerSink.cs b/src/Logging/DebugCrestronLoggerSink.cs similarity index 100% rename from src/Pepperdash Core/Logging/DebugCrestronLoggerSink.cs rename to src/Logging/DebugCrestronLoggerSink.cs diff --git a/src/Pepperdash Core/Logging/DebugErrorLogSink.cs b/src/Logging/DebugErrorLogSink.cs similarity index 100% rename from src/Pepperdash Core/Logging/DebugErrorLogSink.cs rename to src/Logging/DebugErrorLogSink.cs diff --git a/src/Pepperdash Core/Logging/DebugExtensions.cs b/src/Logging/DebugExtensions.cs similarity index 100% rename from src/Pepperdash Core/Logging/DebugExtensions.cs rename to src/Logging/DebugExtensions.cs diff --git a/src/Pepperdash Core/Logging/DebugMemory.cs b/src/Logging/DebugMemory.cs similarity index 100% rename from src/Pepperdash Core/Logging/DebugMemory.cs rename to src/Logging/DebugMemory.cs diff --git a/src/Pepperdash Core/Logging/DebugWebsocketSink.cs b/src/Logging/DebugWebsocketSink.cs similarity index 100% rename from src/Pepperdash Core/Logging/DebugWebsocketSink.cs rename to src/Logging/DebugWebsocketSink.cs diff --git a/src/Pepperdash Core/Network/DiscoveryThings.cs b/src/Network/DiscoveryThings.cs similarity index 100% rename from src/Pepperdash Core/Network/DiscoveryThings.cs rename to src/Network/DiscoveryThings.cs diff --git a/src/Pepperdash Core/PasswordManagement/Config.cs b/src/PasswordManagement/Config.cs similarity index 100% rename from src/Pepperdash Core/PasswordManagement/Config.cs rename to src/PasswordManagement/Config.cs diff --git a/src/Pepperdash Core/PasswordManagement/Constants.cs b/src/PasswordManagement/Constants.cs similarity index 100% rename from src/Pepperdash Core/PasswordManagement/Constants.cs rename to src/PasswordManagement/Constants.cs diff --git a/src/Pepperdash Core/PasswordManagement/OLD-ARRAY-Config.cs b/src/PasswordManagement/OLD-ARRAY-Config.cs similarity index 100% rename from src/Pepperdash Core/PasswordManagement/OLD-ARRAY-Config.cs rename to src/PasswordManagement/OLD-ARRAY-Config.cs diff --git a/src/Pepperdash Core/PasswordManagement/OLD-ARRAY-PasswordClient.cs b/src/PasswordManagement/OLD-ARRAY-PasswordClient.cs similarity index 100% rename from src/Pepperdash Core/PasswordManagement/OLD-ARRAY-PasswordClient.cs rename to src/PasswordManagement/OLD-ARRAY-PasswordClient.cs diff --git a/src/Pepperdash Core/PasswordManagement/OLD-ARRAY-PasswordManager.cs b/src/PasswordManagement/OLD-ARRAY-PasswordManager.cs similarity index 100% rename from src/Pepperdash Core/PasswordManagement/OLD-ARRAY-PasswordManager.cs rename to src/PasswordManagement/OLD-ARRAY-PasswordManager.cs diff --git a/src/Pepperdash Core/PasswordManagement/PasswordClient.cs b/src/PasswordManagement/PasswordClient.cs similarity index 100% rename from src/Pepperdash Core/PasswordManagement/PasswordClient.cs rename to src/PasswordManagement/PasswordClient.cs diff --git a/src/Pepperdash Core/PasswordManagement/PasswordManager.cs b/src/PasswordManagement/PasswordManager.cs similarity index 100% rename from src/Pepperdash Core/PasswordManagement/PasswordManager.cs rename to src/PasswordManagement/PasswordManager.cs diff --git a/src/PepperDash Core.sln b/src/PepperDash Core.sln deleted file mode 100644 index f38b242..0000000 --- a/src/PepperDash Core.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.1.32228.430 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash_Core", "Pepperdash Core\PepperDash_Core.csproj", "{66EB9188-E7AC-410D-AD59-931131DA7C2E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {66EB9188-E7AC-410D-AD59-931131DA7C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66EB9188-E7AC-410D-AD59-931131DA7C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66EB9188-E7AC-410D-AD59-931131DA7C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66EB9188-E7AC-410D-AD59-931131DA7C2E}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {E4615FA3-8C8C-4DC0-897B-E85408B4E341} - EndGlobalSection -EndGlobal diff --git a/src/Pepperdash Core/PepperDash_Core.csproj b/src/PepperDash.Core.4Series.csproj similarity index 95% rename from src/Pepperdash Core/PepperDash_Core.csproj rename to src/PepperDash.Core.4Series.csproj index 5d46b30..ad8ec89 100644 --- a/src/Pepperdash Core/PepperDash_Core.csproj +++ b/src/PepperDash.Core.4Series.csproj @@ -2,7 +2,7 @@ PepperDash.Core PepperDashCore - net472;net6 + net472 true en bin\$(Configuration)\ @@ -15,7 +15,7 @@ crestron;4series; 2.0.0-local $(Version) - ../../package + ../output true diff --git a/src/Pepperdash Core/PepperDash_Core.projectinfo b/src/Pepperdash Core/PepperDash_Core.projectinfo deleted file mode 100644 index ded18d38a0e82af30f289d0b77715995729a9361..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1194 zcmV;b1XcSViwFP!000040PVd8U>r%7B_=Oz%6orG^-9;^bfE}=m|e(^`YTQU3S(MP)`cQ5nRDzBer&HVR2 zsp_0s&Z3`Q(5HJld%N2^54U%B-|X%^y8r2;y`Ayy&i<$O_CMX;`Sj7w4z-(8yOT%1 z@9+Cnlh@7f`}<~BdHFW4f8XEtX*FFh@?}e(y?jdlw;ce!`Floxrvo2MilzS=<29a^ zKcGGfJEEVqzrC!hpU$W4+48)4R+RZNTjT?nT~+nlVtMg(aO$G7l1>Zil+ZeBo)&d` zZBcrC-L(1Qg<#UBFkyUAXN$Aho9rUm;G|ltXehHUm$#e?^TG`T_}QGA)5Rp8y{^{v zG(WDV^WrkMiSLftSV=O(B6w6|>L~>Gdqa75;6Ye^J5D@(^Shb8G>(=|OgXca}Yz?Mxrso95@U$-@V`y9b}%JAV*R zX){1+c6+eH)P1zMqaOz4`$T3DZFr3Q=Pwx21rsmsuNq`3?B+F+H_VUS2zWeb0{fF7T^ZTDZ*f}80@#+5l{n>OD zpO84nU>a@#_*T;p@9O_;#6K7!z9-%tLD+dXy+6CRGb2LHX6FYF?@#Z2noTDd*fD#)P6Wb?N|AE39qhN4zPQE@BI8ApG_v&!TxkQd$4=|{^a4q zgZ=!|2m1#Hlf5|EhrtH)zXkAH(SNwR|F=!V?#|Fmy#9&j8}-il&h-Ay{n;#^&JMB% z2lrqu z!%y#%<9>cG|1_W8zjr@}<4&WP{Vb4u0H0s-{a^A+IQA&ci)jXpLkzVpTj8(&2YjB1 If0Ymb07dkfaR2}S diff --git a/src/Pepperdash Core/Properties/ControlSystem.cfg b/src/Properties/ControlSystem.cfg similarity index 100% rename from src/Pepperdash Core/Properties/ControlSystem.cfg rename to src/Properties/ControlSystem.cfg diff --git a/src/Pepperdash Core/SystemInfo/EventArgs and Constants.cs b/src/SystemInfo/EventArgs and Constants.cs similarity index 100% rename from src/Pepperdash Core/SystemInfo/EventArgs and Constants.cs rename to src/SystemInfo/EventArgs and Constants.cs diff --git a/src/Pepperdash Core/SystemInfo/SystemInfoConfig.cs b/src/SystemInfo/SystemInfoConfig.cs similarity index 100% rename from src/Pepperdash Core/SystemInfo/SystemInfoConfig.cs rename to src/SystemInfo/SystemInfoConfig.cs diff --git a/src/Pepperdash Core/SystemInfo/SystemInfoToSimpl.cs b/src/SystemInfo/SystemInfoToSimpl.cs similarity index 100% rename from src/Pepperdash Core/SystemInfo/SystemInfoToSimpl.cs rename to src/SystemInfo/SystemInfoToSimpl.cs diff --git a/src/Pepperdash Core/Web/BouncyCertificate.cs b/src/Web/BouncyCertificate.cs similarity index 100% rename from src/Pepperdash Core/Web/BouncyCertificate.cs rename to src/Web/BouncyCertificate.cs diff --git a/src/Pepperdash Core/Web/RequestHandlers/DefaultRequestHandler.cs b/src/Web/RequestHandlers/DefaultRequestHandler.cs similarity index 100% rename from src/Pepperdash Core/Web/RequestHandlers/DefaultRequestHandler.cs rename to src/Web/RequestHandlers/DefaultRequestHandler.cs diff --git a/src/Pepperdash Core/Web/RequestHandlers/WebApiBaseRequestAsyncHandler.cs b/src/Web/RequestHandlers/WebApiBaseRequestAsyncHandler.cs similarity index 100% rename from src/Pepperdash Core/Web/RequestHandlers/WebApiBaseRequestAsyncHandler.cs rename to src/Web/RequestHandlers/WebApiBaseRequestAsyncHandler.cs diff --git a/src/Pepperdash Core/Web/RequestHandlers/WebApiBaseRequestHandler.cs b/src/Web/RequestHandlers/WebApiBaseRequestHandler.cs similarity index 100% rename from src/Pepperdash Core/Web/RequestHandlers/WebApiBaseRequestHandler.cs rename to src/Web/RequestHandlers/WebApiBaseRequestHandler.cs diff --git a/src/Pepperdash Core/Web/WebApiServer.cs b/src/Web/WebApiServer.cs similarity index 100% rename from src/Pepperdash Core/Web/WebApiServer.cs rename to src/Web/WebApiServer.cs diff --git a/src/Pepperdash Core/WebApi/Presets/Preset.cs b/src/WebApi/Presets/Preset.cs similarity index 100% rename from src/Pepperdash Core/WebApi/Presets/Preset.cs rename to src/WebApi/Presets/Preset.cs diff --git a/src/Pepperdash Core/WebApi/Presets/User.cs b/src/WebApi/Presets/User.cs similarity index 100% rename from src/Pepperdash Core/WebApi/Presets/User.cs rename to src/WebApi/Presets/User.cs diff --git a/src/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs b/src/WebApi/Presets/WebApiPasscodeClient.cs similarity index 100% rename from src/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs rename to src/WebApi/Presets/WebApiPasscodeClient.cs diff --git a/src/Pepperdash Core/XSigUtility/Serialization/IXSigSerialization.cs b/src/XSigUtility/Serialization/IXSigSerialization.cs similarity index 100% rename from src/Pepperdash Core/XSigUtility/Serialization/IXSigSerialization.cs rename to src/XSigUtility/Serialization/IXSigSerialization.cs diff --git a/src/Pepperdash Core/XSigUtility/Serialization/XSigSerializationException.cs b/src/XSigUtility/Serialization/XSigSerializationException.cs similarity index 100% rename from src/Pepperdash Core/XSigUtility/Serialization/XSigSerializationException.cs rename to src/XSigUtility/Serialization/XSigSerializationException.cs diff --git a/src/Pepperdash Core/XSigUtility/Tokens/XSigAnalogToken.cs b/src/XSigUtility/Tokens/XSigAnalogToken.cs similarity index 100% rename from src/Pepperdash Core/XSigUtility/Tokens/XSigAnalogToken.cs rename to src/XSigUtility/Tokens/XSigAnalogToken.cs diff --git a/src/Pepperdash Core/XSigUtility/Tokens/XSigDigitalToken.cs b/src/XSigUtility/Tokens/XSigDigitalToken.cs similarity index 100% rename from src/Pepperdash Core/XSigUtility/Tokens/XSigDigitalToken.cs rename to src/XSigUtility/Tokens/XSigDigitalToken.cs diff --git a/src/Pepperdash Core/XSigUtility/Tokens/XSigSerialToken.cs b/src/XSigUtility/Tokens/XSigSerialToken.cs similarity index 100% rename from src/Pepperdash Core/XSigUtility/Tokens/XSigSerialToken.cs rename to src/XSigUtility/Tokens/XSigSerialToken.cs diff --git a/src/Pepperdash Core/XSigUtility/Tokens/XSigToken.cs b/src/XSigUtility/Tokens/XSigToken.cs similarity index 100% rename from src/Pepperdash Core/XSigUtility/Tokens/XSigToken.cs rename to src/XSigUtility/Tokens/XSigToken.cs diff --git a/src/Pepperdash Core/XSigUtility/Tokens/XSigTokenType.cs b/src/XSigUtility/Tokens/XSigTokenType.cs similarity index 100% rename from src/Pepperdash Core/XSigUtility/Tokens/XSigTokenType.cs rename to src/XSigUtility/Tokens/XSigTokenType.cs diff --git a/src/Pepperdash Core/XSigUtility/XSigHelpers.cs b/src/XSigUtility/XSigHelpers.cs similarity index 100% rename from src/Pepperdash Core/XSigUtility/XSigHelpers.cs rename to src/XSigUtility/XSigHelpers.cs diff --git a/src/Pepperdash Core/XSigUtility/XSigTokenStreamReader.cs b/src/XSigUtility/XSigTokenStreamReader.cs similarity index 100% rename from src/Pepperdash Core/XSigUtility/XSigTokenStreamReader.cs rename to src/XSigUtility/XSigTokenStreamReader.cs diff --git a/src/Pepperdash Core/XSigUtility/XSigTokenStreamWriter.cs b/src/XSigUtility/XSigTokenStreamWriter.cs similarity index 100% rename from src/Pepperdash Core/XSigUtility/XSigTokenStreamWriter.cs rename to src/XSigUtility/XSigTokenStreamWriter.cs diff --git a/src/Pepperdash Core/lib/net35/PepperDash_Core.clz b/src/lib/net35/PepperDash_Core.clz similarity index 100% rename from src/Pepperdash Core/lib/net35/PepperDash_Core.clz rename to src/lib/net35/PepperDash_Core.clz diff --git a/src/Pepperdash Core/lib/net35/PepperDash_Core.dll b/src/lib/net35/PepperDash_Core.dll similarity index 100% rename from src/Pepperdash Core/lib/net35/PepperDash_Core.dll rename to src/lib/net35/PepperDash_Core.dll