OUT-130: Make GetPEPVersion() method to be used in ribbon also. Release_1_0_Series
authorDean Looyengoed
Fri, 14 Oct 2016 17:42:21 +0200
branchRelease_1_0_Series
changeset 13655aef818d8240
parent 1364 326b6e026fe5
OUT-130: Make GetPEPVersion() method to be used in ribbon also.
Globals.cs
UI/RibbonCustomizations.cs
     1.1 --- a/Globals.cs	Fri Oct 14 16:46:59 2016 +0200
     1.2 +++ b/Globals.cs	Fri Oct 14 17:42:21 2016 +0200
     1.3 @@ -309,12 +309,12 @@
     1.4          }
     1.5  
     1.6          /// <summary>
     1.7 -        /// Gets the current system information string.
     1.8 +        /// Gets the pEp for Outlook version.
     1.9 +        /// This will never be null.
    1.10          /// </summary>
    1.11 -        /// <returns>The system information as a string.</returns>
    1.12 -        public static string GetSystemInfo()
    1.13 +        /// <returns>The version string.</returns>
    1.14 +        public static string GetPEPVersion()
    1.15          {
    1.16 -            string systemInfo = "";
    1.17              string version;
    1.18              string updateLevel;
    1.19  
    1.20 @@ -329,6 +329,18 @@
    1.21                  version += " Update " + updateLevel;
    1.22              }
    1.23  
    1.24 +            return (version);
    1.25 +        }
    1.26 +
    1.27 +        /// <summary>
    1.28 +        /// Gets the current system information string.
    1.29 +        /// </summary>
    1.30 +        /// <returns>The system information as a string.</returns>
    1.31 +        public static string GetSystemInfo()
    1.32 +        {
    1.33 +            string systemInfo = "";
    1.34 +            string version = GetPEPVersion();
    1.35 +
    1.36              try
    1.37              {
    1.38                  systemInfo = string.Join(Environment.NewLine, new string[]
     2.1 --- a/UI/RibbonCustomizations.cs	Fri Oct 14 16:46:59 2016 +0200
     2.2 +++ b/UI/RibbonCustomizations.cs	Fri Oct 14 17:42:21 2016 +0200
     2.3 @@ -686,7 +686,7 @@
     2.4          /// </summary>
     2.5          public string LabelControlVersion_GetLabel(Office.IRibbonControl control)
     2.6          {
     2.7 -            return (Assembly.GetExecutingAssembly().GetName().Version.ToString());
     2.8 +            return (Globals.GetPEPVersion());
     2.9          }
    2.10  
    2.11          /// <summary>