Merge branch 'release/1.6.0' into hotfix/cisco-large-directory-issues

.github/scripts/ZipBuildOutput.ps1

@@ -10,7 +10,7 @@ Get-ChildItem ($destination)
 $exclusions = @(git submodule foreach --quiet 'echo $name')
 # Trying to get any .json schema files (not currently working)
 # Gets any files with the listed extensions.
-Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.dll" | ForEach-Object {
+Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.dll", "*.nuspec" | ForEach-Object {
   $allowed = $true;
   # Exclude any files in submodules
   foreach ($exclude in $exclusions) {

.github/workflows/.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+  "workbench.colorCustomizations": {
+    "activityBar.background": "#332848",
+    "titleBar.activeBackground": "#483764",
+    "titleBar.activeForeground": "#FBFBFD"
+  }
+}

.github/workflows/docker.yml

@@ -32,7 +32,20 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-          submodules: true
+      # And any submodules
+      #- name: Checkout submodules
+      #  shell: bash
+      #  run: |
+      #    git config --global url."https://github.com/".insteadOf "git@github.com:"
+      #    auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+      #    git submodule sync --recursive
+      #    git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+      - name: Add nuget.exe
+        uses: nuget/setup-nuget@v1
+      - name: Add Github Packages source
+        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
+      - name: restore Nuget Packages
+        run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion
         # Fetch all tags
       - name: Fetch tags
         run: git fetch --tags
@@ -107,6 +120,49 @@ jobs:
           asset_content_type: application/zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  Push_Nuget_Package:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      - name: Add nuget.exe
+        uses: nuget/setup-nuget@v1
+      - name: Add Github Packages source
+        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
+      - name: Add nuget.org API Key
+        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
+      - name: Create nuget package
+        run: nuget pack "./PepperDash_Essentials_Core.nuspec" -version ${{ env.VERSION }}
+      - name: Publish nuget package to Github registry
+        run: nuget push **/*.nupkg -source github
+      - name: Publish nuget package to nuget.org
+        run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json
   # This step always runs and pushes the build to the internal build rep
   Internal_Push_Output:
     needs: Build_Project

.github/workflows/main.yml

@@ -25,13 +25,19 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v2
       # And any submodules
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          git config --global url."https://github.com/".insteadOf "git@github.com:"
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+      #- name: Checkout submodules
+      #  shell: bash
+      #  run: |
+      #    git config --global url."https://github.com/".insteadOf "git@github.com:"
+      #    auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+      #    git submodule sync --recursive
+      #    git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+      - name: Add nuget.exe
+        uses: nuget/setup-nuget@v1
+      - name: Add Github Packages source
+        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
+      - name: restore Nuget Packages
+        run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion
       # Generate the appropriate version number
       - name: Set Version Number
         shell: powershell
@@ -85,6 +91,49 @@ jobs:
           asset_content_type: application/zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  Push_Nuget_Package:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      - name: Add nuget.exe
+        uses: nuget/setup-nuget@v1
+      - name: Add Github Packages source
+        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
+      - name: Add nuget.org API Key
+        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
+      - name: Create nuget package
+        run: nuget pack "./PepperDash_Essentials_Core.nuspec" -version ${{ env.VERSION }}
+      - name: Publish nuget package to Github registry
+        run: nuget push **/*.nupkg -source github
+      - name: Publish nuget package to nuget.org
+        run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json
   Internal_Push_Output:
     needs: Build_Project
     runs-on: windows-latest

.gitignore

@@ -23,5 +23,7 @@ SIMPLSharpLogs/
 *.projectinfo
 essentials-framework/EssentialDMTestConfig/
 output/
+packages/
+
 
 PepperDashEssentials-0.0.0-buildType-test.zip

PepperDashEssentials/ControlSystem.cs

@@ -53,7 +53,7 @@ namespace PepperDash.Essentials
 
             if (Debug.DoNotLoadOnNextBoot)
             {
-                CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Loads configuration file",
+                CrestronConsole.AddNewConsoleCommand(s => GoWithLoadDeferred(), "go", "Loads configuration file",
                     ConsoleAccessLevelEnum.AccessOperator);
             }
 
@@ -93,13 +93,18 @@ namespace PepperDash.Essentials
 
             if (!Debug.DoNotLoadOnNextBoot)
             {
-                GoWithLoad();
+                GoWithLoad(null);
                 return;
             }
 
             SystemMonitor.ProgramInitialization.ProgramInitializationComplete = true;
         }
 
+        private void GoWithLoadDeferred()
+        {
+            CrestronInvoke.BeginInvoke(GoWithLoad);
+        }
+
         /// <summary>
         /// Determines if the program is running on a processor (appliance) or server (VC-4).
         /// 
@@ -172,7 +177,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Begins the process of loading resources including plugins and configuration data
         /// </summary>
-        public void GoWithLoad()
+        public void GoWithLoad(object notUsed)
         {
             try
             {

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.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.39.33033, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\essentials-framework\pepperdashcore-builds\PepperDash_Core.dll</HintPath>
+      <HintPath>..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
     </Reference>
     <Reference Include="PepperDash_Essentials_DM, Version=1.0.0.19343, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -404,14 +404,9 @@ namespace PepperDash.Essentials
         /// <param name="souceListKey"></param>
         /// <param name="successCallback"></param>
         public void RunRouteAction(string routeKey, string sourceListKey)
-        {
-            if (string.IsNullOrEmpty(sourceListKey))
         {
             RunRouteAction(routeKey, new Action(() => { }));
         }
-            else
-                throw new NotImplementedException();
-        }
 
         /// <summary>
         /// 
@@ -420,13 +415,9 @@ namespace PepperDash.Essentials
         /// <param name="souceListKey"></param>
         /// <param name="successCallback"></param>
         public void RunRouteAction(string routeKey, string sourceListKey, Action successCallback)
-        {
-            if (string.IsNullOrEmpty(sourceListKey))
         {
                 RunRouteAction(routeKey, successCallback);
-            }
-            else
-                throw new NotImplementedException();
+
         }
 
 		/// <summary>

README.md

@@ -1,26 +1,37 @@
-
 # PepperDash Essentials Framework (c) 2020
 
 ## [Latest Release](https://github.com/PepperDash/Essentials/releases/latest)
 
 ## License
+
 Provided under MIT license
 
 ## Overview
+
 PepperDash Essentials is an open source Crestron framework that can be configured as a standalone program capable of running a wide variety of system designs and can also be utilized as a plug-in architecture to augment other Simpl# Pro and Simpl Windows programs.
 
 Essentials Framework is a collection of C# / Simpl# Pro libraries that can be utilized in several different manners. It is currently operating as a 100% configuration-driven system, and can be extended to add different workflows and behaviors, either through the addition of further device "types" or via the plug-in mechanism. The framework is a collection of "things" that are all related and interconnected, but in general do not have dependencies on each other.
 
 ## Minimum Requirements
+
 - Essentials Framework runs on any Crestron 3-series processor, **4-series** processor or Crestron's VC-4 platform.
 - To edit and compile the source, Microsoft Visual Studio 2008 Professional with SP1 is required.
 - Crestron's Simpl# Plugin is also required (must be obtained from Crestron).
 
 ## Dependencies
 
-The [PepperDash.Core](https://github.com/PepperDash/PepperDashCore) SIMPL# library is required.  It is referenced as a submodule and will be automatically checked out when cloning this repo if set to recurse submodules.  This allows different builds of the PepperDash.Core library to be referenced by checking out the desired submodule commit.
+The [PepperDash.Core](https://github.com/PepperDash/PepperDashCore) SIMPL# library is required. It is referenced via nuget. You must have nuget.exe installed and in the `PATH` environment variable to use the following command. Nuget.exe is available at [nuget.org](https://dist.nuget.org/win-x86-commandline/latest/nuget.exe).
+
+### Installing Dependencies
+
+To install dependencies once nuget.exe is installed, run the following command: `nuget install .\packages.config -OutputDirectory .\packages -excludeVersion`. To verify that the packages installed correctly, open Essentials and make sure that all references are found, then try and build it.
+
+### Installing Different versions of PepperDash Core
+
+If you need a different version of PepperDash Core, use the command `nuget install .\packages.config -OutputDirectory .\packages -excludeVersion -Version {versionToGet}`. Omitting the `-Version` option will pull the latest release version of PepperDash Core.
 
 ## Utilization
+
 Essentials was originally conceptualized as a standalone application for running control system logic entirely in Simpl# Pro. It is primarily designed around accomplishing this goal, but during development, it became obvious that it could easily be leveraged to also serve as a partner application to one or more SIMPL Windows programs.
 
 Utilization of Essentials Framework falls into the following categories:
@@ -34,13 +45,13 @@ Utilization of Essentials Framework falls into the following categories:
 - Advanced logic. Some logic operations that cannot be affectively accomplished in SIMPL Windows (ex. JSON/XML serialization/deserialization, database operations, etc.) can be done in the Simpl# Pro environment and the necessary input and output bridged to a SIMPL Windows program via EISC.
 
 3. Hybrid Application that may contain elements of both standalone control and SIMPL partner application integration.
+
 - There may be a use case where a device can only be defined in a single application, but that device may need to be interacted with from multiple applications. The device can be defined in an Essentials application, interacted with in that application and also bridged to one or more SIMPL Windows applications.
 
 ## Documentation
+
 For detailed documentation, see the [Wiki](https://github.com/PepperDash/EssentialsFramework/wiki).
 
 ## How-To (Getting Started)
 
 See [Getting Started](https://github.com/PepperDash/Essentials/wiki/Get-started#how-to-get-started)
-
-

essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj

@@ -83,9 +83,9 @@
       <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.39.33033, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\pepperdashcore-builds\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>

essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.nuspec

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package >
+  <metadata>
+    <id>PepperDashEssentials</id>
+    <version>1.5.6</version>
+    <title>PepperDash Essentials</title>
+    <authors>PepperDash Technologies</authors>
+    <owners>pepperdash</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <projectUrl>https://github.com/PepperDash/PepperDashCore</projectUrl>
+    <copyright>Copyright 2020</copyright>
+    <description>PepperDash Essentials is an open source Crestron framework that can be configured as a standalone program capable of running a wide variety of system designs and can also be utilized as a plug-in architecture to augment other Simpl# Pro and Simpl Windows programs. Essentials Framework is a collection of C# / Simpl# Pro libraries that can be utilized in several different manners. It is currently operating as a 100% configuration-driven system, and can be extended to add different workflows and behaviors, either through the addition of further device "types" or via the plug-in mechanism. The framework is a collection of "things" that are all related and interconnected, but in general do not have dependencies on each other.</description>
+    <tags>crestron 3series 4series</tags>
+    <repository type="git" url="https://github.com/PepperDash/Essentials"/>
+    <dependencies>
+      <dependency id="PepperDashCore" version="[1.0, 1.1)"/>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="**" target="lib\net35"/>
+    <file src="**" target="lib\net47"/>
+  </files>
+</package>

essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj

@@ -59,9 +59,9 @@
       <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.39.33033, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\pepperdashcore-builds\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>

essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj

@@ -63,9 +63,9 @@
       <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Lighting.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.39.33033, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\pepperdashcore-builds\PepperDash_Core.dll</HintPath>
+      <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
     </Reference>
     <Reference Include="PepperDash_Essentials_Core, Version=0.0.0.22043, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs

@@ -1702,6 +1702,861 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 }
             }
             public override string SipPhoneNumber
+            {
+                get
+                {
+                    if (CodecStatus.Status.SIP != null && CodecStatus.Status.SIP.Registration.Count > 0)
+                    {
+                        var match = Regex.Match(CodecStatus.Status.SIP.Registration[0].URI.Value, @"(\d+)"); // extract numbers only
+                        if (match.Success)
+                        {
+                            Debug.Console(1, "Extracted phone number as '{0}' from string '{1}'", match.Groups[1].Value, CodecStatus.Status.SIP.Registration[0].URI.Value);
+                            return match.Groups[1].Value;
+                        }
+                        else
+                        {
+                            Debug.Console(1, "Unable to extract phone number from string: '{0}'", CodecStatus.Status.SIP.Registration[0].URI.Value);
+                            return string.Empty;
+                        }
+                    }
+                    else
+                    {
+                        Debug.Console(1, "Unable to extract phone number. No SIP Registration items found");
+                        return string.Empty;
+                    }
+                }
+                    else if (response.IndexOf("\"PhonebookSearchResult\":{") > -1 || response.IndexOf("\"PhonebookSearchResult\": {") > -1)
+                    {
+                        var codecPhonebookResponse = new CiscoCodecPhonebook.RootObject();
+
+                        JsonConvert.PopulateObject(response, codecPhonebookResponse);
+
+                        if (!PhonebookSyncState.InitialPhonebookFoldersWasReceived)
+                        {
+                            // Check if the phonebook has any folders
+                            PhonebookSyncState.InitialPhonebookFoldersReceived();
+
+                            PhonebookSyncState.SetPhonebookHasFolders(codecPhonebookResponse.CommandResponse.PhonebookSearchResult.Folder.Count > 0);
+
+                            if (PhonebookSyncState.PhonebookHasFolders)
+                            {
+                                DirectoryRoot.AddFoldersToDirectory(CiscoCodecPhonebook.GetRootFoldersFromSearchResult(codecPhonebookResponse.CommandResponse.PhonebookSearchResult));
+                            }
+
+                            // Get the number of contacts in the phonebook
+                            GetPhonebookContacts();
+                        }
+                        else if (!PhonebookSyncState.NumberOfContactsWasReceived)
+                        {
+                            // Store the total number of contacts in the phonebook
+                            PhonebookSyncState.SetNumberOfContacts(Int32.Parse(codecPhonebookResponse.CommandResponse.PhonebookSearchResult.ResultInfo.TotalRows.Value));
+
+                            DirectoryRoot.AddContactsToDirectory(CiscoCodecPhonebook.GetRootContactsFromSearchResult(codecPhonebookResponse.CommandResponse.PhonebookSearchResult));
+
+                            PhonebookSyncState.PhonebookRootEntriesReceived();
+
+                            PrintDirectory(DirectoryRoot);
+                        }
+                        else if (PhonebookSyncState.InitialSyncComplete)
+                        {
+                            var directoryResults = new CodecDirectory();
+
+                            if(codecPhonebookResponse.CommandResponse.PhonebookSearchResult.ResultInfo.TotalRows.Value != "0")
+                                directoryResults = CiscoCodecPhonebook.ConvertCiscoPhonebookToGeneric(codecPhonebookResponse.CommandResponse.PhonebookSearchResult);
+
+                            PrintDirectory(directoryResults);
+
+                            DirectoryBrowseHistory.Add(directoryResults);
+
+                            OnDirectoryResultReturned(directoryResults);
+   
+                        }
+                    }
+                    else if (response.IndexOf("\"BookingsListResult\":{") > -1)
+                    {
+                        var codecBookings = new CiscoCodecBookings.RootObject();
+
+                        JsonConvert.PopulateObject(response, codecBookings);
+
+                        if(codecBookings.CommandResponse.BookingsListResult.ResultInfo.TotalRows.Value != "0")
+                            CodecSchedule.Meetings = CiscoCodecBookings.GetGenericMeetingsFromBookingResult(codecBookings.CommandResponse.BookingsListResult.Booking);
+
+                        BookingsRefreshTimer.Reset(900000, 900000);
+                    }
+
+                }  
+                
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(1, this, "Error Deserializing feedback from codec: {0}", ex);
+            }
+        }
+
+        /// <summary>
+        /// Call when directory results are updated
+        /// </summary>
+        /// <param name="result"></param>
+        void OnDirectoryResultReturned(CodecDirectory result)
+        {
+            CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
+
+            // This will return the latest results to all UIs.  Multiple indendent UI Directory browsing will require a different methodology
+            var handler = DirectoryResultReturned;
+            if (handler != null)
+            {
+                handler(this, new DirectoryEventArgs()
+                {
+                    Directory = result,
+                    DirectoryIsOnRoot = !CurrentDirectoryResultIsNotDirectoryRoot.BoolValue
+                });
+            }
+
+            PrintDirectory(result);
+        }
+
+        /// <summary>
+        /// Evaluates an event received from the codec
+        /// </summary>
+        /// <param name="eventReceived"></param>
+        void EvalutateDisconnectEvent(CiscoCodecEvents.RootObject eventReceived)
+        {
+            if (eventReceived.Event.CallDisconnect != null)
+            {
+                var tempActiveCall = ActiveCalls.FirstOrDefault(c => c.Id.Equals(eventReceived.Event.CallDisconnect.CallId.Value));
+
+                // Remove the call from the Active calls list
+                if (tempActiveCall != null)
+                {
+                    ActiveCalls.Remove(tempActiveCall);
+
+                    ListCalls();
+
+                    SetSelfViewMode();
+                    // Notify of the call disconnection
+                    SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Disconnected, tempActiveCall);
+
+                    GetCallHistory();
+                }
+            }
+        }
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="selector"></param>
+		public override void ExecuteSwitch(object selector)
+		{
+			(selector as Action)();
+			PresentationSourceKey = selector.ToString();
+		}
+
+		/// <summary>
+		/// This is necessary for devices that are "routers" in the middle of the path, even though it only has one output and 
+		/// may only have one input.
+		/// </summary>
+        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
+        {
+			ExecuteSwitch(inputSelector);
+            PresentationSourceKey = inputSelector.ToString();
+        }
+
+
+        /// <summary>
+        /// Gets the ID of the last connected call
+        /// </summary>
+        /// <returns></returns>
+        public string GetCallId()
+        {
+            string callId = null;
+
+            if (ActiveCalls.Count > 1)
+            {
+                var lastCallIndex = ActiveCalls.Count - 1;
+                callId = ActiveCalls[lastCallIndex].Id;
+            }
+            else if (ActiveCalls.Count == 1)
+                callId =  ActiveCalls[0].Id;
+
+            return callId;
+
+        }
+
+        public void GetCallHistory()
+        {
+            SendText("xCommand CallHistory Recents Limit: 20 Order: OccurrenceTime");
+        }
+
+        /// <summary>
+        /// Required for IHasScheduleAwareness
+        /// </summary>
+        public void GetSchedule()
+        {
+            GetBookings(null);
+        }
+
+        /// <summary>
+        /// Gets the bookings for today
+        /// </summary>
+        /// <param name="command"></param>
+        public void GetBookings(object command)
+        {
+            Debug.Console(1, this, "Retrieving Booking Info from Codec. Current Time: {0}", DateTime.Now.ToLocalTime());
+
+            SendText("xCommand Bookings List Days: 1 DayOffset: 0");
+        }
+
+        /// <summary>
+        /// Checks to see if it is 2am (or within that hour) and triggers a download of the phonebook
+        /// </summary>
+        /// <param name="o"></param>
+        public void CheckCurrentHour(object o)
+        {
+            if (DateTime.Now.Hour == 2)
+            {
+                Debug.Console(1, this, "Checking hour to see if phonebook should be downloaded.  Current hour is {0}", DateTime.Now.Hour);
+
+                GetPhonebook(null);
+                PhonebookRefreshTimer.Reset(3600000, 3600000);
+            }
+        }
+
+        /// <summary>
+        /// Triggers a refresh of the codec phonebook
+        /// </summary>
+        /// <param name="command">Just to allow this method to be called from a console command</param>
+        public void GetPhonebook(string command)
+        {
+            PhonebookSyncState.CodecDisconnected();
+
+            DirectoryRoot = new CodecDirectory();
+
+            GetPhonebookFolders();
+        }
+
+        private void GetPhonebookFolders()
+        {
+            // Get Phonebook Folders (determine local/corporate from config, and set results limit)
+            SendText(string.Format("xCommand Phonebook Search PhonebookType: {0} ContactType: Folder", PhonebookMode));
+        }
+
+        private void GetPhonebookContacts()
+        {
+            // Get Phonebook Folders (determine local/corporate from config, and set results limit)
+            SendText(string.Format("xCommand Phonebook Search PhonebookType: {0} ContactType: Contact Limit: {1}", PhonebookMode, PhonebookResultsLimit));
+        }
+
+        /// <summary>
+        /// Searches the codec phonebook for all contacts matching the search string
+        /// </summary>
+        /// <param name="searchString"></param>
+        public void SearchDirectory(string searchString)
+        {
+            SendText(string.Format("xCommand Phonebook Search SearchString: \"{0}\" PhonebookType: {1} ContactType: Contact Limit: {2}", searchString, PhonebookMode, PhonebookResultsLimit));
+        }
+
+        /// <summary>
+        /// // Get contents of a specific folder in the phonebook
+        /// </summary>
+        /// <param name="folderId"></param>
+        public void GetDirectoryFolderContents(string folderId)
+        {
+            SendText(string.Format("xCommand Phonebook Search FolderId: {0} PhonebookType: {1} ContactType: Any Limit: {2}", folderId, PhonebookMode, PhonebookResultsLimit));
+        }
+
+        /// <summary>
+        /// Sets the parent folder contents or the directory root as teh current directory and fires the event. Used to browse up a level
+        /// </summary>
+        /// <returns></returns>
+        public void GetDirectoryParentFolderContents()
+        {
+            var currentDirectory = new CodecDirectory();
+
+            if (DirectoryBrowseHistory.Count > 0)
+            {
+                var lastItemIndex = DirectoryBrowseHistory.Count - 1;
+                var parentDirectoryContents = DirectoryBrowseHistory[lastItemIndex];
+
+                DirectoryBrowseHistory.Remove(DirectoryBrowseHistory[lastItemIndex]);
+
+                currentDirectory = parentDirectoryContents;
+
+            }
+            else
+            {
+                currentDirectory = DirectoryRoot;
+            }
+
+            OnDirectoryResultReturned(currentDirectory);
+        }
+
+        /// <summary>
+        /// Clears the session browse history and fires the event with the directory root
+        /// </summary>
+        public void SetCurrentDirectoryToRoot()
+        {
+            DirectoryBrowseHistory.Clear();
+
+            OnDirectoryResultReturned(DirectoryRoot);
+        }
+
+        /// <summary>
+        /// Prints the directory to console
+        /// </summary>
+        /// <param name="directory"></param>
+        void PrintDirectory(CodecDirectory directory)
+        {
+            if (Debug.Level > 0)
+            {
+                Debug.Console(1, this, "Directory Results:\n");
+
+                foreach (DirectoryItem item in directory.CurrentDirectoryResults)
+                {
+                    if (item is DirectoryFolder)
+                    {
+                        Debug.Console(1, this, "[+] {0}", item.Name);
+                    }
+                    else if (item is DirectoryContact)
+                    {
+                        Debug.Console(1, this, "{0}", item.Name);
+                    }
+                }
+                Debug.Console(1, this, "Directory is on Root Level: {0}", !CurrentDirectoryResultIsNotDirectoryRoot.BoolValue);
+            }
+
+        }
+
+        /// <summary>
+        /// Simple dial method
+        /// </summary>
+        /// <param name="number"></param>
+        public override void Dial(string number)
+        {
+         	SendText(string.Format("xCommand Dial Number: \"{0}\"", number));
+        }
+
+        /// <summary>
+        /// Dials a specific meeting
+        /// </summary>
+        /// <param name="meeting"></param>
+        public override void Dial(Meeting meeting)
+        {
+            foreach (Call c in meeting.Calls)
+            {
+                Dial(c.Number, c.Protocol, c.CallRate, c.CallType, meeting.Id);
+            }
+        }
+
+        /// <summary>
+        /// Detailed dial method
+        /// </summary>
+        /// <param name="number"></param>
+        /// <param name="protocol"></param>
+        /// <param name="callRate"></param>
+        /// <param name="callType"></param>
+        /// <param name="meetingId"></param>
+        public void Dial(string number, string protocol, string callRate, string callType, string meetingId)
+        {
+            SendText(string.Format("xCommand Dial Number: \"{0}\" Protocol: {1} CallRate: {2} CallType: {3} BookingId: {4}", number, protocol, callRate, callType, meetingId));
+        }
+ 
+        public override void EndCall(CodecActiveCallItem activeCall)
+        {
+            SendText(string.Format("xCommand Call Disconnect CallId: {0}", activeCall.Id));
+        }
+
+        public override void EndAllCalls()
+        {
+            foreach (CodecActiveCallItem activeCall in ActiveCalls)
+            {
+                SendText(string.Format("xCommand Call Disconnect CallId: {0}", activeCall.Id));
+            }
+        }
+
+        public override void AcceptCall(CodecActiveCallItem item)
+        {
+            SendText("xCommand Call Accept");
+        }
+
+        public override void RejectCall(CodecActiveCallItem item)
+        {
+            SendText("xCommand Call Reject");
+        }
+
+        public override void SendDtmf(string s)
+        {
+            if (CallFavorites != null)
+            {
+                SendText(string.Format("xCommand Call DTMFSend CallId: {0} DTMFString: \"{1}\"", GetCallId(), s));
+            }
+        }
+
+        public void SelectPresentationSource(int source)
+        {
+            PresentationSource = source;
+
+            StartSharing();
+        }
+
+        /// <summary>
+        /// Select source 1 as the presetnation source
+        /// </summary>
+        public void SelectPresentationSource1()
+        {
+            SelectPresentationSource(2);
+        }
+
+        /// <summary>
+        /// Select source 2 as the presetnation source
+        /// </summary>
+        public void SelectPresentationSource2()
+        {
+            SelectPresentationSource(3);
+        }
+
+        /// <summary>
+        /// Starts presentation sharing
+        /// </summary>
+        public override void StartSharing()
+        {
+            string sendingMode = string.Empty;
+
+            if (IsInCall)
+                sendingMode = "LocalRemote";
+            else
+                sendingMode = "LocalOnly";
+
+            if(PresentationSource > 0)
+                SendText(string.Format("xCommand Presentation Start PresentationSource: {0} SendingMode: {1}", PresentationSource, sendingMode));
+        }
+
+        /// <summary>
+        /// Stops sharing the current presentation
+        /// </summary>
+        public override void StopSharing()
+        {
+            PresentationSource = 0;
+
+            SendText("xCommand Presentation Stop");
+        }
+
+        public override void PrivacyModeOn()
+        {
+            SendText("xCommand Audio Microphones Mute");
+        }
+
+        public override void PrivacyModeOff()
+        {
+            SendText("xCommand Audio Microphones Unmute");
+        }
+
+        public override void PrivacyModeToggle()
+        {
+            SendText("xCommand Audio Microphones ToggleMute");
+        }
+
+        public override void MuteOff()
+        {
+            SendText("xCommand Audio Volume Unmute");
+        }
+
+        public override void MuteOn()
+        {
+            SendText("xCommand Audio Volume Mute");
+        }
+
+        public override void MuteToggle()
+        {
+            SendText("xCommand Audio Volume ToggleMute");
+        }
+
+        /// <summary>
+        /// Increments the voluem
+        /// </summary>
+        /// <param name="pressRelease"></param>
+        public override void VolumeUp(bool pressRelease)
+        {
+            SendText("xCommand Audio Volume Increase");
+        }
+
+        /// <summary>
+        /// Decrements the volume
+        /// </summary>
+        /// <param name="pressRelease"></param>
+        public override void VolumeDown(bool pressRelease)
+        {
+            SendText("xCommand Audio Volume Decrease");
+        }
+
+        /// <summary>
+        /// Scales the level and sets the codec to the specified level within its range
+        /// </summary>
+        /// <param name="level">level from slider (0-65535 range)</param>
+        public override void SetVolume(ushort level)
+        {
+            var scaledLevel = CrestronEnvironment.ScaleWithLimits(level, 65535, 0, 100, 0); 
+            SendText(string.Format("xCommand Audio Volume Set Level: {0}", scaledLevel));
+        }
+
+        /// <summary>
+        /// Recalls the default volume on the codec
+        /// </summary>
+        public void VolumeSetToDefault()
+        {
+            SendText("xCommand Audio Volume SetToDefault");
+        }
+
+        /// <summary>
+        /// Puts the codec in standby mode
+        /// </summary>
+        public override void StandbyActivate()
+        {
+            SendText("xCommand Standby Activate");
+        }
+
+        /// <summary>
+        /// Wakes the codec from standby
+        /// </summary>
+        public override void StandbyDeactivate()
+        {
+            SendText("xCommand Standby Deactivate");
+        }
+
+        /// <summary>
+        /// Reboots the codec
+        /// </summary>
+        public void Reboot()
+        {
+            SendText("xCommand SystemUnit Boot Action: Restart");
+        }
+
+        /// <summary>
+        /// Sets SelfView Mode based on config
+        /// </summary>
+        void SetSelfViewMode()
+        {
+            if (!IsInCall)
+            {
+                SelfViewModeOff();
+            }
+            else
+            {
+                if (ShowSelfViewByDefault)
+                    SelfViewModeOn();
+                else
+                    SelfViewModeOff();
+            }
+        }
+
+        /// <summary>
+        /// Turns on Selfview Mode
+        /// </summary>
+        public void SelfViewModeOn()
+        {
+            SendText("xCommand Video Selfview Set Mode: On");
+        }
+
+        /// <summary>
+        /// Turns off Selfview Mode
+        /// </summary>
+        public void SelfViewModeOff()
+        {
+            SendText("xCommand Video Selfview Set Mode: Off");
+        }
+
+        /// <summary>
+        /// Toggles Selfview mode on/off
+        /// </summary>
+        public void SelfViewModeToggle()
+        {
+            string mode = string.Empty;
+
+            if (CodecStatus.Status.Video.Selfview.Mode.BoolValue)
+                mode = "Off";
+            else
+                mode = "On";
+
+            SendText(string.Format("xCommand Video Selfview Set Mode: {0}", mode));                    
+        }
+
+        /// <summary>
+        /// Sets a specified position for the selfview PIP window
+        /// </summary>
+        /// <param name="position"></param>
+        public void SelfviewPipPositionSet(CodecCommandWithLabel position)
+        {
+            SendText(string.Format("xCommand Video Selfview Set Mode: On PIPPosition: {0}", position.Command));
+        }
+
+        /// <summary>
+        /// Toggles to the next selfview PIP position
+        /// </summary>
+        public void SelfviewPipPositionToggle()
+        {
+            if (CurrentSelfviewPipPosition != null)
+            {
+                var nextPipPositionIndex = SelfviewPipPositions.IndexOf(CurrentSelfviewPipPosition) + 1;
+
+                if (nextPipPositionIndex >= SelfviewPipPositions.Count) // Check if we need to loop back to the first item in the list
+                    nextPipPositionIndex = 0;                  
+
+                SelfviewPipPositionSet(SelfviewPipPositions[nextPipPositionIndex]);
+            }
+        }
+
+        /// <summary>
+        /// Sets a specific local layout
+        /// </summary>
+        /// <param name="layout"></param>
+        public void LocalLayoutSet(CodecCommandWithLabel layout)
+        {
+            SendText(string.Format("xCommand Video Layout LayoutFamily Set Target: local LayoutFamily: {0}", layout.Command));
+        }
+
+        /// <summary>
+        /// Toggles to the next local layout
+        /// </summary>
+        public void LocalLayoutToggle()
+        {
+            if(CurrentLocalLayout != null)
+            {
+                var nextLocalLayoutIndex = LocalLayouts.IndexOf(CurrentLocalLayout) + 1;
+
+                if (nextLocalLayoutIndex >= LocalLayouts.Count)  // Check if we need to loop back to the first item in the list
+                    nextLocalLayoutIndex = 0;
+                
+                LocalLayoutSet(LocalLayouts[nextLocalLayoutIndex]);
+            }
+        }
+
+        /// <summary>
+        /// Toggles between single/prominent layouts
+        /// </summary>
+        public void LocalLayoutToggleSingleProminent()
+        {
+            if (CurrentLocalLayout != null)
+            {
+                if (CurrentLocalLayout.Label != "Prominent")
+                    LocalLayoutSet(LocalLayouts.FirstOrDefault(l => l.Label.Equals("Prominent")));
+                else
+                    LocalLayoutSet(LocalLayouts.FirstOrDefault(l => l.Label.Equals("Single")));
+            }
+
+        }
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public void MinMaxLayoutToggle()
+		{
+			if (PresentationViewMaximizedFeedback.BoolValue)
+				CurrentPresentationView = "Minimized";
+			else
+				CurrentPresentationView = "Maximized";
+
+			SendText(string.Format("xCommand Video PresentationView Set View:  {0}", CurrentPresentationView));
+			PresentationViewMaximizedFeedback.FireUpdate();
+		}
+
+        /// <summary>
+        /// Calculates the current selfview PIP position
+        /// </summary>
+        void ComputeSelfviewPipStatus()
+        {
+            CurrentSelfviewPipPosition = SelfviewPipPositions.FirstOrDefault(p => p.Command.ToLower().Equals(CodecStatus.Status.Video.Selfview.PIPPosition.Value.ToLower()));
+
+            if(CurrentSelfviewPipPosition != null)
+                SelfviewIsOnFeedback.FireUpdate();
+        }
+
+        /// <summary>
+        /// Calculates the current local Layout
+        /// </summary>
+        void ComputeLocalLayout()
+        {
+            CurrentLocalLayout = LocalLayouts.FirstOrDefault(l => l.Command.ToLower().Equals(CodecStatus.Status.Video.Layout.LayoutFamily.Local.Value.ToLower()));
+
+            if (CurrentLocalLayout != null)
+                LocalLayoutFeedback.FireUpdate();
+        }
+
+        public void RemoveCallHistoryEntry(CodecCallHistory.CallHistoryEntry entry)
+        {
+            SendText(string.Format("xCommand CallHistory DeleteEntry CallHistoryId: {0} AcknowledgeConsecutiveDuplicates: True", entry.OccurrenceHistoryId));
+        }
+
+        #region IHasCameraSpeakerTrack
+
+        public void CameraAutoModeToggle()
+        {
+            if (!CameraAutoModeIsOnFeedback.BoolValue)
+            {
+                SendText("xCommand Cameras SpeakerTrack Activate");
+            }
+            else
+            {
+                SendText("xCommand Cameras SpeakerTrack Deactivate");
+            }
+        }
+
+        public void CameraAutoModeOn()
+        {
+            SendText("xCommand Cameras SpeakerTrack Activate");
+        }
+
+        public void CameraAutoModeOff()
+        {
+            SendText("xCommand Cameras SpeakerTrack Deactivate");
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Builds the cameras List.  Could later be modified to build from config data
+        /// </summary>
+        void SetUpCameras()
+        {
+            // Add the internal camera
+            Cameras = new List<CameraBase>();
+
+            var internalCamera = new CiscoSparkCamera(Key + "-camera1", "Near End", this, 1);
+
+            if(CodecStatus.Status.Cameras.Camera.Count > 0)
+                internalCamera.SetCapabilites(CodecStatus.Status.Cameras.Camera[0].Capabilities.Options.Value);
+            else
+                // Somehow subscribe to the event on the Options.Value property and update when it changes.
+
+            Cameras.Add(internalCamera);
+
+            // Add the far end camera
+            var farEndCamera = new CiscoFarEndCamera(Key + "-cameraFar", "Far End", this);
+            Cameras.Add(farEndCamera);
+
+            SelectedCameraFeedback = new StringFeedback(() => SelectedCamera.Key);
+
+            ControllingFarEndCameraFeedback = new BoolFeedback(() => SelectedCamera is IAmFarEndCamera);
+
+            DeviceManager.AddDevice(internalCamera);
+            DeviceManager.AddDevice(farEndCamera);
+
+            NearEndPresets = new List<CodecRoomPreset>(15);
+
+            FarEndRoomPresets = new List<CodecRoomPreset>(15);
+
+            // Add the far end presets
+            for (int i = 1; i <= FarEndRoomPresets.Capacity; i++)
+            {
+                var label = string.Format("Far End Preset {0}", i);
+                FarEndRoomPresets.Add(new CodecRoomPreset(i, label, true, false));
+            }
+
+            SelectedCamera = internalCamera; ; // call the method to select the camera and ensure the feedbacks get updated.
+        }
+
+        #region IHasCodecCameras Members
+
+        public event EventHandler<CameraSelectedEventArgs> CameraSelected;
+
+        public List<CameraBase> Cameras { get; private set; }
+
+        public StringFeedback SelectedCameraFeedback { get; private set; }
+
+        private CameraBase _selectedCamera;
+
+        /// <summary>
+        /// Returns the selected camera
+        /// </summary>
+        public CameraBase SelectedCamera
+        {
+            get
+            {
+                return _selectedCamera;
+            }
+            private set
+            {
+                _selectedCamera = value;
+                SelectedCameraFeedback.FireUpdate();
+                ControllingFarEndCameraFeedback.FireUpdate();
+
+                var handler = CameraSelected;
+                if (handler != null)
+                {
+                    handler(this, new CameraSelectedEventArgs(SelectedCamera));
+                }
+            }
+        }
+
+        public void SelectCamera(string key)
+        {
+            var camera = Cameras.FirstOrDefault(c => c.Key.IndexOf(key, StringComparison.OrdinalIgnoreCase) > -1);
+            if (camera != null)
+            {
+                Debug.Console(2, this, "Selected Camera with key: '{0}'", camera.Key);
+                SelectedCamera = camera;
+            }
+            else
+                Debug.Console(2, this, "Unable to select camera with key: '{0}'", key);
+        }
+
+        public CameraBase FarEndCamera { get; private set; }
+
+        public BoolFeedback ControllingFarEndCameraFeedback { get; private set; }
+
+        #endregion
+
+        /// <summary>
+		/// 
+		/// </summary>
+        public class CiscoCodecInfo : VideoCodecInfo
+        {
+            public CiscoCodecStatus.RootObject CodecStatus { get; private set; }
+
+            public CiscoCodecConfiguration.RootObject CodecConfiguration { get; private set; }
+
+            public override bool MultiSiteOptionIsEnabled
+            {
+                get
+                {
+                    if (!string.IsNullOrEmpty(CodecStatus.Status.SystemUnit.Software.OptionKeys.MultiSite.Value) && CodecStatus.Status.SystemUnit.Software.OptionKeys.MultiSite.Value.ToLower() == "true")
+                        return true;
+                    else
+                        return false;
+                }
+
+            }
+            public override string IpAddress
+            {
+                get
+                {
+                    if (CodecConfiguration.Configuration.Network != null)   
+                    {
+                        if (CodecConfiguration.Configuration.Network.Count > 0)
+                            return CodecConfiguration.Configuration.Network[0].IPv4.Address.Value;
+                    }
+                    return string.Empty;
+                }
+            }
+            public override string E164Alias
+            {
+                get 
+                {
+                    if (CodecConfiguration.Configuration.H323 != null && CodecConfiguration.Configuration.H323.H323Alias.E164 != null)
+                        return CodecConfiguration.Configuration.H323.H323Alias.E164.Value;
+                    else
+                        return string.Empty;
+                }
+            }
+            public override string H323Id
+            {
+                get
+                {
+                    if (CodecConfiguration.Configuration.H323 != null && CodecConfiguration.Configuration.H323.H323Alias.ID != null)
+                        return CodecConfiguration.Configuration.H323.H323Alias.ID.Value;
+                    else
+                        return string.Empty;
+                }
+            }
+            public override string SipPhoneNumber
             {
                 get
                 {

essentials-framework/Essentials/PepperDashEssentials/packages.config

@@ -0,0 +1,3 @@
+<packages>
+  <package id="PepperDashCore" version="1.0.38-alpha-135" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
+</packages>

packages.config

@@ -0,0 +1,3 @@
+<packages>
+  <package id="PepperDashCore" version="1.0.39" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
+</packages>