Update samples to use current ReactiveUI APIs.

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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
 EndProject
@@ -169,6 +169,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>

samples/BindingTest/BindingTest.csproj

@@ -161,4 +161,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/Program.cs

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

samples/RenderTest/RenderTest.csproj

@@ -183,4 +183,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 = ReactiveCommand.Create(() => DrawDirtyRects = !DrawDirtyRects);
-            ToggleDrawDirtyRects.Subscribe(_ => DrawDirtyRects = !DrawDirtyRects);
+            ToggleDrawFps = ReactiveCommand.Create(() => DrawFps = !DrawFps);
-            ToggleDrawFps = ReactiveCommand.Create();
-            ToggleDrawFps.Subscribe(_ => 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 ToggleDrawDirtyRects { get; }
-        public ReactiveCommand<object> ToggleDrawFps { 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 = ReactiveCommand.Create(() => Recreate());
-            RecreateCommand.Subscribe(_ => Recreate());
 
-            AddItemCommand = ReactiveCommand.Create();
+            AddItemCommand = ReactiveCommand.Create(() => AddItem());
-            AddItemCommand.Subscribe(_ => AddItem());
 
-            RemoveItemCommand = ReactiveCommand.Create();
+            RemoveItemCommand = ReactiveCommand.Create(() => Remove());
-            RemoveItemCommand.Subscribe(_ => Remove());
 
-            SelectFirstCommand = ReactiveCommand.Create();
+            SelectFirstCommand = ReactiveCommand.Create(() => SelectItem(0));
-            SelectFirstCommand.Subscribe(_ => SelectItem(0));
 
-            SelectLastCommand = ReactiveCommand.Create();
+            SelectLastCommand = ReactiveCommand.Create(() => SelectItem(Items.Count - 1));
-            SelectLastCommand.Subscribe(_ => 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 AddItemCommand { get; private set; }
-        public ReactiveCommand<object> RecreateCommand { get; private set; }
+        public ReactiveCommand RecreateCommand { get; private set; }
-        public ReactiveCommand<object> RemoveItemCommand { get; private set; }
+        public ReactiveCommand RemoveItemCommand { get; private set; }
-        public ReactiveCommand<object> SelectFirstCommand { get; private set; }
+        public ReactiveCommand SelectFirstCommand { get; private set; }
-        public ReactiveCommand<object> SelectLastCommand { 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/Avalonia.ReactiveUI.csproj

@@ -6,9 +6,6 @@
   <ItemGroup>
     <Compile Include="..\Shared\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="reactiveui" Version="8.0.0-alpha0034" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
@@ -20,5 +17,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>