Browse Source

Merge branch 'master' into fixes/1029-fix-tooltip-crash

Steven Kirk 8 years ago
parent
commit
94322e2c27

+ 1 - 1
src/Avalonia.Base/Data/BindingNotification.cs

@@ -226,7 +226,7 @@ namespace Avalonia.Data
         /// </summary>
         public void ClearValue()
         {
-            _value = null;
+            _value = AvaloniaProperty.UnsetValue;
         }
 
         /// <summary>

+ 2 - 2
tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs

@@ -171,7 +171,7 @@ namespace Avalonia.Markup.UnitTests.Data
             GC.KeepAlive(data);
         }
 
-        [Fact(Skip="Result is not always AggregateException.")]
+        [Fact]
         public async Task Should_Return_BindingNotification_For_Invalid_FallbackValue()
         {
             var data = new Class1 { StringValue = "foo" };
@@ -193,7 +193,7 @@ namespace Avalonia.Markup.UnitTests.Data
             GC.KeepAlive(data);
         }
 
-        [Fact(Skip="Result is not always AggregateException.")]
+        [Fact]
         public async Task Should_Return_BindingNotification_For_Invalid_FallbackValue_With_Data_Validation()
         {
             var data = new Class1 { StringValue = "foo" };