fix for WhenAny WhenAnyValue ToProperty (#2860)

* Update WhenAny WhenAnyValue to use nullable for selector

* fix ToProperty

Need to add tests

* Update ReactiveUI.sln

* Update WhenAny / WhenAnyValue

Add test

* Put packages back to V12

need to fix Splat.DryIoc to complete V12 update

* Update DryIoc to V12 pending Splat release

Author: ChrisPulman

src/ReactiveUI.Fody.Helpers/ObservableAsPropertyExtensions.cs

@@ -33,8 +33,8 @@ public static class ObservableAsPropertyExtensions
         /// </exception>
         public static ObservableAsPropertyHelper<TRet> ToPropertyEx<TObj, TRet>(
             this IObservable<TRet> item,
-            TObj? source,
-            Expression<Func<TObj, TRet?>> property,
+            TObj source,
+            Expression<Func<TObj, TRet>> property,
             bool deferSubscription = false,
             IScheduler? scheduler = null)
             where TObj : ReactiveObject
@@ -88,8 +88,8 @@ public static ObservableAsPropertyHelper<TRet> ToPropertyEx<TObj, TRet>(
         /// </exception>
         public static ObservableAsPropertyHelper<TRet> ToPropertyEx<TObj, TRet>(
             this IObservable<TRet> item,
-            TObj? source,
-            Expression<Func<TObj, TRet?>> property,
+            TObj source,
+            Expression<Func<TObj, TRet>> property,
             TRet initialValue,
             bool deferSubscription = false,
             IScheduler? scheduler = null)

src/ReactiveUI.Fody.Tests/API/ApiApprovalTests.ReactiveUIFody.net5.0.approved.txt

@@ -14,9 +14,9 @@ namespace ReactiveUI.Fody.Helpers
     }
     public static class ObservableAsPropertyExtensions
     {
-        public static ReactiveUI.ObservableAsPropertyHelper<TRet> ToPropertyEx<TObj, TRet>(this System.IObservable<TRet> item, TObj? source, System.Linq.Expressions.Expression<System.Func<TObj, TRet?>> property, bool deferSubscription = false, System.Reactive.Concurrency.IScheduler? scheduler = null)
+        public static ReactiveUI.ObservableAsPropertyHelper<TRet> ToPropertyEx<TObj, TRet>(this System.IObservable<TRet> item, TObj source, System.Linq.Expressions.Expression<System.Func<TObj, TRet>> property, bool deferSubscription = false, System.Reactive.Concurrency.IScheduler? scheduler = null)
             where TObj : ReactiveUI.ReactiveObject { }
-        public static ReactiveUI.ObservableAsPropertyHelper<TRet> ToPropertyEx<TObj, TRet>(this System.IObservable<TRet> item, TObj? source, System.Linq.Expressions.Expression<System.Func<TObj, TRet?>> property, TRet initialValue, bool deferSubscription = false, System.Reactive.Concurrency.IScheduler? scheduler = null)
+        public static ReactiveUI.ObservableAsPropertyHelper<TRet> ToPropertyEx<TObj, TRet>(this System.IObservable<TRet> item, TObj source, System.Linq.Expressions.Expression<System.Func<TObj, TRet>> property, TRet initialValue, bool deferSubscription = false, System.Reactive.Concurrency.IScheduler? scheduler = null)
             where TObj : ReactiveUI.ReactiveObject { }
     }
     [System.AttributeUsage(System.AttributeTargets.Property | System.AttributeTargets.All)]

src/ReactiveUI.Fody.Tests/API/ApiApprovalTests.ReactiveUIFody.netcoreapp3.1.approved.txt

@@ -14,9 +14,9 @@ namespace ReactiveUI.Fody.Helpers
     }
     public static class ObservableAsPropertyExtensions
     {
-        public static ReactiveUI.ObservableAsPropertyHelper<TRet> ToPropertyEx<TObj, TRet>(this System.IObservable<TRet> item, TObj? source, System.Linq.Expressions.Expression<System.Func<TObj, TRet?>> property, bool deferSubscription = false, System.Reactive.Concurrency.IScheduler? scheduler = null)
+        public static ReactiveUI.ObservableAsPropertyHelper<TRet> ToPropertyEx<TObj, TRet>(this System.IObservable<TRet> item, TObj source, System.Linq.Expressions.Expression<System.Func<TObj, TRet>> property, bool deferSubscription = false, System.Reactive.Concurrency.IScheduler? scheduler = null)
             where TObj : ReactiveUI.ReactiveObject { }
-        public static ReactiveUI.ObservableAsPropertyHelper<TRet> ToPropertyEx<TObj, TRet>(this System.IObservable<TRet> item, TObj? source, System.Linq.Expressions.Expression<System.Func<TObj, TRet?>> property, TRet initialValue, bool deferSubscription = false, System.Reactive.Concurrency.IScheduler? scheduler = null)
+        public static ReactiveUI.ObservableAsPropertyHelper<TRet> ToPropertyEx<TObj, TRet>(this System.IObservable<TRet> item, TObj source, System.Linq.Expressions.Expression<System.Func<TObj, TRet>> property, TRet initialValue, bool deferSubscription = false, System.Reactive.Concurrency.IScheduler? scheduler = null)
             where TObj : ReactiveUI.ReactiveObject { }
     }
     [System.AttributeUsage(System.AttributeTargets.Property | System.AttributeTargets.All)]

src/ReactiveUI.Splat.Tests/ReactiveUI.Splat.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Splat.Autofac" Version="12.*" />
-    <PackageReference Include="Splat.DryIoc" Version="11.*" />
+    <PackageReference Include="Splat.DryIoc" Version="12.*" />
     <PackageReference Include="Splat.Ninject" Version="12.*" />
   </ItemGroup>
 

src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net472.approved.txt

@@ -55,7 +55,7 @@ public MockBindListView()
                     .Where(i => i != null)
                     .Cast<MockBindListItemViewModel>()
                     .Do(_ => ItemList.UnselectAll())
-                    .InvokeCommand(this, v => v.ViewModel!.SelectItem).DisposeWith(d);
+                    .InvokeCommand(this, v => v!.ViewModel!.SelectItem).DisposeWith(d);
             });
         }
 

src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt

@@ -456,13 +456,13 @@ public void ToProperty_NameOf_ValidValuesProduced(string[] testWords, string[] f
 
             fixture.ObservableForProperty(x => x.LastThreeLettersOfOneWord, beforeChange: true).ToObservableChangeSet(ImmediateScheduler.Instance).Bind(out var lastThreeChanging).Subscribe();
 
-            var changing = new[] { firstThreeChanging, lastThreeChanging };
+            var changing = new[] { firstThreeChanging!, lastThreeChanging };
 
             fixture.ObservableForProperty(x => x.FirstThreeLettersOfOneWord, beforeChange: false).ToObservableChangeSet(ImmediateScheduler.Instance).Bind(out var firstThreeChanged).Subscribe();
 
             fixture.ObservableForProperty(x => x.LastThreeLettersOfOneWord, beforeChange: false).ToObservableChangeSet(ImmediateScheduler.Instance).Bind(out var lastThreeChanged).Subscribe();
 
-            var changed = new[] { firstThreeChanged, lastThreeChanged };
+            var changed = new[] { firstThreeChanged!, lastThreeChanged };
 
             Assert.True(changed.All(x => x.Count == 0));
             Assert.True(changing.All(x => x.Count == 0));
@@ -551,11 +551,11 @@ public void NullableTypesTestShouldntNeedDecorators2_ToProperty()
             fixture.WhenAnyValue(
                 x => x.ProjectService.ProjectsNullable,
                 x => x.AccountService.AccountUsersNullable)
-                   .Where(tuple => tuple.Item1.Any() && tuple.Item2.Any())
+                   .Where(tuple => tuple.Item1?.Count > 0 && tuple.Item2?.Count > 0)
                    .Select(tuple =>
                    {
                        var (projects, users) = tuple;
-                       return (int?)users.Values.Count(x => !string.IsNullOrWhiteSpace(x?.LastName));
+                       return users?.Values.Count(x => !string.IsNullOrWhiteSpace(x?.LastName));
                    })
                    .ToProperty(fixture, x => x.AccountsFound, out fixture._accountsFound);
 

src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt

@@ -145,13 +145,13 @@ private static Dictionary<Type, List<Type>> GetServicesThatShouldBeRegistered(IR
 
             new Registrations().Register((factory, serviceType) =>
             {
-                if (serviceTypeToImplementationTypes.TryGetValue(serviceType, out var implementationTypes) == false)
+                if (serviceTypeToImplementationTypes.TryGetValue(serviceType!, out var implementationTypes) == false)
                 {
                     implementationTypes = new List<Type>();
-                    serviceTypeToImplementationTypes.Add(serviceType, implementationTypes);
+                    serviceTypeToImplementationTypes.Add(serviceType!, implementationTypes);
                 }
 
-                implementationTypes.Add(factory().GetType());
+                implementationTypes.Add(factory()!.GetType());
             });
 
             new PlatformRegistrations().Register((factory, serviceType) =>