Merge pull request #1171 from PepperDash/feature-2.0.0/newtonsoft-fixes

Remove Newtonsoft & Update build tasks

.github/workflows/docker.yml

@@ -79,7 +79,7 @@ jobs:
 #            contains(steps.setVersion.outputs.version, '-beta-')
         uses: ncipollo/release-action@v1
         with:
-          artifacts: 'output\*.*(cpz|cplz)'
+          artifacts: 'output\**\*.*(cpz|cplz)'
           generateReleaseNotes: true
           prerelease: ${{contains('debug', env.BUILD_TYPE)}}
           tag: ${{ steps.setVersion.outputs.version }}

.github/workflows/main.yml

@@ -42,7 +42,7 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           updateRelease: true
-          artifacts: 'output\*.*(cpz|cplz)'          
+          artifacts: 'output\**\*.*(cpz|cplz)'          
           tag: ${{ steps.setVersion.outputs.version }}
       - name: Setup Nuget
         run: | 

src/Directory.Build.targets

@@ -1,33 +1,26 @@
 <Project>
   <ItemGroup>
-    <None Include="$(TargetDir)\$(TargetName).$(Version).*.cpz" Condition="$(ProjectType) == 'Program'">
+    <None Include="$(PackageOutputPath)\$(AssemblyName)\*.cpz" Condition="$(ProjectType) == 'Program'">
       <Pack>true</Pack>
-      <PackagePath>content;</PackagePath>
+      <PackagePath>build;</PackagePath>
     </None>
-    <None Include="$(PackageOutputPath)\$(TargetName).$(Version).*.cplz" Condition="$(ProjectType) == 'ProgramLibrary'">
+    <None Include="$(PackageOutputPath)\$(AssemblyName)\*.cplz" Condition="$(ProjectType) == 'ProgramLibrary'">
       <Pack>true</Pack>
-      <PackagePath>content;</PackagePath>
+      <PackagePath>build;</PackagePath>
     </None>
   </ItemGroup>
-  <Target Name="Create CPLZ" AfterTargets="CopyFilesToOutputDirectory" Condition="$(ProjectType) == 'ProgramLibrary'">
+  <Target Name="Create CPLZ" AfterTargets="Build; AfterRebuild" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != ''">
-    <Message Text="Creating CPLZ"></Message>
+    <Message Text="Creating CPLZ $(TargetDir)"></Message>
-    <MakeDir Directories="$(PackageOutputPath)" Condition="!Exists($(PackageOutputPath))"></MakeDir>
+    <MakeDir Directories="$(PackageOutputPath)" Condition="!Exists($(PackageOutputPath))" />
-    <ZipDirectory SourceDirectory="$(TargetDir)" DestinationFile="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cplz" Overwrite="true"/>    
+    <MakeDir Directories="$(PackageOutputPath)\$(AssemblyName)" Condition="!Exists('$(PackageOutputPath)\$(AssemblyName)')" />
-  </Target>
+    <ZipDirectory SourceDirectory="$(TargetDir)" DestinationFile="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cplz" Overwrite="true"/>    
-  <Target Name="Clean CPLZ" AfterTargets="AfterClean" Condition="$(ProjectType) == 'ProgramLibrary'">
-    <Delete Files="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cplz"/>
   </Target>
   <Target Name="Copy CPZ NET6" AfterTargets="SimplSharpPostProcess" Condition="($(ProjectType) == 'Program' And ( '$(TargetFramework)' == 'net6.0' ) Or ( '$(TargetFramework)' == 'net8.0' ))">
     <Message Text="Copying CPZ"></Message>
-    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz" />
+    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cpz" />
-    <Copy SourceFiles="$(TargetDir)$(TargetName).$(Version).${TargetFramework}.cpz" DestinationFiles="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cpz"/>
   </Target>
   <Target Name="Copy CPZ NET47" AfterTargets="SimplSharpPostProcess47" Condition="($(ProjectType) == 'Program' And ( '$(TargetFramework)' != 'net6.0' ) And ( '$(TargetFramework)' != 'net8.0' ))">
     <Message Text="Copying CPZ"></Message>
-    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz" />
+    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cpz" />
-    <Copy SourceFiles="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz" DestinationFiles="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cpz"/>
-  </Target>
-  <Target Name="Clean CPZ" AfterTargets="AfterClean" Condition="$(ProjectType) == 'Program'">
-    <Delete Files="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cpz"/>
   </Target>
 </Project>

src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.EthernetCommunication;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;

src/PepperDash.Essentials.Core/Comm and IR/ComSpecJsonConverter.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -7,8 +7,8 @@ using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
 using PepperDash.Core;
 

src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs

@@ -1,11 +1,11 @@
-extern alias Full;
+
 
 using System;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DM;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
 

src/PepperDash.Essentials.Core/Comm and IR/CommunicationExtras.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -7,8 +7,8 @@ using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
 using PepperDash.Core;
 

src/PepperDash.Essentials.Core/Comm and IR/GenericComm.cs

@@ -1,10 +1,10 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
 using Crestron.SimplSharp.CrestronSockets;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;

src/PepperDash.Essentials.Core/Comm and IR/IRPortHelper.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,8 +6,8 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharpPro;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
 

src/PepperDash.Essentials.Core/Config/BasicConfig.cs

@@ -1,10 +1,10 @@
-extern alias Full;
+
 
 using System.Collections.Generic;
 using System.Linq;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
 namespace PepperDash.Essentials.Core.Config
 {

src/PepperDash.Essentials.Core/Config/ConfigPropertiesHelpers.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -7,7 +7,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
 namespace PepperDash.Essentials.Core.Config
 {

src/PepperDash.Essentials.Core/Config/DeviceConfig.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,8 +6,8 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharpPro;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 

src/PepperDash.Essentials.Core/Config/Essentials/ConfigReader.cs

@@ -1,12 +1,12 @@
-extern alias Full;
+
 
 using System;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Core.Config;
 

src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,8 +6,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using Crestron.SimplSharp.Net.Http;
 using Crestron.SimplSharpPro.Diagnostics;
 

src/PepperDash.Essentials.Core/Config/Essentials/ConfigWriter.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,8 +6,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core.Config

src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs

@@ -1,11 +1,11 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
 using Crestron.SimplSharp.CrestronIO;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 using PepperDash.Core;
 

src/PepperDash.Essentials.Core/Config/InfoConfig.cs

@@ -1,11 +1,11 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.Reflection;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core.Config
 {

src/PepperDash.Essentials.Core/CrestronIO/GenericDigitalInputDevice.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -7,7 +7,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;

src/PepperDash.Essentials.Core/CrestronIO/GenericRelayDevice.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -7,7 +7,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;

src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportAnalogInputDevice.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -13,7 +13,7 @@ using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
 
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {

src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -13,7 +13,7 @@ using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
 
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {

src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportOutputDevice.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -13,7 +13,7 @@ using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
 
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {

src/PepperDash.Essentials.Core/CrestronIO/IOPortConfig.cs

@@ -1,11 +1,11 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl.cs

@@ -32,6 +32,8 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 
         event EventHandler<EventArgs> ClientJoined;
 
+        event EventHandler<EventArgs> AppUrlChanged;
+
         string UserCode { get; }
 
         string QrCodeUrl { get; }
@@ -41,5 +43,7 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
         string McServerUrl { get; }
 
         string RoomName { get; }
+
+        string AppUrl { get; }
     }
 }

src/PepperDash.Essentials.Core/Devices/DestinationListItem.cs

@@ -1,6 +1,6 @@
-extern alias Full;
+
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Core

src/PepperDash.Essentials.Core/Devices/DeviceJsonApi.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections;
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.Reflection;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 using PepperDash.Core;
 

src/PepperDash.Essentials.Core/Devices/GenericIRController.cs

@@ -1,10 +1,10 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;

src/PepperDash.Essentials.Core/Devices/IrOutputPortController.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using PepperDash.Essentials.Core.Config;
 
 

src/PepperDash.Essentials.Core/Devices/ReconfigurableDevice.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -9,8 +9,8 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
 namespace PepperDash.Essentials.Core.Devices
 {

src/PepperDash.Essentials.Core/Devices/SourceListItem.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,9 +6,9 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharpPro;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Converters;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core

src/PepperDash.Essentials.Core/Display/DisplayBase.cs

@@ -1,11 +1,14 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Full.Newtonsoft.Json;
+using Crestron.SimplSharpPro.DM;
+using Crestron.SimplSharpPro.DM.Endpoints;
+using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 

src/PepperDash.Essentials.Core/Extensions/JsonExtensions.cs

@@ -1,12 +1,12 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs

@@ -1,8 +1,8 @@
-extern alias Full;
+
 
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.Reflection;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
 using System;

src/PepperDash.Essentials.Core/Factory/ProcessorExtensionDeviceFactory.cs

@@ -1,6 +1,6 @@
-extern alias Full;
+
 using Crestron.SimplSharp.Reflection;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
@@ -70,9 +70,9 @@ namespace PepperDash.Essentials.Core
             ProcessorExtensionDeviceFactory.ProcessorExtensionFactoryMethods.Add(extensionName, wrapper);
         }
 
-        private static void CheckForSecrets(IEnumerable<Full.Newtonsoft.Json.Linq.JProperty> obj)
+        private static void CheckForSecrets(IEnumerable<Newtonsoft.Json.Linq.JProperty> obj)
         {
-            foreach (var prop in obj.Where(prop => prop.Value as Full.Newtonsoft.Json.Linq.JObject != null))
+            foreach (var prop in obj.Where(prop => prop.Value as Newtonsoft.Json.Linq.JObject != null))
             {
                 if (prop.Name.ToLower() == "secret")
                 {
@@ -80,7 +80,7 @@ namespace PepperDash.Essentials.Core
                     //var secret = GetSecret(JsonConvert.DeserializeObject<SecretsPropertiesConfig>(prop.Children().First().ToString()));
                     prop.Parent.Replace(secret);
                 }
-                var recurseProp = prop.Value as Full.Newtonsoft.Json.Linq.JObject;
+                var recurseProp = prop.Value as Newtonsoft.Json.Linq.JObject;
                 if (recurseProp == null) return;
                 CheckForSecrets(recurseProp.Properties());
             }
@@ -120,7 +120,7 @@ namespace PepperDash.Essentials.Core
 
                 var typeName = localDc.Type.ToLower();
 
-                var jObject = properties as Full.Newtonsoft.Json.Linq.JObject;
+                var jObject = properties as Newtonsoft.Json.Linq.JObject;
                 if (jObject != null)
                 {
                     var jProp = jObject.Properties();

src/PepperDash.Essentials.Core/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -10,7 +10,7 @@ using Crestron.SimplSharp.CrestronXml;
 using Crestron.SimplSharp.CrestronXml.Serialization;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.Fusion;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
 
@@ -252,7 +252,7 @@ namespace PepperDash.Essentials.Core.Fusion
                     ? new FusionRoomGuids(Room.Name, _ipId, RoomGuid, FusionStaticAssets)
                     : new FusionRoomGuids(Room.Name, _ipId, RoomGuid, FusionStaticAssets, FusionOccSensor);
 
-                var json = JsonConvert.SerializeObject(_guiDs, Full.Newtonsoft.Json.Formatting.Indented);
+                var json = JsonConvert.SerializeObject(_guiDs, Newtonsoft.Json.Formatting.Indented);
 
                 using (var sw = new StreamWriter(filePath))
                 {

src/PepperDash.Essentials.Core/Fusion/FusionCustomPropertiesBridge.cs

@@ -1,12 +1,12 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;

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

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Linq;
@@ -14,9 +14,9 @@ using Crestron.SimplSharpPro.DM;
 using PepperDash.Core;
 using PepperDash.Essentials.License;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
-using Full.Newtonsoft.Json.Schema;
+using Newtonsoft.Json.Schema;
 
 
 namespace PepperDash.Essentials.Core

src/PepperDash.Essentials.Core/JoinMaps/JoinMapBase.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -12,7 +12,7 @@ using Crestron.SimplSharp;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/Lighting/LightingBase.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -7,7 +7,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 

src/PepperDash.Essentials.Core/Monitoring/SystemMonitorController.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -7,8 +7,8 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.Diagnostics;
 using PepperDash.Core;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Converters;
 using PepperDash.Essentials.Core.Bridges;
 
 namespace PepperDash.Essentials.Core.Monitoring

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

@@ -28,10 +28,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.20.42" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2">
+    <PackageReference Include="PepperDashCore" Version="2.0.0-beta-383" />
-      <Aliases>Full</Aliases>
-    </PackageReference>
-    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-377" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Crestron\CrestronGenericBaseDevice.cs.orig" />

src/PepperDash.Essentials.Core/Presets/DevicePresets.cs

@@ -1,11 +1,11 @@
-extern alias Full; 
+ 
 
 using System;
 using System.Collections.Generic;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 
 //using SSMono.IO;

src/PepperDash.Essentials.Core/Presets/PresetBase.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core.Presets
 {

src/PepperDash.Essentials.Core/Presets/PresetChannel.cs

@@ -1,11 +1,11 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core.Presets
 {

src/PepperDash.Essentials.Core/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -7,8 +7,8 @@ using System.Text;
 
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.Scheduler;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;

src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombinerPropertiesConfig.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using Crestron.SimplSharp;
 
 using PepperDash.Core;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/Room/Combining/RoomCombinationScenario.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using Crestron.SimplSharp;
 
 using PepperDash.Core;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomScheduledEventsConfig.cs

@@ -1,9 +1,9 @@
-extern alias Full;
+
 
 using System.Collections.Generic;
 using Crestron.SimplSharp.Scheduler;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Converters;
 using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Room.Config

src/PepperDash.Essentials.Core/Routing/TieLineConfig.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,8 +6,8 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharpPro;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 

src/PepperDash.Essentials.Core/Secrets/SecretsPropertiesConfig.cs

@@ -1,11 +1,11 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/Timers/RetriggerableTimer.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -10,7 +10,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 
 namespace PepperDash.Essentials.Core.Timers

src/PepperDash.Essentials.Core/Utilities/ActionSequence.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -11,7 +11,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core.Utilities
 {

src/PepperDash.Essentials.Devices.Common/AudioCodec/MockAC/MockAcPropertiesConfig.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Devices.Common.AudioCodec
 {

src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -16,7 +16,7 @@ using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Presets;
 using PepperDash.Essentials.Devices.Common.Codec;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Devices.Common.Cameras
 {

src/PepperDash.Essentials.Devices.Common/Cameras/CameraVisca.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -14,7 +14,7 @@ using PepperDash.Essentials.Devices.Common.Codec;
 using System.Text.RegularExpressions;
 using Crestron.SimplSharp.Reflection;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Devices.Common.Cameras
 {

src/PepperDash.Essentials.Devices.Common/Codec/CodecActiveCallItem.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,8 +6,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Converters;
 
 namespace PepperDash.Essentials.Devices.Common.Codec
 

src/PepperDash.Essentials.Devices.Common/Codec/iHasCallHistory.cs

@@ -1,11 +1,11 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Converters;
 
 namespace PepperDash.Essentials.Devices.Common.Codec
 {

src/PepperDash.Essentials.Devices.Common/Codec/iHasDirectory.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,8 +6,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Converters;
 
 
 using PepperDash.Core;

src/PepperDash.Essentials.Devices.Common/Codec/iHasScheduleAwareness.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using Crestron.SimplSharp;
 
 using PepperDash.Core;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Devices.Common.Codec
 {

src/PepperDash.Essentials.Devices.Common/DeviceFactory.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Linq;

src/PepperDash.Essentials.Devices.Common/Displays/DisplayBase.cs

@@ -1,5 +1,4 @@
-extern alias Full;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Crestron.SimplSharp;
@@ -8,8 +7,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using Feedback = PepperDash.Essentials.Core.Feedback;
-using JsonConvert = Full::Newtonsoft.Json.JsonConvert;
+using Newtonsoft.Json;
-
 
 namespace PepperDash.Essentials.Devices.Common.Displays
 {

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

@@ -27,9 +27,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.20.42" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2">
+    <PackageReference Include="PepperDashCore" Version="2.0.0-beta-383" />
-      <Aliases>Full</Aliases>
-    </PackageReference>
-    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-377" />
   </ItemGroup>
 </Project>

src/PepperDash.Essentials.Devices.Common/SetTopBox/IRSetTopBoxBase.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -7,7 +7,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;

src/PepperDash.Essentials.Devices.Common/Streaming/AppleTV.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;

src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasCodecLayouts.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using Crestron.SimplSharp;
 
 using PepperDash.Essentials.Core;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec
 {

src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasMeetingInfo.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
 {

src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/iVideoCodecInfo.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Devices.Common.Codec
 {

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

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -14,8 +14,8 @@ using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.Cameras;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec
 {

src/PepperDash.Essentials.Devices.Common/VideoCodec/MockVC/MockVcPropertiesConfig.cs

@@ -1,11 +1,11 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;

src/PepperDash.Essentials/ControlSystem.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharp.Reflection;

src/PepperDash.Essentials/Factory/DeviceFactory.cs

@@ -1,4 +1,4 @@
-extern alias Full;
+
 
 using System;
 using System.Collections.Generic;
@@ -8,8 +8,8 @@ using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharp.Reflection;
 
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;

src/PepperDash.Essentials/PepperDash.Essentials.csproj

@@ -46,10 +46,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.20.42" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2">
+    <PackageReference Include="PepperDashCore" Version="2.0.0-beta-383" />
-      <Aliases>Full</Aliases>
-    </PackageReference>
-    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-377" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />