Merge pull request #42 from NileshGhodekar/master

Query and Iteration Support for SendEmailNotification and other misc. changes
microsoft · Jul 21, 2017 · 8c115bf · 8c115bf
2 parents 0124e93 + 9953220
commit 8c115bf
Show file tree

Hide file tree

Showing 18 changed files with 1,460 additions and 200 deletions.
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.0414.0";
+        internal const string Version = "2.17.0716.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.0414.0";
+        internal const string FileVersion = "2.17.0716.0";
     }
 }
diff --git a/src/WorkflowActivityLibrary.UI/ActivitySettings.Designer.cs b/src/WorkflowActivityLibrary.UI/ActivitySettings.Designer.cs
diff --git a/src/WorkflowActivityLibrary.UI/ActivitySettings.resx b/src/WorkflowActivityLibrary.UI/ActivitySettings.resx
@@ -610,7 +610,7 @@
     <value>A Search Target XPath must be supplied.</value>
   </data>
   <data name="DefinitionsConverter_NullOrEmptyDefinitionsTableError" xml:space="preserve">
-    <value>The definitions table is null or corrupt</value>
+    <value>The definitions table is corrupt.</value>
   </data>
   <data name="ValueExpressionUniquenessKeyValidationError" xml:space="preserve">
     <value>Only the last value expression in the list can leverage the [//UniquenessKey] lookup.</value>
@@ -810,4 +810,19 @@
   <data name="PowerShellUserPasswordValidationError" xml:space="preserve">
     <value>Specify the PowerShell user password.</value>
   </data>
+  <data name="WorkflowDataVariables" xml:space="preserve">
+    <value>Workflow Lookup Variables</value>
+  </data>
+  <data name="WorkflowDataVariablesHelpText" xml:space="preserve">
+    <value>Specify the Workflow Lookup Variables to be used in the email template.</value>
+  </data>
+  <data name="WorkflowDataVariablesLeftHeader" xml:space="preserve">
+    <value>Value Expression</value>
+  </data>
+  <data name="WorkflowDataVariablesRightHeader" xml:space="preserve">
+    <value>Target</value>
+  </data>
+  <data name="WorkflowDataVariablesDefinitionValidationError" xml:space="preserve">
+    <value>One or more workflow lookup variable definitions are incomplete</value>
+  </data>
 </root>
diff --git a/src/WorkflowActivityLibrary.UI/Definitions/DefinitionsConverter.cs b/src/WorkflowActivityLibrary.UI/Definitions/DefinitionsConverter.cs
@@ -109,8 +109,15 @@ public DefinitionsConverter(IEnumerable<DefinitionListing> definitionListings, A
         public DefinitionsConverter(Hashtable definitionsTable)
         {
             // This constructor handles a hash table which is deserialized from an activity definition's XOML
-            // Throw an exception if the hashtable is null or missing the Count key which indicates how many definitions it stores
-            if (definitionsTable == null || !definitionsTable.ContainsKey("Count"))
+
+            // Do nothing if the hashtable is null. This is to allow backward compatibility of the old Activity UI XOML when a newer version is introduced
+            if (definitionsTable == null)
+            {
+                return;
+            }
+
+            // Throw an exception if the hashtable is missing the Count key which indicates how many definitions it stores
+            if (definitionsTable != null && !definitionsTable.ContainsKey("Count"))
             {
                 throw Logger.Instance.ReportError(new ArgumentException(ActivitySettings.DefinitionsConverter_NullOrEmptyDefinitionsTableError, "definitionsTable"));
             }