Merge pull request #46 from NileshGhodekar/master

Version 2.17.0927.0
microsoft · Sep 27, 2017 · 38034a3 · 38034a3
2 parents bba0486 + 87dcaf6
commit 38034a3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -9,6 +9,14 @@ All notable changes to MIMWAL project will be documented in this file. The "Unre
 
 ------------
 
+### Version 2.17.0927.0
+
+#### Fixed
+
+* Bugfix in SortList function.
+
+------------
+
 ### Version 2.17.0721.0
 
 #### Added

diff --git a/src/VersionInfo.cs b/src/VersionInfo.cs
@@ -22,7 +22,7 @@ internal static class VersionInfo
         ///      Build Number (MMDD)
         ///      Revision (if any on the same day)
         /// </summary>
-        internal const string Version = "2.17.0721.0";
+        internal const string Version = "2.17.0927.0";
 
         /// <summary>
         /// File Version information for the assembly consists of the following four values:
@@ -31,6 +31,6 @@ internal static class VersionInfo
         ///      Build Number (MMDD)
         ///      Revision (if any on the same day)
         /// </summary>
-        internal const string FileVersion = "2.17.0721.0";
+        internal const string FileVersion = "2.17.0927.0";
     }
 }
diff --git a/src/WorkflowActivityLibrary/Common/ExpressionFunction.cs b/src/WorkflowActivityLibrary/Common/ExpressionFunction.cs
@@ -2246,7 +2246,7 @@ private object DateTimeFromString()
 
             try
             {
-                if (this.parameters.Count < 1 && this.parameters.Count > 2)
+                if (this.parameters.Count < 1 || this.parameters.Count > 2)
                 {
                     throw Logger.Instance.ReportError(EventIdentifier.ExpressionFunctionDateTimeFromStringInvalidFunctionParameterCountError, new InvalidFunctionFormatException(Messages.ExpressionFunction_InvalidFunctionParameterCountError2, this.function, 1, 2, this.parameters.Count));
                 }
@@ -4903,7 +4903,7 @@ private object SortList()
 
                             list.Sort();
 
-                            result = this.parameters[0];
+                            result = list;
                         }
                         else
                         {