Update dependencies

NicoVIII · Jun 7, 2022 · ca7febe · ca7febe
1 parent 2ce1618
commit ca7febe
Show file tree

Hide file tree

Showing 10 changed files with 107 additions and 609 deletions.
diff --git a/paket.dependencies b/paket.dependencies
@@ -4,20 +4,16 @@ framework: auto-detect
 storage: none
 
 nuget FSharp.Core content: none
-nuget Avalonia 0.10.10
-nuget Avalonia.Diagnostics 0.10.10
-nuget FsToolkit.ErrorHandling ~> 2.0
-nuget NicoVIII.GogApi ~> 3.0
+nuget Avalonia
+nuget Avalonia.Diagnostics
+nuget FsToolkit.ErrorHandling
+nuget JaggerJo.Avalonia.FuncUI.DSL
+nuget JaggerJo.Avalonia.FuncUI.Elmish
+nuget MessageBox.Avalonia
+nuget Mono.Posix.NETStandard
+nuget NicoVIII.GogApi
 nuget NicoVIII.SimpleOptics
-nuget JaggerJo.Avalonia.FuncUI 0.5.0-beta
-nuget JaggerJo.Avalonia.FuncUI.DSL 0.5.0-beta
-nuget JaggerJo.Avalonia.FuncUI.Elmish 0.5.0-beta
-nuget MessageBox.Avalonia ~> 1.6
-nuget Mono.Posix.NETStandard ~> 1.0
-nuget Myriad.Core ~> 0.4.0
-nuget Myriad.Plugins ~> 0.4.0
-nuget Myriad.Sdk ~> 0.4.0
-nuget SharpZipLib ~> 1.2
-nuget TypedPersistence.Json ~> 0.6.0-alpha.5
+nuget SharpZipLib
+nuget TypedPersistence.Json prerelease
 
 nuget Expecto.FsCheck
diff --git a/paket.lock b/paket.lock
diff --git a/src/Andromeda/AvaloniaApp/Components/Authentication.fs b/src/Andromeda/AvaloniaApp/Components/Authentication.fs
@@ -74,7 +74,15 @@ module Authentication =
                 | "" -> Cmd.none
                 | authCode ->
                     let getAuth () =
-                        async { return! Authentication.getNewToken redirectUri authCode }
+                        async {
+                            printfn "get new token"
+
+                            let! response =
+                                Authentication.getNewToken redirectUri authCode
+
+                            printfn "got new token: %A" response
+                            return response
+                        }
 
                     let msgFnc auth = TryAuthenticate auth
 

diff --git a/src/Andromeda/AvaloniaApp/Components/InstallGame.fs b/src/Andromeda/AvaloniaApp/Components/InstallGame.fs
@@ -3,11 +3,13 @@ namespace Andromeda.AvaloniaApp.Components
 open Andromeda.Core
 open Avalonia
 open Avalonia.Controls
-open Avalonia.FuncUI.Components
+
+open Elmish
+open Avalonia.FuncUI
 open Avalonia.FuncUI.DSL
 open Avalonia.Input
 open Avalonia.Layout
-open Elmish
+
 open GogApi
 open GogApi.DomainTypes
 

diff --git a/src/Andromeda/AvaloniaApp/Components/Settings.fs b/src/Andromeda/AvaloniaApp/Components/Settings.fs
@@ -4,11 +4,11 @@ open Andromeda.Core
 open Andromeda.Core.DomainTypes
 open Avalonia
 open Avalonia.Controls
-open Avalonia.FuncUI.Components
+open Elmish
+open Avalonia.FuncUI
 open Avalonia.FuncUI.DSL
 open Avalonia.FuncUI.Types
 open Avalonia.Layout
-open Elmish
 open System.IO
 
 open Andromeda.AvaloniaApp.AvaloniaHelper

diff --git a/src/Andromeda/AvaloniaApp/Program.fs b/src/Andromeda/AvaloniaApp/Program.fs
@@ -4,16 +4,15 @@ open Andromeda.Core
 open Avalonia
 open Avalonia.Controls
 open Avalonia.Controls.ApplicationLifetimes
-open Avalonia.FuncUI.Elmish
 open Elmish
+open Avalonia.FuncUI.Elmish
+open Avalonia.FuncUI.Hosts
 open GogApi
 open Avalonia.FuncUI
 
 open Andromeda.AvaloniaApp
 
 module Program =
-    open Avalonia.FuncUI.Components.Hosts
-
     type MainWindow() as this =
         inherit HostWindow()
 

diff --git a/src/Andromeda/AvaloniaApp/View.fs b/src/Andromeda/AvaloniaApp/View.fs
@@ -4,7 +4,7 @@ open Avalonia.Controls
 open Avalonia.Controls.Primitives
 open Avalonia.Layout
 
-open Avalonia.FuncUI.Components
+open Avalonia.FuncUI
 open Avalonia.FuncUI.DSL
 open Avalonia.FuncUI.Types
 

diff --git a/src/Andromeda/AvaloniaApp/paket.references b/src/Andromeda/AvaloniaApp/paket.references
@@ -1,4 +1,4 @@
-Avalonia
+FSharp.Core
 Avalonia.Diagnostics
 JaggerJo.Avalonia.FuncUI.DSL
 JaggerJo.Avalonia.FuncUI.Elmish

diff --git a/src/Andromeda/Core/Diverse.fs b/src/Andromeda/Core/Diverse.fs
@@ -1,5 +1,6 @@
 namespace Andromeda.Core
 
+open FsHttp
 open FsHttp.DslCE
 open GogApi
 open GogApi.DomainTypes
@@ -31,7 +32,6 @@ module Diverse =
         }
 
     [<Pure>]
-    /// Takes a list of Installers and returns only those, who are for the given OS
     let filterInstallersByOS systemInfo (installers: InstallerInfo list) =
         let filter =
             match systemInfo with

diff --git a/src/Andromeda/Core/paket.references b/src/Andromeda/Core/paket.references
@@ -1,8 +1,7 @@
+FSharp.Core
 NicoVIII.GogApi
 NicoVIII.SimpleOptics
 Mono.Posix.NETStandard
 SharpZipLib
 TypedPersistence.Json
-Myriad.Plugins
-Myriad.Sdk
 FsToolkit.ErrorHandling