Merge remote-tracking branch 'origin/master' into release-2.0.0

Conflicts:
	NTestDataBuilder/TestDataBuilder.cs

Author: robdmoore

NTestDataBuilder.Tests/BuildTests.cs

@@ -31,5 +31,19 @@ public void GivenBuilderWithMethodCalls_WhenCallingBuild_ThenReturnAnObjectWithT
             customer.LastName.ShouldBe("Kocaj");
             customer.YearJoined.ShouldBe(2010);
         }
+
+        [Test]
+        public void GivenBuilder_WhenCallingSet_ShouldOverrideValues()
+        {
+            var builder = new CustomerBuilder()
+                .Set(x => x.FirstName, "Pi")
+                .Set(x => x.LastName, "Lanningham")
+                .Set(x => x.YearJoined, 2014);
+
+            var customer = builder.Build();
+            Assert.That(customer.FirstName, Is.EqualTo("Pi"));
+            Assert.That(customer.LastName, Is.EqualTo("Lanningham"));
+            Assert.That(customer.YearJoined, Is.EqualTo(2014));
+        }
     }
 }

NTestDataBuilder/TestDataBuilder.cs

@@ -76,10 +76,11 @@ protected virtual void AlterProxy(TObject proxy) {}
         /// <typeparam name="TValue">The type of the property</typeparam>
         /// <param name="property">A lambda expression specifying the property to record a value for</param>
         /// <param name="value">The value to record</param>
-        protected TBuilder Set<TValue>(Expression<Func<TObject, TValue>> property, TValue value)
+        public TBuilder Set<TValue>(Expression<Func<TObject, TValue>> property, TValue value)
         {
             _properties[PropertyNameGetter.Get(property)] = value;
             return this as TBuilder;
+            return this as TBuilder;
         }
 
         /// <summary>