diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
index f6f8f6bcb0..48f8c6f396 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
@@ -19,7 +19,6 @@
-
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
index 210ad2ab0b..5028facc78 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
@@ -10,8 +10,9 @@ using Avalonia.Data;
using Avalonia.Markup.Data;
using Avalonia.Markup.Xaml.Data;
using Moq;
-using ReactiveUI;
using Xunit;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
namespace Avalonia.Markup.Xaml.UnitTests.Data
{
@@ -350,14 +351,25 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
}
}
- public class Source : ReactiveObject
+ public class Source : INotifyPropertyChanged
{
private string _foo;
public string Foo
{
get { return _foo; }
- set { this.RaiseAndSetIfChanged(ref _foo, value); }
+ set
+ {
+ _foo = Foo;
+ RaisePropertyChanged();
+ }
+ }
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ private void RaisePropertyChanged([CallerMemberName] string prop = "")
+ {
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(prop));
}
}
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Source.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Source.cs
index 778a93d326..18a6c405f1 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Source.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Source.cs
@@ -6,8 +6,9 @@ using Avalonia.Controls;
using Avalonia.Data;
using Avalonia.Markup.Data;
using Avalonia.Markup.Xaml.Data;
-using ReactiveUI;
using Xunit;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
namespace Avalonia.Markup.Xaml.UnitTests.Data
{
@@ -24,15 +25,26 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
Assert.Equal(target.Text, "foo");
}
-
- public class Source : ReactiveObject
+
+ public class Source : INotifyPropertyChanged
{
private string _foo;
public string Foo
{
get { return _foo; }
- set { this.RaiseAndSetIfChanged(ref _foo, value); }
+ set
+ {
+ _foo = Foo;
+ RaisePropertyChanged();
+ }
+ }
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ private void RaisePropertyChanged([CallerMemberName] string prop = "")
+ {
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(prop));
}
}
}