reactiveui · glennawatson · Feb 14, 2022 · Feb 14, 2022 · Feb 14, 2022 · Feb 14, 2022
diff --git a/src/Directory.build.props b/src/Directory.build.props
@@ -50,9 +50,9 @@
     <PackageReference Include="Xunit.StaFact" Version="1.1.11" />
     <PackageReference Include="FluentAssertions" Version="6.5.1" />
     <PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
-    <PackageReference Include="PublicApiGenerator" Version="10.2.0" />
+    <PackageReference Include="PublicApiGenerator" Version="10.3.0" />
     <PackageReference Include="coverlet.msbuild" Version="3.1.2" PrivateAssets="All" />
-    <PackageReference Include="Verify.Xunit" Version="16.1.1" />
+    <PackageReference Include="Verify.Xunit" Version="16.1.2" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsTestProject)' != 'true'">
@@ -71,7 +71,7 @@
   <ItemGroup>	
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.255" PrivateAssets="all" />	
 
-    <PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
+    <PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.406" PrivateAssets="all" />
     <PackageReference Include="Roslynator.Analyzers" Version="4.0.2" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj b/src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net6')) ">
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ReactiveUI.Maui/ReactiveMasterDetailPage.cs b/src/ReactiveUI.Maui/ReactiveMasterDetailPage.cs
@@ -8,7 +8,7 @@
 namespace ReactiveUI.Maui;
 
 /// <summary>
-/// This is an <see cref="MasterDetailPage"/> that is also an <see cref="IViewFor{T}"/>.
+/// This is an MasterDetailPage that is also an <see cref="IViewFor{T}"/>.
 /// </summary>
 /// <typeparam name="TViewModel">The type of the view model.</typeparam>
 /// <seealso cref="Microsoft.Maui.Controls" />
@@ -51,4 +51,4 @@ protected override void OnBindingContextChanged()
     }
 
     private static void OnViewModelChanged(BindableObject bindableObject, object oldValue, object newValue) => bindableObject.BindingContext = newValue;
-}
+}
diff --git a/src/ReactiveUI.Maui/ReactiveNavigationPage.cs b/src/ReactiveUI.Maui/ReactiveNavigationPage.cs
@@ -11,7 +11,6 @@ namespace ReactiveUI.Maui;
 /// This is an <see cref="NavigationPage"/> that is also an <see cref="IViewFor{T}"/>.
 /// </summary>
 /// <typeparam name="TViewModel">The type of the view model.</typeparam>
-/// <seealso cref="Xamarin.Forms.NavigationPage" />
 /// <seealso cref="ReactiveUI.IViewFor{TViewModel}" />
 public class ReactiveNavigationPage<TViewModel> : NavigationPage, IViewFor<TViewModel>
     where TViewModel : class
@@ -51,4 +50,4 @@ protected override void OnBindingContextChanged()
     }
 
     private static void OnViewModelChanged(BindableObject bindableObject, object oldValue, object newValue) => bindableObject.BindingContext = newValue;
-}
+}
diff --git a/src/ReactiveUI.Maui/ReactiveUI.Maui.csproj b/src/ReactiveUI.Maui/ReactiveUI.Maui.csproj
@@ -1,16 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <PackageDescription>Contains the ReactiveUI platform specific extensions for Microsoft Maui</PackageDescription>
     <PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;maui;android;ios;mac;forms;net</PackageTags>
+    <UseMaui>true</UseMaui>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="6.0.100-preview.*" />
-    <PackageReference Include="Microsoft.Maui.Core" Version="6.0.100-preview.*" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
   </ItemGroup>

diff --git 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<ReactiveUI.IObservedChange<, >[]> getCurrentViewModelProperties, System.Func<ReactiveUI.IObservedChange<, >[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction);
+        bool ExecuteHook(object? source, object target, System.Func<ReactiveUI.IObservedChange<object, object>[]> getCurrentViewModelProperties, System.Func<ReactiveUI.IObservedChange<object, object>[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction);
     }
     public class IROObservableForProperty : ReactiveUI.ICreatesObservableForProperty, Splat.IEnableLogger
     {
@@ -402,7 +402,7 @@ namespace ReactiveUI
     public class Interaction<TInput, TOutput>
     {
         public Interaction(System.Reactive.Concurrency.IScheduler? handlerScheduler = null) { }
-        protected System.Func<, >[] GetHandlers() { }
+        protected System.Func<ReactiveUI.InteractionContext<TInput, TOutput>, System.IObservable<System.Reactive.Unit>>[] GetHandlers() { }
         public virtual System.IObservable<TOutput> Handle(TInput input) { }
         public System.IDisposable RegisterHandler(System.Action<ReactiveUI.InteractionContext<TInput, TOutput>> handler) { }
         public System.IDisposable RegisterHandler(System.Func<ReactiveUI.InteractionContext<TInput, TOutput>, 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<System.Linq.Expressions.Expression> expressionChain) { }
+        public static bool TryGetAllValuesForPropertyChain(out ReactiveUI.IObservedChange<object, object?>[] changeValues, object? current, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> expressionChain) { }
         public static bool TryGetValueForPropertyChain<TValue>(out TValue changeValue, object? current, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> expressionChain) { }
         public static bool TrySetValueToPropertyChain<TValue>(object? target, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> 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<TInput, TOutput>? 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
@@ -280,7 +280,7 @@ namespace ReactiveUI
     }
     public interface IPropertyBindingHook
     {
-        bool ExecuteHook(object? source, object target, System.Func<ReactiveUI.IObservedChange<, >[]> getCurrentViewModelProperties, System.Func<ReactiveUI.IObservedChange<, >[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction);
+        bool ExecuteHook(object? source, object target, System.Func<ReactiveUI.IObservedChange<object, object>[]> getCurrentViewModelProperties, System.Func<ReactiveUI.IObservedChange<object, object>[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction);
     }
     public class IROObservableForProperty : ReactiveUI.ICreatesObservableForProperty, Splat.IEnableLogger
     {
@@ -409,7 +409,7 @@ namespace ReactiveUI
     public class Interaction<TInput, TOutput>
     {
         public Interaction(System.Reactive.Concurrency.IScheduler? handlerScheduler = null) { }
-        protected System.Func<, >[] GetHandlers() { }
+        protected System.Func<ReactiveUI.InteractionContext<TInput, TOutput>, System.IObservable<System.Reactive.Unit>>[] GetHandlers() { }
         public virtual System.IObservable<TOutput> Handle(TInput input) { }
         public System.IDisposable RegisterHandler(System.Action<ReactiveUI.InteractionContext<TInput, TOutput>> handler) { }
         public System.IDisposable RegisterHandler(System.Func<ReactiveUI.InteractionContext<TInput, TOutput>, 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<System.Linq.Expressions.Expression> expressionChain) { }
+        public static bool TryGetAllValuesForPropertyChain(out ReactiveUI.IObservedChange<object, object?>[] changeValues, object? current, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> expressionChain) { }
         public static bool TryGetValueForPropertyChain<TValue>(out TValue changeValue, object? current, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> expressionChain) { }
         public static bool TrySetValueToPropertyChain<TValue>(object? target, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> 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<TInput, TOutput>? 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/...eUI.Tests/Platforms/winforms/API/WinformsApiApprovalTests.Winforms.DotNet6_0.verified.txt b/...eUI.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<ReactiveUI.IObservedChange<, >[]> getCurrentViewModelProperties, System.Func<ReactiveUI.IObservedChange<, >[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction) { }
+        public bool ExecuteHook(object? source, object target, System.Func<ReactiveUI.IObservedChange<object, object>[]> getCurrentViewModelProperties, System.Func<ReactiveUI.IObservedChange<object, object>[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction) { }
     }
     public class CreatesWinformsCommandBinding : ReactiveUI.ICreatesCommandBinding
     {

diff --git a/...tiveUI.Tests/Platforms/winforms/API/WinformsApiApprovalTests.Winforms.Net4_8.verified.txt b/...tiveUI.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<ReactiveUI.IObservedChange<, >[]> getCurrentViewModelProperties, System.Func<ReactiveUI.IObservedChange<, >[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction) { }
+        public bool ExecuteHook(object? source, object target, System.Func<ReactiveUI.IObservedChange<object, object>[]> getCurrentViewModelProperties, System.Func<ReactiveUI.IObservedChange<object, object>[]> 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
@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" !$(TargetFramework.StartsWith('net6.0-windows10')) ">
-    <PackageReference Include="Uno.WinUI" Version="4.0.9" />
+    <PackageReference Include="Uno.WinUI" Version="4.0.13" />
   </ItemGroup>
    <PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-windows10'))">
     <DefineConstants>$(DefineConstants);HAS_UNO_WINUI</DefineConstants>

diff --git a/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj b/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" !$(TargetFramework.StartsWith('uap')) ">
-    <PackageReference Include="Uno.UI" Version="4.0.9" />
+    <PackageReference Include="Uno.UI" Version="4.0.13" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">

diff --git a/src/ReactiveUI.XamForms/ReactiveUI.XamForms.csproj b/src/ReactiveUI.XamForms/ReactiveUI.XamForms.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2244" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2337" />
   </ItemGroup>
 
   <ItemGroup>

diff --git 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);
     }
-}
+}
diff --git 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<Type, ICreatesCommandBinding?> _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<object?> commandParameter)
     {
@@ -74,4 +76,4 @@ public static IDisposable BindCommandToObject(ICommand? command, object? target,
 
         return ret;
     }
-}
+}
diff --git a/src/ReactiveUI/Mixins/AutoPersistHelper.cs b/src/ReactiveUI/Mixins/AutoPersistHelper.cs
@@ -29,7 +29,8 @@ public static class AutoPersistHelper
     private static readonly MemoizingMRUCache<Type, Dictionary<string, bool>> _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<Type, bool> _dataContractCheckCache = new(
      (t, _) => t.GetTypeInfo().GetCustomAttributes(typeof(DataContractAttribute), true).Length > 0,
@@ -401,4 +402,4 @@ public static IDisposable ActOnEveryObject<TItem>(this IObservable<IChangeSet<TI
                 }
             }
         });
-}
+}
diff --git a/src/ReactiveUI/Mixins/ReactiveNotifyPropertyChangedMixin.cs b/src/ReactiveUI/Mixins/ReactiveNotifyPropertyChangedMixin.cs
@@ -25,7 +25,8 @@ public static class ReactiveNotifyPropertyChangedMixin
                              {
                                  var score = x.GetAffinityForObject(t.senderType, t.propertyName, t.beforeChange);
                                  return score > acc.score ? (score, x) : acc;
-                             }).binding, RxApp.BigCacheLimit);
+                             }).binding,
+            RxApp.BigCacheLimit);
 
     static ReactiveNotifyPropertyChangedMixin() => RxApp.EnsureInitialized();
 
@@ -204,4 +205,4 @@ public static IObservable<IObservedChange<TSender, TValue>> SubscribeToExpressio
 
         return result.GetNotificationForProperty(sender, expression, propertyName, beforeChange, suppressWarnings);
     }
-}
+}
diff --git 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);
 
     /// <inheritdoc/>
     public int GetAffinityForObjects(Type fromType, Type toType)