From bf6971a52de4b66df86ad17e347060a258bc9aa2 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Tue, 29 Jan 2019 17:50:46 -0700 Subject: [PATCH] Adds ability to have configuration filenames with prefixes or suffixes. --- PepperDashEssentials/ControlSystem.cs | 6 +++--- PepperDashEssentials/Properties/AssemblyInfo.cs | 2 +- essentials-framework | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/PepperDashEssentials/ControlSystem.cs b/PepperDashEssentials/ControlSystem.cs index 1179a64b..51856749 100644 --- a/PepperDashEssentials/ControlSystem.cs +++ b/PepperDashEssentials/ControlSystem.cs @@ -101,7 +101,7 @@ namespace PepperDash.Essentials if(Directory.Exists(directoryPrefix + dirSeparator + "User" + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber))) { - Debug.Console(0, @"User/programX directory found"); + Debug.Console(0, @"User/program{0} directory found", InitialParametersClass.ApplicationNumber); filePathPrefix = directoryPrefix + dirSeparator + "User" + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator; } @@ -109,14 +109,14 @@ namespace PepperDash.Essentials else if (Directory.Exists(directoryPrefix + dirSeparator + "Nvram" + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber))) { - Debug.Console(0, @"Nvram/programX directory found"); + Debug.Console(0, @"Nvram/program{0} directory found", InitialParametersClass.ApplicationNumber); filePathPrefix = directoryPrefix + dirSeparator + "Nvram" + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator; } // If neither exists, set path to User/ProgramX else { - Debug.Console(0, @"No previous directory found. Using User/programX"); + Debug.Console(0, @"No previous directory found. Using User/program{0}", InitialParametersClass.ApplicationNumber); filePathPrefix = directoryPrefix + dirSeparator + "User" + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator; } diff --git a/PepperDashEssentials/Properties/AssemblyInfo.cs b/PepperDashEssentials/Properties/AssemblyInfo.cs index 1f037bfb..97d14f56 100644 --- a/PepperDashEssentials/Properties/AssemblyInfo.cs +++ b/PepperDashEssentials/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ [assembly: AssemblyCompany("PepperDash Technology Corp")] [assembly: AssemblyProduct("PepperDashEssentials")] [assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2018")] -[assembly: AssemblyVersion("1.3.1.*")] +[assembly: AssemblyVersion("1.3.2.*")] diff --git a/essentials-framework b/essentials-framework index 5bee684b..c190321c 160000 --- a/essentials-framework +++ b/essentials-framework @@ -1 +1 @@ -Subproject commit 5bee684b52588788c392c666126a52c176e03a62 +Subproject commit c190321c536c07caae9187e026363c712caac0f7