pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-04-12 12:06:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Remove Newtonsoft & Update build tasks
This commit is contained in:
Nick Genovese 2024-02-02 13:10:05 -05:00 • committed by GitHub
commit 5941763acb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
72 changed files with 181 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/docker.yml vendored
View file

@ -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 }}

2
.github/workflows/main.yml vendored
View file

@ -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: |

29
src/Directory.Build.targets
View file

@ -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'">
<Message Text="Creating CPLZ"></Message>
<MakeDir Directories="$(PackageOutputPath)" Condition="!Exists($(PackageOutputPath))"></MakeDir>
<ZipDirectory SourceDirectory="$(TargetDir)" DestinationFile="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cplz" Overwrite="true"/>
</Target>
<Target Name="Clean CPLZ" AfterTargets="AfterClean" Condition="$(ProjectType) == 'ProgramLibrary'">
<Delete Files="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cplz"/>
<Target Name="Create CPLZ" AfterTargets="Build; AfterRebuild" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != ''">
<Message Text="Creating CPLZ $(TargetDir)"></Message>
<MakeDir Directories="$(PackageOutputPath)" Condition="!Exists($(PackageOutputPath))" />
<MakeDir Directories="$(PackageOutputPath)\$(AssemblyName)" Condition="!Exists('$(PackageOutputPath)\$(AssemblyName)')" />
<ZipDirectory SourceDirectory="$(TargetDir)" DestinationFile="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cplz" Overwrite="true"/>
</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" />
<Copy SourceFiles="$(TargetDir)$(TargetName).$(Version).${TargetFramework}.cpz" DestinationFiles="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cpz"/>
<Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(PackageOutputPath)\$(AssemblyName)\$(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" />
<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"/>
<Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cpz" />
</Target>
</Project>

4
src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs
View file

@ -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;

6
src/PepperDash.Essentials.Core/Comm and IR/ComSpecJsonConverter.cs
View file

@ -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 Full.Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using PepperDash.Core;

6
src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs
View file

@ -1,11 +1,11 @@
extern alias Full;

using System;
using Crestron.SimplSharp;
using Crestron.SimplSharpPro;
using Crestron.SimplSharpPro.DM;
using Full.Newtonsoft.Json;
using Full.Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using PepperDash.Core;
using PepperDash.Essentials.Core.Config;

6
src/PepperDash.Essentials.Core/Comm and IR/CommunicationExtras.cs
View file

@ -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 Full.Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using PepperDash.Core;

4
src/PepperDash.Essentials.Core/Comm and IR/GenericComm.cs
View file

@ -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;

6
src/PepperDash.Essentials.Core/Comm and IR/IRPortHelper.cs
View file

@ -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 Full.Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using PepperDash.Core;
using PepperDash.Essentials.Core.Config;

6
src/PepperDash.Essentials.Core/Config/BasicConfig.cs
View file

@ -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
{

4
src/PepperDash.Essentials.Core/Config/ConfigPropertiesHelpers.cs
View file

@ -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
{

6
src/PepperDash.Essentials.Core/Config/DeviceConfig.cs
View file

@ -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 Full.Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using PepperDash.Core;
using PepperDash.Essentials.Core;

6
src/PepperDash.Essentials.Core/Config/Essentials/ConfigReader.cs
View file

@ -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 Full.Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using PepperDash.Core;
using PepperDash.Core.Config;

6
src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs
View file

@ -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 Full.Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Crestron.SimplSharp.Net.Http;
using Crestron.SimplSharpPro.Diagnostics;

6
src/PepperDash.Essentials.Core/Config/Essentials/ConfigWriter.cs
View file

@ -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 Full.Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using PepperDash.Core;
namespace PepperDash.Essentials.Core.Config

4
src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs
View file

@ -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;

4
src/PepperDash.Essentials.Core/Config/InfoConfig.cs
View file

@ -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
{

4
src/PepperDash.Essentials.Core/CrestronIO/GenericDigitalInputDevice.cs
View file

@ -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;

4
src/PepperDash.Essentials.Core/CrestronIO/GenericRelayDevice.cs
View file

@ -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;

4
src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportAnalogInputDevice.cs
View file

@ -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
{

4
src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs
View file

@ -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
{

4
src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportOutputDevice.cs
View file

@ -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
{

4
src/PepperDash.Essentials.Core/CrestronIO/IOPortConfig.cs
View file

@ -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
{

4
src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl.cs
View file

@ -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; }
}
}

4
src/PepperDash.Essentials.Core/Devices/DestinationListItem.cs
View file

@ -1,6 +1,6 @@
extern alias Full;

using Full.Newtonsoft.Json;
using Newtonsoft.Json;
using PepperDash.Essentials.Core;
namespace PepperDash.Essentials.Core

4
src/PepperDash.Essentials.Core/Devices/DeviceJsonApi.cs
View file

@ -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;

4
src/PepperDash.Essentials.Core/Devices/GenericIRController.cs
View file

@ -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;

4
src/PepperDash.Essentials.Core/Devices/IrOutputPortController.cs
View file

@ -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;

6
src/PepperDash.Essentials.Core/Devices/ReconfigurableDevice.cs
View file

@ -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 Full.Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace PepperDash.Essentials.Core.Devices
{

8
src/PepperDash.Essentials.Core/Devices/SourceListItem.cs
View file

@ -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 Full.Newtonsoft.Json.Converters;
using Full.Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Linq;
using PepperDash.Core;
namespace PepperDash.Essentials.Core

7
src/PepperDash.Essentials.Core/Display/DisplayBase.cs
View file

@ -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;

6
src/PepperDash.Essentials.Core/Extensions/JsonExtensions.cs
View file

@ -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 Full.Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace PepperDash.Essentials.Core
{

4
src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs
View file

@ -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;

12
src/PepperDash.Essentials.Core/Factory/ProcessorExtensionDeviceFactory.cs
View file

@ -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();

6
src/PepperDash.Essentials.Core/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
View file

@ -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))
{

6
src/PepperDash.Essentials.Core/Fusion/FusionCustomPropertiesBridge.cs
View file

@ -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 Full.Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using PepperDash.Core;
using PepperDash.Essentials.Core;

8
src/PepperDash.Essentials.Core/Global/Global.cs
View file

@ -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 Full.Newtonsoft.Json.Linq;
using Full.Newtonsoft.Json.Schema;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Schema;
namespace PepperDash.Essentials.Core

4
src/PepperDash.Essentials.Core/JoinMaps/JoinMapBase.cs
View file

@ -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
{

4
src/PepperDash.Essentials.Core/Lighting/LightingBase.cs
View file

@ -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;

6
src/PepperDash.Essentials.Core/Monitoring/SystemMonitorController.cs
View file

@ -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 Full.Newtonsoft.Json.Converters;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using PepperDash.Essentials.Core.Bridges;
namespace PepperDash.Essentials.Core.Monitoring

5
src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj
View file

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

4
src/PepperDash.Essentials.Core/Presets/DevicePresets.cs
View file

@ -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;

4
src/PepperDash.Essentials.Core/Presets/PresetBase.cs
View file

@ -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
{

4
src/PepperDash.Essentials.Core/Presets/PresetChannel.cs
View file

@ -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
{

6
src/PepperDash.Essentials.Core/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs
View file

@ -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 Full.Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using PepperDash.Core;
using PepperDash.Essentials.Core;

4
src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombinerPropertiesConfig.cs
View file

@ -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
{

4
src/PepperDash.Essentials.Core/Room/Combining/RoomCombinationScenario.cs
View file

@ -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
{

6
src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomScheduledEventsConfig.cs
View file

@ -1,9 +1,9 @@
extern alias Full;

using System.Collections.Generic;
using Crestron.SimplSharp.Scheduler;
using Full.Newtonsoft.Json;
using Full.Newtonsoft.Json.Converters;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using PepperDash.Essentials.Core;
namespace PepperDash.Essentials.Room.Config

6
src/PepperDash.Essentials.Core/Routing/TieLineConfig.cs
View file

@ -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 Full.Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using PepperDash.Core;
using PepperDash.Essentials.Core;

4
src/PepperDash.Essentials.Core/Secrets/SecretsPropertiesConfig.cs
View file

@ -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
{

4
src/PepperDash.Essentials.Core/Timers/RetriggerableTimer.cs
View file

@ -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

4
src/PepperDash.Essentials.Core/Utilities/ActionSequence.cs
View file

@ -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
{

4
src/PepperDash.Essentials.Devices.Common/AudioCodec/MockAC/MockAcPropertiesConfig.cs
View file

@ -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
{

4
src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs
View file

@ -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
{

4
src/PepperDash.Essentials.Devices.Common/Cameras/CameraVisca.cs
View file

@ -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
{

6
src/PepperDash.Essentials.Devices.Common/Codec/CodecActiveCallItem.cs
View file

@ -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 Full.Newtonsoft.Json.Converters;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace PepperDash.Essentials.Devices.Common.Codec

6
src/PepperDash.Essentials.Devices.Common/Codec/iHasCallHistory.cs
View file

@ -1,11 +1,11 @@
extern alias Full;

using System;
using System.Collections.Generic;
using PepperDash.Essentials.Devices.Common.VideoCodec;
using Full.Newtonsoft.Json;
using Full.Newtonsoft.Json.Converters;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace PepperDash.Essentials.Devices.Common.Codec
{

6
src/PepperDash.Essentials.Devices.Common/Codec/iHasDirectory.cs
View file

@ -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 Full.Newtonsoft.Json.Converters;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using PepperDash.Core;

4
src/PepperDash.Essentials.Devices.Common/Codec/iHasScheduleAwareness.cs
View file

@ -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
{

2
src/PepperDash.Essentials.Devices.Common/DeviceFactory.cs
View file

@ -1,4 +1,4 @@
extern alias Full;

using System;
using System.Linq;

6
src/PepperDash.Essentials.Devices.Common/Displays/DisplayBase.cs
View file

@ -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
{

5
src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj
View file

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

4
src/PepperDash.Essentials.Devices.Common/SetTopBox/IRSetTopBoxBase.cs
View file

@ -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;

4
src/PepperDash.Essentials.Devices.Common/Streaming/AppleTV.cs
View file

@ -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;

4
src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasCodecLayouts.cs
View file

@ -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
{

4
src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasMeetingInfo.cs
View file

@ -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
{

4
src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/iVideoCodecInfo.cs
View file

@ -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
{

6
src/PepperDash.Essentials.Devices.Common/VideoCodec/MockVC/MockVC.cs
View file

@ -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 Full.Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace PepperDash.Essentials.Devices.Common.VideoCodec
{

4
src/PepperDash.Essentials.Devices.Common/VideoCodec/MockVC/MockVcPropertiesConfig.cs
View file

@ -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;

2
src/PepperDash.Essentials/ControlSystem.cs
View file

@ -1,4 +1,4 @@
extern alias Full;

using Crestron.SimplSharp;
using Crestron.SimplSharp.CrestronIO;
using Crestron.SimplSharp.Reflection;

6
src/PepperDash.Essentials/Factory/DeviceFactory.cs
View file

@ -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 Full.Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using PepperDash.Core;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;

5
src/PepperDash.Essentials/PepperDash.Essentials.csproj
View file

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