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.

9 years ago · e028f39ae0
6 changed files with 26 additions and 154 deletions
--- 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,80 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard1.3</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="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\Shared\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.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" />
+    <PackageReference Include="reactiveui" Version="8.0.0-alpha0034" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
--- a/src/Avalonia.ReactiveUI/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.ReactiveUI/Properties/AssemblyInfo.cs
@ -1,33 +1,6 @@
 // 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.Resources;
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;

-// 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")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Avalonia.ReactiveUI")]
-[assembly: AssemblyCopyright("Copyright \u00A9  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
--- 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
			`@ -1 +0,0 @@`
			`Subproject commit 3f725c808b1d4c8457f0d3204e0a071aa462cd75`