Merge branch 'master' into dynamicresource-instead-of-styleresource

9 years ago · bce80366c9
25 changed files with 115 additions and 185 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,7 +1,3 @@
-[submodule "src/Avalonia.ReactiveUI/src"]
-	path = src/Avalonia.ReactiveUI/src
-	url = https://github.com/AvaloniaUI/ReactiveUI.git
-	branch = avalonia-snapshot
 [submodule "src/Avalonia.HtmlRenderer/external"]
 	path = src/Avalonia.HtmlRenderer/external
 	url = https://github.com/AvaloniaUI/HTML-Renderer.git
--- a/Avalonia.sln
+++ b/Avalonia.sln
@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+VisualStudioVersion = 15.0.26430.16
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
 EndProject
@ -159,6 +159,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1
 		build\Microsoft.Reactive.Testing.props = build\Microsoft.Reactive.Testing.props
 		build\Moq.props = build\Moq.props
 		build\NetCore.props = build\NetCore.props
+		build\ReactiveUI.props = build\ReactiveUI.props
 		build\Rx.props = build\Rx.props
 		build\Serilog.props = build\Serilog.props
 		build\Serilog.Sinks.Trace.props = build\Serilog.Sinks.Trace.props
--- a/build/ReactiveUI.props
+++ b/build/ReactiveUI.props
@ -0,0 +1,5 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="reactiveui" Version="8.0.0-alpha0073" />
+  </ItemGroup>
+</Project>
--- a/build/Rx.props
+++ b/build/Rx.props
@ -1,11 +1,10 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
-    <PackageReference Include="System.Reactive" Version="3.0.0" />
-    <PackageReference Include="System.Reactive.Core" Version="3.0.0" />
-    <PackageReference Include="System.Reactive.Interfaces" Version="3.0.0" />
-    <PackageReference Include="System.Reactive.Linq" Version="3.0.0" />
-    <PackageReference Include="System.Reactive.PlatformServices" Version="3.0.0" />
-    <PackageReference Condition="'$(TargetFramework)' == 'net45'" Include="System.Reactive.Windows.Threading" Version="3.0.0" />
-    <PackageReference Condition="'$(TargetFramework)' == 'net461'" Include="System.Reactive.Windows.Threading" Version="3.0.0" />
+    <PackageReference Include="System.Reactive" Version="3.1.1" />
+    <PackageReference Include="System.Reactive.Core" Version="3.1.1" />
+    <PackageReference Include="System.Reactive.Interfaces" Version="3.1.1" />
+    <PackageReference Include="System.Reactive.Linq" Version="3.1.1" />
+    <PackageReference Include="System.Reactive.PlatformServices" Version="3.1.1" />
+    <PackageReference Condition="$(TargetFramework.StartsWith('net4'))" Include="System.Reactive.Windows.Threading" Version="3.1.1" />
  </ItemGroup>
 </Project>
--- a/packages.cake
+++ b/packages.cake
@ -110,6 +110,7 @@ public class Packages
        var SplatVersion = packageVersions["Splat"].FirstOrDefault().Item1;
        var SpracheVersion = packageVersions["Sprache"].FirstOrDefault().Item1;
        var SystemReactiveVersion = packageVersions["System.Reactive"].FirstOrDefault().Item1;
+        var ReactiveUIVersion = packageVersions["reactiveui"].FirstOrDefault().Item1;
        var SystemValueTupleVersion = packageVersions["System.ValueTuple"].FirstOrDefault().Item1;
        SkiaSharpVersion = packageVersions["SkiaSharp"].FirstOrDefault().Item1;
 		SkiaSharpLinuxVersion = packageVersions["Avalonia.Skia.Linux.Natives"].FirstOrDefault().Item1;
@ -123,6 +124,7 @@ public class Packages
        context.Information("Package: Splat, version: {0}", SplatVersion);
        context.Information("Package: Sprache, version: {0}", SpracheVersion);
        context.Information("Package: System.Reactive, version: {0}", SystemReactiveVersion);
+        context.Information("Package: reactiveui, version: {0}", ReactiveUIVersion);
        context.Information("Package: System.ValueTuple, version: {0}", SystemValueTupleVersion);
        context.Information("Package: SkiaSharp, version: {0}", SkiaSharpVersion);
        context.Information("Package: Avalonia.Skia.Linux.Natives, version: {0}", SkiaSharpLinuxVersion);
@ -175,7 +177,6 @@ public class Packages
            new [] { "./src/", "Avalonia.Visuals", ".xml" },
            new [] { "./src/", "Avalonia.Styling", ".dll" },
            new [] { "./src/", "Avalonia.Styling", ".xml" },
-            new [] { "./src/", "Avalonia.ReactiveUI", ".dll" },
            new [] { "./src/", "Avalonia.Themes.Default", ".dll" },
            new [] { "./src/", "Avalonia.Themes.Default", ".xml" },
            new [] { "./src/Markup/", "Avalonia.Markup", ".dll" },
@ -272,7 +273,24 @@ public class Packages
                },
                BasePath = context.Directory("./src/Avalonia.HtmlRenderer/bin/" + parameters.DirSuffix + "/netstandard2.0"),
                OutputDirectory = parameters.NugetRoot
-            }
+            },
+            ///////////////////////////////////////////////////////////////////////////////
+            // Avalonia.ReactiveUI
+            ///////////////////////////////////////////////////////////////////////////////
+            new NuGetPackSettings()
+            {
+                Id = "Avalonia.ReactiveUI",
+                Dependencies = new DependencyBuilder(this)
+                {
+                    new NuSpecDependency() { Id = "Avalonia", Version = parameters.Version },
+                }.Deps(new string[] {null}, "reactiveui"),
+                Files = new []
+                {
+                    new NuSpecContent { Source = "Avalonia.ReactiveUI.dll", Target = "lib/netstandard2.0" }
+                },
+                BasePath = context.Directory("./src/Avalonia.ReactiveUI/bin/" + parameters.DirSuffix + "/netstandard2.0"),
+                OutputDirectory = parameters.NugetRoot
+            },
        };

        var nuspecNuGetSettingsMobile = new []
--- a/samples/BindingTest/App.xaml.cs
+++ b/samples/BindingTest/App.xaml.cs
@ -20,6 +20,7 @@ namespace BindingTest

            AppBuilder.Configure<App>()
                .UsePlatformDetect()
+                .UseReactiveUI()
                .Start<MainWindow>();
        }

--- a/samples/BindingTest/BindingTest.csproj
+++ b/samples/BindingTest/BindingTest.csproj
@ -45,7 +45,6 @@
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
@ -163,4 +162,5 @@
  <Import Project="..\..\build\Serilog.Sinks.Trace.props" />
  <Import Project="..\..\build\Splat.props" />
  <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\ReactiveUI.props" />
 </Project>
--- a/samples/BindingTest/ViewModels/MainWindowViewModel.cs
+++ b/samples/BindingTest/ViewModels/MainWindowViewModel.cs
@ -28,15 +28,13 @@ namespace BindingTest.ViewModels

            SelectedItems = new ObservableCollection<TestItem>();

-            ShuffleItems = ReactiveCommand.Create();
-            ShuffleItems.Subscribe(_ =>
+            ShuffleItems = ReactiveCommand.Create(() =>
            {
                var r = new Random();
                Items.Move(r.Next(Items.Count), 1);
            });

-            StringValueCommand = ReactiveCommand.Create();
-            StringValueCommand.Subscribe(param =>
+            StringValueCommand = ReactiveCommand.Create<object>(param =>
            {
                BooleanFlag = !BooleanFlag;
                StringValue = param.ToString();
@ -58,7 +56,7 @@ namespace BindingTest.ViewModels

        public ObservableCollection<TestItem> Items { get; }
        public ObservableCollection<TestItem> SelectedItems { get; }
-        public ReactiveCommand<object> ShuffleItems { get; }
+        public ReactiveCommand ShuffleItems { get; }

        public string BooleanString
        {
@ -91,7 +89,7 @@ namespace BindingTest.ViewModels
        }

        public IObservable<string> CurrentTimeObservable { get; }
-        public ReactiveCommand<object> StringValueCommand { get; }
+        public ReactiveCommand StringValueCommand { get; }

        public DataAnnotationsErrorViewModel DataAnnotationsValidation { get; } = new DataAnnotationsErrorViewModel();
        public ExceptionErrorViewModel ExceptionDataValidation { get; } = new ExceptionErrorViewModel();
--- a/samples/BindingTest/ViewModels/NestedCommandViewModel.cs
+++ b/samples/BindingTest/ViewModels/NestedCommandViewModel.cs
@ -12,7 +12,7 @@ namespace BindingTest.ViewModels
    {
        public NestedCommandViewModel()
        {
-            Command = ReactiveCommand.Create();
+            Command = ReactiveCommand.Create(() => { });
        }

        public ICommand Command { get; }
--- a/samples/ControlCatalog.NetCore/Program.cs
+++ b/samples/ControlCatalog.NetCore/Program.cs
@ -16,6 +16,7 @@ namespace ControlCatalog.NetCore
            else
                AppBuilder.Configure<App>()
                    .UsePlatformDetect()
+                    .UseReactiveUI()
                    .Start<MainWindow>();
        }

--- a/samples/RenderTest/Program.cs
+++ b/samples/RenderTest/Program.cs
@ -18,6 +18,7 @@ namespace RenderTest
            // again.
            AppBuilder.Configure<App>()
                .UsePlatformDetect()
+                .UseReactiveUI()
                .Start<MainWindow>();
        }

--- a/samples/RenderTest/RenderTest.csproj
+++ b/samples/RenderTest/RenderTest.csproj
@ -191,4 +191,5 @@
  <Import Project="..\..\build\Serilog.Sinks.Trace.props" />
  <Import Project="..\..\build\Splat.props" />
  <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\ReactiveUI.props" />
 </Project>
--- a/samples/RenderTest/ViewModels/MainWindowViewModel.cs
+++ b/samples/RenderTest/ViewModels/MainWindowViewModel.cs
@ -10,10 +10,8 @@ namespace RenderTest.ViewModels

        public MainWindowViewModel()
        {
-            ToggleDrawDirtyRects = ReactiveCommand.Create();
-            ToggleDrawDirtyRects.Subscribe(_ => DrawDirtyRects = !DrawDirtyRects);
-            ToggleDrawFps = ReactiveCommand.Create();
-            ToggleDrawFps.Subscribe(_ => DrawFps = !DrawFps);
+            ToggleDrawDirtyRects = ReactiveCommand.Create(() => DrawDirtyRects = !DrawDirtyRects);
+            ToggleDrawFps = ReactiveCommand.Create(() => DrawFps = !DrawFps);
        }

        public bool DrawDirtyRects
@ -28,7 +26,7 @@ namespace RenderTest.ViewModels
            set { this.RaiseAndSetIfChanged(ref drawFps, value); }
        }

-        public ReactiveCommand<object> ToggleDrawDirtyRects { get; }
-        public ReactiveCommand<object> ToggleDrawFps { get; }
+        public ReactiveCommand ToggleDrawDirtyRects { get; }
+        public ReactiveCommand ToggleDrawFps { get; }
    }
 }
--- a/samples/VirtualizationTest/Program.cs
+++ b/samples/VirtualizationTest/Program.cs
@ -17,6 +17,7 @@ namespace VirtualizationTest

            AppBuilder.Configure<App>()
               .UsePlatformDetect()
+               .UseReactiveUI()
               .Start<MainWindow>();
        }

--- a/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs
+++ b/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs
@ -23,20 +23,15 @@ namespace VirtualizationTest.ViewModels
        public MainWindowViewModel()
        {
            this.WhenAnyValue(x => x.ItemCount).Subscribe(ResizeItems);
-            RecreateCommand = ReactiveCommand.Create();
-            RecreateCommand.Subscribe(_ => Recreate());
+            RecreateCommand = ReactiveCommand.Create(() => Recreate());

-            AddItemCommand = ReactiveCommand.Create();
-            AddItemCommand.Subscribe(_ => AddItem());
+            AddItemCommand = ReactiveCommand.Create(() => AddItem());

-            RemoveItemCommand = ReactiveCommand.Create();
-            RemoveItemCommand.Subscribe(_ => Remove());
+            RemoveItemCommand = ReactiveCommand.Create(() => Remove());

-            SelectFirstCommand = ReactiveCommand.Create();
-            SelectFirstCommand.Subscribe(_ => SelectItem(0));
+            SelectFirstCommand = ReactiveCommand.Create(() => SelectItem(0));

-            SelectLastCommand = ReactiveCommand.Create();
-            SelectLastCommand.Subscribe(_ => SelectItem(Items.Count - 1));
+            SelectLastCommand = ReactiveCommand.Create(() => SelectItem(Items.Count - 1));
        }

        public string NewItemString
@ -78,11 +73,11 @@ namespace VirtualizationTest.ViewModels
        public IEnumerable<ItemVirtualizationMode> VirtualizationModes => 
            Enum.GetValues(typeof(ItemVirtualizationMode)).Cast<ItemVirtualizationMode>();

-        public ReactiveCommand<object> AddItemCommand { get; private set; }
-        public ReactiveCommand<object> RecreateCommand { get; private set; }
-        public ReactiveCommand<object> RemoveItemCommand { get; private set; }
-        public ReactiveCommand<object> SelectFirstCommand { get; private set; }
-        public ReactiveCommand<object> SelectLastCommand { get; private set; }
+        public ReactiveCommand AddItemCommand { get; private set; }
+        public ReactiveCommand RecreateCommand { get; private set; }
+        public ReactiveCommand RemoveItemCommand { get; private set; }
+        public ReactiveCommand SelectFirstCommand { get; private set; }
+        public ReactiveCommand SelectLastCommand { get; private set; }

        private void ResizeItems(int count)
        {
--- a/samples/VirtualizationTest/VirtualizationTest.csproj
+++ b/samples/VirtualizationTest/VirtualizationTest.csproj
@ -158,4 +158,5 @@
  <Import Project="..\..\build\Serilog.Sinks.Trace.props" />
  <Import Project="..\..\build\Splat.props" />
  <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\ReactiveUI.props" />
 </Project>
--- a/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs
+++ b/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs
@ -0,0 +1,24 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Avalonia.Controls;
+using Avalonia.Threading;
+using ReactiveUI;
+using System;
+using System.Reactive.Concurrency;
+using System.Threading;
+
+namespace Avalonia
+{
+    public static class AppBuilderExtensions
+    {
+        public static TAppBuilder UseReactiveUI<TAppBuilder>(this TAppBuilder builder)
+            where TAppBuilder : AppBuilderBase<TAppBuilder>, new()
+        {
+            return builder.AfterSetup(_ =>
+            {
+                RxApp.MainThreadScheduler = AvaloniaScheduler.Instance;
+            });
+        }
+    }
+}
--- a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
+++ b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
@ -1,83 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard2.0</TargetFramework>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MONO PORTABLE;NETSTANDARD1_1</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MONO PORTABLE;RELEASE;NETSTANDARD1_1</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Remove="Shims.cs" />
-  </ItemGroup>
  <ItemGroup>
    <Compile Include="..\Shared\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Registrations.cs" />
-    <Compile Include="Shims.cs" />
-    <Compile Include="src\ReactiveUI\ExpressionMixins.cs" />
-    <Compile Include="src\ReactiveUI\ExpressionRewriter.cs" />
-    <Compile Include="src\ReactiveUI\Activation.cs" />
-    <Compile Include="src\ReactiveUI\ReactiveBinding.cs" />
-    <Compile Include="src\ReactiveUI\AutoPersistHelper.cs" />
-    <Compile Include="src\ReactiveUI\BindingTypeConverters.cs" />
-    <Compile Include="src\ReactiveUI\CollectionDebugView.cs" />
-    <Compile Include="src\ReactiveUI\CommandBinding.cs" />
-    <Compile Include="src\ReactiveUI\CompatMixins.cs" />
-    <Compile Include="src\ReactiveUI\ContractStubs.cs" />
-    <Compile Include="src\ReactiveUI\CreatesCommandBinding.cs" />
-    <Compile Include="src\ReactiveUI\DefaultPropertyBinding.cs" />
-    <Compile Include="src\ReactiveUI\Errors.cs" />
-    <Compile Include="src\ReactiveUI\IDependencyResolver.cs" />
-    <Compile Include="src\ReactiveUI\INPCObservableForProperty.cs" />
-    <Compile Include="src\ReactiveUI\Interfaces.cs" />
-    <Compile Include="src\ReactiveUI\IROObservableForProperty.cs" />
-    <Compile Include="src\ReactiveUI\MessageBus.cs" />
-    <Compile Include="src\ReactiveUI\MobileLifecycle.cs" />
-    <Compile Include="src\ReactiveUI\NullDefaultPropertyBindingProvider.cs" />
-    <Compile Include="src\ReactiveUI\ObservableAsPropertyHelper.cs" />
-    <Compile Include="src\ReactiveUI\ObservedChangedMixin.cs" />
-    <Compile Include="src\ReactiveUI\OrderedComparer.cs" />
-    <Compile Include="src\ReactiveUI\POCOObservableForProperty.cs" />
-    <Compile Include="src\ReactiveUI\PropertyBinding.cs" />
-    <Compile Include="src\ReactiveUI\ReactiveList.cs" />
-    <Compile Include="src\ReactiveUI\ReactiveCollectionMixins.cs" />
-    <Compile Include="src\ReactiveUI\ReactiveCommand.cs" />
-    <Compile Include="src\ReactiveUI\ReactiveNotifyPropertyChangedMixin.cs" />
-    <Compile Include="src\ReactiveUI\ReactiveObject.cs" />
-    <Compile Include="src\ReactiveUI\RefcountDisposeWrapper.cs" />
-    <Compile Include="src\ReactiveUI\Reflection.cs" />
-    <Compile Include="src\ReactiveUI\RegisterableInterfaces.cs" />
-    <Compile Include="src\ReactiveUI\Registrations.cs" />
-    <Compile Include="src\ReactiveUI\RoutableViewModelMixin.cs" />
-    <Compile Include="src\ReactiveUI\RoutingState.cs" />
-    <Compile Include="src\ReactiveUI\RxApp.cs" />
-    <Compile Include="src\ReactiveUI\ViewLocator.cs" />
-    <Compile Include="src\ReactiveUI\ScheduledSubject.cs" />
-    <Compile Include="src\ReactiveUI\VariadicTemplates.cs" />
-    <Compile Include="src\ReactiveUI\WaitForDispatcherScheduler.cs" />
-    <Compile Include="src\ReactiveUI\LoggingMixins.cs" />
-    <Compile Include="src\ReactiveUI\IReactiveObject.cs" />
-    <Compile Include="src\ReactiveUI\WeakEventManager.cs" />
-    <Compile Include="src\ReactiveUI\Legacy\ReactiveCommand.cs" />
-  </ItemGroup>
-  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
    <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
@ -88,5 +15,6 @@
    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
  </ItemGroup>
  <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\ReactiveUI.props" />
  <Import Project="..\..\build\Splat.props" />
 </Project>
--- a/src/Avalonia.ReactiveUI/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.ReactiveUI/Properties/AssemblyInfo.cs
@ -3,7 +3,4 @@

 using System.Reflection;

-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("Avalonia.ReactiveUI")]
--- a/src/Avalonia.ReactiveUI/Registrations.cs
+++ b/src/Avalonia.ReactiveUI/Registrations.cs
@ -1,23 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Reactive.Concurrency;
-using System.Threading;
-
-
-namespace ReactiveUI
-{
-    /// <summary>
-    /// Ignore me. This class is a secret handshake between RxUI and RxUI.Xaml
-    /// in order to register certain classes on startup that would be difficult
-    /// to register otherwise.
-    /// </summary>
-    public class PlatformRegistrations : IWantsToRegisterStuff
-    {
-        public void Register(Action<Func<object>, Type> registerFunction)
-        {
-            RxApp.MainThreadScheduler = new SynchronizationContextScheduler(SynchronizationContext.Current);
-        }
-    }
-}
--- a/src/Avalonia.ReactiveUI/Shims.cs
+++ b/src/Avalonia.ReactiveUI/Shims.cs
@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace System.Runtime.Serialization
-{
-    class IgnoreDataMemberAttribute : Attribute
-    {
-    }
-
-    class DataMemberAttribute : Attribute
-    {
-    }
-    class OnDeserializedAttribute : Attribute
-    {
-    }
-
-    class DataContractAttribute : Attribute
-    {
-    }
-
-    class StreamingContext { }
-}
-
-namespace System.Diagnostics.Contracts
-{
-    static class Contract
-    {
-        public static void Requires(bool condition)
-        {
-
-        }
-    }
-}
--- a/src/Avalonia.ReactiveUI/src
+++ b/src/Avalonia.ReactiveUI/src
@ -1 +0,0 @@
-Subproject commit 3f725c808b1d4c8457f0d3204e0a071aa462cd75
--- 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 @@
    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
--- 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 = value;
+                    RaisePropertyChanged();
+                }
+            }
+
+            public event PropertyChangedEventHandler PropertyChanged;
+
+            private void RaisePropertyChanged([CallerMemberName] string prop = "")
+            {
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(prop));
            }
        }

--- 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 = value;
+                    RaisePropertyChanged();
+                }
+            }
+
+            public event PropertyChangedEventHandler PropertyChanged;
+
+            private void RaisePropertyChanged([CallerMemberName] string prop = "")
+            {
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(prop));
            }
        }
    }
			`@ -1 +0,0 @@`
			`Subproject commit 3f725c808b1d4c8457f0d3204e0a071aa462cd75`