Dependency: update Uno to 4.0.9 (#3079)

* Dependency: update Uno to 4.0.7 * Update ReactiveUI.Uno.WinUI.csproj * Update ReactiveUI.Uno.csproj
reactiveui · Dec 3, 2021 · f771bd8 · f771bd8
1 parent 5628ffb
commit f771bd8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj b/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Uno.WinUI" Version="3.10.11" />
+    <PackageReference Include="Uno.WinUI" Version="4.0.9" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">

diff --git a/src/ReactiveUI.Uno/ActivationForViewFetcher.cs b/src/ReactiveUI.Uno/ActivationForViewFetcher.cs
@@ -38,11 +38,8 @@ public IObservable<bool> GetActivationForView(IActivatableView view)
             }
 
 #pragma warning disable SA1114 // Parameter list after.
-#if NETSTANDARD
-            var viewLoaded = Observable.FromEvent<RoutedEventHandler, bool>(
-#else
-            var viewLoaded = Observable.FromEvent<TypedEventHandler<DependencyObject, object>, bool>(
-#endif
+            var viewLoaded = Observable.FromEvent<TypedEventHandler<FrameworkElement, object>, bool>(
+
                 eventHandler => (_, _) => eventHandler(true),
                 x => fe.Loading += x,
                 x => fe.Loading -= x);

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="3.10.11" />
+    <PackageReference Include="Uno.UI" Version="4.0.9" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">