Upgrade ReactiveUI to the v8 alpha nuget package so we don't need to maintain our own fork. Avalonia.ReactiveUI only registers the MainScheduler, and it does so via a call to UseReactiveUI on AppBuilder.

Update Rx.Net dependency to match reactiveui's dependency on Rx.

Removed ReactiveUI dependeny in BindingTests.

Updated BindingTest sample to use the new reactiveui APIs.

Update samples to use current ReactiveUI APIs.

Fixed bug I introduced into tests.

Remove RxUI submodule info from .gitmodules

.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

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

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-alpha0034" />
+  </ItemGroup>
+</Project>

build/Rx.props

@@ -1,11 +1,11 @@
 <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.0" />
+    <PackageReference Include="System.Reactive.Core" Version="3.1.0" />
+    <PackageReference Include="System.Reactive.Interfaces" Version="3.1.0" />
+    <PackageReference Include="System.Reactive.Linq" Version="3.1.0" />
+    <PackageReference Include="System.Reactive.PlatformServices" Version="3.1.0" />
+    <PackageReference Condition="'$(TargetFramework)' == 'net45'" Include="System.Reactive.Windows.Threading" Version="3.1.0" />
+    <PackageReference Condition="'$(TargetFramework)' == 'net461'" Include="System.Reactive.Windows.Threading" Version="3.1.0" />
   </ItemGroup>
 </Project>

samples/BindingTest/App.xaml.cs

@@ -20,6 +20,7 @@ namespace BindingTest
 
             AppBuilder.Configure<App>()
                 .UsePlatformDetect()
+                .UseReactiveUI()
                 .Start<MainWindow>();
         }
 

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>

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();

samples/RenderTest/Program.cs

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

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>

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; }
     }
 }

samples/VirtualizationTest/Program.cs

@@ -17,6 +17,7 @@ namespace VirtualizationTest
 
             AppBuilder.Configure<App>()
                .UsePlatformDetect()
+               .UseReactiveUI()
                .Start<MainWindow>();
         }
 

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)
         {

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>

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;
+            });
+        }
+    }
+}

src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard1.3</TargetFramework>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -29,53 +28,7 @@
     <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" />
+    <Compile Include="..\Shared\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
@@ -88,5 +41,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>

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")]

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);
-        }
-    }
-}

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)
-        {
-
-        }
-    }
-}

src/Avalonia.ReactiveUI/src

@@ -1 +0,0 @@
-Subproject commit 3f725c808b1d4c8457f0d3204e0a071aa462cd75

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" />

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));
             }
         }
 

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));
             }
         }
     }