Update to Avalonia 11 RC 1 (#308)

* Update for Avalonia 11 RC 1

* Remove commented out bindings

---------

Co-authored-by: Richard Webb <richard.webb@helpsystems.com>

src/Avalonia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog/ControlCatalog.fs

@@ -8,6 +8,7 @@ open Avalonia.FuncUI.Elmish
 open Avalonia.FuncUI.ControlCatalog.Views
 open Avalonia.Themes.Fluent
 open Avalonia.FuncUI
+open Avalonia.Controls
 
 type MainWindow() as this =
     inherit HostWindow()
@@ -17,7 +18,7 @@ type MainWindow() as this =
         base.Height <- 600.0
         base.Width <- 800.0
 
-        this.VisualRoot.Renderer.Diagnostics.DebugOverlays <- Avalonia.Rendering.RendererDebugOverlays.Fps
+        TopLevel.GetTopLevel(this).RendererDiagnostics.DebugOverlays <- Avalonia.Rendering.RendererDebugOverlays.Fps
         //this.VisualRoot.VisualRoot.Renderer.DrawDirtyRects <- true
         ()
 

src/Avalonia.FuncUI/DSL/Base/Animatable.fs

@@ -9,6 +9,3 @@ module Animatable =
     type Animatable with
         static member transitions<'t when 't :> Animatable>(transitions: Transitions) : IAttr<'t> =
             AttrBuilder<'t>.CreateProperty<Transitions>(Animatable.TransitionsProperty, transitions, ValueNone)
-
-        static member clock<'t when 't :> Animatable>(clock: IClock) : IAttr<'t> =
-            AttrBuilder<'t>.CreateProperty<IClock>(Animatable.ClockProperty, clock, ValueNone)

src/Avalonia.FuncUI/DSL/MenuBase.fs

@@ -10,7 +10,7 @@ module MenuBase =
     type MenuBase with
 
         static member onMenuOpened<'t when 't :> MenuBase>(func: RoutedEventArgs -> unit, ?subPatchOptions) : IAttr<'t> =
-            AttrBuilder<'t>.CreateSubscription(MenuBase.MenuOpenedEvent, func, ?subPatchOptions = subPatchOptions);
+            AttrBuilder<'t>.CreateSubscription(MenuBase.OpenedEvent, func, ?subPatchOptions = subPatchOptions);
 
         static member onMenuClosed<'t when 't :> MenuBase>(func: RoutedEventArgs -> unit, ?subPatchOptions) : IAttr<'t> =
-            AttrBuilder<'t>.CreateSubscription(MenuBase.MenuClosedEvent, func, ?subPatchOptions = subPatchOptions);
+            AttrBuilder<'t>.CreateSubscription(MenuBase.ClosedEvent, func, ?subPatchOptions = subPatchOptions);

src/Avalonia.FuncUI/DSL/TabItem.fs

@@ -5,14 +5,15 @@ module TabItem =
     open Avalonia.Controls
     open Avalonia.FuncUI.Types
     open Avalonia.FuncUI.Builder
-
+    open System
+
     let create (attrs: IAttr<TabItem> list): IView<TabItem> =
         ViewBuilder.Create<TabItem>(attrs)
 
     type TabItem with
 
-        static member tabStripPlacement<'t when 't :> TabItem>(placement: Dock) : IAttr<'t> =
-            AttrBuilder<'t>.CreateProperty<Dock>(TabItem.TabStripPlacementProperty, placement, ValueNone)
+        static member tabStripPlacement<'t when 't :> TabItem>(placement: Dock Nullable) : IAttr<'t> =
+            AttrBuilder<'t>.CreateProperty<Dock Nullable>(TabItem.TabStripPlacementProperty, placement, ValueNone)
 
         static member isSelected<'t when 't :> TabItem>(value: bool) : IAttr<'t> =
             AttrBuilder<'t>.CreateProperty<bool>(TabItem.IsSelectedProperty, value, ValueNone)

src/Avalonia.FuncUI/DSL/TransitioningContentControl.fs

@@ -13,8 +13,5 @@ module TransitioningContentControl =
 
     type TransitioningContentControl with
 
-        static member currentContent<'t when 't :> TransitioningContentControl>(value: obj) : IAttr<'t> =
-            AttrBuilder<'t>.CreateProperty<obj>(TransitioningContentControl.CurrentContentProperty, value, ValueNone)
-
         static member pageTransition<'t when 't :> TransitioningContentControl>(transition: IPageTransition) : IAttr<'t> =
             AttrBuilder<'t>.CreateProperty<IPageTransition>(TransitioningContentControl.PageTransitionProperty, transition, ValueNone)

src/Avalonia.FuncUI/VirtualDom/VirtualDom.fs

@@ -16,7 +16,7 @@ module rec VirtualDom =
         let delta = Differ.diff(last, next)
         Patcher.patch(root, delta)
 
-    let updateRoot (host: IContentControl, last: IView option, next: IView option) =
+    let updateRoot (host: ContentControl, last: IView option, next: IView option) =
         let root : Control voption =
             if host.Content <> null then
                 match host.Content with

src/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <AvaloniaVersion>11.0.0-preview8</AvaloniaVersion>
+    <AvaloniaVersion>11.0.0-rc1.1</AvaloniaVersion>
     <FuncUIVersion>0.6.0-preview9.1</FuncUIVersion>
   </PropertyGroup>
 </Project>

src/Examples/Component Examples/Examples.Presso/Lib/Library.fs

@@ -18,5 +18,4 @@ module Extensions =
             if uri.IsAbsoluteUri && uri.IsFile then
                 new Bitmap(uri.LocalPath)
             else
-                let assets = AvaloniaLocator.Current.GetService<IAssetLoader>();
-                new Bitmap(assets.Open(uri));
+                new Bitmap(AssetLoader.Open(uri))

src/Examples/Elmish Examples/Examples.Elmish.MusicPlayer/Extensions.fs

@@ -4,7 +4,6 @@ namespace Examples.MusicPlayer
 [<AutoOpen>]
 module Extensions =
     open System
-    open Avalonia
     open Avalonia.Controls
     open Avalonia.Media.Imaging
     open Avalonia.Platform
@@ -17,8 +16,7 @@ module Extensions =
             if uri.IsAbsoluteUri && uri.IsFile then
                 new Bitmap(uri.LocalPath)
             else
-                let assets = AvaloniaLocator.Current.GetService<IAssetLoader>()
-                new Bitmap(assets.Open(uri))
+                new Bitmap(AssetLoader.Open(uri))
 
     type Image with
         static member FromString(s: string): Image =

src/Examples/Elmish Examples/Examples.Elmish.Presso/Lib/Library.fs

@@ -18,5 +18,4 @@ module Extensions =
             if uri.IsAbsoluteUri && uri.IsFile then
                 new Bitmap(uri.LocalPath)
             else
-                let assets = AvaloniaLocator.Current.GetService<IAssetLoader>();
-                new Bitmap(assets.Open(uri));
+                new Bitmap(AssetLoader.Open(uri))