From 77d54380632cf5fbcc99d4837e0d9d6cad568788 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Fri, 12 Jul 2019 11:37:16 -0600 Subject: [PATCH 1/2] Updates to script file --- .../Properties/UpdateAssemblyVersion.ps1 | 35 ++++++------------- 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 b/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 index 64d18786..46392b31 100644 --- a/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 +++ b/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 @@ -1,17 +1,4 @@ -#Set-ExecutionPolicy RemoteSigned -function Usage -{ -echo "This is "; -echo “Usage: “; -echo ” from cmd.exe: “; -echo ” powershell.exe SetVersion.ps1 2.8.3.0″; -echo ” “; -echo ” from powershell.exe prompt: “; -echo ” .\SetVersion.ps1 2.8.3.0″; -echo ” “; -} - -function Update-SourceVersion +function Update-SourceVersion { Param ([string]$Version) $NewVersion = ‘AssemblyVersion("‘ + $Version + ‘.*")’; @@ -35,14 +22,14 @@ function Update-AllAssemblyInfoFiles ( $version ) # validate arguments $r= [System.Text.RegularExpressions.Regex]::Match($args[0], "^\d+\.\d+\.\d+$"); - if ($r.Success) - { - Update-AllAssemblyInfoFiles $args[0]; - } - else - { - echo ” “; - echo “Bad Input!” - echo ” “; - Usage ; +if ($r.Success) +{ + Update-AllAssemblyInfoFiles $args[0]; +} +else +{ + echo ” “; + echo “Error: Input version does not match x.y.z format!” + echo ” “; + echo "Unable to apply version to AssemblyInfo.cs files"; } From ddfd1d058675f9f5ce439baea17430191da7ea50 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 18 Jul 2019 14:13:43 -0600 Subject: [PATCH 2/2] Corrected case of dmTx to dmtx on dmtx200 --- .../Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs index 48507151..fef29b49 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs @@ -37,7 +37,7 @@ namespace PepperDash.Essentials.DM // Catch constructor failures, mainly dues to IPID try { - if(typeName.StartsWith("dmTx200")) + if(typeName.StartsWith("dmtx200")) return new DmTx200Controller(key, name, new DmTx200C2G(ipid, Global.ControlSystem)); if (typeName.StartsWith("dmtx201")) return new DmTx201XController(key, name, new DmTx201S(ipid, Global.ControlSystem)); @@ -93,7 +93,7 @@ namespace PepperDash.Essentials.DM chassis is DmMd32x32Cpu3 || chassis is DmMd8x8Cpu3rps || chassis is DmMd16x16Cpu3rps || chassis is DmMd32x32Cpu3rps) { - if (typeName.StartsWith("dmTx200")) + if (typeName.StartsWith("dmtx200")) return new DmTx200Controller(key, name, new DmTx200C2G(chassis.Inputs[num])); if (typeName.StartsWith("dmtx201")) return new DmTx201XController(key, name, new DmTx201C(chassis.Inputs[num])); @@ -112,7 +112,7 @@ namespace PepperDash.Essentials.DM } else { - if (typeName.StartsWith("dmTx200")) + if (typeName.StartsWith("dmtx200")) return new DmTx200Controller(key, name, new DmTx200C2G(ipid, chassis.Inputs[num])); if (typeName.StartsWith("dmtx201")) return new DmTx201XController(key, name, new DmTx201C(ipid, chassis.Inputs[num]));