Update to new Avalonia.FuncUI NuGet package

Fixes #17
SilkyFowl · May 4, 2023 · 89a0aa4 · 89a0aa4
1 parent 9c20d74
commit 89a0aa4
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 85 deletions.
diff --git a/paket.dependencies b/paket.dependencies
@@ -10,12 +10,12 @@ group Main
     nuget FSharp.Core content: none
     nuget FsUnit.xUnit
 
-    nuget JaggerJo.Avalonia.FuncUI
-    nuget JaggerJo.Avalonia.FuncUI.DSL
-    nuget JaggerJo.Avalonia.FuncUI.Elmish
+    nuget Avalonia.FuncUI
+    nuget Avalonia.FuncUI.Elmish
 
-    nuget Avalonia.Desktop
-    nuget Avalonia.Diagnostics
+    nuget Avalonia.Desktop prerelease
+    nuget Avalonia.Diagnostics prerelease
+    nuget Avalonia.Themes.Fluent prerelease
     nuget Avalonia.Angle.Windows.Natives 2.1.0.2023020321
     nuget MessagePack.FSharpExtensions
     nuget Microsoft.NET.Test.Sdk

diff --git a/paket.lock b/paket.lock
@@ -2,54 +2,66 @@ STORAGE: NONE
 RESTRICTION: == net6.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    Avalonia (0.10.19)
-      Avalonia.Remote.Protocol (>= 0.10.19)
-      JetBrains.Annotations (>= 10.3)
+    Avalonia (11.0.0-preview7)
+      Avalonia.BuildServices (>= 0.0.12)
+      Avalonia.Remote.Protocol (>= 11.0.0-preview7)
+      MicroCom.Runtime (>= 0.11)
       System.ComponentModel.Annotations (>= 4.5)
-      System.Memory (>= 4.5.3)
-      System.Reactive (>= 5.0)
-      System.Runtime.CompilerServices.Unsafe (>= 4.6)
-      System.ValueTuple (>= 4.5)
     Avalonia.Angle.Windows.Natives (2.1.0.2023020321)
-    Avalonia.Controls.DataGrid (0.10.19)
-      Avalonia (>= 0.10.19)
-      Avalonia.Remote.Protocol (>= 0.10.19)
-      JetBrains.Annotations (>= 10.3)
-      System.Reactive (>= 5.0)
-    Avalonia.Desktop (0.10.19)
-      Avalonia (>= 0.10.19)
-      Avalonia.Native (>= 0.10.19)
-      Avalonia.Skia (>= 0.10.19)
-      Avalonia.Win32 (>= 0.10.19)
-      Avalonia.X11 (>= 0.10.19)
-    Avalonia.Diagnostics (0.10.19)
-      Avalonia (>= 0.10.19)
-      Avalonia.Controls.DataGrid (>= 0.10.19)
-      Microsoft.CodeAnalysis.CSharp.Scripting (>= 3.4)
-      System.Reactive (>= 5.0)
-    Avalonia.FreeDesktop (0.10.19)
-      Avalonia (>= 0.10.19)
-      Tmds.DBus (>= 0.9)
-    Avalonia.Native (0.10.19)
-      Avalonia (>= 0.10.19)
-    Avalonia.Remote.Protocol (0.10.19)
-    Avalonia.Skia (0.10.19)
-      Avalonia (>= 0.10.19)
-      HarfBuzzSharp (>= 2.8.2.1-preview.108)
-      HarfBuzzSharp.NativeAssets.Linux (>= 2.8.2.1-preview.108)
-      HarfBuzzSharp.NativeAssets.WebAssembly (>= 2.8.2.1-preview.108)
-      SkiaSharp (>= 2.88.1-preview.108)
-      SkiaSharp.NativeAssets.Linux (>= 2.88.1-preview.108)
-      SkiaSharp.NativeAssets.WebAssembly (>= 2.88.1-preview.108)
-    Avalonia.Win32 (0.10.19)
-      Avalonia (>= 0.10.19)
-      Avalonia.Angle.Windows.Natives (>= 2.1.0.2020091801)
-      System.Drawing.Common (>= 4.5)
+    Avalonia.BuildServices (0.0.12)
+    Avalonia.Controls.ColorPicker (11.0.0-preview7)
+      Avalonia (>= 11.0.0-preview7)
+      Avalonia.Remote.Protocol (>= 11.0.0-preview7)
+    Avalonia.Controls.DataGrid (11.0.0-preview7)
+      Avalonia (>= 11.0.0-preview7)
+      Avalonia.Remote.Protocol (>= 11.0.0-preview7)
+    Avalonia.Desktop (11.0.0-preview7)
+      Avalonia (>= 11.0.0-preview7)
+      Avalonia.Native (>= 11.0.0-preview7)
+      Avalonia.Skia (>= 11.0.0-preview7)
+      Avalonia.Win32 (>= 11.0.0-preview7)
+      Avalonia.X11 (>= 11.0.0-preview7)
+    Avalonia.Diagnostics (11.0.0-preview7)
+      Avalonia (>= 11.0.0-preview7)
+      Avalonia.Controls.ColorPicker (>= 11.0.0-preview7)
+      Avalonia.Controls.DataGrid (>= 11.0.0-preview7)
+      Avalonia.Themes.Simple (>= 11.0.0-preview7)
+      Microsoft.CodeAnalysis.Common (>= 3.8)
+      Microsoft.CodeAnalysis.CSharp.Scripting (>= 3.8)
+    Avalonia.FreeDesktop (11.0.0-preview7)
+      Avalonia (>= 11.0.0-preview7)
+      Tmds.DBus.Protocol (>= 0.14)
+    Avalonia.FuncUI (0.6.0-preview9.1)
+      Avalonia (>= 11.0.0-preview6)
+      FSharp.Core (>= 7.0.200)
+    Avalonia.FuncUI.Elmish (0.6.0-preview9.1)
+      Avalonia.FuncUI (>= 0.6.0-preview9.1)
+      Elmish (>= 4.0)
+      FSharp.Core (>= 7.0.200)
+    Avalonia.Native (11.0.0-preview7)
+      Avalonia (>= 11.0.0-preview7)
+    Avalonia.Remote.Protocol (11.0.0-preview7)
+    Avalonia.Skia (11.0.0-preview7)
+      Avalonia (>= 11.0.0-preview7)
+      HarfBuzzSharp (>= 2.8.2.3)
+      HarfBuzzSharp.NativeAssets.Linux (>= 2.8.2.3)
+      HarfBuzzSharp.NativeAssets.WebAssembly (>= 2.8.2.3)
+      SkiaSharp (>= 2.88.3)
+      SkiaSharp.NativeAssets.Linux (>= 2.88.3)
+      SkiaSharp.NativeAssets.WebAssembly (>= 2.88.3)
+    Avalonia.Themes.Fluent (11.0.0-preview7)
+      Avalonia (>= 11.0.0-preview7)
+    Avalonia.Themes.Simple (11.0.0-preview7)
+      Avalonia (>= 11.0.0-preview7)
+    Avalonia.Win32 (11.0.0-preview7)
+      Avalonia (>= 11.0.0-preview7)
+      Avalonia.Angle.Windows.Natives (>= 2.1.0.2023020321)
+      System.Drawing.Common (>= 6.0)
       System.Numerics.Vectors (>= 4.5)
-    Avalonia.X11 (0.10.19)
-      Avalonia (>= 0.10.19)
-      Avalonia.FreeDesktop (>= 0.10.19)
-      Avalonia.Skia (>= 0.10.19)
+    Avalonia.X11 (11.0.0-preview7)
+      Avalonia (>= 11.0.0-preview7)
+      Avalonia.FreeDesktop (>= 11.0.0-preview7)
+      Avalonia.Skia (>= 11.0.0-preview7)
     coverlet.collector (3.2)
     Elmish (4.0.1)
     FSharp.Analyzers.SDK (0.11)
@@ -78,18 +90,6 @@ NUGET
     HarfBuzzSharp.NativeAssets.macOS (2.8.2.3)
     HarfBuzzSharp.NativeAssets.WebAssembly (2.8.2.3)
     HarfBuzzSharp.NativeAssets.Win32 (2.8.2.3)
-    JaggerJo.Avalonia.FuncUI (0.5.3)
-      Avalonia (>= 0.10.15)
-      Avalonia.Desktop (>= 0.10.15)
-      FSharp.Core (>= 6.0.4)
-    JaggerJo.Avalonia.FuncUI.DSL (0.5.3)
-      FSharp.Core (>= 6.0.4)
-      JaggerJo.Avalonia.FuncUI (>= 0.5.3)
-    JaggerJo.Avalonia.FuncUI.Elmish (0.5.3)
-      Elmish (>= 3.1)
-      FSharp.Core (>= 6.0.4)
-      JaggerJo.Avalonia.FuncUI (>= 0.5.3)
-    JetBrains.Annotations (2022.3.1)
     McMaster.NETCore.Plugins (1.4)
       Microsoft.DotNet.PlatformAbstractions (>= 3.1.6)
       Microsoft.Extensions.DependencyModel (>= 5.0)
@@ -101,6 +101,7 @@ NUGET
     MessagePack.FSharpExtensions (4.0)
       FSharp.Core (>= 7.0.200)
       MessagePack (>= 2.4.59)
+    MicroCom.Runtime (0.11)
     Microsoft.CodeAnalysis.Analyzers (3.3.4)
     Microsoft.CodeAnalysis.Common (4.5)
       Microsoft.CodeAnalysis.Analyzers (>= 3.3.3)
@@ -158,9 +159,9 @@ NUGET
       System.Runtime.CompilerServices.Unsafe (>= 6.0)
     System.Drawing.Common (7.0)
       Microsoft.Win32.SystemEvents (>= 7.0)
+    System.IO.Pipelines (7.0)
     System.Memory (4.5.5)
     System.Numerics.Vectors (4.5)
-    System.Reactive (5.0)
     System.Reflection.Emit (4.7)
     System.Reflection.Metadata (7.0.1)
       System.Collections.Immutable (>= 7.0)
@@ -172,8 +173,8 @@ NUGET
     System.Text.Json (7.0.2)
       System.Runtime.CompilerServices.Unsafe (>= 6.0)
       System.Text.Encodings.Web (>= 7.0)
-    System.ValueTuple (4.5)
-    Tmds.DBus (0.15)
+    Tmds.DBus.Protocol (0.15)
+      System.IO.Pipelines (>= 6.0)
     xunit (2.4.2)
       xunit.analyzers (>= 1.0)
       xunit.assert (>= 2.4.2)

diff --git a/src/Avalonia.FuncUI.LiveView.Core/FuncUIAnalysis.fs b/src/Avalonia.FuncUI.LiveView.Core/FuncUIAnalysis.fs
@@ -51,11 +51,11 @@ let stringArgDSLFuncMap =
 
     let controlTypes =
         [| "Avalonia.Controls"
-           "Avalonia.Styling" |]
+           "Avalonia.Base" |]
         |> Array.map (fun name -> Assembly.Load(name).GetExportedTypes())
         |> Array.concat
 
-    let dslAssembly = Assembly.Load "Avalonia.FuncUI.DSL"
+    let dslAssembly = Assembly.Load "Avalonia.FuncUI"
 
     dslAssembly.GetExportedTypes()
     |> Array.choose (fun ty ->

diff --git a/src/Avalonia.FuncUI.LiveView.Core/paket.references b/src/Avalonia.FuncUI.LiveView.Core/paket.references
@@ -1,5 +1,4 @@
 group Main
     Avalonia.Desktop
     FSharp.Compiler.Service
-    JaggerJo.Avalonia.FuncUI
-    JaggerJo.Avalonia.FuncUI.DSL
+    Avalonia.FuncUI
diff --git a/src/Avalonia.FuncUI.LiveView/FsiSession.fs b/src/Avalonia.FuncUI.LiveView/FsiSession.fs
@@ -90,7 +90,7 @@ let getLivePreviews (assembly: Assembly) =
                         try
                             match m.Invoke((), [||]) with
                             | :? IView as view ->  view
-                            | :? IControl as view ->
+                            | :? Control as view ->
                                 ContentControl.create [
                                     ContentControl.content view
                                 ]

diff --git a/src/Avalonia.FuncUI.LiveView/LiveView.fs b/src/Avalonia.FuncUI.LiveView/LiveView.fs
@@ -15,7 +15,7 @@ open Avalonia.FuncUI.LiveView.MessagePack
 
 type StateStore =
     { Msg: IWritable<Msg>
-      EvalResult: IWritable<list<string * IControl>>
+      EvalResult: IWritable<list<string * Control>>
       EvalWarings: IWritable<obj []>
       Status: IWritable<LogMessage>
       TempScriptFileInfo: FileInfo }

diff --git a/src/Avalonia.FuncUI.LiveView/paket.references b/src/Avalonia.FuncUI.LiveView/paket.references
@@ -1,7 +1,6 @@
 group Main
     Avalonia.Desktop
     Avalonia.Diagnostics
-    JaggerJo.Avalonia.FuncUI
-    JaggerJo.Avalonia.FuncUI.DSL
-    JaggerJo.Avalonia.FuncUI.Elmish
+    Avalonia.FuncUI
+    Avalonia.FuncUI.Elmish
     FSharp.Compiler.Service
diff --git a/src/Sample/ElmishDefineDUInAnotherFileSample.fs b/src/Sample/ElmishDefineDUInAnotherFileSample.fs
@@ -41,7 +41,7 @@ type Host() as this =
     do
         Elmish.Program.mkSimple (fun () -> init) update view
         |> Program.withHost this
-        |> Elmish.Program.run
+        |> Program.runWithAvaloniaSyncDispatch ()
 
 [<LivePreview>]
 let preview () = ViewBuilder.Create<Host> []
diff --git a/src/Sample/ElmishSample.fs b/src/Sample/ElmishSample.fs
@@ -54,7 +54,7 @@ type Host() as this =
     do
         Elmish.Program.mkSimple (fun () -> init) update view
         |> Program.withHost this
-        |> Elmish.Program.run
+        |> Program.runWithAvaloniaSyncDispatch ()
 
 [<LivePreview>]
 let preview () = ViewBuilder.Create<Host> []
diff --git a/src/Sample/Program.fs b/src/Sample/Program.fs
@@ -35,8 +35,9 @@ type App() =
         | _ -> false
 
     override this.Initialize() =
-        this.Styles.Add (FluentTheme(baseUri = null, Mode = FluentThemeMode.Dark))
-
+        this.Styles.Add (FluentTheme())
+        this.RequestedThemeVariant <- Styling.ThemeVariant.Dark
+
     override this.OnFrameworkInitializationCompleted() =
         match this.ApplicationLifetime with
         | :? IClassicDesktopStyleApplicationLifetime as desktopLifetime ->

diff --git a/src/Sample/paket.references b/src/Sample/paket.references
@@ -1,6 +1,6 @@
 group Main
     Avalonia.Desktop
     Avalonia.Diagnostics
-    JaggerJo.Avalonia.FuncUI
-    JaggerJo.Avalonia.FuncUI.DSL
-    JaggerJo.Avalonia.FuncUI.Elmish
+    Avalonia.Themes.Fluent
+    Avalonia.FuncUI
+    Avalonia.FuncUI.Elmish
diff --git a/tests/Avalonia.FuncUI.LiveView.Core.Tests/FuncUIAnalysisTests.fs b/tests/Avalonia.FuncUI.LiveView.Core.Tests/FuncUIAnalysisTests.fs
@@ -35,7 +35,6 @@ module private Helper =
                 "Avalonia.Desktop.dll"
                 "Avalonia.Diagnostics.dll"
                 "Avalonia.FuncUI.dll"
-                "Avalonia.FuncUI.DSL.dll"
                 "Avalonia.FuncUI.Elmish.dll"
             }
             |> Seq.map getDeps

diff --git a/tests/Avalonia.FuncUI.LiveView.Core.Tests/paket.references b/tests/Avalonia.FuncUI.LiveView.Core.Tests/paket.references
@@ -7,6 +7,5 @@ group Main
     FSharp.Compiler.Service
     Avalonia.Desktop
     Avalonia.Diagnostics
-    JaggerJo.Avalonia.FuncUI
-    JaggerJo.Avalonia.FuncUI.DSL
-    JaggerJo.Avalonia.FuncUI.Elmish
+    Avalonia.FuncUI
+    Avalonia.FuncUI.Elmish