Fixes #218 & SetState & SetStateDynamicEntity message property of EntityMoniker (#220) (#222)

* Fixes #218

* SetState & SetStateDynamicEntity use message property of EntityMoniker

Author: scottdurow

.vs/slnx.sqlite

@@ -147,10 +147,10 @@ public static string GetAttributeCode(this CrmPluginRegistrationAttribute attrib
                 additionalParmeters += indentation + ",DeleteAsyncOperaton = " + attribute.DeleteAsyncOperaton;
 
             if (attribute.UnSecureConfiguration != null)
-                additionalParmeters += indentation + ",UnSecureConfiguration = \"" + attribute.UnSecureConfiguration + "\"";
+            additionalParmeters += indentation + ",UnSecureConfiguration = @\"" + attribute.UnSecureConfiguration.Replace("\"","\"\"") + "\"";
 
             if (attribute.SecureConfiguration != null)
-                additionalParmeters += indentation + ",SecureConfiguration = \"" + attribute.SecureConfiguration + "\"";
+                additionalParmeters += indentation + ",SecureConfiguration = @\"" + attribute.SecureConfiguration.Replace("\"","\"\"") + "\"";
 
             if (attribute.Action != null)
                 additionalParmeters += indentation + ",Action = PluginStepOperationEnum." + attribute.Action.ToString();

spkl/SparkleXrm.Tasks/CustomAttributeDataEx.cs

@@ -456,23 +456,34 @@ private SdkMessageProcessingStepImage RegisterImage(CrmPluginRegistrationAttribu
             {
                 return null;
             }
-            var image = existingImages.Where(a =>
-                            a.SdkMessageProcessingStepId.Id == step.Id
-                            &&
-                            a.EntityAlias == imageName
-                            && a.ImageType == (sdkmessageprocessingstepimage_imagetype)imagetype).FirstOrDefault();
-            if (image == null)
-            {
-                image = new SdkMessageProcessingStepImage();
-            }
+            
+            var image = existingImages.FirstOrDefault(
+                            a => a.SdkMessageProcessingStepId.Id == step.Id
+                                 && a.EntityAlias == imageName
+                                 && a.ImageType == (sdkmessageprocessingstepimage_imagetype)imagetype) ??
+                        new SdkMessageProcessingStepImage();
 
             image.Name = imageName;
-           
+
             image.ImageType = (sdkmessageprocessingstepimage_imagetype)imagetype;
             image.SdkMessageProcessingStepId = new EntityReference(SdkMessageProcessingStep.EntityLogicalName, step.Id);
             image.Attributes1 = attributes;
             image.EntityAlias = imageName;
-            image.MessagePropertyName = stepAttribute.Message == "Create" ? "Id" : "Target";
+
+            switch (stepAttribute.Message)
+            {
+                case "Create":
+                    image.MessagePropertyName = "Id";
+                    break;
+                case "SetState":
+                case "SetStateDynamicEntity":
+                    image.MessagePropertyName = "EntityMoniker";
+                    break;
+                default:
+                    image.MessagePropertyName = "Target";
+                    break;
+            }
+
             if (image.Id == Guid.Empty)
             {
                 _trace.WriteLine("Registering Image '{0}'", image.Name);