update

- to .Net 5.0 - to Avalonia 0.10 RC 1 (includes required fixes) - add standalone menu to sample
fsprojects · Dec 22, 2020 · b70b64b · b70b64b
1 parent 0ca5166
commit b70b64b
Show file tree

Hide file tree

Showing 19 changed files with 95 additions and 52 deletions.
diff --git a/src/Avalonia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog.fsproj b/src/Avalonia.FuncUI.ControlCatalog/Avalonia.FuncUI.ControlCatalog.fsproj
@@ -2,13 +2,12 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
         <Compile Include="Library\Extensions.fs" />
         <Compile Include="Views\Tabs\ToggleSwitchDemo.fs" />
-
         <Compile Include="Views\Tabs\SpinnerDemo.fs" />
         <Compile Include="Views\Tabs\TreeViewDemo.fs" />
         <Compile Include="Views\Tabs\NumericUpDownDemo.fs" />
@@ -17,7 +16,7 @@
         <Compile Include="Views\Tabs\DataTemplateDemo.fs" />
         <Compile Include="Views\Tabs\GridDemo.fs" />
         <Compile Include="Views\Tabs\CanvasDemo.fs" />
-        <Compile Include="Views\Tabs\MenuDemo.fs" />
+        <Compile Include="Views\Tabs\ContextMenuDemo.fs" />
         <Compile Include="Views\Tabs\StylesDemo.fs" />
         <Compile Include="Views\Tabs\TextBoxDemo.fs" />
         <Compile Include="Views\Tabs\GridPatchDemo.fs" />
@@ -26,9 +25,9 @@
         <Compile Include="Views\Tabs\TimePickerDemo.fs" />
         <Compile Include="Views\Tabs\SplitViewDemo.fs" />
         <Compile Include="Views\Tabs\TickBarDemo.fs" />
-        <AvaloniaResource Include="**\*.xaml" />
+        <Compile Include="Views\Tabs\WindowMenuDemo.fs" />
         <Compile Include="Views\MainView.fs" />
-
+        <AvaloniaResource Include="**\*.xaml" />        
         <Compile Include="Main.fs" />
     </ItemGroup>
 
@@ -39,7 +38,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview5" />
+      <PackageReference Include="Avalonia.Desktop" Version="0.10.0-rc1" />
       <PackageReference Include="Bogus" Version="28.4.1" />
       <PackageReference Update="FSharp.Core" Version="4.7.2" />
     </ItemGroup>

diff --git a/src/Avalonia.FuncUI.ControlCatalog/Main.fs b/src/Avalonia.FuncUI.ControlCatalog/Main.fs
@@ -1,8 +1,9 @@
 namespace Avalonia.FuncUI.ControlCatalog
 
-open Avalonia.FuncUI.Components.Hosts
 open Avalonia
+open Avalonia.FuncUI.Components.Hosts
 open Avalonia.FuncUI.Elmish
+open Avalonia.Themes.Fluent
 open Elmish
 open Avalonia.Controls.ApplicationLifetimes
 open Avalonia.FuncUI.ControlCatalog.Views
@@ -23,8 +24,7 @@ type App() =
     inherit Application()
 
     override this.Initialize() =
-        this.Styles.Load "avares://Avalonia.Themes.Fluent/Accents/FluentDark.xaml"
-        this.Styles.Load "avares://Avalonia.Themes.Default/Accents/BaseDark.xaml"
+        this.Styles.Add (FluentTheme(baseUri = null, Mode = FluentThemeMode.Dark))
         this.Styles.Load "avares://Avalonia.FuncUI.ControlCatalog/Styles/TabControl.xaml"
 
     override this.OnFrameworkInitializationCompleted() =

diff --git a/src/Avalonia.FuncUI.ControlCatalog/Views/MainView.fs b/src/Avalonia.FuncUI.ControlCatalog/Views/MainView.fs
@@ -58,8 +58,12 @@ module MainView =
                     TabItem.content (ViewBuilder.Create<CanvasDemo.Host>([]))
                 ]
                 TabItem.create [
-                    TabItem.header "Menu Demo"
-                    TabItem.content (ViewBuilder.Create<MenuDemo.Host>([]))
+                    TabItem.header "Context Menu Demo"
+                    TabItem.content (ViewBuilder.Create<ContextMenuDemo.Host>([]))
+                ]
+                TabItem.create [
+                    TabItem.header "Widow Menu Demo"
+                    TabItem.content (ViewBuilder.Create<WindowMenuDemo.Host>([]))
                 ]
                 // ToDo: return it back when styles will be worked
                 //TabItem.create [

diff --git a/...cUI.ControlCatalog/Views/Tabs/MenuDemo.fs → ...trolCatalog/Views/Tabs/ContextMenuDemo.fs b/...cUI.ControlCatalog/Views/Tabs/MenuDemo.fs → ...trolCatalog/Views/Tabs/ContextMenuDemo.fs
@@ -6,7 +6,7 @@ open Avalonia.FuncUI.Components
 open Avalonia.FuncUI.Elmish
 open Elmish
 
-module MenuDemo =
+module ContextMenuDemo =
     type State = { color: string }
 
     let init = { color = "gray" }
@@ -26,17 +26,6 @@ module MenuDemo =
                 ContextMenu.create [
                     ContextMenu.viewItems [
                         MenuItem.create [
-                            MenuItem.header "Red"
-                            MenuItem.viewItems [
-                                MenuItem.create [
-                                    MenuItem.header "Light"
-                                    MenuItem.onClick (fun _ -> "#e74c3c" |> SetColor |> dispatch)
-                                ]
-                                MenuItem.create [
-                                    MenuItem.header "Dark"
-                                    MenuItem.onClick (fun _ -> "#c0392b" |> SetColor |> dispatch)
-                                ]  
-                            ]
                             MenuItem.header "Green"
                             MenuItem.viewItems [
                                 MenuItem.create [

diff --git a/src/Avalonia.FuncUI.ControlCatalog/Views/Tabs/WindowMenuDemo.fs b/src/Avalonia.FuncUI.ControlCatalog/Views/Tabs/WindowMenuDemo.fs
@@ -0,0 +1,54 @@
+namespace Avalonia.FuncUI.ControlCatalog.Views
+
+open Avalonia.Controls
+open Avalonia.FuncUI.DSL
+open Avalonia.FuncUI.Components
+open Avalonia.FuncUI.Elmish
+open Elmish
+
+module WindowMenuDemo =
+    type State = { color: string }
+
+    let init = { color = "gray" }
+
+    type Msg =
+    | SetColor of string
+
+    let update (msg: Msg) (state: State) : State =
+        match msg with
+        | SetColor color -> { state with color = color }
+
+    let view (state: State) (dispatch) =
+        StackPanel.create [
+            StackPanel.background state.color
+
+            StackPanel.children [
+                Menu.create [
+                    Menu.viewItems [
+                        MenuItem.create [
+                            MenuItem.header "Red"
+                            MenuItem.viewItems [
+                                MenuItem.create [
+                                    MenuItem.header "Light"
+                                    MenuItem.onClick (fun _ -> "#e74c3c" |> SetColor |> dispatch)
+                                ]
+                                MenuItem.create [
+                                    MenuItem.header "Dark"
+                                    MenuItem.onClick (fun _ -> "#c0392b" |> SetColor |> dispatch)
+                                ]  
+                            ]
+                        ] 
+                    ]
+                ]                         
+            ]
+        ]
+
+
+    type Host() as this =
+        inherit Hosts.HostControl()
+        do
+            Elmish.Program.mkSimple (fun () -> init) update view
+            |> Program.withHost this
+            |> Program.withConsoleTrace
+            |> Program.run
+
diff --git a/src/Avalonia.FuncUI.DSL/Avalonia.FuncUI.DSL.fsproj b/src/Avalonia.FuncUI.DSL/Avalonia.FuncUI.DSL.fsproj
@@ -109,7 +109,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\Avalonia.FuncUI\Avalonia.FuncUI.fsproj" />
-      <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview5" />
+      <PackageReference Include="Avalonia.Desktop" Version="0.10.0-rc1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Avalonia.FuncUI.Elmish/Avalonia.FuncUI.Elmish.fsproj b/src/Avalonia.FuncUI.Elmish/Avalonia.FuncUI.Elmish.fsproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview5" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-rc1" />
     <PackageReference Include="Elmish" Version="3.0.6" />
     <PackageReference Update="FSharp.Core" Version="4.7.2" />
   </ItemGroup>

diff --git a/src/Avalonia.FuncUI.UnitTests/Avalonia.FuncUI.UnitTests.fsproj b/src/Avalonia.FuncUI.UnitTests/Avalonia.FuncUI.UnitTests.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
     <GenerateProgramFile>false</GenerateProgramFile>
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview5" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-rc1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="xunit" Version="2.4.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />

diff --git a/src/Avalonia.FuncUI/Avalonia.FuncUI.fsproj b/src/Avalonia.FuncUI/Avalonia.FuncUI.fsproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview5" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-rc1" />
     <PackageReference Update="FSharp.Core" Version="4.7.2" />
   </ItemGroup>
 

diff --git a/src/Examples/Examples.ClockApp/Examples.ClockApp.fsproj b/src/Examples/Examples.ClockApp/Examples.ClockApp.fsproj
@@ -2,12 +2,13 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
         <Compile Include="Clock.fs" />
         <Compile Include="Program.fs" />
+        <AvaloniaResource Include="**\*.xaml" />
     </ItemGroup>
 
     <ItemGroup>
@@ -17,7 +18,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview5" />
+        <PackageReference Include="Avalonia.Desktop" Version="0.10.0-rc1" />
         <PackageReference Update="FSharp.Core" Version="4.7.2" />
     </ItemGroup>
 </Project>
diff --git a/src/Examples/Examples.ClockApp/Program.fs b/src/Examples/Examples.ClockApp/Program.fs
@@ -2,6 +2,7 @@
 
 open System
 open Avalonia
+open Avalonia.Themes.Fluent
 open Avalonia.Threading
 open Elmish
 open Avalonia.FuncUI.Components.Hosts
@@ -44,8 +45,7 @@ type App() =
     inherit Application()
 
     override this.Initialize() =
-        this.Styles.Load "avares://Avalonia.Themes.Fluent/Accents/FluentDark.xaml"
-        this.Styles.Load "avares://Avalonia.Themes.Default/Accents/BaseDark.xaml"
+        this.Styles.Add (FluentTheme(baseUri = null, Mode = FluentThemeMode.Dark))
 
     override this.OnFrameworkInitializationCompleted() =
         match this.ApplicationLifetime with

diff --git a/src/Examples/Examples.CounterApp/Examples.CounterApp.fsproj b/src/Examples/Examples.CounterApp/Examples.CounterApp.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
@@ -17,7 +17,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview5" />
+        <PackageReference Include="Avalonia.Desktop" Version="0.10.0-rc1" />
         <PackageReference Update="FSharp.Core" Version="4.7.2" />
     </ItemGroup>
 

diff --git a/src/Examples/Examples.CounterApp/Program.fs b/src/Examples/Examples.CounterApp/Program.fs
@@ -1,6 +1,7 @@
 namespace Examples.CounterApp
 
 open Avalonia
+open Avalonia.Themes.Fluent
 open Elmish
 open Avalonia.FuncUI.Components.Hosts
 open Avalonia.FuncUI
@@ -25,8 +26,7 @@ type App() =
     inherit Application()
 
     override this.Initialize() =
-        this.Styles.Load "avares://Avalonia.Themes.Fluent/Accents/FluentDark.xaml"
-        this.Styles.Load "avares://Avalonia.Themes.Default/Accents/BaseDark.xaml"
+        this.Styles.Add (FluentTheme(baseUri = null, Mode = FluentThemeMode.Dark))
 
     override this.OnFrameworkInitializationCompleted() =
         match this.ApplicationLifetime with

diff --git a/src/Examples/Examples.GameOfLife/Examples.GameOfLife.fsproj b/src/Examples/Examples.GameOfLife/Examples.GameOfLife.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
@@ -21,7 +21,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview5" />
+        <PackageReference Include="Avalonia.Desktop" Version="0.10.0-rc1" />
         <PackageReference Update="FSharp.Core" Version="4.7.2" />
     </ItemGroup>
 

diff --git a/src/Examples/Examples.GameOfLife/Program.fs b/src/Examples/Examples.GameOfLife/Program.fs
@@ -2,6 +2,7 @@
 
 open System
 open Avalonia
+open Avalonia.Themes.Fluent
 open Elmish
 open Avalonia.FuncUI.Components.Hosts
 open Avalonia.FuncUI
@@ -38,8 +39,7 @@ type App() =
     inherit Application()
 
     override this.Initialize() =
-        this.Styles.Load "avares://Avalonia.Themes.Fluent/Accents/FluentDark.xaml"
-        this.Styles.Load "avares://Avalonia.Themes.Default/Accents/BaseDark.xaml"
+        this.Styles.Add (FluentTheme(baseUri = null, Mode = FluentThemeMode.Dark))
 
     override this.OnFrameworkInitializationCompleted() =
         match this.ApplicationLifetime with

diff --git a/src/Examples/Examples.MusicPlayer/Examples.MusicPlayer.fsproj b/src/Examples/Examples.MusicPlayer/Examples.MusicPlayer.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
@@ -22,7 +22,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview5" />
+        <PackageReference Include="Avalonia.Desktop" Version="0.10.0-rc1" />
         <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview2" />
         <PackageReference Include="VideoLAN.LibVLC.Mac" Version="3.1.3.1" />
         <ProjectReference Include="..\..\Avalonia.FuncUI.DSL\Avalonia.FuncUI.DSL.fsproj" />

diff --git a/src/Examples/Examples.MusicPlayer/Program.fs b/src/Examples/Examples.MusicPlayer/Program.fs
@@ -2,15 +2,15 @@ namespace Examples.MusicPlayer
 open Avalonia
 open Avalonia.Controls.ApplicationLifetimes
 open Avalonia.FuncUI
+open Avalonia.Themes.Fluent
 open LibVLCSharp.Shared
 
 
 type App() =
     inherit Application()
 
     override this.Initialize() =
-        this.Styles.Load "avares://Avalonia.Themes.Default/Accents/BaseDark.xaml"
-        this.Styles.Load "avares://Avalonia.Themes.Fluent/Accents/FluentDark.xaml"
+        this.Styles.Add (FluentTheme(baseUri = null, Mode = FluentThemeMode.Dark))
         this.Styles.Load "avares://Examples.MusicPlayer/Styles.xaml"
         Core.Initialize()
 

diff --git a/src/Examples/Examples.Presso/Examples.Presso.fsproj b/src/Examples/Examples.Presso/Examples.Presso.fsproj
@@ -2,14 +2,14 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
         <AvaloniaResource Include="**\*.xaml" />
         <AvaloniaResource Include="Assets\*" />
 
-        <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview5" />
+        <PackageReference Include="Avalonia.Desktop" Version="0.10.0-rc1" />
     </ItemGroup>
 
     <ItemGroup>