Merge branch 'release-1.6'

Author: robinhultman

Src/SetProperty/BiztalkComponents.Utils/PropertyBagHelper.cs

@@ -39,6 +39,34 @@ public static object ReadPropertyBag(IPropertyBag pb, string propName)
             return val;
         }
 
+        public static T ReadPropertyBag<T>(IPropertyBag pb, string propName)
+        {
+            try
+            {
+                object val;
+                pb.Read(propName, out val, 0);
+
+                if (val == null)
+                {
+                    return default(T);
+                }
+
+                return (T)val;
+            }
+            catch (ArgumentException)
+            {
+                return default(T);
+            }
+            catch (InvalidCastException)
+            {
+                return default(T);
+            }
+            catch (Exception e)
+            {
+                throw new ApplicationException(e.Message);
+            }
+        }
+
         /// <summary>
         /// Writes property values into a property bag.
         /// </summary>

Src/SetProperty/Properties/AssemblyInfo.cs

@@ -34,4 +34,4 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0.0")]

Src/SetProperty/SetProperty.cs

@@ -16,6 +16,7 @@ public partial class SetProperty : IComponent, IBaseComponent,
     {
         private const string PropertyPathPropertyName = "PropertyPath";
         private const string ValuePropertyName = "Value";
+        private const string PromoteProperytName = "Promote";
 
         [DisplayName("Property Path")]
         [Description("The property path where the specified value will be promoted to, i.e. http://temupuri.org#MyProperty.")]
@@ -29,6 +30,11 @@ public partial class SetProperty : IComponent, IBaseComponent,
         [RequiredRuntime]
         public string Value { get; set; }
 
+        [DisplayName("Promote Property")]
+        [Description("Specifies whether the property should be promoted or just written to the context.")]
+        [RequiredRuntime]
+        public bool PromoteProperty { get; set; }
+
         public IBaseMessage Execute(IPipelineContext pContext, IBaseMessage pInMsg)
         {
             string errorMessage;
@@ -38,21 +44,30 @@ public IBaseMessage Execute(IPipelineContext pContext, IBaseMessage pInMsg)
                 throw new ArgumentException(errorMessage);
             }
 
-            pInMsg.Context.Promote(new ContextProperty(PropertyPath), Value);
+            if (PromoteProperty)
+            {
+                pInMsg.Context.Promote(new ContextProperty(PropertyPath), Value);    
+            }
+            else
+            {
+                pInMsg.Context.Write(new ContextProperty(PropertyPath), Value);    
+            }
 
             return pInMsg;
         }
 
         public void Load(IPropertyBag propertyBag, int errorLog)
         {
-            PropertyPath = PropertyBagHelper.ToStringOrDefault(PropertyBagHelper.ReadPropertyBag(propertyBag, PropertyPathPropertyName), string.Empty);
-            Value = PropertyBagHelper.ToStringOrDefault(PropertyBagHelper.ReadPropertyBag(propertyBag, ValuePropertyName), string.Empty);
+            PropertyPath = PropertyBagHelper.ReadPropertyBag<string>(propertyBag, PropertyPathPropertyName);
+            Value = PropertyBagHelper.ReadPropertyBag<string>(propertyBag, ValuePropertyName);
+            PromoteProperty = PropertyBagHelper.ReadPropertyBag<bool>(propertyBag, PromoteProperytName);
         }
 
         public void Save(IPropertyBag propertyBag, bool clearDirty, bool saveAllProperties)
         {
             PropertyBagHelper.WritePropertyBag(propertyBag, PropertyPathPropertyName, PropertyPath);
             PropertyBagHelper.WritePropertyBag(propertyBag, ValuePropertyName, Value);
+            PropertyBagHelper.WritePropertyBag(propertyBag, PromoteProperytName, PromoteProperty);
         }
     }
 }

Src/SetProperty/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BizTalkComponents.Utils" version="2.1.0.4" targetFramework="net45" />
+  <package id="BizTalkComponents.Utils" version="2.1.0.5" targetFramework="net40" />
 </packages>

Tests/UnitTests/SetPropertyTests.cs

@@ -7,13 +7,14 @@ namespace BizTalkComponents.PipelineComponents.SetProperty.Tests.UnitTests
     public class SetPropertyTests
     {
         [TestMethod]
-        public void TestSetProperty()
+        public void TestSetPropertyPromote()
         {
             var pipeline = PipelineFactory.CreateEmptyReceivePipeline();
             var component = new SetProperty
             {
                 PropertyPath = "http://tempuri.org#MyProp",
-                Value = "Test"
+                Value = "Test",
+                PromoteProperty = true
             };
 
             pipeline.AddComponent(component, PipelineStage.Decode);
@@ -29,5 +30,55 @@ public void TestSetProperty()
 
             Assert.IsTrue(output[0].Context.IsPromoted("MyProp", "http://tempuri.org"));
         }
+
+
+        [TestMethod]
+        public void TestSetPropertyWrite()
+        {
+            var pipeline = PipelineFactory.CreateEmptyReceivePipeline();
+            var component = new SetProperty
+            {
+                PropertyPath = "http://tempuri.org#MyProp",
+                Value = "Test",
+                PromoteProperty = false
+            };
+
+            pipeline.AddComponent(component, PipelineStage.Decode);
+
+            var message = MessageHelper.Create("<test></test>");
+
+
+            Assert.IsNull(message.Context.Read("MyProp", "http://tempuri.org"));
+
+            var output = pipeline.Execute(message);
+
+            Assert.AreEqual(1, output.Count);
+
+            Assert.IsFalse(output[0].Context.IsPromoted("MyProp", "http://tempuri.org"));
+        }
+
+        [TestMethod]
+        public void TestSetPropertyPromotePropertyNotSet()
+        {
+            var pipeline = PipelineFactory.CreateEmptyReceivePipeline();
+            var component = new SetProperty
+            {
+                PropertyPath = "http://tempuri.org#MyProp",
+                Value = "Test"
+            };
+
+            pipeline.AddComponent(component, PipelineStage.Decode);
+
+            var message = MessageHelper.Create("<test></test>");
+
+
+            Assert.IsNull(message.Context.Read("MyProp", "http://tempuri.org"));
+
+            var output = pipeline.Execute(message);
+
+            Assert.AreEqual(1, output.Count);
+
+            Assert.IsFalse(output[0].Context.IsPromoted("MyProp", "http://tempuri.org"));
+        }
     }
 }

….4/BizTalkComponents.Utils.2.1.0.4.nupkg ….5/BizTalkComponents.Utils.2.1.0.5.nupkgpackages/BizTalkComponents.Utils.2.1.0.4/BizTalkComponents.Utils.2.1.0.4.nupkg renamed to packages/BizTalkComponents.Utils.2.1.0.5/BizTalkComponents.Utils.2.1.0.5.nupkg packages/BizTalkComponents.Utils.2.1.0.4/BizTalkComponents.Utils.2.1.0.4.nupkg renamed to packages/BizTalkComponents.Utils.2.1.0.5/BizTalkComponents.Utils.2.1.0.5.nupkg

@@ -39,6 +39,34 @@ public static object ReadPropertyBag(IPropertyBag pb, string propName)
             return val;
         }
 
+        public static T ReadPropertyBag<T>(IPropertyBag pb, string propName)
+        {
+            try
+            {
+                object val;
+                pb.Read(propName, out val, 0);
+
+                if (val == null)
+                {
+                    return default(T);
+                }
+
+                return (T)val;
+            }
+            catch (ArgumentException)
+            {
+                return default(T);
+            }
+            catch (InvalidCastException)
+            {
+                return default(T);
+            }
+            catch (Exception e)
+            {
+                throw new ApplicationException(e.Message);
+            }
+        }
+
         /// <summary>
         /// Writes property values into a property bag.
         /// </summary>