From 13cbeb7605261a534ce93c3680aabb9fa9bb2b55 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Tue, 24 Nov 2020 16:09:30 -0700 Subject: [PATCH 1/3] Add PepperDash_Essentials_Interfaces project --- PepperDashEssentials.sln | 6 ++ .../PepperDash_Essentials_Interfaces.csproj | 70 +++++++++++++++++++ .../Properties/AssemblyInfo.cs | 8 +++ .../Properties/ControlSystem.cfg | 0 4 files changed, 84 insertions(+) create mode 100644 essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj create mode 100644 essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/Properties/AssemblyInfo.cs create mode 100644 essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/Properties/ControlSystem.cfg diff --git a/PepperDashEssentials.sln b/PepperDashEssentials.sln index af0007ba..c6e35a27 100644 --- a/PepperDashEssentials.sln +++ b/PepperDashEssentials.sln @@ -20,6 +20,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash_Essentials_DM", {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} = {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash_Essentials_Interfaces", "essentials-framework\Essentials Interfaces\PepperDash_Essentials_Interfaces\PepperDash_Essentials_Interfaces.csproj", "{E51D7C84-4906-486C-B2BA-EEB3B4E9731B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -42,6 +44,10 @@ Global {9199CE8A-0C9F-4952-8672-3EED798B284F}.Debug|Any CPU.Build.0 = Debug|Any CPU {9199CE8A-0C9F-4952-8672-3EED798B284F}.Release|Any CPU.ActiveCfg = Release|Any CPU {9199CE8A-0C9F-4952-8672-3EED798B284F}.Release|Any CPU.Build.0 = Release|Any CPU + {E51D7C84-4906-486C-B2BA-EEB3B4E9731B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E51D7C84-4906-486C-B2BA-EEB3B4E9731B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E51D7C84-4906-486C-B2BA-EEB3B4E9731B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E51D7C84-4906-486C-B2BA-EEB3B4E9731B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj b/essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj new file mode 100644 index 00000000..fddc5112 --- /dev/null +++ b/essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj @@ -0,0 +1,70 @@ + + + Release + AnyCPU + 9.0.30729 + 2.0 + {E51D7C84-4906-486C-B2BA-EEB3B4E9731B} + Library + Properties + PepperDash_Essentials_Interfaces + PepperDash_Essentials_Interfaces + {0B4745B0-194B-4BB6-8E21-E9057CA92500};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + WindowsCE + E2BECB1F-8C8C-41ba-B736-9BE7D946A398 + 5.0 + SmartDeviceProject1 + v3.5 + Windows CE + + + + + .allowedReferenceRelatedFileExtensions + true + full + false + bin\ + DEBUG;TRACE; + prompt + 4 + 512 + true + true + off + + + .allowedReferenceRelatedFileExtensions + none + true + bin\Release\ + prompt + 4 + 512 + true + true + off + + + + + False + ..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll + + + False + ..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll + + + + + + + + + + + + rem S# preparation will execute after these operations + + \ No newline at end of file diff --git a/essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/Properties/AssemblyInfo.cs b/essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..1b02c1cb --- /dev/null +++ b/essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/Properties/AssemblyInfo.cs @@ -0,0 +1,8 @@ +using System.Reflection; + +[assembly: AssemblyTitle("PepperDash_Essentials_Interfaces")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("PepperDash_Essentials_Interfaces")] +[assembly: AssemblyCopyright("Copyright © 2020")] +[assembly: AssemblyVersion("1.0.0.*")] + diff --git a/essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/Properties/ControlSystem.cfg b/essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/Properties/ControlSystem.cfg new file mode 100644 index 00000000..e69de29b From 0f8251ea8a6345eec5e5473c05acc38b246b4153 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Tue, 24 Nov 2020 17:06:03 -0700 Subject: [PATCH 2/3] update dependencies, references, and build order --- PepperDashEssentials.sln | 3 +++ PepperDashEssentials/PepperDashEssentials.csproj | 4 ++++ .../PepperDash_Essentials_Core.csproj | 6 ++++++ .../Essentials_DM/PepperDash_Essentials_DM.csproj | 4 ++++ .../Essentials Devices Common.csproj | 4 ++++ 5 files changed, 21 insertions(+) diff --git a/PepperDashEssentials.sln b/PepperDashEssentials.sln index c6e35a27..d49b4ed1 100644 --- a/PepperDashEssentials.sln +++ b/PepperDashEssentials.sln @@ -9,6 +9,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDashEssentials", "Pep 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}" + ProjectSection(ProjectDependencies) = postProject + {E51D7C84-4906-486C-B2BA-EEB3B4E9731B} = {E51D7C84-4906-486C-B2BA-EEB3B4E9731B} + EndProjectSection 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}" ProjectSection(ProjectDependencies) = postProject diff --git a/PepperDashEssentials/PepperDashEssentials.csproj b/PepperDashEssentials/PepperDashEssentials.csproj index 42d0e288..286da1a4 100644 --- a/PepperDashEssentials/PepperDashEssentials.csproj +++ b/PepperDashEssentials/PepperDashEssentials.csproj @@ -215,6 +215,10 @@ {9199CE8A-0C9F-4952-8672-3EED798B284F} PepperDash_Essentials_DM + + {E51D7C84-4906-486C-B2BA-EEB3B4E9731B} + PepperDash_Essentials_Interfaces + diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj index 6d4def73..81b9806d 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj @@ -350,6 +350,12 @@ + + + {E51D7C84-4906-486C-B2BA-EEB3B4E9731B} + PepperDash_Essentials_Interfaces + + diff --git a/essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj b/essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj index 69045ea5..d147b025 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj +++ b/essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj @@ -154,6 +154,10 @@ {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} PepperDash_Essentials_Core + + {E51D7C84-4906-486C-B2BA-EEB3B4E9731B} + PepperDash_Essentials_Interfaces + diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj index 54d37613..8c912221 100644 --- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj +++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj @@ -184,6 +184,10 @@ {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} PepperDash_Essentials_Core + + {E51D7C84-4906-486C-B2BA-EEB3B4E9731B} + PepperDash_Essentials_Interfaces + From 0cfc727b08768ec196a1014d8b3154bf7fb32575 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 25 Nov 2020 09:57:09 -0700 Subject: [PATCH 3/3] Fix root namespaces --- PepperDashEssentials/PepperDashEssentials.csproj | 2 +- .../PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj | 2 +- .../PepperDash_Essentials_Interfaces.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PepperDashEssentials/PepperDashEssentials.csproj b/PepperDashEssentials/PepperDashEssentials.csproj index 286da1a4..09e14ec0 100644 --- a/PepperDashEssentials/PepperDashEssentials.csproj +++ b/PepperDashEssentials/PepperDashEssentials.csproj @@ -7,7 +7,7 @@ {1BED5BA9-88C4-4365-9362-6F4B128071D3} Library Properties - PepperDashEssentials + PepperDash.Essentials PepperDashEssentials {0B4745B0-194B-4BB6-8E21-E9057CA92230};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} WindowsCE diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj index 81b9806d..b5aa4543 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj @@ -7,7 +7,7 @@ {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} Library Properties - PepperDash_Essentials_Core + PepperDash.Essentials.Core PepperDash_Essentials_Core {0B4745B0-194B-4BB6-8E21-E9057CA92300};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} WindowsCE diff --git a/essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj b/essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj index fddc5112..1ccb318d 100644 --- a/essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj +++ b/essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj @@ -7,7 +7,7 @@ {E51D7C84-4906-486C-B2BA-EEB3B4E9731B} Library Properties - PepperDash_Essentials_Interfaces + PepperDash.Essentials.Interfaces PepperDash_Essentials_Interfaces {0B4745B0-194B-4BB6-8E21-E9057CA92500};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} WindowsCE