Remove Rx.props from ControlCatalog and some other projects too

samples/ControlCatalog/Pages/MenuPage.xaml.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Reactive;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Avalonia.Controls;

samples/ControlCatalog/Pages/PointerContactsTab.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reactive.Linq;
 
 using Avalonia;
 using Avalonia.Controls;

samples/ControlCatalog/ViewModels/ComboBoxPageViewModel.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Reactive;
 using Avalonia.Controls;
 using Avalonia.Controls.Selection;
 using MiniMvvm;

samples/ControlCatalog/ViewModels/ContextPageViewModel.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Reactive;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.VisualTree;

samples/ControlCatalog/ViewModels/ListBoxPageViewModel.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Reactive;
 using Avalonia.Controls;
 using Avalonia.Controls.Selection;
 using ControlCatalog.Pages;

samples/ControlCatalog/ViewModels/MainWindowViewModel.cs

@@ -1,9 +1,9 @@
-using System.Reactive;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Notifications;
 using Avalonia.Dialogs;
 using Avalonia.Platform;
+using Avalonia.Reactive;
 using System;
 using System.ComponentModel.DataAnnotations;
 using MiniMvvm;

samples/ControlCatalog/ViewModels/MenuPageViewModel.cs

@@ -1,6 +1,4 @@
 using System.Collections.Generic;
-using System.Reactive;
-using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.VisualTree;

samples/ControlCatalog/ViewModels/NotificationViewModel.cs

@@ -1,5 +1,4 @@
-using System.Reactive;
-using Avalonia.Controls.Notifications;
+using Avalonia.Controls.Notifications;
 using MiniMvvm;
 
 namespace ControlCatalog.ViewModels

samples/ControlCatalog/ViewModels/RefreshContainerViewModel.cs

@@ -1,6 +1,5 @@
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Reactive;
 using System.Threading.Tasks;
 using Avalonia.Controls.Notifications;
 using ControlCatalog.Pages;

samples/ControlCatalog/ViewModels/TreeViewPageViewModel.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Reactive;
 using Avalonia.Controls;
 using MiniMvvm;
 

samples/MiniMvvm/MiniMvvm.csproj

@@ -2,5 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
-  <Import Project="..\..\build\Rx.props" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
+  </ItemGroup>
 </Project>

samples/MiniMvvm/PropertyChangedExtensions.cs

@@ -1,8 +1,8 @@
 using System;
 using System.ComponentModel;
 using System.Linq.Expressions;
-using System.Reactive.Linq;
 using System.Reflection;
+using Avalonia.Reactive;
 
 namespace MiniMvvm
 {
@@ -92,11 +92,13 @@ namespace MiniMvvm
             Expression<Func<TModel, T3>> v3,
             Func<T1, T2, T3, TRes> cb
         ) where TModel : INotifyPropertyChanged =>
-            Observable.CombineLatest(
-                model.WhenAnyValue(v1),
-                model.WhenAnyValue(v2),
-                model.WhenAnyValue(v3),
-                cb);
+            model.WhenAnyValue(v1)
+                .CombineLatest(
+                    model.WhenAnyValue(v2),
+                    (l, r) => (l, r))
+                .CombineLatest(
+                    model.WhenAnyValue(v3),
+                    (t, r) => cb(t.l, t.r, r));
 
         public static IObservable<ValueTuple<T1, T2, T3>> WhenAnyValue<TModel, T1, T2, T3>(this TModel model,
             Expression<Func<TModel, T1>> v1,

samples/MiniMvvm/ViewModelBase.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Reactive.Joins;
 using System.Runtime.CompilerServices;
 
 namespace MiniMvvm

samples/ReactiveUIDemo/ReactiveUIDemo.csproj

@@ -23,6 +23,5 @@
   <Import Project="..\..\build\SampleApp.props" />
   <Import Project="..\..\build\ReferenceCoreLibraries.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
-  <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ReactiveUI.props" />
 </Project>

samples/interop/WindowsInteropTest/WindowsInteropTest.csproj

@@ -15,6 +15,4 @@
       <Name>ControlCatalog</Name>
     </ProjectReference>
   </ItemGroup>
-
-  <Import Project="..\..\..\build\Rx.props" />
 </Project>

src/Avalonia.Base/Avalonia.Base.csproj

@@ -58,6 +58,8 @@
     <InternalsVisibleTo Include="Avalonia.iOS, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Dialogs, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Diagnostics, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="MiniMvvm, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="ControlCatalog, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
   </ItemGroup>