fix: correct namespaces to allow plugins to load correctly

src/PepperDash.Essentials.Core/Devices/PC/InRoomPc.cs

@@ -5,7 +5,6 @@ using Crestron.SimplSharpPro;
 
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Routing;
 using PepperDash.Core;
 using Serilog.Events;
 

src/PepperDash.Essentials.Core/Devices/PC/Laptop.cs

@@ -5,7 +5,6 @@ using Crestron.SimplSharpPro;
 
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Routing;
 using PepperDash.Core;
 using Serilog.Events;
 

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

@@ -10,7 +10,6 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Core

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

@@ -5,7 +5,6 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
 using System;
 using System.Collections.Generic;

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

@@ -11,7 +11,6 @@ using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Core.Config;
 using Serilog.Events;
 

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

@@ -9,7 +9,6 @@ using Crestron.SimplSharpPro.Fusion;
 using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
 using System;
 using System.Collections.Generic;

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

@@ -11,6 +11,7 @@
     <RootNamespace>PepperDash.Essentials.Core</RootNamespace>
     <Title>PepperDash Essentials Core</Title>
     <PackageId>PepperDash.Essentials.Core</PackageId>
+    <InformationalVersion>$(Version)</InformationalVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>full</DebugType>

src/PepperDash.Essentials.Core/Plugins/PluginLoader.cs

@@ -59,7 +59,7 @@ namespace PepperDash.Essentials
 
             Debug.LogMessage(LogEventLevel.Verbose, "Found {0} Assemblies", assemblyFiles.Length);
 
-            foreach (var fi in assemblyFiles)
+            foreach (var fi in assemblyFiles.Where(fi => fi.Name.Contains("Essentials") || fi.Name.Contains("PepperDash")))
             {
                 string version = string.Empty;
                 Assembly assembly = null;

src/PepperDash.Essentials.Core/Room/Interfaces.cs

@@ -5,7 +5,6 @@ using System.Text;
 using Crestron.SimplSharp;
 
 using PepperDash.Core;
-using PepperDash.Essentials.Core.Routing;
 
 
 namespace PepperDash.Essentials.Core

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

@@ -9,7 +9,7 @@ using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Core.Routing.Interfaces
 */
-namespace PepperDash.Essentials.Core.Routing
+namespace PepperDash.Essentials.Core
 {
     /// <summary>
     /// The handler type for a Room's SourceInfoChange

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

@@ -1,4 +1,4 @@
-namespace PepperDash.Essentials.Core.Routing
+namespace PepperDash.Essentials.Core
 {
     /// <summary>
     /// Defines a receiver that has internal routing (DM-RMC-4K-Z-SCALER-C)

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

@@ -1,6 +1,4 @@
-using PepperDash.Essentials.Core.Routing;
+namespace PepperDash.Essentials.Core
-
-namespace PepperDash.Essentials.Core
 {
     /// <summary>
     /// Defines an IRmcRouting with a feedback event 

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

@@ -1,15 +1,16 @@
-using PepperDash.Essentials.Core.Routing;
+namespace PepperDash.Essentials.Core
-
-namespace PepperDash.Essentials.Core
 {
     /// <summary>
     /// For fixed-source endpoint devices
     /// </summary>
     public interface IRoutingSink : IRoutingInputs, IHasCurrentSourceInfoChange
     {        
-        RoutingInputPort CurrentInputPort { get; }
     }
 
+    public interface IRoutingSinkWithInputPort :IRoutingSink
+    {
+        RoutingInputPort CurrentInputPort { get; }
+    }
     /*/// <summary>
     /// For fixed-source endpoint devices
     /// </summary>

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

@@ -10,7 +10,10 @@ namespace PepperDash.Essentials.Core
     public interface IRoutingSinkWithSwitching : IRoutingSink
 	{		
 		void ExecuteSwitch(object inputSelector);        
+    }
 
+    public interface IRoutingSinkWithSwitchingWithInputPort:IRoutingSinkWithSwitching, IRoutingSinkWithInputPort
+    {
         event InputChangedEventHandler InputChanged;
     }
 

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

@@ -26,7 +26,7 @@ namespace PepperDash.Essentials.Core.Routing
 
         private void SubscribeForSinkFeedback()
         {
-                var sinkDevices = DeviceManager.AllDevices.OfType<IRoutingSinkWithSwitching>();
+                var sinkDevices = DeviceManager.AllDevices.OfType<IRoutingSinkWithSwitchingWithInputPort>();
 
                 foreach (var device in sinkDevices)
                 {
@@ -38,7 +38,7 @@ namespace PepperDash.Essentials.Core.Routing
         {
             try
             {
-                var devices = DeviceManager.AllDevices.OfType<IRoutingSinkWithSwitching>();
+                var devices = DeviceManager.AllDevices.OfType<IRoutingSinkWithSwitchingWithInputPort>();
 
                 foreach (var device in devices)
                 {

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

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Essentials.Core.Routing
+namespace PepperDash.Essentials.Core
 {
 	/// <summary>
 	/// These should correspond directly with the portNames var in the config tool.

src/PepperDash.Essentials.Devices.Common/Audio/GenericAudioOut.cs

@@ -8,7 +8,6 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 
-using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Devices.Common

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

@@ -7,7 +7,6 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Devices.Common.Displays

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

@@ -4,7 +4,6 @@ using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
 using System;
 using System.Collections.Generic;

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

@@ -8,7 +8,6 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Devices.Common.Displays

src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs

@@ -1,7 +1,6 @@
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
 using System;
 using System.Collections.Generic;

src/PepperDash.Essentials.Devices.Common/Generic/GenericSource.cs

@@ -9,7 +9,6 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Devices.Common

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

@@ -12,6 +12,7 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Title>PepperDash Essentials Devices Common</Title>
     <PackageId>PepperDash.Essentials.Devices.Common</PackageId>
+    <InformationalVersion>$(Version)</InformationalVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>full</DebugType>

src/PepperDash.Essentials.Devices.Common/Room/IEssentialsHuddleSpaceRoom.cs

@@ -1,5 +1,4 @@
 using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Room.Config;
 
 namespace PepperDash.Essentials.Devices.Common.Room

src/PepperDash.Essentials.Devices.Common/Room/IEssentialsHuddleVtc1Room.cs

@@ -1,5 +1,4 @@
 using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.AudioCodec;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;

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

@@ -13,7 +13,6 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Presets;
-using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using Serilog.Events;
 

src/PepperDash.Essentials.Devices.Common/SoftCodec/BlueJeansPc.cs

@@ -5,7 +5,6 @@ using Crestron.SimplSharp;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Sources;
 using Serilog.Events;
 

src/PepperDash.Essentials.Devices.Common/SoftCodec/GenericSoftCodec.cs

@@ -2,7 +2,6 @@
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
 using System.Collections.Generic;
 using System.Linq;

src/PepperDash.Essentials.Devices.Common/Sources/InRoomPc.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Devices.Common.Sources

src/PepperDash.Essentials.Devices.Common/Sources/Laptop.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Devices.Common.Sources

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

@@ -13,7 +13,6 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Devices.Common

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

@@ -9,7 +9,6 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Devices.Common

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

@@ -14,13 +14,13 @@ using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Devices;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 using PepperDash.Essentials.Core.Bridges.JoinMaps;
 using Feedback = PepperDash.Essentials.Core.Feedback;
 using Serilog.Events;
+using PepperDash.Essentials.Core.Routing;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec
 {

src/PepperDash.Essentials/PepperDash.Essentials.csproj

@@ -11,7 +11,7 @@
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <Title>PepperDash Essentials</Title>
     <PackageId>PepperDashEssentials</PackageId>
-    <AssemblyInformationalVersion>$(Version)</AssemblyInformationalVersion>
+    <InformationalVersion>$(Version)</InformationalVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>full</DebugType>