From 86283536c38a84e2f5a4b92e69076903c25b551a Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Mon, 14 Feb 2022 15:43:34 +1100 Subject: [PATCH] housekeeping: Update dependencies (#3188) * housekeeping: Update dependencies * Update * Update verifications --- src/Directory.build.props | 6 +++--- src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj | 2 +- src/ReactiveUI.Maui/ReactiveMasterDetailPage.cs | 4 ++-- src/ReactiveUI.Maui/ReactiveNavigationPage.cs | 3 +-- src/ReactiveUI.Maui/ReactiveUI.Maui.csproj | 8 ++------ .../ApiApprovalTests.ReactiveUI.DotNet6_0.verified.txt | 10 +++++----- .../ApiApprovalTests.ReactiveUI.Net4_8.verified.txt | 10 +++++----- ...rmsApiApprovalTests.Winforms.DotNet6_0.verified.txt | 2 +- ...nformsApiApprovalTests.Winforms.Net4_8.verified.txt | 2 +- src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj | 2 +- src/ReactiveUI.Uno/ReactiveUI.Uno.csproj | 2 +- src/ReactiveUI.XamForms/ReactiveUI.XamForms.csproj | 2 +- src/ReactiveUI/Activation/ViewForMixins.cs | 5 +++-- .../Bindings/Command/CreatesCommandBinding.cs | 8 +++++--- src/ReactiveUI/Mixins/AutoPersistHelper.cs | 5 +++-- .../Mixins/ReactiveNotifyPropertyChangedMixin.cs | 5 +++-- .../xamarin-common/ComponentModelTypeConverter.cs | 3 ++- 17 files changed, 40 insertions(+), 39 deletions(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index 1da0687074..605d5ace9a 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -50,9 +50,9 @@ - + - + @@ -71,7 +71,7 @@ - + diff --git a/src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj b/src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj index a8024a0de9..c542dd3af7 100644 --- a/src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj +++ b/src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/ReactiveUI.Maui/ReactiveMasterDetailPage.cs b/src/ReactiveUI.Maui/ReactiveMasterDetailPage.cs index f530f33e50..6456d46cf1 100644 --- a/src/ReactiveUI.Maui/ReactiveMasterDetailPage.cs +++ b/src/ReactiveUI.Maui/ReactiveMasterDetailPage.cs @@ -8,7 +8,7 @@ namespace ReactiveUI.Maui; /// -/// This is an that is also an . +/// This is an MasterDetailPage that is also an . /// /// The type of the view model. /// @@ -51,4 +51,4 @@ protected override void OnBindingContextChanged() } private static void OnViewModelChanged(BindableObject bindableObject, object oldValue, object newValue) => bindableObject.BindingContext = newValue; -} \ No newline at end of file +} diff --git a/src/ReactiveUI.Maui/ReactiveNavigationPage.cs b/src/ReactiveUI.Maui/ReactiveNavigationPage.cs index 4e369a12d0..335d8d3238 100644 --- a/src/ReactiveUI.Maui/ReactiveNavigationPage.cs +++ b/src/ReactiveUI.Maui/ReactiveNavigationPage.cs @@ -11,7 +11,6 @@ namespace ReactiveUI.Maui; /// This is an that is also an . /// /// The type of the view model. -/// /// public class ReactiveNavigationPage : NavigationPage, IViewFor where TViewModel : class @@ -51,4 +50,4 @@ protected override void OnBindingContextChanged() } private static void OnViewModelChanged(BindableObject bindableObject, object oldValue, object newValue) => bindableObject.BindingContext = newValue; -} \ No newline at end of file +} diff --git a/src/ReactiveUI.Maui/ReactiveUI.Maui.csproj b/src/ReactiveUI.Maui/ReactiveUI.Maui.csproj index b282902027..2bc48fe2e1 100644 --- a/src/ReactiveUI.Maui/ReactiveUI.Maui.csproj +++ b/src/ReactiveUI.Maui/ReactiveUI.Maui.csproj @@ -1,16 +1,12 @@ - net6.0 + net6.0 Contains the ReactiveUI platform specific extensions for Microsoft Maui mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;maui;android;ios;mac;forms;net + true - - - - - diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.DotNet6_0.verified.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.DotNet6_0.verified.txt index b9eb3793a6..f69faa0c80 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.DotNet6_0.verified.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.DotNet6_0.verified.txt @@ -273,7 +273,7 @@ namespace ReactiveUI } public interface IPropertyBindingHook { - bool ExecuteHook(object? source, object target, System.Func[]> getCurrentViewModelProperties, System.Func[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction); + bool ExecuteHook(object? source, object target, System.Func[]> getCurrentViewModelProperties, System.Func[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction); } public class IROObservableForProperty : ReactiveUI.ICreatesObservableForProperty, Splat.IEnableLogger { @@ -402,7 +402,7 @@ namespace ReactiveUI public class Interaction { public Interaction(System.Reactive.Concurrency.IScheduler? handlerScheduler = null) { } - protected System.Func<, >[] GetHandlers() { } + protected System.Func, System.IObservable>[] GetHandlers() { } public virtual System.IObservable Handle(TInput input) { } public System.IDisposable RegisterHandler(System.Action> handler) { } public System.IDisposable RegisterHandler(System.Func, System.Threading.Tasks.Task> handler) { } @@ -745,7 +745,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) { } } @@ -824,7 +824,7 @@ namespace ReactiveUI public int GetAffinityForObjects(System.Type fromType, System.Type toType) { } public bool TryConvert(object? from, System.Type toType, object? conversionHint, out object result) { } } - [System.AttributeUsage(System.AttributeTargets.Class | System.AttributeTargets.All)] + [System.AttributeUsage(System.AttributeTargets.Class)] public sealed class SingleInstanceViewAttribute : System.Attribute { public SingleInstanceViewAttribute() { } @@ -873,7 +873,7 @@ namespace ReactiveUI public ReactiveUI.Interaction? Interaction { get; } public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } - [System.AttributeUsage(System.AttributeTargets.Class | System.AttributeTargets.All)] + [System.AttributeUsage(System.AttributeTargets.Class)] public sealed class ViewContractAttribute : System.Attribute { public ViewContractAttribute(string contract) { } diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.Net4_8.verified.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.Net4_8.verified.txt index 8429790734..6f97019659 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.Net4_8.verified.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.Net4_8.verified.txt @@ -280,7 +280,7 @@ namespace ReactiveUI } public interface IPropertyBindingHook { - bool ExecuteHook(object? source, object target, System.Func[]> getCurrentViewModelProperties, System.Func[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction); + bool ExecuteHook(object? source, object target, System.Func[]> getCurrentViewModelProperties, System.Func[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction); } public class IROObservableForProperty : ReactiveUI.ICreatesObservableForProperty, Splat.IEnableLogger { @@ -409,7 +409,7 @@ namespace ReactiveUI public class Interaction { public Interaction(System.Reactive.Concurrency.IScheduler? handlerScheduler = null) { } - protected System.Func<, >[] GetHandlers() { } + protected System.Func, System.IObservable>[] GetHandlers() { } public virtual System.IObservable Handle(TInput input) { } public System.IDisposable RegisterHandler(System.Action> handler) { } public System.IDisposable RegisterHandler(System.Func, System.Threading.Tasks.Task> handler) { } @@ -752,7 +752,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) { } } @@ -831,7 +831,7 @@ namespace ReactiveUI public int GetAffinityForObjects(System.Type fromType, System.Type toType) { } public bool TryConvert(object? from, System.Type toType, object? conversionHint, out object result) { } } - [System.AttributeUsage(System.AttributeTargets.Class | System.AttributeTargets.All)] + [System.AttributeUsage(System.AttributeTargets.Class)] public sealed class SingleInstanceViewAttribute : System.Attribute { public SingleInstanceViewAttribute() { } @@ -880,7 +880,7 @@ namespace ReactiveUI public ReactiveUI.Interaction? Interaction { get; } public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } - [System.AttributeUsage(System.AttributeTargets.Class | System.AttributeTargets.All)] + [System.AttributeUsage(System.AttributeTargets.Class)] public sealed class ViewContractAttribute : System.Attribute { public ViewContractAttribute(string contract) { } diff --git a/src/ReactiveUI.Tests/Platforms/winforms/API/WinformsApiApprovalTests.Winforms.DotNet6_0.verified.txt b/src/ReactiveUI.Tests/Platforms/winforms/API/WinformsApiApprovalTests.Winforms.DotNet6_0.verified.txt index 2db85ce976..489223c745 100644 --- a/src/ReactiveUI.Tests/Platforms/winforms/API/WinformsApiApprovalTests.Winforms.DotNet6_0.verified.txt +++ b/src/ReactiveUI.Tests/Platforms/winforms/API/WinformsApiApprovalTests.Winforms.DotNet6_0.verified.txt @@ -12,7 +12,7 @@ namespace ReactiveUI.Winforms public class ContentControlBindingHook : ReactiveUI.IPropertyBindingHook { public ContentControlBindingHook() { } - public bool ExecuteHook(object? source, object target, System.Func[]> getCurrentViewModelProperties, System.Func[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction) { } + public bool ExecuteHook(object? source, object target, System.Func[]> getCurrentViewModelProperties, System.Func[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction) { } } public class CreatesWinformsCommandBinding : ReactiveUI.ICreatesCommandBinding { diff --git a/src/ReactiveUI.Tests/Platforms/winforms/API/WinformsApiApprovalTests.Winforms.Net4_8.verified.txt b/src/ReactiveUI.Tests/Platforms/winforms/API/WinformsApiApprovalTests.Winforms.Net4_8.verified.txt index 3f24eda752..92e5468102 100644 --- a/src/ReactiveUI.Tests/Platforms/winforms/API/WinformsApiApprovalTests.Winforms.Net4_8.verified.txt +++ b/src/ReactiveUI.Tests/Platforms/winforms/API/WinformsApiApprovalTests.Winforms.Net4_8.verified.txt @@ -10,7 +10,7 @@ namespace ReactiveUI.Winforms public class ContentControlBindingHook : ReactiveUI.IPropertyBindingHook { public ContentControlBindingHook() { } - public bool ExecuteHook(object? source, object target, System.Func[]> getCurrentViewModelProperties, System.Func[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction) { } + public bool ExecuteHook(object? source, object target, System.Func[]> getCurrentViewModelProperties, System.Func[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction) { } } public class CreatesWinformsCommandBinding : ReactiveUI.ICreatesCommandBinding { diff --git a/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj b/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj index accd42d78f..fe81b85f50 100644 --- a/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj +++ b/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj @@ -30,7 +30,7 @@ - + $(DefineConstants);HAS_UNO_WINUI diff --git a/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj b/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj index 40d1aeebe0..48f06c17ae 100644 --- a/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj +++ b/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj @@ -28,7 +28,7 @@ - + diff --git a/src/ReactiveUI.XamForms/ReactiveUI.XamForms.csproj b/src/ReactiveUI.XamForms/ReactiveUI.XamForms.csproj index 66b8f7eed3..f1d97333a1 100644 --- a/src/ReactiveUI.XamForms/ReactiveUI.XamForms.csproj +++ b/src/ReactiveUI.XamForms/ReactiveUI.XamForms.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/ReactiveUI/Activation/ViewForMixins.cs b/src/ReactiveUI/Activation/ViewForMixins.cs index c5227a93c0..1ccad7aa71 100644 --- a/src/ReactiveUI/Activation/ViewForMixins.cs +++ b/src/ReactiveUI/Activation/ViewForMixins.cs @@ -27,7 +27,8 @@ public static class ViewForMixins { var score = x?.GetAffinityForView(t) ?? 0; return score > acc.count ? (score, x) : acc; - }).viewFetcher, RxApp.SmallCacheLimit); + }).viewFetcher, + RxApp.SmallCacheLimit); static ViewForMixins() => RxApp.EnsureInitialized(); @@ -282,4 +283,4 @@ private static IDisposable HandleViewModelActivation(IViewFor view, IObservable< vmDisposable, viewVmDisposable); } -} \ No newline at end of file +} diff --git a/src/ReactiveUI/Bindings/Command/CreatesCommandBinding.cs b/src/ReactiveUI/Bindings/Command/CreatesCommandBinding.cs index 21fb00334a..30deb85877 100644 --- a/src/ReactiveUI/Bindings/Command/CreatesCommandBinding.cs +++ b/src/ReactiveUI/Bindings/Command/CreatesCommandBinding.cs @@ -22,7 +22,8 @@ internal class CreatesCommandBinding { var score = x.GetAffinityForObject(t, false); return (score > acc.score) ? (score, x) : acc; - }).binding, RxApp.SmallCacheLimit); + }).binding, + RxApp.SmallCacheLimit); private static readonly MemoizingMRUCache _bindCommandEventCache = new( @@ -31,7 +32,8 @@ internal class CreatesCommandBinding { var score = x.GetAffinityForObject(t, true); return (score > acc.score) ? (score, x) : acc; - }).binding, RxApp.SmallCacheLimit); + }).binding, + RxApp.SmallCacheLimit); public static IDisposable BindCommandToObject(ICommand? command, object? target, IObservable commandParameter) { @@ -74,4 +76,4 @@ public static IDisposable BindCommandToObject(ICommand? command, object? target, return ret; } -} \ No newline at end of file +} diff --git a/src/ReactiveUI/Mixins/AutoPersistHelper.cs b/src/ReactiveUI/Mixins/AutoPersistHelper.cs index 1d2e40e5c7..5a4ea9b637 100644 --- a/src/ReactiveUI/Mixins/AutoPersistHelper.cs +++ b/src/ReactiveUI/Mixins/AutoPersistHelper.cs @@ -29,7 +29,8 @@ public static class AutoPersistHelper private static readonly MemoizingMRUCache> _persistablePropertiesCache = new( (type, _) => type.GetTypeInfo().DeclaredProperties .Where(x => x.CustomAttributes.Any(y => typeof(DataMemberAttribute).GetTypeInfo().IsAssignableFrom(y.AttributeType.GetTypeInfo()))) - .ToDictionary(k => k.Name, _ => true), RxApp.SmallCacheLimit); + .ToDictionary(k => k.Name, _ => true), + RxApp.SmallCacheLimit); private static readonly MemoizingMRUCache _dataContractCheckCache = new( (t, _) => t.GetTypeInfo().GetCustomAttributes(typeof(DataContractAttribute), true).Length > 0, @@ -401,4 +402,4 @@ public static IDisposable ActOnEveryObject(this IObservable acc.score ? (score, x) : acc; - }).binding, RxApp.BigCacheLimit); + }).binding, + RxApp.BigCacheLimit); static ReactiveNotifyPropertyChangedMixin() => RxApp.EnsureInitialized(); @@ -204,4 +205,4 @@ public static IObservable> SubscribeToExpressio return result.GetNotificationForProperty(sender, expression, propertyName, beforeChange, suppressWarnings); } -} \ No newline at end of file +} diff --git a/src/ReactiveUI/Platforms/xamarin-common/ComponentModelTypeConverter.cs b/src/ReactiveUI/Platforms/xamarin-common/ComponentModelTypeConverter.cs index a324a344b9..a55bba4f82 100644 --- a/src/ReactiveUI/Platforms/xamarin-common/ComponentModelTypeConverter.cs +++ b/src/ReactiveUI/Platforms/xamarin-common/ComponentModelTypeConverter.cs @@ -27,7 +27,8 @@ public class ComponentModelTypeConverter : IBindingTypeConverter var converter = TypeDescriptor.GetConverter(types.fromType); return converter.CanConvertTo(types.toType) ? converter : null; - }, RxApp.SmallCacheLimit); + }, + RxApp.SmallCacheLimit); /// public int GetAffinityForObjects(Type fromType, Type toType)