diff --git a/src/Andromeda/AvaloniaApp.FSharp/Andromeda.AvaloniaApp.FSharp.fsproj b/src/Andromeda/AvaloniaApp.FSharp/Andromeda.AvaloniaApp.FSharp.fsproj
index 80afb11..151c291 100644
--- a/src/Andromeda/AvaloniaApp.FSharp/Andromeda.AvaloniaApp.FSharp.fsproj
+++ b/src/Andromeda/AvaloniaApp.FSharp/Andromeda.AvaloniaApp.FSharp.fsproj
@@ -12,12 +12,13 @@
-
+
+
diff --git a/src/Andromeda/AvaloniaApp.FSharp/AvaloniaHelper.fs b/src/Andromeda/AvaloniaApp.FSharp/AvaloniaHelper.fs
new file mode 100644
index 0000000..fa77a35
--- /dev/null
+++ b/src/Andromeda/AvaloniaApp.FSharp/AvaloniaHelper.fs
@@ -0,0 +1,15 @@
+namespace Andromeda.AvaloniaApp.FSharp
+
+open Avalonia
+open Avalonia.Platform
+open System
+
+module AvaloniaHelper =
+ let loadAssetPath (path: string) =
+ let uri =
+ if path.StartsWith("/")
+ then Uri(path, UriKind.Relative)
+ else Uri(path, UriKind.RelativeOrAbsolute);
+
+ let assets = AvaloniaLocator.Current.GetService();
+ assets.Open(uri)
diff --git a/src/Andromeda/AvaloniaApp.FSharp/Config.fs b/src/Andromeda/AvaloniaApp.FSharp/Config.fs
index 78e29f6..6ac7a1a 100644
--- a/src/Andromeda/AvaloniaApp.FSharp/Config.fs
+++ b/src/Andromeda/AvaloniaApp.FSharp/Config.fs
@@ -1,4 +1,4 @@
namespace Andromeda.AvaloniaApp.FSharp
module Config =
- let version = "v0.3.0-beta.5"
+ let version = "v0.3.0-beta.6"
diff --git a/src/Andromeda/AvaloniaApp.FSharp/Main.fs b/src/Andromeda/AvaloniaApp.FSharp/Main.fs
index f49aa1a..080909f 100644
--- a/src/Andromeda/AvaloniaApp.FSharp/Main.fs
+++ b/src/Andromeda/AvaloniaApp.FSharp/Main.fs
@@ -10,6 +10,7 @@ open Avalonia.FuncUI.DSL
open Avalonia.Input
open Avalonia.Layout
open Avalonia.Media
+open Avalonia.Platform
open Avalonia.Threading
open Elmish
open GogApi.DotNet.FSharp.Listing
@@ -18,7 +19,6 @@ open System
open System.ComponentModel
open System.Diagnostics
open System.IO
-open System.Threading
open System.Threading.Tasks
module Main =
@@ -420,7 +420,7 @@ module Main =
inherit HostWindow()
do
base.Title <- "Andromeda"
- base.Icon <- WindowIcon "Assets/logo.ico"
+ base.Icon <- WindowIcon (AvaloniaHelper.loadAssetPath "avares://Andromeda.AvaloniaApp.FSharp/Assets/logo.ico")
base.Width <- 1024.0
base.Height <- 660.0