From d8776502965f2a3c9787bb3cd402d72d95f88b79 Mon Sep 17 00:00:00 2001 From: Artjom Graf Date: Tue, 6 Aug 2019 14:56:04 +0300 Subject: [PATCH 1/4] Fix NU1605 error, fix an issue with Uno --- src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj | 2 +- src/ReactiveUI.Uno/ActivationForViewFetcher.cs | 2 +- src/ReactiveUI/ReactiveUI.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj b/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj index 42a163e604..c170484a40 100644 --- a/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj +++ b/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/ReactiveUI.Uno/ActivationForViewFetcher.cs b/src/ReactiveUI.Uno/ActivationForViewFetcher.cs index 7308e4ce75..506f2d12d0 100644 --- a/src/ReactiveUI.Uno/ActivationForViewFetcher.cs +++ b/src/ReactiveUI.Uno/ActivationForViewFetcher.cs @@ -38,7 +38,7 @@ public IObservable GetActivationForView(IActivatable view) } #pragma warning disable SA1114 // Parameter list after. -#if NETSTANDARD || MAC +#if NETSTANDARD var viewLoaded = Observable.FromEvent( #else var viewLoaded = Observable.FromEvent, bool>( diff --git a/src/ReactiveUI/ReactiveUI.csproj b/src/ReactiveUI/ReactiveUI.csproj index 2feb208286..d3bc3a9591 100644 --- a/src/ReactiveUI/ReactiveUI.csproj +++ b/src/ReactiveUI/ReactiveUI.csproj @@ -12,7 +12,7 @@ - + From 00037003096dbb4d9e3bdd31fd786e54b97824e6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2019 00:13:51 +0000 Subject: [PATCH 2/4] build(deps): bump Microsoft.Reactive.Testing from 4.1.5 to 4.1.6 Bumps [Microsoft.Reactive.Testing](https://github.com/dotnet/reactive) from 4.1.5 to 4.1.6. - [Release notes](https://github.com/dotnet/reactive/releases) - [Commits](https://github.com/dotnet/reactive/compare/rxnet-v4.1.5...rxnet-v4.1.6) Signed-off-by: dependabot-preview[bot] --- src/Directory.build.props | 2 +- src/ReactiveUI.Testing/ReactiveUI.Testing.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index ce1e1abf4c..cc86cc09e8 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -47,7 +47,7 @@ - + diff --git a/src/ReactiveUI.Testing/ReactiveUI.Testing.csproj b/src/ReactiveUI.Testing/ReactiveUI.Testing.csproj index 1675b9f9dc..49faa8ca3c 100644 --- a/src/ReactiveUI.Testing/ReactiveUI.Testing.csproj +++ b/src/ReactiveUI.Testing/ReactiveUI.Testing.csproj @@ -10,7 +10,7 @@ - + From be4d98d77f04e74bf9b9191b8efde4f9190de3cb Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Tue, 6 Aug 2019 22:28:17 +1000 Subject: [PATCH 3/4] housekeeping: update both nbgv and api generator --- src/Directory.build.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index 25e0616a7d..6d7253af95 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -48,7 +48,7 @@ - + @@ -68,7 +68,7 @@ - + From 0d7d1c1dc51703c63d5250c9cb3af9722d3e8874 Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Tue, 6 Aug 2019 22:51:40 +1000 Subject: [PATCH 4/4] fix: the api approval tests --- ...provalTests.ReactiveUI.net461.approved.txt | 26 +++++++++---------- ...ests.ReactiveUI.netcoreapp2.0.approved.txt | 26 +++++++++---------- ...iApprovalTests.Testing.net461.approved.txt | 10 +++---- ...alTests.Testing.netcoreapp2.0.approved.txt | 10 +++---- .../ApiApprovalTests.Wpf.net461.approved.txt | 12 --------- src/ReactiveUI/Interfaces/IHasScheduler.cs | 0 6 files changed, 36 insertions(+), 48 deletions(-) create mode 100644 src/ReactiveUI/Interfaces/IHasScheduler.cs diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net461.approved.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net461.approved.txt index b671259841..b7fe8eae6d 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net461.approved.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net461.approved.txt @@ -15,7 +15,7 @@ namespace ReactiveUI where TItem : ReactiveUI.IReactiveObject { } public static System.IDisposable ActOnEveryObject(this TCollection @this, System.Action onAdd, System.Action onRemove) where TItem : ReactiveUI.IReactiveObject - where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable<> { } + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } public static System.IDisposable ActOnEveryObject(this System.IObservable> @this, System.Action onAdd, System.Action onRemove) where TItem : ReactiveUI.IReactiveObject { } public static System.IDisposable AutoPersist(this T @this, System.Func> doPersist, System.Nullable interval = null) @@ -30,7 +30,7 @@ namespace ReactiveUI where TItem : ReactiveUI.IReactiveObject { } public static System.IDisposable AutoPersistCollection(this TCollection @this, System.Func> doPersist, System.IObservable manualSaveSignal, System.Nullable interval = null) where TItem : ReactiveUI.IReactiveObject - where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable<> { } + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } } public enum BindingDirection { @@ -52,7 +52,7 @@ namespace ReactiveUI } public class CombinedReactiveCommand : ReactiveUI.ReactiveCommandBase> { - protected internal CombinedReactiveCommand(System.Collections.Generic.IEnumerable> childCommands, System.IObservable canExecute, System.Reactive.Concurrency.IScheduler outputScheduler) { } + protected CombinedReactiveCommand(System.Collections.Generic.IEnumerable> childCommands, System.IObservable canExecute, System.Reactive.Concurrency.IScheduler outputScheduler) { } public override System.IObservable CanExecute { get; } public override System.IObservable IsExecuting { get; } public override System.IObservable ThrownExceptions { get; } @@ -63,15 +63,15 @@ namespace ReactiveUI public class static CommandBinder { public static ReactiveUI.IReactiveBinding BindCommand(this TView view, TViewModel viewModel, System.Linq.Expressions.Expression> propertyName, System.Linq.Expressions.Expression> controlName, System.IObservable withParameter, string toEvent = null) - where TView : class, ReactiveUI.IViewFor<> + where TView : class, ReactiveUI.IViewFor where TViewModel : class where TProp : System.Windows.Input.ICommand { } public static ReactiveUI.IReactiveBinding BindCommand(this TView view, TViewModel viewModel, System.Linq.Expressions.Expression> propertyName, System.Linq.Expressions.Expression> controlName, string toEvent = null) - where TView : class, ReactiveUI.IViewFor<> + where TView : class, ReactiveUI.IViewFor where TViewModel : class where TProp : System.Windows.Input.ICommand { } public static ReactiveUI.IReactiveBinding BindCommand(this TView view, TViewModel viewModel, System.Linq.Expressions.Expression> propertyName, System.Linq.Expressions.Expression> controlName, System.Linq.Expressions.Expression> withParameter, string toEvent = null) - where TView : class, ReactiveUI.IViewFor<> + where TView : class, ReactiveUI.IViewFor where TViewModel : class where TProp : System.Windows.Input.ICommand { } } @@ -79,11 +79,11 @@ namespace ReactiveUI { public CommandBinderImplementation() { } public ReactiveUI.IReactiveBinding BindCommand(TViewModel viewModel, TView view, System.Linq.Expressions.Expression> vmProperty, System.Linq.Expressions.Expression> controlProperty, System.Func withParameter, string toEvent = null) - where TView : class, ReactiveUI.IViewFor<> + where TView : class, ReactiveUI.IViewFor where TViewModel : class where TProp : System.Windows.Input.ICommand { } public ReactiveUI.IReactiveBinding BindCommand(TViewModel viewModel, TView view, System.Linq.Expressions.Expression> vmProperty, System.Linq.Expressions.Expression> controlProperty, System.IObservable withParameter, string toEvent = null) - where TView : class, ReactiveUI.IViewFor<> + where TView : class, ReactiveUI.IViewFor where TViewModel : class where TProp : System.Windows.Input.ICommand { } } @@ -359,11 +359,11 @@ namespace ReactiveUI { public static ReactiveUI.ObservableAsPropertyHelper ToProperty(this System.IObservable target, TObj source, System.Linq.Expressions.Expression> property, TRet initialValue = null, bool deferSubscription = False, System.Reactive.Concurrency.IScheduler scheduler = null) where TObj : class, ReactiveUI.IReactiveObject { } - public static ReactiveUI.ObservableAsPropertyHelper ToProperty(this System.IObservable target, TObj source, System.Linq.Expressions.Expression> property, out ReactiveUI.ObservableAsPropertyHelper<> result, TRet initialValue = null, bool deferSubscription = False, System.Reactive.Concurrency.IScheduler scheduler = null) + public static ReactiveUI.ObservableAsPropertyHelper ToProperty(this System.IObservable target, TObj source, System.Linq.Expressions.Expression> property, out ReactiveUI.ObservableAsPropertyHelper result, TRet initialValue = null, bool deferSubscription = False, System.Reactive.Concurrency.IScheduler scheduler = null) where TObj : class, ReactiveUI.IReactiveObject { } public static ReactiveUI.ObservableAsPropertyHelper ToProperty(this System.IObservable target, TObj source, string property, TRet initialValue = null, bool deferSubscription = False, System.Reactive.Concurrency.IScheduler scheduler = null) where TObj : class, ReactiveUI.IReactiveObject { } - public static ReactiveUI.ObservableAsPropertyHelper ToProperty(this System.IObservable target, TObj source, string property, out ReactiveUI.ObservableAsPropertyHelper<> result, TRet initialValue = null, bool deferSubscription = False, System.Reactive.Concurrency.IScheduler scheduler = null) + public static ReactiveUI.ObservableAsPropertyHelper ToProperty(this System.IObservable target, TObj source, string property, out ReactiveUI.ObservableAsPropertyHelper result, TRet initialValue = null, bool deferSubscription = False, System.Reactive.Concurrency.IScheduler scheduler = null) where TObj : class, ReactiveUI.IReactiveObject { } } public sealed class ObservableAsPropertyHelper : ReactiveUI.IHandleObservableErrors, Splat.IEnableLogger, System.IDisposable @@ -513,7 +513,7 @@ namespace ReactiveUI } public class ReactiveCommand : ReactiveUI.ReactiveCommandBase { - protected internal ReactiveCommand(System.Func> execute, System.IObservable canExecute, System.Reactive.Concurrency.IScheduler outputScheduler) { } + protected ReactiveCommand(System.Func> execute, System.IObservable canExecute, System.Reactive.Concurrency.IScheduler outputScheduler) { } public override System.IObservable CanExecute { get; } public override System.IObservable IsExecuting { get; } public override System.IObservable ThrownExceptions { get; } @@ -566,7 +566,7 @@ namespace ReactiveUI public static System.Type ReallyFindType(string type, bool throwOnFailure) { } public static System.Linq.Expressions.Expression Rewrite(System.Linq.Expressions.Expression expression) { } public static void ThrowIfMethodsNotOverloaded(string callingTypeName, object targetObject, params string[] methodsToCheck) { } - public static bool TryGetAllValuesForPropertyChain(out ReactiveUI.IObservedChange<, > changeValues, object current, System.Collections.Generic.IEnumerable expressionChain) { } + public static bool TryGetAllValuesForPropertyChain(out ReactiveUI.IObservedChange<, >[] changeValues, object current, System.Collections.Generic.IEnumerable expressionChain) { } public static bool TryGetValueForPropertyChain(out TValue changeValue, object current, System.Collections.Generic.IEnumerable expressionChain) { } public static bool TrySetValueToPropertyChain(object target, System.Collections.Generic.IEnumerable expressionChain, TValue value, bool shouldThrow = True) { } } @@ -898,7 +898,7 @@ namespace ReactiveUI.Legacy public static ReactiveUI.Legacy.IReactiveDerivedList CreateCollection(this System.IObservable fromObservable, System.Nullable withDelay = null, System.Action onError = null, System.Reactive.Concurrency.IScheduler scheduler = null) { } } [System.Diagnostics.DebuggerDisplayAttribute("Count = {Count}")] - [System.Diagnostics.DebuggerTypeProxyAttribute(typeof(ReactiveUI.Legacy.CollectionDebugView<>))] + [System.Diagnostics.DebuggerTypeProxyAttribute(typeof(ReactiveUI.Legacy.CollectionDebugView))] [System.ObsoleteAttribute("ReactiveList is no longer supported. We suggest replacing it with DynamicData htt" + "ps://github.com/rolandpheasant/dynamicdata")] public class ReactiveList : ReactiveUI.INotifyCollectionChanging, ReactiveUI.INotifyPropertyChanging, ReactiveUI.IReactiveObject, ReactiveUI.Legacy.IReactiveCollection, ReactiveUI.Legacy.IReactiveList, ReactiveUI.Legacy.IReactiveNotifyCollectionChanged, ReactiveUI.Legacy.IReactiveNotifyCollectionItemChanged, ReactiveUI.Legacy.IReadOnlyReactiveCollection, ReactiveUI.Legacy.IReadOnlyReactiveList, Splat.IEnableLogger, System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.IReadOnlyList, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.IList, System.Collections.Specialized.INotifyCollectionChanged, System.ComponentModel.INotifyPropertyChanged diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp2.0.approved.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp2.0.approved.txt index b25be35e00..89a43aa80f 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp2.0.approved.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp2.0.approved.txt @@ -15,7 +15,7 @@ namespace ReactiveUI where TItem : ReactiveUI.IReactiveObject { } public static System.IDisposable ActOnEveryObject(this TCollection @this, System.Action onAdd, System.Action onRemove) where TItem : ReactiveUI.IReactiveObject - where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable<> { } + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } public static System.IDisposable ActOnEveryObject(this System.IObservable> @this, System.Action onAdd, System.Action onRemove) where TItem : ReactiveUI.IReactiveObject { } public static System.IDisposable AutoPersist(this T @this, System.Func> doPersist, System.Nullable interval = null) @@ -30,7 +30,7 @@ namespace ReactiveUI where TItem : ReactiveUI.IReactiveObject { } public static System.IDisposable AutoPersistCollection(this TCollection @this, System.Func> doPersist, System.IObservable manualSaveSignal, System.Nullable interval = null) where TItem : ReactiveUI.IReactiveObject - where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable<> { } + where TCollection : System.Collections.Specialized.INotifyCollectionChanged, System.Collections.Generic.IEnumerable { } } public enum BindingDirection { @@ -52,7 +52,7 @@ namespace ReactiveUI } public class CombinedReactiveCommand : ReactiveUI.ReactiveCommandBase> { - protected internal CombinedReactiveCommand(System.Collections.Generic.IEnumerable> childCommands, System.IObservable canExecute, System.Reactive.Concurrency.IScheduler outputScheduler) { } + protected CombinedReactiveCommand(System.Collections.Generic.IEnumerable> childCommands, System.IObservable canExecute, System.Reactive.Concurrency.IScheduler outputScheduler) { } public override System.IObservable CanExecute { get; } public override System.IObservable IsExecuting { get; } public override System.IObservable ThrownExceptions { get; } @@ -63,15 +63,15 @@ namespace ReactiveUI public class static CommandBinder { public static ReactiveUI.IReactiveBinding BindCommand(this TView view, TViewModel viewModel, System.Linq.Expressions.Expression> propertyName, System.Linq.Expressions.Expression> controlName, System.IObservable withParameter, string toEvent = null) - where TView : class, ReactiveUI.IViewFor<> + where TView : class, ReactiveUI.IViewFor where TViewModel : class where TProp : System.Windows.Input.ICommand { } public static ReactiveUI.IReactiveBinding BindCommand(this TView view, TViewModel viewModel, System.Linq.Expressions.Expression> propertyName, System.Linq.Expressions.Expression> controlName, string toEvent = null) - where TView : class, ReactiveUI.IViewFor<> + where TView : class, ReactiveUI.IViewFor where TViewModel : class where TProp : System.Windows.Input.ICommand { } public static ReactiveUI.IReactiveBinding BindCommand(this TView view, TViewModel viewModel, System.Linq.Expressions.Expression> propertyName, System.Linq.Expressions.Expression> controlName, System.Linq.Expressions.Expression> withParameter, string toEvent = null) - where TView : class, ReactiveUI.IViewFor<> + where TView : class, ReactiveUI.IViewFor where TViewModel : class where TProp : System.Windows.Input.ICommand { } } @@ -79,11 +79,11 @@ namespace ReactiveUI { public CommandBinderImplementation() { } public ReactiveUI.IReactiveBinding BindCommand(TViewModel viewModel, TView view, System.Linq.Expressions.Expression> vmProperty, System.Linq.Expressions.Expression> controlProperty, System.Func withParameter, string toEvent = null) - where TView : class, ReactiveUI.IViewFor<> + where TView : class, ReactiveUI.IViewFor where TViewModel : class where TProp : System.Windows.Input.ICommand { } public ReactiveUI.IReactiveBinding BindCommand(TViewModel viewModel, TView view, System.Linq.Expressions.Expression> vmProperty, System.Linq.Expressions.Expression> controlProperty, System.IObservable withParameter, string toEvent = null) - where TView : class, ReactiveUI.IViewFor<> + where TView : class, ReactiveUI.IViewFor where TViewModel : class where TProp : System.Windows.Input.ICommand { } } @@ -353,11 +353,11 @@ namespace ReactiveUI { public static ReactiveUI.ObservableAsPropertyHelper ToProperty(this System.IObservable target, TObj source, System.Linq.Expressions.Expression> property, TRet initialValue = null, bool deferSubscription = False, System.Reactive.Concurrency.IScheduler scheduler = null) where TObj : class, ReactiveUI.IReactiveObject { } - public static ReactiveUI.ObservableAsPropertyHelper ToProperty(this System.IObservable target, TObj source, System.Linq.Expressions.Expression> property, out ReactiveUI.ObservableAsPropertyHelper<> result, TRet initialValue = null, bool deferSubscription = False, System.Reactive.Concurrency.IScheduler scheduler = null) + public static ReactiveUI.ObservableAsPropertyHelper ToProperty(this System.IObservable target, TObj source, System.Linq.Expressions.Expression> property, out ReactiveUI.ObservableAsPropertyHelper result, TRet initialValue = null, bool deferSubscription = False, System.Reactive.Concurrency.IScheduler scheduler = null) where TObj : class, ReactiveUI.IReactiveObject { } public static ReactiveUI.ObservableAsPropertyHelper ToProperty(this System.IObservable target, TObj source, string property, TRet initialValue = null, bool deferSubscription = False, System.Reactive.Concurrency.IScheduler scheduler = null) where TObj : class, ReactiveUI.IReactiveObject { } - public static ReactiveUI.ObservableAsPropertyHelper ToProperty(this System.IObservable target, TObj source, string property, out ReactiveUI.ObservableAsPropertyHelper<> result, TRet initialValue = null, bool deferSubscription = False, System.Reactive.Concurrency.IScheduler scheduler = null) + public static ReactiveUI.ObservableAsPropertyHelper ToProperty(this System.IObservable target, TObj source, string property, out ReactiveUI.ObservableAsPropertyHelper result, TRet initialValue = null, bool deferSubscription = False, System.Reactive.Concurrency.IScheduler scheduler = null) where TObj : class, ReactiveUI.IReactiveObject { } } public sealed class ObservableAsPropertyHelper : ReactiveUI.IHandleObservableErrors, Splat.IEnableLogger, System.IDisposable @@ -507,7 +507,7 @@ namespace ReactiveUI } public class ReactiveCommand : ReactiveUI.ReactiveCommandBase { - protected internal ReactiveCommand(System.Func> execute, System.IObservable canExecute, System.Reactive.Concurrency.IScheduler outputScheduler) { } + protected ReactiveCommand(System.Func> execute, System.IObservable canExecute, System.Reactive.Concurrency.IScheduler outputScheduler) { } public override System.IObservable CanExecute { get; } public override System.IObservable IsExecuting { get; } public override System.IObservable ThrownExceptions { get; } @@ -560,7 +560,7 @@ namespace ReactiveUI public static System.Type ReallyFindType(string type, bool throwOnFailure) { } public static System.Linq.Expressions.Expression Rewrite(System.Linq.Expressions.Expression expression) { } public static void ThrowIfMethodsNotOverloaded(string callingTypeName, object targetObject, params string[] methodsToCheck) { } - public static bool TryGetAllValuesForPropertyChain(out ReactiveUI.IObservedChange<, > changeValues, object current, System.Collections.Generic.IEnumerable expressionChain) { } + public static bool TryGetAllValuesForPropertyChain(out ReactiveUI.IObservedChange<, >[] changeValues, object current, System.Collections.Generic.IEnumerable expressionChain) { } public static bool TryGetValueForPropertyChain(out TValue changeValue, object current, System.Collections.Generic.IEnumerable expressionChain) { } public static bool TrySetValueToPropertyChain(object target, System.Collections.Generic.IEnumerable expressionChain, TValue value, bool shouldThrow = True) { } } @@ -892,7 +892,7 @@ namespace ReactiveUI.Legacy public static ReactiveUI.Legacy.IReactiveDerivedList CreateCollection(this System.IObservable fromObservable, System.Nullable withDelay = null, System.Action onError = null, System.Reactive.Concurrency.IScheduler scheduler = null) { } } [System.Diagnostics.DebuggerDisplayAttribute("Count = {Count}")] - [System.Diagnostics.DebuggerTypeProxyAttribute(typeof(ReactiveUI.Legacy.CollectionDebugView<>))] + [System.Diagnostics.DebuggerTypeProxyAttribute(typeof(ReactiveUI.Legacy.CollectionDebugView))] [System.ObsoleteAttribute("ReactiveList is no longer supported. We suggest replacing it with DynamicData htt" + "ps://github.com/rolandpheasant/dynamicdata")] public class ReactiveList : ReactiveUI.INotifyCollectionChanging, ReactiveUI.INotifyPropertyChanging, ReactiveUI.IReactiveObject, ReactiveUI.Legacy.IReactiveCollection, ReactiveUI.Legacy.IReactiveList, ReactiveUI.Legacy.IReactiveNotifyCollectionChanged, ReactiveUI.Legacy.IReactiveNotifyCollectionItemChanged, ReactiveUI.Legacy.IReadOnlyReactiveCollection, ReactiveUI.Legacy.IReadOnlyReactiveList, Splat.IEnableLogger, System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.IReadOnlyList, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.IList, System.Collections.Specialized.INotifyCollectionChanged, System.ComponentModel.INotifyPropertyChanged diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.net461.approved.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.net461.approved.txt index 517ff80fca..cbfec3e3ec 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.net461.approved.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.net461.approved.txt @@ -6,15 +6,15 @@ namespace ReactiveUI.Testing { public static TBuilder With(this TBuilder builder, ref TField field, TField value) where TBuilder : ReactiveUI.Testing.IBuilder { } - public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.List<> field, System.Collections.Generic.IEnumerable values) + public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.List field, System.Collections.Generic.IEnumerable values) where TBuilder : ReactiveUI.Testing.IBuilder { } - public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.List<> field, TField value) + public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.List field, TField value) where TBuilder : ReactiveUI.Testing.IBuilder { } - public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.Dictionary<, > dictionary, System.Collections.Generic.KeyValuePair keyValuePair) + public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.Dictionary dictionary, System.Collections.Generic.KeyValuePair keyValuePair) where TBuilder : ReactiveUI.Testing.IBuilder { } - public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.Dictionary<, > dictionary, TKey key, TField value) + public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.Dictionary dictionary, TKey key, TField value) where TBuilder : ReactiveUI.Testing.IBuilder { } - public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.Dictionary<, > dictionary, System.Collections.Generic.IDictionary keyValuePair) { } + public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.Dictionary dictionary, System.Collections.Generic.IDictionary keyValuePair) { } } public class static MessageBusExtensions { diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.netcoreapp2.0.approved.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.netcoreapp2.0.approved.txt index af2f4a4878..905b59d3dd 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.netcoreapp2.0.approved.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.netcoreapp2.0.approved.txt @@ -6,15 +6,15 @@ namespace ReactiveUI.Testing { public static TBuilder With(this TBuilder builder, ref TField field, TField value) where TBuilder : ReactiveUI.Testing.IBuilder { } - public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.List<> field, System.Collections.Generic.IEnumerable values) + public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.List field, System.Collections.Generic.IEnumerable values) where TBuilder : ReactiveUI.Testing.IBuilder { } - public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.List<> field, TField value) + public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.List field, TField value) where TBuilder : ReactiveUI.Testing.IBuilder { } - public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.Dictionary<, > dictionary, System.Collections.Generic.KeyValuePair keyValuePair) + public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.Dictionary dictionary, System.Collections.Generic.KeyValuePair keyValuePair) where TBuilder : ReactiveUI.Testing.IBuilder { } - public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.Dictionary<, > dictionary, TKey key, TField value) + public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.Dictionary dictionary, TKey key, TField value) where TBuilder : ReactiveUI.Testing.IBuilder { } - public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.Dictionary<, > dictionary, System.Collections.Generic.IDictionary keyValuePair) { } + public static TBuilder With(this TBuilder builder, ref System.Collections.Generic.Dictionary dictionary, System.Collections.Generic.IDictionary keyValuePair) { } } public class static MessageBusExtensions { diff --git a/src/ReactiveUI.Tests/Platforms/wpf/API/ApiApprovalTests.Wpf.net461.approved.txt b/src/ReactiveUI.Tests/Platforms/wpf/API/ApiApprovalTests.Wpf.net461.approved.txt index d308bde040..a2b9191edc 100644 --- a/src/ReactiveUI.Tests/Platforms/wpf/API/ApiApprovalTests.Wpf.net461.approved.txt +++ b/src/ReactiveUI.Tests/Platforms/wpf/API/ApiApprovalTests.Wpf.net461.approved.txt @@ -129,16 +129,4 @@ namespace ReactiveUI.Wpf public Registrations() { } public void Register(System.Action, System.Type> registerFunction) { } } -} -namespace XamlGeneratedNamespace -{ - public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper - { - public GeneratedInternalTypeHelper() { } - protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { } - protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { } - protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { } - protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { } - protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { } - } } \ No newline at end of file diff --git a/src/ReactiveUI/Interfaces/IHasScheduler.cs b/src/ReactiveUI/Interfaces/IHasScheduler.cs new file mode 100644 index 0000000000..e69de29bb2