minor fixes

MaxxVolk · Jul 14, 2020 · d6d8eda · d6d8eda
1 parent 3dd96ff
commit d6d8eda
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/Maximus.Base.Library.ManagedWorkflowBase/Properties/AssemblyInfo.cs b/Maximus.Base.Library.ManagedWorkflowBase/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.1")]
-[assembly: AssemblyFileVersion("1.0.0.1")]
+[assembly: AssemblyVersion("1.0.0.2")]
+[assembly: AssemblyFileVersion("1.0.0.2")]
diff --git a/Maximus.Base.Library.ManagedWorkflowBase/ServiceHelpers/FormattingHelper.cs b/Maximus.Base.Library.ManagedWorkflowBase/ServiceHelpers/FormattingHelper.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
+using System.Linq;
 
 namespace Maximus.Library.Helpers
 {
@@ -137,7 +138,7 @@ public static double ConvertBytes1024(decimal fromBytes, BinaryPrefix fromUnit,
       if (valueList.Length == 0)
         return string.Empty;
       string Result = "";
-      foreach (var value in valueList)
+      foreach (object value in valueList)
         Result += value.ToString() + separator;
       return Result.Substring(0, Result.Length - separator.Length);
     }
@@ -149,7 +150,7 @@ public static double ConvertBytes1024(decimal fromBytes, BinaryPrefix fromUnit,
       if (valueDictionary.Keys.Count == 0)
         return string.Empty;
       string Result = "";
-      foreach (var pair in valueDictionary)
+      foreach (KeyValuePair<string, object> pair in valueDictionary)
         Result += pair.Key.ToString() + namevalueSeparator + pair.Value.ToString() + itemSeparator;
       return Result.Substring(0, Result.Length - itemSeparator.Length);
     }
@@ -161,13 +162,17 @@ public static double ConvertBytes1024(decimal fromBytes, BinaryPrefix fromUnit,
       if (valueDictionary.Keys.Count == 0)
         return string.Empty;
       string Result = "";
-      foreach (var pair in valueDictionary)
+      foreach (KeyValuePair<string, double> pair in valueDictionary)
         Result += pair.Key.ToString() + namevalueSeparator + pair.Value.ToString(doubleFormat) + itemSeparator;
       return Result.Substring(0, Result.Length - itemSeparator.Length);
     }
 
     public static string EnumElements(IEnumerable<object> inputObjects, string separator = "; ")
     {
+      if (inputObjects == null)
+        return string.Empty;
+      if (!inputObjects.Any())
+        return string.Empty;
       string Result = "";
       foreach (object obj in inputObjects)
         Result += obj.ToString() + separator;

diff --git a/Maximus.Base.Library.ManagedWorkflowBase/ServiceHelpers/LoggingHelper.cs b/Maximus.Base.Library.ManagedWorkflowBase/ServiceHelpers/LoggingHelper.cs
@@ -154,7 +154,7 @@ public void WriteVerbose(string debugInfo, string component, string source, int
     public void WriteInformation(string message, object Src, params object[] stringFormatArgs)
     {
 #if DEBUG // using only text file logging in DEBUG release
-      logWriteVerbose(message, "", "", 0);
+      WriteVerbose(message, "", "", 0);
 #else
       if (EventLoggingLevel >= EventLoggingLevel.Informational)
         WriteEvent(message, EventLogEntryType.Information, Src, stringFormatArgs);
@@ -163,7 +163,7 @@ public void WriteInformation(string message, object Src, params object[] stringF
     public void WriteWarning(string message, object Src, params object[] stringFormatArgs)
     {
 #if DEBUG // using only text file logging in DEBUG release
-      logWriteVerbose(message, "", "", 1);
+      WriteVerbose(message, "", "", 1);
 #else
       if (EventLoggingLevel >= EventLoggingLevel.Warning)
         WriteEvent(message, EventLogEntryType.Warning, Src, stringFormatArgs);
@@ -172,7 +172,7 @@ public void WriteWarning(string message, object Src, params object[] stringForma
     public void WriteError(string message, object Src, params object[] stringFormatArgs)
     {
 #if DEBUG // using only text file logging in DEBUG release
-      logWriteVerbose(message, "", "", 2);
+      WriteVerbose(message, "", "", 2);
 #else
       if (EventLoggingLevel >= EventLoggingLevel.Error)
         WriteEvent(message, EventLogEntryType.Error, Src, stringFormatArgs);

diff --git a/Maximus.Base.Library/Assembly.mpx b/Maximus.Base.Library/Assembly.mpx
@@ -6,7 +6,7 @@
               Comment="Base assembly for SCOM Console extensions. Must not be referenced in Module Type projects. Must not be referenced together with base managed workflow library." />
     <DeployableAssembly ID="Maximus.Base.Library.ManagedWorkflowBase.DeployableAssembly" Accessibility="Public" HasNullStream="false"
                         FileName="Maximus.Base.Library.ManagedWorkflowBase.dll"
-                        QualifiedName="Maximus.Base.Library.ManagedWorkflowBase, Version=1.0.0.1, Culture=neutral, PublicKeyToken=fd5098a6a3259696"
+                        QualifiedName="Maximus.Base.Library.ManagedWorkflowBase, Version=1.0.0.2, Culture=neutral, PublicKeyToken=fd5098a6a3259696"
                         Comment="Base library for managed workflow. Must not be used in SCOM Console extension projects. Must not be referenced with base console extension library." />
     <DeployableAssembly ID="Maximus.Base.Library.Newtonsoft.Json.DeployableAssembly" Accessibility="Public" HasNullStream="false"
                         QualifiedName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"

diff --git a/Maximus.Base.Library/MPResources.resources b/Maximus.Base.Library/MPResources.resources