Merge branch 'master' into master

CONTRIBUTING.md

@@ -25,15 +25,7 @@ You can also submit an issue. Use the [Issues](https://github.com/Microsoft/MIMW
 
 ## Contributing to MIMWAL Wiki
 
-The two ways to contribute to MIMWAL Wiki are again: Fork the Repository or Submit an Issue.
-
-### Fork the MIMWAL Wiki Repository.
-
-Fork a copy of the [MIMWAL Wiki Repo](https://github.com/Microsoft/MIMWAL/wiki) and send a pull request.
-
-### Submit an Issue.
-
-You can also submit an issue. Use the [Issues](https://github.com/Microsoft/MIMWAL/issues) tab to create a new issue.
+To contribute to the MIMWAL wiki, please submit an Issue. Use the [Issues](https://github.com/Microsoft/MIMWAL/issues) tab to create a new issue.
 
 ##### Wiki Acceptance
 

ChangeLog.md

@@ -7,12 +7,29 @@ All notable changes to MIMWAL project will be documented in this file. The "Unre
 * Support for multi-valued attributes in `[//Effective]` lookup in AuthZ workflows.
 * Implement Approve Request Activity.
 
+------------
+
 ### Version 2.17.0927.0
 
 #### Fixed
 
 * Bugfix in SortList function.
 
+------------
+
+### Version 2.17.0721.0
+
+#### Added
+
+* Support for Query and Iternation in SendEmailNotification activity.
+* [DateTimeFromString][DateTimeFromStringFunction] function.
+
+#### Fixed
+
+* Fixed ParameterValue* functions to return attribute values in the original datatype than as string.
+* Correctly setting connection timeout for ODBC connection in ExecuteSqlNonQuery and ExecuteSqlScalar functions.
+
+------------
 
 ### Version 2.17.0414.0
 
@@ -25,6 +42,8 @@ All notable changes to MIMWAL project will be documented in this file. The "Unre
 	* New function [ExecuteSqlScalar][ExecuteSqlScalarFunction]
 	* New function [ValueByKey][ValueByKeyFunction]
 
+------------
+
 ### Version 2.16.1028.0
 
 #### Changed
@@ -151,3 +170,4 @@ All notable changes to MIMWAL project will be documented in this file. The "Unre
 [ExecuteSqlNonQueryFunction]: https://github.com/Microsoft/MIMWAL/wiki/ExecuteSqlNonQuery-Function
 [ExecuteSqlScalarFunction]: https://github.com/Microsoft/MIMWAL/wiki/ExecuteSqlScalar-Function
 [ValueByKeyFunction]: https://github.com/Microsoft/MIMWAL/wiki/ValueByKey-Function
+[DateTimeFromStringFunction]: https://github.com/Microsoft/MIMWAL/wiki/DateTimeFromString-Function

src/WorkflowActivityLibrary/Activities/SendEmailNotification.Designer.cs

@@ -469,8 +469,6 @@ namespace MicrosoftServices.IdentityManagement.WorkflowActivityLibrary.Activitie
 
         #endregion
 
-        private ComponentActivities.ResolveLookups ResolveLookups;
-        private ComponentActivities.ResolveQueries ResolveQueries;
         private IfElseBranchActivity QueriesDoHaveValueExpressions;
         private ComponentActivities.ResolveQueries RunQueriesOnce;
         private IfElseBranchActivity QueriesHaveNoValueExpressions;