Compare commits

...

2 Commits

Author SHA1 Message Date
Nick Genovese
1dd5cf380c feat: skips Newtonsoft.Compact as well 2024-02-02 16:17:04 -05:00
Nick Genovese
7399564ac0 feat: skips moving legacy dll files to plugin folder 2024-02-02 14:50:36 -05:00

View File

@@ -201,6 +201,15 @@ namespace PepperDash.Essentials
CrestronConsole.ConsoleCommandResponse("{0} Version: {1}" + CrestronEnvironment.NewLine, assembly.Name, assembly.Version); CrestronConsole.ConsoleCommandResponse("{0} Version: {1}" + CrestronEnvironment.NewLine, assembly.Name, assembly.Version);
} }
} }
static bool IsLegacyAssembly(string assemblyName) =>
assemblyName.Contains("PepperDashEssentials") ||
assemblyName.Contains("PepperDash_Essentials_Core") ||
assemblyName.Contains("PepperDash_Essentials_DM") ||
assemblyName.Contains("Essentials Devices Common") ||
assemblyName.Contains("PepperDash_Core") ||
assemblyName.Contains("Newtonsoft.Json.Compact");
/// <summary> /// <summary>
/// Moves any .dll assemblies not already loaded from the plugins folder to loadedPlugins folder /// Moves any .dll assemblies not already loaded from the plugins folder to loadedPlugins folder
/// </summary> /// </summary>
@@ -209,7 +218,7 @@ namespace PepperDash.Essentials
Debug.Console(0, "Looking for .dll assemblies from plugins folder..."); Debug.Console(0, "Looking for .dll assemblies from plugins folder...");
var pluginDi = new DirectoryInfo(_pluginDirectory); var pluginDi = new DirectoryInfo(_pluginDirectory);
var pluginFiles = pluginDi.GetFiles("*.dll"); var pluginFiles = pluginDi.GetFiles("*.dll").Where(file => !IsLegacyAssembly(file.Name)).ToArray();
if (pluginFiles.Length > 0) if (pluginFiles.Length > 0)
{ {
@@ -283,7 +292,7 @@ namespace PepperDash.Essentials
var result = CrestronZIP.Unzip(zfi.FullName, tempDi.FullName); var result = CrestronZIP.Unzip(zfi.FullName, tempDi.FullName);
Debug.Console(0, "UnZip Result: {0}", result.ToString()); Debug.Console(0, "UnZip Result: {0}", result.ToString());
var tempFiles = tempDi.GetFiles("*.dll"); var tempFiles = tempDi.GetFiles("*.dll").Where(file => !IsLegacyAssembly(file.Name)).ToArray();
foreach (var tempFile in tempFiles) foreach (var tempFile in tempFiles)
{ {
try try